From 2884730688fa33c525cb45897eb719a1b87db376 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 23 Nov 2020 15:18:49 +0100 Subject: [PATCH 1/3] Update sim x split ODL --- CVCncLib/CVCncLib.dll | Bin 967680 -> 967680 bytes IOB-WIN/IobConfiguration.cs | 24 ++++++++++++------------ IOB-WIN/IobGeneric.cs | 2 +- IOB-WIN/IobSimula.cs | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CVCncLib/CVCncLib.dll b/CVCncLib/CVCncLib.dll index d5143db0042bc39828252c4f668ae3ba5d3501b9..c17d5ad976402bfa00596e6fbb8a25aedc84dc5e 100644 GIT binary patch delta 171 zcmZqZux{wEp3uQu{d7lTcWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V z9?OLSt}D$r&39_L?%nxFZ1+T~$L&`Z@&GaK_A3kd{_wd2jf!Ug0wy4qVPs%|t3i}9HYFHoAn*(xTqIJKxarZ_RTG&Ltxuec;NF}HlW Uz(zi~>G~V_&TnVg#P>%K0Fn1WF8}}l delta 169 zcmZqZux{wEp3uR3G-z96cWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V z9?OLSX^zX?E1VRZH~-1(KX3nEy8X&R9w6r3eq|xwA3ld8LEGXPfPe{zWf&P4UYz4& zc(H+xAt=}-c#-RW4MUG&ht(G^x=u2ze*u(caJGsGElw>ejww#eEltfyoi4tSPmZy8 Ty6Hx~^Aio&wzF*F`y&Vd3~NAp diff --git a/IOB-WIN/IobConfiguration.cs b/IOB-WIN/IobConfiguration.cs index 22a1369c..b2bcd469 100644 --- a/IOB-WIN/IobConfiguration.cs +++ b/IOB-WIN/IobConfiguration.cs @@ -15,6 +15,17 @@ namespace IOB_WIN [Serializable] public class IobConfiguration { + #region Public Constructors + + /// + /// Avvio configurazione DUMMY + /// + public IobConfiguration() + { + } + + #endregion Public Constructors + #region Public Properties /// @@ -113,17 +124,6 @@ namespace IOB_WIN public string versIOB { get; set; } = "0"; #endregion Public Properties - - #region INIT class - - /// - /// Avvio configurazione DUMMY - /// - public IobConfiguration() - { - } - - #endregion INIT class } /// @@ -146,7 +146,7 @@ namespace IOB_WIN /// Comando x reboot /// Comando x check data avvio ODL /// Comando x forzare split ODL - public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdl/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/") + public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdlFull/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/") { if (!string.IsNullOrEmpty(MPIP_)) { diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 37c86653..10accb3a 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}?doConfirm=true&qtyFromLast=true&roundStep=200", 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=500", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMD_FORCLE_SPLIT_ODL, cIobConf.codIOB); } } diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs index c1f31c4f..f153c026 100644 --- a/IOB-WIN/IobSimula.cs +++ b/IOB-WIN/IobSimula.cs @@ -303,7 +303,7 @@ namespace IOB_WIN { bit6 = setupSimPar("SIM_WUCD"); } - // in manuale: provo split ODL + // in warm up: provo split ODL trySplitOdl(); } else if (bit7.wait <= 0) @@ -317,7 +317,7 @@ namespace IOB_WIN { bit7 = setupSimPar("SIM_EMRG"); } - // in manuale: provo split ODL + // in emergenza: provo split ODL trySplitOdl(); } else if (bit4.wait <= 0) From 820f75aa8ed495a6d0f0ec54ffb3f17f3e45bb1d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 23 Nov 2020 15:18:56 +0100 Subject: [PATCH 2/3] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 503f0229..7ac8e6ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=746']) { + withEnv(['NEXT_BUILD_NUMBER=747']) { // 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' From d5ee4060b8736b27b5760bdf7d0d9e3d96728637 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 23 Nov 2020 15:26:45 +0100 Subject: [PATCH 3/3] update conf IOB SIM --- IOB-WIN/DATA/CONF/SIMUL_01.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_02.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_03.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_04.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_05.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_06.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_07.ini | 4 ++-- IOB-WIN/DATA/CONF/SIMUL_08.ini | 6 +++--- IOB-WIN/DATA/CONF/SIM_DP_01.ini | 4 ++-- IOB-WIN/DATA/CONF/SIM_DP_02.ini | 4 ++-- IOB-WIN/IobConfiguration.cs | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/IOB-WIN/DATA/CONF/SIMUL_01.ini b/IOB-WIN/DATA/CONF/SIMUL_01.ini index 7edc9817..b0c0e8e2 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_01.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_01.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -44,7 +44,7 @@ MAX_SEND_PZC_BLOCK=100 ; gestione cambio ODL automatico (minuti minimi durata) MIN_DURATA_ODL=240 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo) -PER_BASE=1200 +PER_BASE=3600 SIM_PZCNT=5|1 SIM_ALARM=1000|20 SIM_MANU=50|6 diff --git a/IOB-WIN/DATA/CONF/SIMUL_02.ini b/IOB-WIN/DATA/CONF/SIMUL_02.ini index 8bf3f51c..953879ae 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_02.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_02.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -38,7 +38,7 @@ CHANGE_ODL_IDLE_MIN=0 PZCOUNT_MODE=BIT ENABLE_PZ_RESET=TRUE ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo) -PER_BASE=1500 +PER_BASE=4500 SIM_PZCNT=8|1 SIM_ALARM=900|15 SIM_MANU=40|5 diff --git a/IOB-WIN/DATA/CONF/SIMUL_03.ini b/IOB-WIN/DATA/CONF/SIMUL_03.ini index e0886e95..b1103099 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_03.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_03.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -38,7 +38,7 @@ CHANGE_ODL_IDLE_MIN=0 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=1700 +PER_BASE=3400 SIM_PZCNT=15|1 SIM_ALARM=1000|20 SIM_MANU=100|4 diff --git a/IOB-WIN/DATA/CONF/SIMUL_04.ini b/IOB-WIN/DATA/CONF/SIMUL_04.ini index e4ffe720..25944ac5 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_04.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_04.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -38,7 +38,7 @@ CHANGE_ODL_IDLE_MIN=0 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 +PER_BASE=4800 SIM_PZCNT=13|1 SIM_ALARM=1000|20 SIM_MANU=100|10 diff --git a/IOB-WIN/DATA/CONF/SIMUL_05.ini b/IOB-WIN/DATA/CONF/SIMUL_05.ini index 4db9e3ae..34680ba0 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_05.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_05.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -38,7 +38,7 @@ CHANGE_ODL_IDLE_MIN=0 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 +PER_BASE=3800 SIM_PZCNT=13|1 SIM_ALARM=1000|20 SIM_MANU=100|10 diff --git a/IOB-WIN/DATA/CONF/SIMUL_06.ini b/IOB-WIN/DATA/CONF/SIMUL_06.ini index d526916d..b5e6a8fd 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_06.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_06.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -38,7 +38,7 @@ CHANGE_ODL_IDLE_MIN=0 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 +PER_BASE=2800 SIM_PZCNT=13|1 SIM_ALARM=1000|20 SIM_MANU=100|10 diff --git a/IOB-WIN/DATA/CONF/SIMUL_07.ini b/IOB-WIN/DATA/CONF/SIMUL_07.ini index 2b2ac85d..eaf1d1ca 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_07.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_07.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -38,7 +38,7 @@ CHANGE_ODL_IDLE_MIN=0 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 +PER_BASE=3800 SIM_PZCNT=13|1 SIM_ALARM=200|20 SIM_MANU=150|3 diff --git a/IOB-WIN/DATA/CONF/SIMUL_08.ini b/IOB-WIN/DATA/CONF/SIMUL_08.ini index e3f062b8..c7744c2e 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_08.ini +++ b/IOB-WIN/DATA/CONF/SIMUL_08.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -33,12 +33,12 @@ BLINK_FILT=0 [OPTPAR] AUTO_CHANGE_ODL=false CHANGE_ODL_HOURS=48 -CHANGE_ODL_IDLE_MIN=00 +CHANGE_ODL_IDLE_MIN=10 ;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 +PER_BASE=4800 SIM_PZCNT=13|1 SIM_ALARM=200|10 SIM_MANU=130|3 diff --git a/IOB-WIN/DATA/CONF/SIM_DP_01.ini b/IOB-WIN/DATA/CONF/SIM_DP_01.ini index d5572abe..4e895e30 100644 --- a/IOB-WIN/DATA/CONF/SIM_DP_01.ini +++ b/IOB-WIN/DATA/CONF/SIM_DP_01.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -45,7 +45,7 @@ MIN_SEND_PZC_BLOCK=0 MAX_SEND_PZC_BLOCK=100 MIN_DURATA_ODL=240 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo) -PER_BASE=800 +PER_BASE=4500 SIM_PZCNT=10|3 SIM_ALARM=1000|20 SIM_MANU=50|6 diff --git a/IOB-WIN/DATA/CONF/SIM_DP_02.ini b/IOB-WIN/DATA/CONF/SIM_DP_02.ini index fae98375..392943e7 100644 --- a/IOB-WIN/DATA/CONF/SIM_DP_02.ini +++ b/IOB-WIN/DATA/CONF/SIM_DP_02.ini @@ -21,7 +21,7 @@ CMDENABLED=/IOB/enabled/ CMDADV1=?valore= CMDREBO=/sendReboot.aspx?idxMacchina= CMD_ODL_STARTED=/IOB/getCurrOdlStart/ -CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdl/ +CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ [MEMORY] @@ -45,7 +45,7 @@ MIN_SEND_PZC_BLOCK=0 MAX_SEND_PZC_BLOCK=100 MIN_DURATA_ODL=240 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo) -PER_BASE=800 +PER_BASE=3800 SIM_PZCNT=10|2 SIM_ALARM=1000|20 SIM_MANU=50|6 diff --git a/IOB-WIN/IobConfiguration.cs b/IOB-WIN/IobConfiguration.cs index b2bcd469..3ce13940 100644 --- a/IOB-WIN/IobConfiguration.cs +++ b/IOB-WIN/IobConfiguration.cs @@ -146,7 +146,7 @@ namespace IOB_WIN /// Comando x reboot /// Comando x check data avvio ODL /// Comando x forzare split ODL - public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdlFull/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/") + public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdl/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/") { if (!string.IsNullOrEmpty(MPIP_)) {