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
///
public string lastPrgName { get; set; }
///
- /// Ultimo sysinfo letto
+ /// Ultimo SysInfo letto
///
public string lastSysInfo { get; set; }
+ ///
+ /// Ultimo DynData letto
+ ///
+ public string lastDynData { get; set; }
///
/// 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;
+ }
+ }
}
///
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 @@
- v.1.11.* → v.1.14.*
+ v.1.11.* → v.1.15.*
- Inserimento nuove letture FANUC x programmi
- Inserimento nuove letture FANUC x SysEx (informazioni sistema)
@@ -21,6 +21,7 @@
- Inserimento contapezzi da area memoria X
- NUOVA Gestione rami cliente e URL di update
- Gestione modi CNC
+ - Lettura dari dinamycs FANUC (feed, speed)
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'
}
}