aggiunta visualizzazione e fluxLog dei MODE oltre che status

This commit is contained in:
Samuele E. Locatelli
2018-11-23 09:54:47 +01:00
parent 28419f0f62
commit 138f0bca90
3 changed files with 28 additions and 3 deletions
+1 -1
View File
@@ -644,10 +644,10 @@ namespace IOB_WIN
else if (ciclo == gatherCycle.HF)
{
processAllMemory();
processMode();
}
else if (ciclo == gatherCycle.MF)
{
processMode();
processOverride();
processContapezzi();
processCncAlarms();
+26 -1
View File
@@ -23,6 +23,10 @@ namespace IOB_WIN
/// Vettore degli allarmi CNC attivi
/// </summary>
public Dictionary<string, string> allarmiCNC = new Dictionary<string, string>();
/// <summary>
/// Stato corrente (da classe ENUM)
/// </summary>
public CNC_STATUS_OSAI currStatus;
#if false
/// <summary>
@@ -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();
}
}
/// <summary>
/// Decodifica del MODE selezionato
Vendored
+1 -1
View File
@@ -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'