diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index b77e2b75..e397c6de 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -107,6 +107,10 @@ namespace IOB_WIN MemBlockG = new byte[fIni.ReadInteger("MEMORY", "AREAG_SIZE", 8)]; MemBlockX = new byte[fIni.ReadInteger("MEMORY", "AREAX_SIZE", 8)]; MemBlockY = new byte[fIni.ReadInteger("MEMORY", "AREAY_SIZE", 8)]; + // loggo aree di memoria avviate... + lg.Info(string.Format("Avviare area di memoria MemBlockG: {0} byte", MemBlockG.Length)); + lg.Info(string.Format("Avviare area di memoria MemBlockX: {0} byte", MemBlockX.Length)); + lg.Info(string.Format("Avviare area di memoria MemBlockY: {0} byte", MemBlockY.Length)); // effettuo lettura della conf sigLUT... cercando 1:1 i bit... string currBit = ""; @@ -612,7 +616,7 @@ namespace IOB_WIN } catch (Exception exc) { - lg.Error(exc, "Errore in process Mode G43"); + lg.Error(exc, string.Format("Errore in process Mode G43: {0}{1}", Environment.NewLine, exc)); connectionOk = false; stopwatch.Stop(); } diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 7899ed48..76e3f8b6 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -1587,19 +1587,23 @@ namespace IOB_WIN { currOverride.Add("FEED_OVER", string.Format("D-{0:HHmm}", DateTime.Now)); } - // verifico SE sia cambiato il programma... - if (lastOverrideFS != currOverride["FEED_OVER"] || lastOverrideRapid != currOverride["RAPID_OVER"]) + // SE sono connesso... + if (connectionOk) { - // salvo! - lastOverrideFS = currOverride["FEED_OVER"]; - lastOverrideRapid = currOverride["RAPID_OVER"]; - // per ogni valore del dizionario mostro ed accodo! - string sVal = ""; - foreach (var item in currOverride) + // verifico SE sia cambiato il programma... + if (lastOverrideFS != currOverride["FEED_OVER"] || lastOverrideRapid != currOverride["RAPID_OVER"]) { - sVal = string.Format("[OVERRIDES]{0}|{1}", item.Key, item.Value); - // chiamo accodamento... - accodaFLog(sVal, qEncodeFLog(item.Key, item.Value)); + // salvo! + lastOverrideFS = currOverride["FEED_OVER"]; + lastOverrideRapid = currOverride["RAPID_OVER"]; + // per ogni valore del dizionario mostro ed accodo! + string sVal = ""; + foreach (var item in currOverride) + { + sVal = string.Format("[OVERRIDES]{0}|{1}", item.Key, item.Value); + // chiamo accodamento... + accodaFLog(sVal, qEncodeFLog(item.Key, item.Value)); + } } } } diff --git a/Jenkinsfile b/Jenkinsfile index 441aa3d6..087644e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=220']) { + withEnv(['NEXT_BUILD_NUMBER=221']) { // env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'