From 42376e9ff3f1581804dd078e24cd9ecafd8fb3ed Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 29 Apr 2019 17:04:24 +0200
Subject: [PATCH] fix aprochim (emergenza in coda)

---
 IOB-WIN/IobGeneric.cs         |  5 +----
 IOB-WIN/IobSiemensAprochim.cs | 33 ++++++++++++++++++++++++---------
 Jenkinsfile                   |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index c3215a46..2e1bd60a 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -2147,10 +2147,7 @@ namespace IOB_WIN
 
       if (enableByApp || enableByIob)
       {
-        if (verboseLog)
-        {
-          lgInfo("Inizio processDynData");
-        }
+        lgInfo("Inizio processDynData");
         if (connectionOk)
         {
           currDynData = getDynData();
diff --git a/IOB-WIN/IobSiemensAprochim.cs b/IOB-WIN/IobSiemensAprochim.cs
index 555f63b9..cf09e5ab 100644
--- a/IOB-WIN/IobSiemensAprochim.cs
+++ b/IOB-WIN/IobSiemensAprochim.cs
@@ -161,18 +161,28 @@ namespace IOB_WIN
        * B3: allarme
        * B4: manuale
        * B5: emergenza
-      ----------------------------------------------------- */
+       * 
+       * 
+       * - BIT di stato
+       *   - DB60.DBX3.0: AUSILIARI INSERITI = NO EMERGENZA
+       *   - DB60.DBX3.1: Filtro (macchina) in LAVORAZIONE
+       *   - DB60.DBX3.2: Selettore in AUTOMATICO (sennò GIALLO)  
+       *   - DB60.DBX3.3: WARNING MIN LIV VASCA (arancio)        
+       *   - DB60.DBX3.4: WARNING MIN LIV CELLULOSA (blu)
+       *   - DB60.DBX3.5: LAMPADA ROSSA (allarmi almeno 1 attivo)
+       ----------------------------------------------------- */
+
 
 
       /* -----------------------------------------------------
        * bitmap MAPO FILTRO Aprochim   
        * B0: POWER_ON
-       * B1: NOT emergenza
-       * B2: RUN
-       * B3: Automatico
-       * B4: WARN_MIN_VASCA
-       * B5: WARN_MIN_CELL
-       * B6: ALARM
+       * B1: RUN
+       * B2: AUTOMATICO
+       * B3: WARN_MIN_VASCA
+       * B4: WARN_MIN_CELL
+       * B5: ALARM  
+       * B6: EMERGENZA
       ----------------------------------------------------- */
 
       // bit 0 (poweron) imposto a 1 SE connected...
@@ -180,8 +190,13 @@ namespace IOB_WIN
 
       // recupero byte segnali...
       int byteSignals = RawInput[3];
-      // faccio uno shift a sx di 1...
-      byteSignals = byteSignals << 1;
+      // aggiungo "in coda" primo bit emergenza...essendo un bit negato (NON emergenza) lo cambio di segno
+      if ((byteSignals & (1 << 0)) == 0)
+      {
+        byteSignals += (1 << 6);
+      }
+      // cancello primo bit (faccio uno shift a dx e poi a sx di 1...)
+      byteSignals = ((byteSignals >> 1) << 1);
       // bit 0 (poweron) imposto a 1 SE connected...
       if (currPLC.IsConnected)
       {
diff --git a/Jenkinsfile b/Jenkinsfile
index 8e9580c3..0bf87210 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=409']) {
+        withEnv(['NEXT_BUILD_NUMBER=411']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'