Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cambio vers 1.15, gestione CORRETTA x valori DYN DATA...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-11-16 11:48:29 +01:00
parent d5e63fb3e1
commit 98e8c23627
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobGeneric.cs
+24 -20
View File
@@ -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>
IOB-WIN/Resources/ChangeLog.html
+2 -1
View File
@@ -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>
Jenkinsfile
Vendored
+2 -2
View File
@@ -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'
}
}