diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config
index 739b025d..c1d60bd9 100644
--- a/IOB-WIN/App.config
+++ b/IOB-WIN/App.config
@@ -12,7 +12,7 @@
-
+
diff --git a/IOB-WIN/DATA/CONF/3001.ini b/IOB-WIN/DATA/CONF/3001.ini
index 1751d501..af112d07 100644
--- a/IOB-WIN/DATA/CONF/3001.ini
+++ b/IOB-WIN/DATA/CONF/3001.ini
@@ -13,7 +13,7 @@ PORT=8193
GETPRGNAME=true
[SERVER]
-MPIP=http://10.74.82.219
+MPIP=http://192.168.1.7
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
diff --git a/IOB-WIN/DATA/CONF/3002.ini b/IOB-WIN/DATA/CONF/3002.ini
index aa280683..19fd57bb 100644
--- a/IOB-WIN/DATA/CONF/3002.ini
+++ b/IOB-WIN/DATA/CONF/3002.ini
@@ -13,7 +13,7 @@ PORT=8193
GETPRGNAME=true
[SERVER]
-MPIP=http://10.74.82.219
+MPIP=http://192.168.1.7
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
diff --git a/IOB-WIN/DATA/CONF/3004.ini b/IOB-WIN/DATA/CONF/3004.ini
index 52676596..99bff82a 100644
--- a/IOB-WIN/DATA/CONF/3004.ini
+++ b/IOB-WIN/DATA/CONF/3004.ini
@@ -60,7 +60,7 @@ BLINK_FILT=8
[OPTPAR]
;PZCOUNT_MODE=STD|BIT
-PZCOUNT_MODE=STD
+PZCOUNT_MODE=STD.PAR.6711
PZ_CAD_MADDR=1602
PZ_REQ_MADDR=1603
PZ_DONE_MADDR=1604
diff --git a/IOB-WIN/DATA/CONF/3005.ini b/IOB-WIN/DATA/CONF/3005.ini
index 5b09bdf4..44173f71 100644
--- a/IOB-WIN/DATA/CONF/3005.ini
+++ b/IOB-WIN/DATA/CONF/3005.ini
@@ -60,7 +60,7 @@ BLINK_FILT=8
[OPTPAR]
;PZCOUNT_MODE=STD|BIT
-PZCOUNT_MODE=STD
+PZCOUNT_MODE=STD.PAR.6711
PZ_CAD_MADDR=1602
PZ_REQ_MADDR=1603
PZ_DONE_MADDR=1604
diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini
index 3068db9e..c9c64b01 100644
--- a/IOB-WIN/DATA/CONF/MAIN.ini
+++ b/IOB-WIN/DATA/CONF/MAIN.ini
@@ -4,13 +4,13 @@
NAME=develop
[SERVER]
-#MPIP=192.168.1.7
-MPIP=10.74.82.219
+MPIP=192.168.1.7
+#MPIP=10.74.82.219
MPURL=/MP/IO
CMDREBO=/IOB/sendRebootGateway?GWIP=
CMDIOB2CALL=/IOB/getIob2call?GWIP=
[IOB]
-STARTLIST=3007
+STARTLIST=3001
MAXCNC=4
;STARTLIST=3001,3002,3003,3004,3005
\ No newline at end of file
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index 8fc8b318..b3938950 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -546,8 +546,10 @@ namespace IOB_WIN
}
}
+#if false
+ // da rivedere x gestione contapezzi a bit...
// verifico se si tratta di un segnale contapezzo... nel qual caso conteggio ed invio...
- if(currIobConf.optPar["PZCOUNT_MODE"].StartsWith("BIT"))
+ if (currIobConf.optPar["PZCOUNT_MODE"].StartsWith("BIT"))
{
// salvo nuovo contapezzi (incremento di 1...)
contapezzi++;
@@ -556,7 +558,8 @@ namespace IOB_WIN
lgInfo("Aggiornato contapezzi: {0}", contapezzi);
// resetto timer...
lastPzCountSend = DateTime.Now;
- }
+ }
+#endif
}
}
diff --git a/Jenkinsfile b/Jenkinsfile
index 5a4ce810..2531f28e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=258']) {
+ withEnv(['NEXT_BUILD_NUMBER=259']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'