From a09f295f052dfcad249406459d5a6c342d31a00f Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Sep 2018 12:39:55 +0200
Subject: [PATCH 1/2] Update TAKISAWA: ignorato giallo che indica sforzo
 utensile, sistemato contapezzi

---
 IOB-WIN/DATA/CONF/C502.ini | 18 ++++++++++++------
 IOB-WIN/DATA/CONF/MAIN.ini |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/IOB-WIN/DATA/CONF/C502.ini b/IOB-WIN/DATA/CONF/C502.ini
index d262cafc..2686b85b 100644
--- a/IOB-WIN/DATA/CONF/C502.ini
+++ b/IOB-WIN/DATA/CONF/C502.ini
@@ -23,12 +23,12 @@ CMDADV1=?valore=
 CMDREBO=/sendReboot.aspx?idxMacchina=
      
 [MEMORY]        
-; Red: Y7.4 | Yellow: Y7.5 | Green Y7.6 | Alarm	Y 51.4 
+; Red: Y7.4 | Yellow: Y51.1 (porta chiusa, da NEGARE) | Green Y7.6 | Alarm	Y 51.4 
 ;BIT0=CONN
-BIT1=Y7.6                
-BIT2=PZCOUNT.PAR.6711
+BIT1=Y7.6
+BIT2=PZCOUNT.D.3010.DW
 BIT3=Y7.4  
-BIT4=Y7.5
+;BIT4=Y51.1
 BIT5=Y51.4
 AREAD_START=0
 AREAD_SIZE=9999
@@ -58,10 +58,16 @@ BLINK_FILT=0
 
 [OPTPAR]                   
 ;PZCOUNT_MODE=STD|BIT
-PZCOUNT_MODE=STD.PAR.6711
+PZCOUNT_MODE=STD.D.3010.DW     
 ;PZ_CAD_MADDR=1602; cad
 ;PZ_REQ_MADDR=1603; pz richiesti (DW)
 ;PZ_DONE_MADDR=1604; pz fatti
 ;PZ_GTOT_MADDR=1605; pz tot macchina
 
-[BRANCH]
\ No newline at end of file
+;D.3010.DW: pz prodotti
+;D.3020.DW: TOTALI               
+;D.3060.DW: pz da fare
+;D.3064.DW: SUPER-TOTALE???
+
+[BRANCH]    
+NAME=master
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini
index e4e85e83..1925004e 100644
--- a/IOB-WIN/DATA/CONF/MAIN.ini
+++ b/IOB-WIN/DATA/CONF/MAIN.ini
@@ -11,6 +11,7 @@ CMDREBO=/IOB/sendRebootGateway?GWIP=
 CMDIOB2CALL=/IOB/getIob2call?GWIP=
 
 [IOB]
-STARTLIST=3013
+STARTLIST=C502
+;STARTLIST=3013
 MAXCNC=4
 ;STARTLIST=3001,3002,3003,3004,3005
\ No newline at end of file

From 61779aa6fabd6163bd97ead52f8826c50b349fb9 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Sep 2018 18:49:07 +0200
Subject: [PATCH 2/2] update x vers Jetco  x evitare problemi rilettura
 contapezzi (Tornoss DT26 II)

---
 IOB-WIN/IobGeneric.cs | 16 +++++++++++++---
 Jenkinsfile           |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index a82a73b6..accc903a 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -462,7 +462,6 @@ namespace IOB_WIN
     protected void pzCntReload()
     {
       // legge da IO server ULTIMO valore CONTPEZZI al riavvio...
-      lgInfo("Lettura contapezzi dall'url {0}", urlGetPzCount);
       string currServerCount = "";
       if (checkServerAlive)
       {
@@ -470,16 +469,27 @@ namespace IOB_WIN
         if (QueueIN.Count > 0)
         {
           currServerCount = utils.callUrl(urlGetPzCount);
+          lgInfo("Lettura contapezzi dall'url {0}", urlGetPzCount);
         }
         // altrimenti uso dati da TCiclo registrati...
         else
         {
           currServerCount = utils.callUrl(urlGetPzCountRec);
+          lgInfo("Lettura contapezzi da TCiclo dall'url {0}", urlGetPzCountRec);
         }
         if (currServerCount != "")
         {
-          int.TryParse(currServerCount, out contapezzi);
-          lgInfo("Ricevuta conferma da server di {0} pezzi registrati per ODL", currServerCount);
+          // se "-1" resto a ultimo...
+          if (currServerCount != "-1")
+          {
+            int.TryParse(currServerCount, out contapezzi);
+            lgInfo("Ricevuta conferma da server di {0} pezzi registrati per ODL", currServerCount);
+          }
+          else
+          {
+            contapezzi = lastCountCNC;
+            lgInfo("Errore lettura contapezzi (-1) - uso lastCountCNC --> " + contapezzi);
+          }
         }
         else
         {
diff --git a/Jenkinsfile b/Jenkinsfile
index d886558e..c357101c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=287']) {
+        withEnv(['NEXT_BUILD_NUMBER=288']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'