From 3a4d5276a5f773f57693f5b0ff48b40e588fb853 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 9 Apr 2019 21:19:34 +0200 Subject: [PATCH] Altro update x FANUC --- IOB-WIN/IobFanuc.cs | 4 +++- Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index e314637d..1229233b 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -954,11 +954,13 @@ namespace IOB_WIN if (cIobConf.optPar.Count > 0) { string newVal = ""; +#if false // controllo SE salvare contapezzo if (getOptPar("PZCOUNT_MODE") != "") { sendOptVal("PZ_COUNT", lastCountCNC); - } + } +#endif // controllo SE devo gestire contatore pezzi REQUESTED (lanciati) if (getOptPar("PZREQ_MODE") != "") { diff --git a/Jenkinsfile b/Jenkinsfile index 69cddc9d..ed8b6ec9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=379']) { + withEnv(['NEXT_BUILD_NUMBER=381']) { // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'