From 581f5cfc669d8b81a3129e8b38e2b3611cfdf42e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 6 Dec 2019 08:36:40 +0100
Subject: [PATCH] ancora update SAET

---
 IOB-WIN/DATA/CONF/VL20.json | 6 +++---
 IOB-WIN/IobSiemensSaet.cs   | 9 +++++++--
 Jenkinsfile                 | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/IOB-WIN/DATA/CONF/VL20.json b/IOB-WIN/DATA/CONF/VL20.json
index 3b4e7ebd..32b44e07 100644
--- a/IOB-WIN/DATA/CONF/VL20.json
+++ b/IOB-WIN/DATA/CONF/VL20.json
@@ -5,7 +5,7 @@
       "description": "Articolo",
       "memAddr": "DB1275.DBB96",
       "tipoMem": "String",
-      "index": 4,
+      "index": 96,
       "size": 32
     },
     "setComm": {
@@ -13,7 +13,7 @@
       "description": "Commessa",
       "memAddr": "DB1275.DBB130",
       "tipoMem": "String",
-      "index": 38,
+      "index": 130,
       "size": 12
     },
     "setPzComm": {
@@ -21,7 +21,7 @@
       "description": "Qty",
       "memAddr": "DB1275.DBB144",
       "tipoMem": "Int",
-      "index": 52,
+      "index": 144,
       "size": 4
     }
   },
diff --git a/IOB-WIN/IobSiemensSaet.cs b/IOB-WIN/IobSiemensSaet.cs
index a2285618..e4157f61 100644
--- a/IOB-WIN/IobSiemensSaet.cs
+++ b/IOB-WIN/IobSiemensSaet.cs
@@ -137,7 +137,6 @@ namespace IOB_WIN
             case taskType.forceResetPzCount:
             case taskType.forceSetPzCount:
             case taskType.setProg:
-            case taskType.startSetup:
               taskVal = $"taskReq: {tName} | key: {item.Key} | val: {item.Value} | SKIPPED | NO EXEC";
               break;
             case taskType.setArt:
@@ -193,12 +192,18 @@ namespace IOB_WIN
               memAddrWrite = "DB1275.DBB92";
               taskVal = $"VALUE DB1275.92 --> {counterMes2Plc}";
               break;
-            case taskType.stopSetup:
+            case taskType.startSetup:
               // processo scrittura BIT x richeista nuovo ordine a FINE setup
               MemBlock = new byte[1];
               MemBlock[0] = (byte)1;
               memAddrWrite = "DB1275.DBB94";
               break;
+            case taskType.stopSetup:
+              // processo scrittura BIT x richeista nuovo ordine a FINE setup
+              MemBlock = new byte[1];
+              MemBlock[0] = (byte)0;
+              memAddrWrite = "DB1275.DBB94";
+              break;
             default:
               taskVal = "SKIPPED | NO EXEC";
               break;
diff --git a/Jenkinsfile b/Jenkinsfile
index f453b5f3..377c52d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=581']) {
+        withEnv(['NEXT_BUILD_NUMBER=582']) {
           // 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'