diff --git a/IOB-WIN/DATA/CONF/IMI_50.ini b/IOB-WIN/DATA/CONF/IMI_50.ini index c9566748..56521241 100644 --- a/IOB-WIN/DATA/CONF/IMI_50.ini +++ b/IOB-WIN/DATA/CONF/IMI_50.ini @@ -56,7 +56,7 @@ BLINK_FILT=0 ; attenzione memoria sempre base BYTE (1604 DW --> 6416...) PZCOUNT_MODE=STD.DM20.2 DISABLE_PZCOUNT=TRUE -ENABLE_DYN_DATA=TRUE +ENABLE_DYN_DATA=FALSE FORCE_DYN_DATA=TRUE ; conf parametri memoria READ/WRITE diff --git a/IOB-WIN/IobMTC.cs b/IOB-WIN/IobMTC.cs index 2df4621a..f9be0067 100644 --- a/IOB-WIN/IobMTC.cs +++ b/IOB-WIN/IobMTC.cs @@ -573,9 +573,36 @@ namespace IOB_WIN if (utils.CRB("enableContapezzi")) { // cerco parametro contapezzi... + string currPzCount = ""; + string currPartId = ""; + string currProg = ""; + try + { + var currDataItem = dataItemMem["Path_01_PZ_TOT"]; + currPzCount = currDataItem.value; + } + catch + { } + try + { + var currDataItem = dataItemMem["Path_01_PartId"]; + currPartId = currDataItem.value; + } + catch + { } + try + { + var currDataItem = dataItemMem["Path_01_CurrProg"]; + currProg = currDataItem.value; + } + catch + { } - var exeMode = dataItemMem["Path_01_EXE_MODE"]; - + // se ho un contapezzi... processo... + if (!string.IsNullOrEmpty(currPzCount)) + { + int.TryParse(currPzCount, out lastCountCNC); + } #if false try { diff --git a/Jenkinsfile b/Jenkinsfile index 59c418be..f55d3651 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=543']) { + withEnv(['NEXT_BUILD_NUMBER=544']) { // env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'