From 19496c21669aa9299d4de04beb6060b7fad36fb5 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 3 Dec 2019 18:17:33 +0100
Subject: [PATCH] Fix decodifica eventi (da rendere configurabile!!!)

---
 IOB-WIN/IobMTC.cs | 9 +++++----
 Jenkinsfile       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IOB-WIN/IobMTC.cs b/IOB-WIN/IobMTC.cs
index 4f37e28e..b8d423a4 100644
--- a/IOB-WIN/IobMTC.cs
+++ b/IOB-WIN/IobMTC.cs
@@ -782,13 +782,14 @@ namespace IOB_WIN
       string currPowerOn = "";
       try
       {
-        var exeMode = dataItemMem["POWER"];
+        var exeMode = dataItemMem["E_POWER"];
         currPowerOn = exeMode.value;
       }
       catch (Exception exc)
       {
         lgError($"Eccezione in decodifica currPowerOn: {Environment.NewLine}{exc}");
       }
+
       bool checkPowerOn = (currPowerOn == "ON");
 
       // bit 0 (poweron) imposto a 1 SE pingo o PowerOn=="ON"...
@@ -801,7 +802,7 @@ namespace IOB_WIN
       string currUnOpStatus = "";
       try
       {
-        var exeMode = dataItemMem["Path_01_EXE_MODE"];
+        var exeMode = dataItemMem["E_Path_01_EXE_MODE"];
         currExe = exeMode.value;
       }
       catch (Exception exc)
@@ -810,7 +811,7 @@ namespace IOB_WIN
       }
       try
       {
-        var runMode = dataItemMem["Path_01_RUN_MODE"];
+        var runMode = dataItemMem["E_Path_01_RUN_MODE"];
         currRun = runMode.value;
       }
       catch (Exception exc)
@@ -819,7 +820,7 @@ namespace IOB_WIN
       }
       try
       {
-        var UnOp_Status = dataItemMem["ST_UnOp_01_Status"];
+        var UnOp_Status = dataItemMem["E_ST_UnOp_01_Status"];
         currUnOpStatus = UnOp_Status.value;
       }
       catch (Exception exc)
diff --git a/Jenkinsfile b/Jenkinsfile
index 657420fb..e4d1997a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=553']) {
+        withEnv(['NEXT_BUILD_NUMBER=554']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'