From 98e8c236273a5a70e02b0533f669a511cba0f682 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 16 Nov 2017 11:48:29 +0100
Subject: [PATCH] cambio vers 1.15, gestione CORRETTA x valori DYN DATA...

---
 IOB-WIN/IobGeneric.cs            | 44 +++++++++++++++++---------------
 IOB-WIN/Resources/ChangeLog.html |  3 ++-
 Jenkinsfile                      |  4 +--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index 614002e6..37ed7c73 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -145,9 +145,13 @@ namespace IOB_WIN
     /// </summary>
     public string lastPrgName { get; set; }
     /// <summary>
-    /// Ultimo sysinfo letto
+    /// Ultimo SysInfo letto
     /// </summary>
     public string lastSysInfo { get; set; }
+    /// <summary>
+    /// Ultimo DynData letto
+    /// </summary>
+    public string lastDynData { get; set; }
 
     /// <summary>
     /// Array dei contatori x segnali blinking
@@ -1578,25 +1582,25 @@ namespace IOB_WIN
       {
         currDynData.Add("DYN-DEMO", string.Format("D-{0:HHmm}", DateTime.Now));
       }
-      //// verifico SE sia cambiato il programma...
-      //if (lastSysInfo != currSysInfo["SYSINFO"])
-      //{
-      //  // salvo!
-      //  lastSysInfo = currSysInfo["SYSINFO"];
-      //  // per ogni valore del dizionario mostro ed accodo!
-      //  string sVal = "";
-      //  foreach (var item in currSysInfo)
-      //  {
-      //    sVal = string.Format("[SYSINFO]{0}|{1}", item.Key, item.Value);
-      //    displayOtherData(sVal);
-      //    // --> accodo (valore già formattato)!
-      //    QueueFLog.Enqueue(qEncodeFLog(item.Key, item.Value));
-      //    // Gestione counter FLog!
-      //    counterFLog++;
-      //    // se supera 10k resetto...
-      //    if (counterFLog > 9999) counterFLog = 0;
-      //  }
-      //}
+      // verifico SE sia cambiato il programma...
+      if (lastDynData != currDynData["DYNDATA"])
+      {
+        // salvo!
+        lastSysInfo = currDynData["DYNDATA"];
+        // per ogni valore del dizionario mostro ed accodo!
+        string sVal = "";
+        foreach (var item in currDynData)
+        {
+          sVal = string.Format("[DYNDATA]{0}|{1}", item.Key, item.Value);
+          displayOtherData(sVal);
+          // --> accodo (valore già formattato)!
+          QueueFLog.Enqueue(qEncodeFLog(item.Key, item.Value));
+          // Gestione counter FLog!
+          counterFLog++;
+          // se supera 10k resetto...
+          if (counterFLog > 9999) counterFLog = 0;
+        }
+      }
     }
 
     /// <summary>
diff --git a/IOB-WIN/Resources/ChangeLog.html b/IOB-WIN/Resources/ChangeLog.html
index 90d5fa06..a6087453 100644
--- a/IOB-WIN/Resources/ChangeLog.html
+++ b/IOB-WIN/Resources/ChangeLog.html
@@ -9,7 +9,7 @@
       <ul>{{LAST-CHANGES}}</ul>
     </li>
     <li>
-      <b>v.1.11.* &rarr; v.1.14.*</b>
+      <b>v.1.11.* &rarr; v.1.15.*</b>
       <ul>
         <li>Inserimento nuove letture FANUC x programmi</li>
         <li>Inserimento nuove letture FANUC x SysEx (informazioni sistema)</li>
@@ -21,6 +21,7 @@
         <li>Inserimento contapezzi da area memoria X</li>
         <li>NUOVA Gestione rami cliente e URL di update</li>
         <li>Gestione modi CNC</li>
+        <li>Lettura dari dinamycs FANUC (feed, speed)</li>
       </ul>
     </li>
     <li>
diff --git a/Jenkinsfile b/Jenkinsfile
index 85ace57c..013661e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,8 +15,8 @@ pipeline {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
         withEnv(['NEXT_BUILD_NUMBER=174']) {
-          // env.versionNumber = VersionNumber(versionNumberString : '1.14.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
-          env.versionNumber = VersionNumber(versionNumberString : '1.14.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+          // 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'
         }
       }