From 39d4f9d5c6134291e3ea9844e5c991a0171e8b5b Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 23 Apr 2018 10:12:34 +0200
Subject: [PATCH] update x salvataggio samples... e conf pzCount..

---
 IOB-WIN/DATA/CONF/3003.ini |  2 +-
 IOB-WIN/DATA/CONF/3004.ini |  2 +-
 IOB-WIN/DATA/CONF/3005.ini |  2 +-
 IOB-WIN/DATA/CONF/3006.ini |  2 +-
 IOB-WIN/IobFanuc.cs        | 14 +++++++-------
 Jenkinsfile                |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/IOB-WIN/DATA/CONF/3003.ini b/IOB-WIN/DATA/CONF/3003.ini
index 7855ff1e..dabc8fa5 100644
--- a/IOB-WIN/DATA/CONF/3003.ini
+++ b/IOB-WIN/DATA/CONF/3003.ini
@@ -28,7 +28,7 @@ AREAY_SIZE=8
 ; Red: Y3.7 | Yellow: Y3.6 | Green Y3.5 | All DoorsClosed: Y4.0 (X5.1) | ..........WrkZone Y8.7
 ;BIT0=CONN
 BIT1=Y3.5
-BIT2=PZCOUNT
+BIT2=PZCOUNT.PAR.6711
 BIT3=Y3.7
 BIT4=Y3.6
 AREAD_START=0
diff --git a/IOB-WIN/DATA/CONF/3004.ini b/IOB-WIN/DATA/CONF/3004.ini
index 67d2b075..a576a52b 100644
--- a/IOB-WIN/DATA/CONF/3004.ini
+++ b/IOB-WIN/DATA/CONF/3004.ini
@@ -28,7 +28,7 @@ AREAY_SIZE=12
 ; Red: Y3.2 | Yellow: !Y8.0 | Green Y4.5
 ;BIT0=CONN
 BIT1=Y4.5
-BIT2=PZCOUNT
+BIT2=PZCOUNT.PAR.6711
 BIT3=Y3.2
 BIT4=Y8.0
 AREAD_START=0
diff --git a/IOB-WIN/DATA/CONF/3005.ini b/IOB-WIN/DATA/CONF/3005.ini
index e2f3101a..595ec4a4 100644
--- a/IOB-WIN/DATA/CONF/3005.ini
+++ b/IOB-WIN/DATA/CONF/3005.ini
@@ -28,7 +28,7 @@ AREAY_SIZE=12
 ; Red: Y3.2 | Yellow: !Y8.0 | Green Y4.5
 ;BIT0=CONN
 BIT1=Y4.5
-BIT2=PZCOUNT
+BIT2=PZCOUNT.PAR.6711
 BIT3=Y3.2
 BIT4=Y8.0
 AREAD_START=0
diff --git a/IOB-WIN/DATA/CONF/3006.ini b/IOB-WIN/DATA/CONF/3006.ini
index 61415836..a72fb373 100644
--- a/IOB-WIN/DATA/CONF/3006.ini
+++ b/IOB-WIN/DATA/CONF/3006.ini
@@ -28,7 +28,7 @@ AREAY_SIZE=56
 ; Red: Y53.0 | Yellow: Y53.1 | Green Y53.2
 ;BIT0=CONN
 BIT1=Y53.2
-BIT2=PZCOUNT
+BIT2=PZCOUNT.PAR.6711
 BIT3=Y53.0
 BIT4=Y53.1
 AREAD_START=0
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index c443e0ab..f6197d6f 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -421,7 +421,7 @@ namespace IOB_WIN
           // recupero nome variabile...
           bVal = signLUT[bKey];
           // se l'area è PZCOUNT... processo PUNTUALMENTE il CONTAPEZZI...
-          if (bVal == "PZCOUNT")
+          if (bVal.StartsWith("PZCOUNT"))
           {
             // controllo se è passato intervallo minimo tra 2 controlli/elaborazioni x distanziare invio e ridurre letture
             if (DateTime.Now >= lastPzCountSend.AddMilliseconds(pzCountDelay))
@@ -777,16 +777,16 @@ namespace IOB_WIN
       // seconda del tipo di lettura definisco i nomi delle variabili...
       if (tipo == dumpType.SAMPLE)
       {
-        nomeFileB = string.Format(@"{0}\SAMPLES\MemDumpD_Byte_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso);
-        nomeFileW = string.Format(@"{0}\SAMPLES\MemDumpD_W_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso);
-        nomeFileDW = string.Format(@"{0}\SAMPLES\MemDumpD_DW_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso);
+        nomeFileB = string.Format(@"{0}\SAMPLES\{2}_MemDumpD_Byte_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso, currIobConf.codIOB);
+        nomeFileW = string.Format(@"{0}\SAMPLES\{2}_MemDumpD_W_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso, currIobConf.codIOB);
+        nomeFileDW = string.Format(@"{0}\SAMPLES\{2}_MemDumpD_DW_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso, currIobConf.codIOB);
       }
       else
       {
         // salvo in file i dati letti come BYTE
-        nomeFileB = string.Format(@"{0}\MemDumpD_Byte.dat", utils.dataDatDir);
-        nomeFileW = string.Format(@"{0}\MemDumpD_W.dat", utils.dataDatDir);
-        nomeFileDW = string.Format(@"{0}\MemDumpD_DW.dat", utils.dataDatDir);
+        nomeFileB = string.Format(@"{0}\{1}_MemDumpD_Byte.dat", utils.dataDatDir, currIobConf.codIOB);
+        nomeFileW = string.Format(@"{0}\{1}_MemDumpD_W.dat", utils.dataDatDir, currIobConf.codIOB);
+        nomeFileDW = string.Format(@"{0}\{1}_MemDumpD_DW.dat", utils.dataDatDir, currIobConf.codIOB);
       }
 
       // salvo in file i dati letti come BYTE
diff --git a/Jenkinsfile b/Jenkinsfile
index 141ff90c..ce7e8339 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=247']) {
+        withEnv(['NEXT_BUILD_NUMBER=248']) {
           // 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'