From e18dac8d33da4705aebdf2a0623b8084fb716833 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 17 Nov 2017 17:48:31 +0100
Subject: [PATCH] test x loggare meglio lettura area G...

---
 IOB-WIN/App.config  |  2 +-
 IOB-WIN/IobFanuc.cs | 14 ++++++++++++++
 Jenkinsfile         |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config
index a81a3aea..6f4897a5 100644
--- a/IOB-WIN/App.config
+++ b/IOB-WIN/App.config
@@ -12,7 +12,7 @@
     <add key="enableOverrides" value="true" />    
     <add key="doMemDump" value="false" />
     <add key="doSampleMemory" value="false" />
-    <add key="basePrgMemPath" value="CNCMEMUSERPATH1" />
+    <add key="basePrgMemPath" value="CNCMEMUSER" />
     <!--gestione TIMERS e periodi multipli x thread lenti-->
     <add key="startTimerMs" value="250" />
     <!-- ciclo corto x invio a server: ms -->
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index bd6b6bc0..79aa626a 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -382,6 +382,13 @@ namespace IOB_WIN
           int memIndex = 1;
           FanucMemRW(R, FANUC.MemType.G, memIndex, ref MemBlockG);
           if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlockG.Length), DateTime.Now.Subtract(inizio).Ticks);
+          // loggo...
+          string allG = "processMode: ";
+          for (int i = 0; i < MemBlockG.Length; i++)
+          {
+            allG += string.Format("{0}:{1} | ", i, MemBlockG[i]);
+          }
+          lg.Info(allG);
           // verifico modo con valore corrente, se cambia aggiorno...
           CNC_MODE newMode = decodeG43(MemBlockG[43]);
           if (newMode != currMode)
@@ -525,6 +532,13 @@ namespace IOB_WIN
 #endif
       outVal.Add("FEED_OVER", MemBlockG[30].ToString());
       outVal.Add("RAPID_OVER", MemBlockG[12].ToString());
+      // loggo...
+      string allG = "getOverrides: ";
+      for (int i = 0; i < MemBlockG.Length; i++)
+      {
+        allG += string.Format("{0}:{1} | ", i, MemBlockG[i]);
+      }
+      lg.Info(allG);
       return outVal;
     }
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 11c97708..46c96fb9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=182']) {
+        withEnv(['NEXT_BUILD_NUMBER=183']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.15.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.15.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'