diff --git a/IOB-WIN/DATA/CONF/VL23.json b/IOB-WIN/DATA/CONF/VL23.json index b7997ed7..3ff8669d 100644 --- a/IOB-WIN/DATA/CONF/VL23.json +++ b/IOB-WIN/DATA/CONF/VL23.json @@ -30,7 +30,7 @@ "name": "Temp_Olio", "description": "Temperatura Olio", "memAddr": "DB64.DBB6", - "tipoMem": "Real", + "tipoMem": "DWord", "index": 6, "size": 4, "func": "MAX", @@ -41,7 +41,7 @@ "name": "Power", "description": "Forza", "memAddr": "DB64.DBB10", - "tipoMem": "Real", + "tipoMem": "Word", "index": 10, "size": 2, "func": "MAX", @@ -52,7 +52,7 @@ "name": "VelAsseSup", "description": "Vel Asse Superiore", "memAddr": "DB64.DBB12", - "tipoMem": "Real", + "tipoMem": "Word", "index": 12, "size": 2, "func": "MAX", @@ -63,7 +63,7 @@ "name": "VelAsseInf", "description": "Vel Asse Inferiore", "memAddr": "DB64.DBB14", - "tipoMem": "Real", + "tipoMem": "Word", "index": 14, "size": 2, "func": "MAX", @@ -74,7 +74,7 @@ "name": "Pressione", "description": "Pressione", "memAddr": "DB64.DBB16", - "tipoMem": "Real", + "tipoMem": "Word", "index": 16, "size": 2, "func": "MAX", @@ -85,7 +85,7 @@ "name": "Tensione", "description": "Tensione", "memAddr": "DB64.DBB18", - "tipoMem": "Real", + "tipoMem": "Word", "index": 18, "size": 2, "func": "MAX", @@ -116,7 +116,7 @@ "name": "CosPhi", "description": "CosPhi", "memAddr": "DB64.DBB88", - "tipoMem": "Real", + "tipoMem": "Word", "index": 28, "size": 2, "func": "MAX", diff --git a/Jenkinsfile b/Jenkinsfile index 12fb13b2..2fa2a910 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=527']) { + withEnv(['NEXT_BUILD_NUMBER=528']) { // 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'