From 67c5bec38369b40c191432218de68d25e1567251 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 26 Apr 2019 15:32:11 +0200
Subject: [PATCH] Cambio init stringhe all'avvio

---
 IOB-WIN/AdapterForm.cs        | 2 ++
 IOB-WIN/DATA/CONF/3017.ini    | 9 +++++----
 IOB-WIN/IobSiemensAprochim.cs | 8 ++++----
 Jenkinsfile                   | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index cbf4c487..b83bb633 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -479,6 +479,7 @@ namespace IOB_WIN
             kvp = item.Split('=');
             optParRead.Add(kvp[0], kvp[1]);
           }
+          lgInfo($"Caricati {optParRead.Count} parametri opzionali da OPTPAR");
         }
         catch (Exception exc)
         {
@@ -505,6 +506,7 @@ namespace IOB_WIN
         MAX_COUNTER_BLINK = Convert.ToInt32(fIni.ReadString("BLINK", "MAX_COUNTER_BLINK", "1")),
         BLINK_FILT = Convert.ToInt32(fIni.ReadString("BLINK", "BLINK_FILT", "0"))
       };
+      lgInfo($"Creato IOBConf!");
 
       loadIobType();
       // avvio macchina con adapter specificato...
diff --git a/IOB-WIN/DATA/CONF/3017.ini b/IOB-WIN/DATA/CONF/3017.ini
index d77846b1..85c21a90 100644
--- a/IOB-WIN/DATA/CONF/3017.ini
+++ b/IOB-WIN/DATA/CONF/3017.ini
@@ -30,10 +30,10 @@ ADDR_WRITE=DB60.DBB18
 SIZE_READ=18
 SIZE_WRITE=0
 ;BIT0=CONN
-BIT1=DB60.DBB1
+;BIT1=DB60.DBB1
 ;BIT2=PZCOUNT.STD.DB700.DBW22
-BIT3=DB60.DBB3
-BIT4=DB60.DBB4
+;BIT3=DB60.DBB3
+;BIT4=DB60.DBB4
 
 
 [BLINK]
@@ -52,8 +52,9 @@ BLINK_FILT=0
 
 [OPTPAR]
 ;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
-; attenzione memoria sempre base BYTE (1604 DW --> 6416...)
+; attenzione memoria sempre base BYTE (1604 DW --> 6416...)		
 ;PZCOUNT_MODE=STD.DB550.DBDW0
+PZCOUNT_MODE=NONE
 ;PZ_CAD_MADDR=1602
 ;PZ_REQ_MADDR=1603
 ;PZ_DONE_MADDR=1604
diff --git a/IOB-WIN/IobSiemensAprochim.cs b/IOB-WIN/IobSiemensAprochim.cs
index 90c2e759..b3239c84 100644
--- a/IOB-WIN/IobSiemensAprochim.cs
+++ b/IOB-WIN/IobSiemensAprochim.cs
@@ -42,7 +42,7 @@ namespace IOB_WIN
       lgInfo("NEW IOB SIEMENS versione APROCHIM");
 
       // leggo 1 byte
-      for (int i = 0; i < 10; i++)
+      for (int i = 0; i < 3; i++)
       {
         Byte[] memByteRead = currPLC.ReadBytes(DataType.DataBlock, 60, 0, 18);
         double pressCamFilt = S7.Net.Types.Double.FromByteArray(memByteRead.Skip(6).Take(4).ToArray());
@@ -52,9 +52,9 @@ namespace IOB_WIN
         byte statusByte = S7.Net.Types.Byte.FromByteArray(memByteRead.Skip(3).Take(1).ToArray());
 
         // log!                                      
-        lgInfo($"pressCamFilt: {pressCamFilt:N6}");
-        lgInfo($"pressLinUt: {pressLinUt:N6}");
-        lgInfo($"tempH2O: {tempH2O:N3}");
+        lgInfo($"pressCamFilt: {pressCamFilt}");
+        lgInfo($"pressLinUt: {pressLinUt}");
+        lgInfo($"tempH2O: {tempH2O}");
 
         lgInfo($"statusByte: {statusByte}");
 
diff --git a/Jenkinsfile b/Jenkinsfile
index bec1f29b..08d9f1fd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=388']) {
+        withEnv(['NEXT_BUILD_NUMBER=389']) {
           // 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'