From cc202c5a9e66f6f65fadfd791d042edef0f41906 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 3 Dec 2019 17:34:05 +0100 Subject: [PATCH] Modifica x debug REMOSA --- IOB-WIN/IobMTC.cs | 20 ++++++++++++++++---- Jenkinsfile | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/IOB-WIN/IobMTC.cs b/IOB-WIN/IobMTC.cs index ba54a3f1..24409027 100644 --- a/IOB-WIN/IobMTC.cs +++ b/IOB-WIN/IobMTC.cs @@ -797,8 +797,6 @@ namespace IOB_WIN string currExe = ""; string currRun = ""; string currUnOpStatus = ""; - string currGettoOn = ""; - string currAbilAbras = ""; try { var exeMode = dataItemMem["Path_01_EXE_MODE"]; @@ -842,6 +840,11 @@ namespace IOB_WIN { // se ho run mode != auto --> manual B_input += (1 << 4); + // loggo cosa sia curr run! + if (utils.CRB("verbose")) + { + lgInfo($"Indicato manuale | currRun = {currRun}"); + } } @@ -884,7 +887,7 @@ namespace IOB_WIN // log opzionale! if (verboseLog) { - lgInfo(string.Format("Trasformazione B_input: {0}", B_input)); + lgInfo($"Trasformazione B_input: {B_input} | currRun = {currRun} | currExe = {currExe} | currUnOpStatus {currUnOpStatus}"); } } /// @@ -896,7 +899,16 @@ namespace IOB_WIN protected bool checkDataItem(string itemName, string trueVal) { bool answ = false; - + MtcDataItemExt currValue = null; + try + { + currValue = dataItemMem[itemName]; + answ = (currValue.value.Equals(trueVal)); + } + catch + { + lgError($"Errore in decodifica valore per {itemName} rispetto a {trueVal} | recuperato {currValue} / {currValue.value}"); + } return answ; } diff --git a/Jenkinsfile b/Jenkinsfile index c0058760..efa0d321 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=551']) { + withEnv(['NEXT_BUILD_NUMBER=552']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'