From ee14560322347a46857cd9dcc3309eb34adce1aa Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 16 Apr 2018 12:11:09 +0200
Subject: [PATCH] fix x gestione timer controllo contapezzi

---
 IOB-WIN/IobFanuc.cs | 3 ++-
 Jenkinsfile         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index e225a07e..799a080d 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -400,6 +400,8 @@ namespace IOB_WIN
               // controllo se è passato intervallo minimo pre invio
               if (DateTime.Now >= lastPzCountSend.AddMilliseconds(pzCountDelay))
               {
+                // resetto timer...
+                lastPzCountSend = DateTime.Now;
                 if (utils.CRB("enableContapezzi"))
                 {
                   try
@@ -462,7 +464,6 @@ namespace IOB_WIN
                   B_input += 1 << 2;
                   // registro contapezzi
                   lg.Info(string.Format("Contapezzi FANUC: {0} | Contapezzi interno {1}", lastCount, contapezzi));
-                  lastPzCountSend = DateTime.Now;
                 }
                 else if (contapezzi > lastCount) // in questo caso resetto
                 {
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d54bd8e..2fd06bcd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=225']) {
+        withEnv(['NEXT_BUILD_NUMBER=226']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'