From 777b5f3c5307e6564a1be7d7e0fba3cf30f1159d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 4 Dec 2019 18:59:01 +0100 Subject: [PATCH] Fix stringa watchdog counter --- IOB-WIN/IobSiemens.cs | 2 +- IOB-WIN/IobSiemensIngenia.cs | 1 + Jenkinsfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs index 442f475d..d2155bd1 100644 --- a/IOB-WIN/IobSiemens.cs +++ b/IOB-WIN/IobSiemens.cs @@ -585,7 +585,7 @@ namespace IOB_WIN switch (errorCode) { case ErrorCode.NoError: - lgInfo($"Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | value: {Value} | BIN: {Value.ValToBinString()}"); + lgInfo($"Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | BIN: {Value.ValToBinString()}"); answ = true; break; case ErrorCode.WrongCPU_Type: diff --git a/IOB-WIN/IobSiemensIngenia.cs b/IOB-WIN/IobSiemensIngenia.cs index 56baffd6..a266c06a 100644 --- a/IOB-WIN/IobSiemensIngenia.cs +++ b/IOB-WIN/IobSiemensIngenia.cs @@ -99,6 +99,7 @@ namespace IOB_WIN Dictionary taskDone = new Dictionary(); task2exe.Add("sendWatchDogMes2Plc", counterMes2Plc.ToString()); taskDone = executeTasks(task2exe); + lgInfo($"Scritto watchdog: {counterMes2Plc} | watchDog MES: {counterPlc2Mes}"); // salvo watchdog PLC lastPLCWatchDog = adesso; } diff --git a/Jenkinsfile b/Jenkinsfile index c632c2a4..e9a1855e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=578']) { + withEnv(['NEXT_BUILD_NUMBER=579']) { // 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'