From 7e84c56cde31120baebcf0755feb8a66b31a048d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 24 Apr 2019 14:56:32 +0200
Subject: [PATCH] altro test debug aprochim

---
 IOB-WIN/DATA/CONF/3017.ini    |  2 +-
 IOB-WIN/IobSiemensAprochim.cs | 45 ++++++++++++++++++++++++++++-------
 Jenkinsfile                   |  2 +-
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/IOB-WIN/DATA/CONF/3017.ini b/IOB-WIN/DATA/CONF/3017.ini
index e70a29e7..ee812c7a 100644
--- a/IOB-WIN/DATA/CONF/3017.ini
+++ b/IOB-WIN/DATA/CONF/3017.ini
@@ -53,7 +53,7 @@ BLINK_FILT=0
 [OPTPAR]
 ;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
 ; attenzione memoria sempre base BYTE (1604 DW --> 6416...)
-PZCOUNT_MODE=STD.DB550.DBDW0
+;PZCOUNT_MODE=STD.DB550.DBDW0
 ;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 388bd1c2..cca907f5 100644
--- a/IOB-WIN/IobSiemensAprochim.cs
+++ b/IOB-WIN/IobSiemensAprochim.cs
@@ -114,11 +114,17 @@ namespace IOB_WIN
     public override Dictionary<string, string> getDynData()
     {
       Dictionary<string, string> outVal = new Dictionary<string, string>();
+#if false
       ushort valStatus = S7.Net.Types.Word.FromByteArray(RawInput.Skip(0).Take(2).ToArray());
-      //ushort valPosit = S7.Net.Types.Word.FromByteArray(RawInput.Skip(2).Take(2).ToArray());
+      ushort valPosit = S7.Net.Types.Word.FromByteArray(RawInput.Skip(2).Take(2).ToArray());
       outVal.Add("CURR_STATO", ((statoMacchina)valStatus).ToString());
-      //outVal.Add("CURR_POSIT", ((posizioneSequenza)valPosit).ToString());
-      return outVal;
+      outVal.Add("CURR_POSIT", ((posizioneSequenza)valPosit).ToString());
+#endif                                                                          
+      outVal.Add("CURR_B0", RawInput.Skip(0).Take(1).ToArray().ToString());
+      outVal.Add("CURR_B1", RawInput.Skip(1).Take(1).ToArray().ToString());
+      outVal.Add("CURR_B2", RawInput.Skip(2).Take(1).ToArray().ToString());
+      outVal.Add("CURR_B3", RawInput.Skip(3).Take(1).ToArray().ToString());
+      return outVal; 
     }
 
     /// <summary>
@@ -128,11 +134,13 @@ namespace IOB_WIN
     {
       // init a zero...
       B_input = 0;
+#if false
       // FAPE: leggo i primi 2 WORD x decodifica stato e posizione...  
       ushort valStatus = S7.Net.Types.Word.FromByteArray(RawInput.Skip(0).Take(2).ToArray());
-      //ushort valPosit = S7.Net.Types.Word.FromByteArray(RawInput.Skip(2).Take(2).ToArray());
+      ushort valPosit = S7.Net.Types.Word.FromByteArray(RawInput.Skip(2).Take(2).ToArray());
       statoMacchina _stMacch = ((statoMacchina)valStatus);
-      //posizioneSequenza _posSeq = ((posizioneSequenza)valPosit);
+      posizioneSequenza _posSeq = ((posizioneSequenza)valPosit); 
+#endif
 
       /* -----------------------------------------------------
        * bitmap MAPO    
@@ -146,6 +154,22 @@ namespace IOB_WIN
 
       // bit 0 (poweron) imposto a 1 SE connected...
       B_input = currPLC.IsConnected ? 1 : 0;
+
+      // controllo bit preliminare...
+      int byteSem = RawInput[0];
+
+      // azzero powerOn...      
+      byteSem &= ~(1 << 0);
+      // bit 0 (powerOn) imposto a 1 SE connected...
+      if (currPLC.IsConnected)
+      {
+        byteSem += (1 << 0);
+      }
+
+      // salvo infine variabile bit x invio
+      B_input = byteSem;
+
+#if false
       // controllo stato macchina x impostare altri bit...
       switch (_stMacch)
       {
@@ -180,8 +204,10 @@ namespace IOB_WIN
         case statoMacchina.LIBERO:
         default:
           break;
-      }
+      } 
+#endif
 
+#if false
       string currODL = "";
       try
       {
@@ -212,7 +238,9 @@ namespace IOB_WIN
           lgError(exc, "Errore in fase di chiamata URL x ODL corrente | URL chiamato: {0}", urlGetCurrODL);
           lastWarnODL = DateTime.Now;
         }
-      }
+      } 
+#endif
+#if false
       if (currODL != null && currODL != "" && currODL != "0")
       {
         // ora processo il contapezzi...
@@ -256,7 +284,8 @@ namespace IOB_WIN
           // resetto timer...
           lastPzCountSend = DateTime.Now;
         }
-      }
+      } 
+#endif
 
       // log opzionale!
       if (verboseLog)
diff --git a/Jenkinsfile b/Jenkinsfile
index 194ac4b1..73c0ff6f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=383']) {
+        withEnv(['NEXT_BUILD_NUMBER=384']) {
           // 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'