diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index c732dc66..16d3ea30 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -194,23 +194,27 @@ namespace IOB_WIN
displayTaskAndLog("Program Running");
- try
+ // check oggetto not null
+ if (iobObj != null)
{
- // verifico server online...
- if (iobObj.checkServerAlive)
+ try
{
- // segnalo reboot (programma)...
- IobGeneric.callUrl(iobObj.urlReboot, true);
+ // verifico server online...
+ if (iobObj.checkServerAlive)
+ {
+ // segnalo reboot (programma)...
+ IobGeneric.callUrl(iobObj.urlReboot, true);
+ }
+ else
+ {
+ displayTaskAndLog("AdapterForm: Server OFFLINE");
+ }
}
- else
+ catch (Exception exc)
{
- displayTaskAndLog("AdapterForm: Server OFFLINE");
+ lgError(string.Format("AdapterForm: EXCEPTION in fase di chiamata URL di reboot:{0}{1}{2}", iobObj.urlReboot, Environment.NewLine, exc));
}
}
- catch (Exception exc)
- {
- lgError(string.Format("AdapterForm: EXCEPTION in fase di chiamata URL di reboot:{0}{1}{2}", iobObj.urlReboot, Environment.NewLine, exc));
- }
displayTaskAndLog("Main Form OK");
}
diff --git a/IOB-WIN/DATA/CONF/INTERCL_01.ini b/IOB-WIN/DATA/CONF/INTERCL_01.ini
index 2a2bd67e..3fd03726 100644
--- a/IOB-WIN/DATA/CONF/INTERCL_01.ini
+++ b/IOB-WIN/DATA/CONF/INTERCL_01.ini
@@ -38,7 +38,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=STD.DB1275.DBDW4
DISABLE_PZCOUNT=TRUE
diff --git a/IOB-WIN/DATA/CONF/INTERCL_02.ini b/IOB-WIN/DATA/CONF/INTERCL_02.ini
index b91763ae..c0af98f1 100644
--- a/IOB-WIN/DATA/CONF/INTERCL_02.ini
+++ b/IOB-WIN/DATA/CONF/INTERCL_02.ini
@@ -36,7 +36,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=STD.DM20.2
DISABLE_PZCOUNT=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_01.ini b/IOB-WIN/DATA/CONF/SIMUL_01.ini
index c453dab5..7edc9817 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_01.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_01.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_02.ini b/IOB-WIN/DATA/CONF/SIMUL_02.ini
index cb5e4701..8bf3f51c 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_02.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_02.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_03.ini b/IOB-WIN/DATA/CONF/SIMUL_03.ini
index 1339e2fe..e0886e95 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_03.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_03.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_04.ini b/IOB-WIN/DATA/CONF/SIMUL_04.ini
index 91d7ff31..e4ffe720 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_04.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_04.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_04.json b/IOB-WIN/DATA/CONF/SIMUL_04.json
index bb10aa12..049835e0 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_04.json
+++ b/IOB-WIN/DATA/CONF/SIMUL_04.json
@@ -1,79 +1,79 @@
{
- "mMapWrite": {
- "setArt": {
- "name": "setArt",
- "description": "Articolo",
- "memAddr": "DB150.DBB12",
- "tipoMem": "String",
- "index": 12,
- "size": 20
+ "mMapWrite": {
+ "setArt": {
+ "name": "setArt",
+ "description": "Articolo",
+ "memAddr": "DB150.DBB12",
+ "tipoMem": "String",
+ "index": 12,
+ "size": 20
+ },
+ "setComm": {
+ "name": "setComm",
+ "description": "Commessa",
+ "memAddr": "DB150.DBB32",
+ "tipoMem": "String",
+ "index": 32,
+ "size": 20
+ },
+ "setPzComm": {
+ "name": "setPzComm",
+ "description": "Qty",
+ "memAddr": "DB150.DBB8",
+ "tipoMem": "Int",
+ "index": 8,
+ "size": 4
+ }
},
- "setComm": {
- "name": "setComm",
- "description": "Commessa",
- "memAddr": "DB150.DBB32",
- "tipoMem": "String",
- "index": 32,
- "size": 20
- },
- "setPzComm": {
- "name": "setPzComm",
- "description": "Qty",
- "memAddr": "DB150.DBB8",
- "tipoMem": "Int",
- "index": 8,
- "size": 4
+ "mMapRead": {
+ "TEMP_01": {
+ "name": "TEMP_01",
+ "description": "Temperatura 01",
+ "tipoMem": "Real",
+ "minVal": 18,
+ "maxVal": 24
+ },
+ "POWER_01": {
+ "name": "POWER_01",
+ "description": "Potenza impianto",
+ "tipoMem": "Int",
+ "minVal": 40,
+ "maxVal": 80
+ },
+ "FEED_OVER": {
+ "name": "FEED_OVER",
+ "description": "FEED override",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 100
+ },
+ "RAPID_OVER": {
+ "name": "RAPID_OVER",
+ "description": "RAPID override",
+ "tipoMem": "Int",
+ "minVal": 50,
+ "maxVal": 120
+ },
+ "POS_X": {
+ "name": "POS_X",
+ "description": "Asse X",
+ "tipoMem": "Int",
+ "minVal": -2000,
+ "maxVal": 2000
+ },
+ "POS_Y": {
+ "name": "POS_Y",
+ "description": "Asse Y",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 2000
+ },
+ "POS_Z": {
+ "name": "POS_Z",
+ "description": "Asse Z",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 1500
+ }
}
- },
- "mMapRead": {
- "TEMP_01": {
- "name": "TEMP_01",
- "description": "Temperatura 01",
- "tipoMem": "Real",
- "minVal": 18,
- "maxVal": 24
- },
- "POWER_01": {
- "name": "POWER_01",
- "description": "Potenza impianto",
- "tipoMem": "Int",
- "minVal": 40,
- "maxVal": 80
- },
- "FEED_OVER": {
- "name": "FEED_OVER",
- "description": "FEED override",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 100
- },
- "RAPID_OVER": {
- "name": "RAPID_OVER",
- "description": "RAPID override",
- "tipoMem": "Int",
- "minVal": 50,
- "maxVal": 120
- },
- "POS_X": {
- "name": "POS_X",
- "description": "Asse X",
- "tipoMem": "Int",
- "minVal": -2000,
- "maxVal": 2000
- },
- "POS_Y": {
- "name": "POS_Y",
- "description": "Asse Y",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 2000
- },
- "POS_Z": {
- "name": "POS_Z",
- "description": "Asse Z",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 1500
- }
- }
}
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIMUL_05.ini b/IOB-WIN/DATA/CONF/SIMUL_05.ini
index 34e0e9f6..4db9e3ae 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_05.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_05.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_06.ini b/IOB-WIN/DATA/CONF/SIMUL_06.ini
index 65c71337..d526916d 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_06.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_06.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_07.ini b/IOB-WIN/DATA/CONF/SIMUL_07.ini
index e49824ef..2b2ac85d 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_07.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_07.ini
@@ -33,15 +33,15 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE, default 1 secondo)
PER_BASE=800
SIM_PZCNT=13|1
-SIM_ALARM=20|20
-SIM_MANU=10|10
+SIM_ALARM=200|20
+SIM_MANU=150|3
; indica gestione e simulazione bit 5 --> slow
SIM_SLOW=2500|20
; indica gestione e simulazione bit 6 --> warmup/cooldown
diff --git a/IOB-WIN/DATA/CONF/SIMUL_07.json b/IOB-WIN/DATA/CONF/SIMUL_07.json
index bb10aa12..049835e0 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_07.json
+++ b/IOB-WIN/DATA/CONF/SIMUL_07.json
@@ -1,79 +1,79 @@
{
- "mMapWrite": {
- "setArt": {
- "name": "setArt",
- "description": "Articolo",
- "memAddr": "DB150.DBB12",
- "tipoMem": "String",
- "index": 12,
- "size": 20
+ "mMapWrite": {
+ "setArt": {
+ "name": "setArt",
+ "description": "Articolo",
+ "memAddr": "DB150.DBB12",
+ "tipoMem": "String",
+ "index": 12,
+ "size": 20
+ },
+ "setComm": {
+ "name": "setComm",
+ "description": "Commessa",
+ "memAddr": "DB150.DBB32",
+ "tipoMem": "String",
+ "index": 32,
+ "size": 20
+ },
+ "setPzComm": {
+ "name": "setPzComm",
+ "description": "Qty",
+ "memAddr": "DB150.DBB8",
+ "tipoMem": "Int",
+ "index": 8,
+ "size": 4
+ }
},
- "setComm": {
- "name": "setComm",
- "description": "Commessa",
- "memAddr": "DB150.DBB32",
- "tipoMem": "String",
- "index": 32,
- "size": 20
- },
- "setPzComm": {
- "name": "setPzComm",
- "description": "Qty",
- "memAddr": "DB150.DBB8",
- "tipoMem": "Int",
- "index": 8,
- "size": 4
+ "mMapRead": {
+ "TEMP_01": {
+ "name": "TEMP_01",
+ "description": "Temperatura 01",
+ "tipoMem": "Real",
+ "minVal": 18,
+ "maxVal": 24
+ },
+ "POWER_01": {
+ "name": "POWER_01",
+ "description": "Potenza impianto",
+ "tipoMem": "Int",
+ "minVal": 40,
+ "maxVal": 80
+ },
+ "FEED_OVER": {
+ "name": "FEED_OVER",
+ "description": "FEED override",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 100
+ },
+ "RAPID_OVER": {
+ "name": "RAPID_OVER",
+ "description": "RAPID override",
+ "tipoMem": "Int",
+ "minVal": 50,
+ "maxVal": 120
+ },
+ "POS_X": {
+ "name": "POS_X",
+ "description": "Asse X",
+ "tipoMem": "Int",
+ "minVal": -2000,
+ "maxVal": 2000
+ },
+ "POS_Y": {
+ "name": "POS_Y",
+ "description": "Asse Y",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 2000
+ },
+ "POS_Z": {
+ "name": "POS_Z",
+ "description": "Asse Z",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 1500
+ }
}
- },
- "mMapRead": {
- "TEMP_01": {
- "name": "TEMP_01",
- "description": "Temperatura 01",
- "tipoMem": "Real",
- "minVal": 18,
- "maxVal": 24
- },
- "POWER_01": {
- "name": "POWER_01",
- "description": "Potenza impianto",
- "tipoMem": "Int",
- "minVal": 40,
- "maxVal": 80
- },
- "FEED_OVER": {
- "name": "FEED_OVER",
- "description": "FEED override",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 100
- },
- "RAPID_OVER": {
- "name": "RAPID_OVER",
- "description": "RAPID override",
- "tipoMem": "Int",
- "minVal": 50,
- "maxVal": 120
- },
- "POS_X": {
- "name": "POS_X",
- "description": "Asse X",
- "tipoMem": "Int",
- "minVal": -2000,
- "maxVal": 2000
- },
- "POS_Y": {
- "name": "POS_Y",
- "description": "Asse Y",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 2000
- },
- "POS_Z": {
- "name": "POS_Z",
- "description": "Asse Z",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 1500
- }
- }
}
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIMUL_08.ini b/IOB-WIN/DATA/CONF/SIMUL_08.ini
index 63b75bd6..e3f062b8 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_08.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_08.ini
@@ -31,25 +31,25 @@ MAX_COUNTER_BLINK = 15
BLINK_FILT=0
[OPTPAR]
-AUTO_CHANGE_ODL=true
-CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+AUTO_CHANGE_ODL=false
+CHANGE_ODL_HOURS=48
+CHANGE_ODL_IDLE_MIN=00
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE, default 1 secondo)
PER_BASE=800
SIM_PZCNT=13|1
-SIM_ALARM=1000|20
-SIM_MANU=100|10
-; indica gestione e simulazione bit 5 --> slo
-SIM_SLOW=3500|20
+SIM_ALARM=200|10
+SIM_MANU=130|3
+; indica gestione e simulazione bit 5 --> slow
+SIM_SLOW=2500|20
; indica gestione e simulazione bit 6 --> warmup/cooldown
SIM_WUCD=8000|20
; indica gestione e simulazione bit 7 --> emergenza
-SIM_EMRG=4000|10
+SIM_EMRG=4000|10
; indica simulazione delle funzionalit� power ON/ OFF
-SIM_POW_ON_OFF=true
+SIM_POW_ON_OFF=false
T_ON=6
T_OFF=22
; gestione DynData simulati
diff --git a/IOB-WIN/DATA/CONF/SIMUL_08.json b/IOB-WIN/DATA/CONF/SIMUL_08.json
index bb10aa12..049835e0 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_08.json
+++ b/IOB-WIN/DATA/CONF/SIMUL_08.json
@@ -1,79 +1,79 @@
{
- "mMapWrite": {
- "setArt": {
- "name": "setArt",
- "description": "Articolo",
- "memAddr": "DB150.DBB12",
- "tipoMem": "String",
- "index": 12,
- "size": 20
+ "mMapWrite": {
+ "setArt": {
+ "name": "setArt",
+ "description": "Articolo",
+ "memAddr": "DB150.DBB12",
+ "tipoMem": "String",
+ "index": 12,
+ "size": 20
+ },
+ "setComm": {
+ "name": "setComm",
+ "description": "Commessa",
+ "memAddr": "DB150.DBB32",
+ "tipoMem": "String",
+ "index": 32,
+ "size": 20
+ },
+ "setPzComm": {
+ "name": "setPzComm",
+ "description": "Qty",
+ "memAddr": "DB150.DBB8",
+ "tipoMem": "Int",
+ "index": 8,
+ "size": 4
+ }
},
- "setComm": {
- "name": "setComm",
- "description": "Commessa",
- "memAddr": "DB150.DBB32",
- "tipoMem": "String",
- "index": 32,
- "size": 20
- },
- "setPzComm": {
- "name": "setPzComm",
- "description": "Qty",
- "memAddr": "DB150.DBB8",
- "tipoMem": "Int",
- "index": 8,
- "size": 4
+ "mMapRead": {
+ "TEMP_01": {
+ "name": "TEMP_01",
+ "description": "Temperatura 01",
+ "tipoMem": "Real",
+ "minVal": 18,
+ "maxVal": 24
+ },
+ "POWER_01": {
+ "name": "POWER_01",
+ "description": "Potenza impianto",
+ "tipoMem": "Int",
+ "minVal": 40,
+ "maxVal": 80
+ },
+ "FEED_OVER": {
+ "name": "FEED_OVER",
+ "description": "FEED override",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 100
+ },
+ "RAPID_OVER": {
+ "name": "RAPID_OVER",
+ "description": "RAPID override",
+ "tipoMem": "Int",
+ "minVal": 50,
+ "maxVal": 120
+ },
+ "POS_X": {
+ "name": "POS_X",
+ "description": "Asse X",
+ "tipoMem": "Int",
+ "minVal": -2000,
+ "maxVal": 2000
+ },
+ "POS_Y": {
+ "name": "POS_Y",
+ "description": "Asse Y",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 2000
+ },
+ "POS_Z": {
+ "name": "POS_Z",
+ "description": "Asse Z",
+ "tipoMem": "Int",
+ "minVal": 0,
+ "maxVal": 1500
+ }
}
- },
- "mMapRead": {
- "TEMP_01": {
- "name": "TEMP_01",
- "description": "Temperatura 01",
- "tipoMem": "Real",
- "minVal": 18,
- "maxVal": 24
- },
- "POWER_01": {
- "name": "POWER_01",
- "description": "Potenza impianto",
- "tipoMem": "Int",
- "minVal": 40,
- "maxVal": 80
- },
- "FEED_OVER": {
- "name": "FEED_OVER",
- "description": "FEED override",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 100
- },
- "RAPID_OVER": {
- "name": "RAPID_OVER",
- "description": "RAPID override",
- "tipoMem": "Int",
- "minVal": 50,
- "maxVal": 120
- },
- "POS_X": {
- "name": "POS_X",
- "description": "Asse X",
- "tipoMem": "Int",
- "minVal": -2000,
- "maxVal": 2000
- },
- "POS_Y": {
- "name": "POS_Y",
- "description": "Asse Y",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 2000
- },
- "POS_Z": {
- "name": "POS_Z",
- "description": "Asse Z",
- "tipoMem": "Int",
- "minVal": 0,
- "maxVal": 1500
- }
- }
}
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIM_DP_01.ini b/IOB-WIN/DATA/CONF/SIM_DP_01.ini
index 20f9f7c4..d5572abe 100644
--- a/IOB-WIN/DATA/CONF/SIM_DP_01.ini
+++ b/IOB-WIN/DATA/CONF/SIM_DP_01.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;elenco comma separated delle sub-machine (tipicamente tavole)
IOB_MULTI_CNAME=TAV_1,TAV_2
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
diff --git a/IOB-WIN/DATA/CONF/SIM_DP_02.ini b/IOB-WIN/DATA/CONF/SIM_DP_02.ini
index 64eae285..fae98375 100644
--- a/IOB-WIN/DATA/CONF/SIM_DP_02.ini
+++ b/IOB-WIN/DATA/CONF/SIM_DP_02.ini
@@ -33,7 +33,7 @@ BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_HOURS=24
-CHANGE_ODL_IDLE_MIN=1
+CHANGE_ODL_IDLE_MIN=0
;elenco comma separated delle sub-machine (tipicamente tavole)
IOB_MULTI_CNAME=TAV_1,TAV_2
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 08902473..903360ba 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -280,10 +280,18 @@
Always
-
-
-
-
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
Always
diff --git a/IOB-WIN/IobFileEurom63.cs b/IOB-WIN/IobFileEurom63.cs
index e70deaf3..80aa367e 100644
--- a/IOB-WIN/IobFileEurom63.cs
+++ b/IOB-WIN/IobFileEurom63.cs
@@ -40,7 +40,7 @@ namespace IOB_WIN
///
/// Massimo delay lettura dati prima di considerarli scaduti (30 sec, ma x test 1 gg)
///
- protected int maxDelaySec = 30;
+ protected int maxDelaySec = 60;
#endregion Protected Fields
@@ -80,7 +80,7 @@ namespace IOB_WIN
// elimino TUTTE le risposte...
cleanupResp(currSession.SessionName);
// imposto livello...
- actLevel = Eurom63.ComLevel.ChannelOk;
+ actLevel = Eurom63.ComLevel.HasInfo;
}
}
}
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index e2661221..37c86653 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -1064,7 +1064,7 @@ namespace IOB_WIN
{
get
{
- return string.Format(@"http://{0}{1}{2}{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMD_FORCLE_SPLIT_ODL, cIobConf.codIOB);
+ return string.Format(@"http://{0}{1}{2}{3}?doConfirm=true&qtyFromLast=true&roundStep=200", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMD_FORCLE_SPLIT_ODL, cIobConf.codIOB);
}
}
@@ -3548,7 +3548,7 @@ namespace IOB_WIN
if (doProc)
{
// carico i parametri di configurazione x reset ODL...
- string CHANGE_ODL_HOURS = getOptPar("CHANGE_ODL_IDLE_MIN");
+ string CHANGE_ODL_HOURS = getOptPar("CHANGE_ODL_HOURS");
string CHANGE_ODL_IDLE_MIN = getOptPar("CHANGE_ODL_IDLE_MIN");
if (!string.IsNullOrEmpty(CHANGE_ODL_HOURS) && !string.IsNullOrEmpty(CHANGE_ODL_IDLE_MIN))
{
@@ -3557,7 +3557,7 @@ namespace IOB_WIN
int.TryParse(CHANGE_ODL_HOURS, out minOdlDurHours);
int.TryParse(CHANGE_ODL_IDLE_MIN, out minPlcIdelMin);
// controllo parametri validi
- if (minOdlDurHours > 0 && minPlcIdelMin > 0)
+ if (minOdlDurHours > 0 && minPlcIdelMin >= 0)
{
// leggo da server inizio ODL... se non multi 1 solo...
DateTime inizioOdl = DateTime.Now;
diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index 4ea64010..1fd8a5f2 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -338,8 +338,8 @@ namespace IOB_WIN
{
// salvo nuovo contapezziPLC (incremento RAND 0..3)
var rand = new Random();
- // se online vero delta altrimenti solo 0..1 50% probabilità
- int delta = IobOnline ? rand.Next(1, 4) : rand.Next(0, 2);
+ // se online vero delta (0..2) altrimenti solo 0
+ int delta = IobOnline ? rand.Next(1, 3) : 0;
if (!isMulti)
{
// solo se MP online...
diff --git a/Jenkinsfile b/Jenkinsfile
index f6adf412..0c3ba53d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=730']) {
+ withEnv(['NEXT_BUILD_NUMBER=733']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'