diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index a1e8897f..ac2e67b1 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -644,10 +644,10 @@ namespace IOB_WIN else if (ciclo == gatherCycle.HF) { processAllMemory(); + processMode(); } else if (ciclo == gatherCycle.MF) { - processMode(); processOverride(); processContapezzi(); processCncAlarms(); diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs index b47d42ac..fd7f1c40 100644 --- a/IOB-WIN/IobOSAI.cs +++ b/IOB-WIN/IobOSAI.cs @@ -23,6 +23,10 @@ namespace IOB_WIN /// Vettore degli allarmi CNC attivi /// public Dictionary allarmiCNC = new Dictionary(); + /// + /// Stato corrente (da classe ENUM) + /// + public CNC_STATUS_OSAI currStatus; #if false /// @@ -841,11 +845,32 @@ namespace IOB_WIN } catch (Exception exc) { - lgError(exc, string.Format("Errore in process Mode G43: {0}{1}", Environment.NewLine, exc)); + lgError(exc, string.Format("Errore in process Mode OSAI: {0}{1}", Environment.NewLine, exc)); connectionOk = false; stopwatch.Stop(); } } + // lo status lo processo SEMPRE + try + { + // verifico modo con valore corrente, se cambia aggiorno... + CNC_STATUS_OSAI newStatus = (CNC_STATUS_OSAI)(oData.status); + if (newStatus != currStatus) + { + // aggiorno! + currStatus = newStatus; + // accodo x invio + string sVal = string.Format("[CNC_STATUS]{0}", currStatus.ToString()); + // chiamo accodamento... + accodaFLog(sVal, qEncodeFLog("CNC_STATUS", currStatus.ToString())); + } + } + catch (Exception exc) + { + lgError(exc, string.Format("Errore in process Mode OSAI: {0}{1}", Environment.NewLine, exc)); + connectionOk = false; + stopwatch.Stop(); + } } /// /// Decodifica del MODE selezionato diff --git a/Jenkinsfile b/Jenkinsfile index ea095d58..bb67375f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=296']) { + withEnv(['NEXT_BUILD_NUMBER=297']) { // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'