From 28369150f81255ec6dcb66f87be2ccb68547d95f Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 1 Oct 2020 12:45:37 +0200
Subject: [PATCH] Fix contapezzi in new rel

---
 IOB-WIN/IobSimula.cs | 24 ++++++++++++------------
 Jenkinsfile          |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index e589e7bd..bfe267f2 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -484,18 +484,6 @@ namespace IOB_WIN
                     // in manuale: provo split ODL
                     trySplitOdl();
                 }
-                else if (bit5.wait <= 0 || tcMan.alarmDelayTC)
-                {
-                    // segnalo BIT
-                    B_input += (1 << 5);
-                    // decremento duration
-                    bit5.duration--;
-                    // controllo se sia scaduta la duration... in quel caso reset...
-                    if (bit5.duration <= 0)
-                    {
-                        bit5 = setupSimPar("SIM_SLOW");
-                    }
-                }
                 else if (bit2.wait <= 0)
                 {
                     // salvo nuovo contapezziPLC (incremento RAND 0..3)
@@ -568,6 +556,18 @@ namespace IOB_WIN
                         trySplitOdl();
                     }
                 }
+                else if (bit5.wait <= 0 || tcMan.alarmDelayTC)
+                {
+                    // segnalo BIT
+                    B_input += (1 << 5);
+                    // decremento duration
+                    bit5.duration--;
+                    // controllo se sia scaduta la duration... in quel caso reset...
+                    if (bit5.duration <= 0)
+                    {
+                        bit5 = setupSimPar("SIM_SLOW");
+                    }
+                }
                 // se multi gestisco il bit delle tavole...
                 if (isMulti)
                 {
diff --git a/Jenkinsfile b/Jenkinsfile
index ffe10d30..f2e21cdd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=704']) {
+        withEnv(['NEXT_BUILD_NUMBER=705']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'