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

Merge branch 'release/ModBusFix06'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-11-03 17:08:42 +01:00
parent 3ca08a6661 d363a620f4
commit 3195e9b47f
5 changed files with 94 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/ToMapo.cs
+2 -1
View File
@@ -17,7 +17,7 @@ namespace IOB_UT_NEXT
#region Public Fields
/// <summary>
/// valore di aprtenza x un segnale di blink in caso di inizio variazione
/// valore di partenza x un segnale di blink in caso di inizio variazione
/// </summary>
public int blinkVal = 30;
@@ -152,6 +152,7 @@ namespace IOB_UT_NEXT
}
else
{
alarmsBlinkCounter[idx] = 1;
alarmsMask[bank] += (uint)1 << idx;
}
idx++;
IOB-WIN-NEXT/DATA/CONF/PIZ05_alarm.json
+34 -2
View File
@@ -4,7 +4,7 @@
"tipoMem": "DInt",
"memAddr": "40901",
"index": 901,
"size": 2,
"size": 4,
"messages": [
"Basso livello serbatoio",
"Alto livello serbatoio",
@@ -21,6 +21,22 @@
"##",
"Allarme rilevatore gas 3",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##"
]
},
@@ -29,7 +45,7 @@
"tipoMem": "DInt",
"memAddr": "40907",
"index": 907,
"size": 2,
"size": 4,
"messages": [
"##",
"Pulsante di Emergenza Premuto",
@@ -46,6 +62,22 @@
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##"
]
}
IOB-WIN-NEXT/DATA/CONF/PIZ05_alarm.json.bak
+52
View File
@@ -0,0 +1,52 @@
[
{
"description": "Allarmi Impianto",
"tipoMem": "DInt",
"memAddr": "40901",
"index": 901,
"size": 2,
"messages": [
"Basso livello serbatoio",
"Alto livello serbatoio",
"Errore trasmettitore livello",
"Bassa pressione serbatoio",
"Alta pressione serbatoio",
"##",
"##",
"Allarme rilevatore gas 1",
"##",
"##",
"Allarme rilevatore gas 2",
"##",
"##",
"Allarme rilevatore gas 3",
"##",
"##"
]
},
{
"description": "Emergenza",
"tipoMem": "DInt",
"memAddr": "40907",
"index": 907,
"size": 2,
"messages": [
"##",
"Pulsante di Emergenza Premuto",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##"
]
}
]
IOB-WIN-NEXT/IobGeneric.cs
+4 -4
View File
@@ -4616,10 +4616,10 @@ namespace IOB_WIN_NEXT
{
ActiveAlarmList.Add($"{i:000}-{AlarmList.ElementAt(i)}");
}
else
{
ActiveAlarmList.Add($"Unknown Bit.{i}");
}
//else
//{
// ActiveAlarmList.Add($"Unknown Bit.{i}");
//}
}
}
}
IOB-WIN-NEXT/IobModbusTCPHam.cs
+2 -2
View File
@@ -85,10 +85,10 @@ namespace IOB_WIN_NEXT
numErrors++;
}
// registro gli allarmi attivi e trasmetto...
if (sendAlarmVariations(item.memAddr, i, item.alarmsState[i], (uint)currStatus, item.messages))
if (sendAlarmVariations(item.memAddr, i, item.alarmsState[i], (uint)(item.alarmsMask[i] & currStatus), item.messages))
{
// se inviato --> salvo stato da current...
item.updStatusVal(i, (uint)currStatus);
item.updStatusVal(i, (uint)(item.alarmsMask[i] & currStatus));
}
}
}