From cbc2feea352f994be15747a5717064f7f8e862d8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 26 Apr 2019 19:00:29 +0200 Subject: [PATCH] update con gest valori precedenti --- IOB-WIN/IobSiemensAprochim.cs | 15 ++++++++++++++- Jenkinsfile | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/IOB-WIN/IobSiemensAprochim.cs b/IOB-WIN/IobSiemensAprochim.cs index 02f200fe..0592e282 100644 --- a/IOB-WIN/IobSiemensAprochim.cs +++ b/IOB-WIN/IobSiemensAprochim.cs @@ -33,7 +33,7 @@ namespace IOB_WIN * - DB60.DBX3.5: LAMPADA ROSSA (allarmi almeno 1 attivo) * -------------------------------------------------------------------------------- */ - + protected Dictionary LastTSVC = new Dictionary(); /// /// Classe base con i metodi x Siemens /// @@ -72,6 +72,8 @@ namespace IOB_WIN foreach (var item in TSVC_Data) { lgInfo($"TSVC: {item.Key} | periodo: {item.Value.Periodo} | funz: {item.Value.Funzione}"); + // salvo i valori PREC... + LastTSVC.Add(item.Key, 0); } } #if false @@ -155,6 +157,17 @@ namespace IOB_WIN outVal.Add("pressCamFilt", $"{pressCamFilt:N6}"); outVal.Add("pressLinUt", $"{pressLinUt:N6}"); outVal.Add("tempH2O", $"{tempH2O:N3}"); + // salvo! + LastTSVC["pressCamFilt"] = pressCamFilt; + LastTSVC["pressLinUt"] = pressLinUt; + LastTSVC["tempH2O"] = tempH2O; + } + else + { + pressCamFilt = 0; + pressLinUt = 0; + tempH2O = 0; + outVal.Add("DYNDATA", $"pressCamFilt {LastTSVC["pressCamFilt"]:N6} | pressLinUt {LastTSVC["pressLinUt"]:N6} | tempH2O {LastTSVC["tempH2O"]:N3}"); } } else diff --git a/Jenkinsfile b/Jenkinsfile index 2bb49b0c..69f382ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=397']) { + withEnv(['NEXT_BUILD_NUMBER=398']) { // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'