Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into IOB-NET

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-23 15:26:56 +01:00
parent bd9370faa1 d5ee4060b8
commit 883db17aa9
15 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CVCncLib/CVCncLib.dll
BIN
View File
Binary file not shown.
IOB-WIN/DATA/CONF/SIMUL_01.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_02.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_03.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_04.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_05.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_06.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_07.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIMUL_08.ini
+3 -3
View File
@@ -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
IOB-WIN/DATA/CONF/SIM_DP_01.ini
+2 -2
View File
@@ -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
IOB-WIN/DATA/CONF/SIM_DP_02.ini
+2 -2
View File
@@ -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
IOB-WIN/IobConfiguration.cs
+11 -11
View File
@@ -15,6 +15,17 @@ namespace IOB_WIN
[Serializable]
public class IobConfiguration
{
#region Public Constructors
/// <summary>
/// Avvio configurazione DUMMY
/// </summary>
public IobConfiguration()
{
}
#endregion Public Constructors
#region Public Properties
/// <summary>
@@ -113,17 +124,6 @@ namespace IOB_WIN
public string versIOB { get; set; } = "0";
#endregion Public Properties
#region INIT class
/// <summary>
/// Avvio configurazione DUMMY
/// </summary>
public IobConfiguration()
{
}
#endregion INIT class
}
/// <summary>
IOB-WIN/IobGeneric.cs
+1 -1
View File
@@ -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);
}
}
IOB-WIN/IobSimula.cs
+2 -2
View File
@@ -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)
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'