From b05b6f2a268af9fc0b3f5537bd1f6d80ce4b4281 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 13 Nov 2019 22:07:17 +0100 Subject: [PATCH] modifica x testare altro modo di ottenere stringa... --- IOB-WIN/DATA/CONF/INTERCL_01.ini | 1 + IOB-WIN/IobSiemens.cs | 6 +++--- Jenkinsfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/IOB-WIN/DATA/CONF/INTERCL_01.ini b/IOB-WIN/DATA/CONF/INTERCL_01.ini index 8fe462df..e48914b8 100644 --- a/IOB-WIN/DATA/CONF/INTERCL_01.ini +++ b/IOB-WIN/DATA/CONF/INTERCL_01.ini @@ -61,6 +61,7 @@ FORCE_DYN_DATA=TRUE ; conf parametri memoria READ/WRITE PARAM_CONF=INTERCL_01.json WRITE_CHECK=TRUE +TEST_MODE=TRUE [BRANCH] NAME=master \ No newline at end of file diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs index 841b8384..9e25aa2f 100644 --- a/IOB-WIN/IobSiemens.cs +++ b/IOB-WIN/IobSiemens.cs @@ -1189,13 +1189,13 @@ namespace IOB_WIN saveRealOnMemBlock(ref MemBlock, 0, currMem.value); break; case plcDataType.String: - if (true) + if (getOptPar("TEST_MODE") == "TRUE") { - saveStringOnMemBlock(ref MemBlock, 0, currMem.size, currMem.value); + MemBlock = stringToByte(currMem.value, currMem.size); } else { - MemBlock = stringToByte(currMem.value, currMem.size); + saveStringOnMemBlock(ref MemBlock, 0, currMem.size, currMem.value); } break; default: diff --git a/Jenkinsfile b/Jenkinsfile index 278d5993..08982d00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=521']) { + withEnv(['NEXT_BUILD_NUMBER=522']) { // env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'