Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifica x testare altro modo di ottenere stringa...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-13 22:07:17 +01:00
parent 8a67bd6a6e
commit b05b6f2a26
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/DATA/CONF/INTERCL_01.ini
+1
View File
@@ -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
IOB-WIN/IobSiemens.cs
+3 -3
View File
@@ -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:
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'