Merge branch 'release/TestRiduzioneInvioAllarmiGWMS'

This commit is contained in:
Samuele Locatelli
2021-12-18 12:44:12 +01:00
5 changed files with 26 additions and 11 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ namespace IOB_UT_NEXT
/// <summary>
/// valore di partenza x un segnale di blink in caso di inizio variazione
/// </summary>
public int blinkVal = 30;
public int blinkVal { get; set; } = 30;
#endregion Public Fields
+4 -4
View File
@@ -60,18 +60,18 @@ CLI_INST=SteamWareSim
; SIMULAZIONE verso server ufficio
;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
;STARTLIST=SIM_DP_01
;STARTLIST=TEST
;STARTLIST=SIM_DP_01
;STARTLIST=SIMUL_01
;STARTLIST=1032
;STARTLIST=1033
;STARTLIST=PIZ03
;STARTLIST=PIZ04
;STARTLIST=OPC_UA
;STARTLIST=FOV062
;STARTLIST=FP_TR2
;STARTLIST=PING
;STARTLIST=SIM_PIZ03
STARTLIST=MECART_80
;STARTLIST=MECART_80
;STARTLIST=PING
STARTLIST=PIZ09
MAXCNC=10
+13 -4
View File
@@ -29,20 +29,29 @@
},
"condPowerOn": {
"checkMode": "OR",
"negateValue": true,
"checkList": [
{
"keyName": "MachineStatus(0)",
"targetValue": "2"
"targetValue": "0"
},
{
"keyName": "MachineStatus(0)",
"targetValue": "3"
"targetValue": "1"
},
{
"keyName": "MachineStatus(0)",
"targetValue": "2"
}
]
},
"condReady": {
"checkMode": "AND",
"checkMode": "OR",
"checkList": [
{
"keyName": "MachineStatus(0)",
"targetValue": "3"
},
{
"keyName": "MachineStatus(0)",
"targetValue": "5"
@@ -69,7 +78,6 @@
},
"condError": {
"checkMode": "AND",
"negateValue": true,
"checkList": [
{
"keyName": "MachineStatus(0)",
@@ -83,6 +91,7 @@
},
"condWarmUpCoolDown": {
"checkMode": "OR",
"negateValue": true,
"checkList": []
},
"condWarning": {
+2
View File
@@ -1,5 +1,6 @@
[
{
"blinkVal": 100,
"description": "Allarmi Impianto",
"tipoMem": "DInt",
"memAddr": "40901",
@@ -25,6 +26,7 @@
]
},
{
"blinkVal": 100,
"description": "Emergenza",
"tipoMem": "DInt",
"memAddr": "40907",
+6 -2
View File
@@ -3001,7 +3001,7 @@ namespace IOB_WIN_NEXT
{
item.setupData();
// loggo
lgInfo($"Decodifica aree alarmMap: {item.description} | {item.memAddr} x {item.size} byte | {item.messages} messaggi allarme");
lgDebug($"Decodifica aree alarmMap: {item.description} | {item.memAddr} x {item.size} byte | {item.messages} messaggi allarme");
}
// invio oggetto alarmMap al server x successiva decodifica
@@ -3018,7 +3018,7 @@ namespace IOB_WIN_NEXT
if (utils.CRB("verbose"))
{
string rawMemConf = JsonConvert.SerializeObject(memMap, Formatting.Indented);
lgInfo($"setupMemMap | configurazione memoria R/W:{Environment.NewLine}{rawMemConf}");
lgDebug($"setupMemMap | configurazione memoria R/W:{Environment.NewLine}{rawMemConf}");
}
// se ho variabili read --> genero dati TSVC...
if (memMap.mMapRead.Count > 0)
@@ -4735,6 +4735,10 @@ namespace IOB_WIN_NEXT
fatto = true;
}
}
else
{
lgError($"Errore in invio richiesta registrazione allarme: URL: {lastUrl}{Environment.NewLine}Payload:{Environment.NewLine}{rawData}");
}
}
return fatto;
}