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

Merge branch 'release/UpdateRimorHmi'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-03-02 12:19:32 +01:00
parent 5736c8e5b3 27d23fe29f
commit f88eef7f67
6 changed files with 48 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.ini
-2
View File
@@ -69,8 +69,6 @@ PARAM_CONF=IMI_RIMOR_SAB_02.json
NO_PING=FALSE
; conf blocchi memoria x READ
MEM_BLOCK=IMI_RIMOR_SAB_02_MBlock.json
; conf aree allarme
ALARM_CONF=IMI_RIMOR_SAB_02_alarm.json
; rimozione check limiti min/max dynData
disDynDataRangeCheck=true
IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json
+19 -77
View File
@@ -1,90 +1,32 @@
{
"mMapWrite": {
"setArt": {
"name": "setArt",
"description": "Articolo",
"memAddr": "40901",
"tipoMem": "String",
"index": 901,
"size": 12
},
"setComm": {
"name": "setComm",
"description": "Commessa",
"memAddr": "40050",
"memAddr": "40921",
"tipoMem": "String",
"index": 50,
"size": 20
"index": 921,
"size": 12
},
"setProg": {
"name": "setProg",
"description": "Qty",
"memAddr": "40941",
"tipoMem": "String",
"index": 941,
"size": 30
}
},
"mMapRead": {
"AmpMot1": {
"name": "AmpMot1",
"description": "Assorbimento (MAX) motore 1 - catena linea1 motore 1 tazze A4.2",
"memAddr": "40003",
"tipoMem": "Int",
"index": 3,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 0.01,
"minVal": 0,
"maxVal": 999,
"unit": "%"
},
"AmpMot2": {
"name": "AmpMot2",
"description": "Assorbimento (MAX) motore 2 - catena linea2 motore 2 tazze A4.2",
"memAddr": "40004",
"tipoMem": "Int",
"index": 4,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 0.01,
"minVal": 0,
"maxVal": 999,
"unit": "%"
},
"AmpMot3": {
"name": "AmpMot3",
"description": "Assorbimento (MAX) motore 3 - nastro uscita cesti motore 3 A2.4",
"memAddr": "40005",
"tipoMem": "Int",
"index": 5,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 0.01,
"minVal": 0,
"maxVal": 999,
"unit": "%"
},
"AmpMot4": {
"name": "AmpMot4",
"description": "Assorbimento (MAX) motore 4 - curva uscita cesti motore 4 A2.4",
"memAddr": "40006",
"tipoMem": "Int",
"index": 6,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 0.01,
"minVal": 0,
"maxVal": 999,
"unit": "%"
},
"AmpMot5": {
"name": "AmpMot5",
"description": "Assorbimento (MAX) motore 5 - nastro ingresso casse vuote motore 5 A2.4",
"memAddr": "40007",
"tipoMem": "Int",
"index": 7,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 0.01,
"minVal": 0,
"maxVal": 999,
"unit": "%"
}
},
"optMemPar": {
"AlarmIntCond": "40000|0=0",
"ManualIntCond": "40000|0=1",
"EStopBitCond": "40001.0=1",
"WorkIntCond": "40000|0=2,4"
}
}
IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_MBlock.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"ReadBlocks": {
"40000": 10
"40900": 70
}
}
IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_alarm.json
-52
View File
@@ -1,52 +0,0 @@
[
{
"description": "Allarmi Impianto",
"tipoMem": "DInt",
"memAddr": "40000",
"index": 0,
"size": 2,
"messages": [
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"##",
"EMERGENZA GENERALE",
"TERMICO SCATTATO",
"FAULT INVERTER",
"FAULT STEPPER",
"CARTER APERTI",
"PORTA SX APERTA",
"PORTA DX APERTA",
"CARTER APERTI"
]
},
{
"description": "Allarmi Impianto",
"tipoMem": "DInt",
"memAddr": "40002",
"index": 2,
"size": 2,
"messages": [
"TOUT BF NASTRO 1",
"TOUT BF NASTRO 2",
"TOUT BF NASTRO 3",
"TOUT BF NASTRO 4",
"TOUT BF NASTRO 5",
"TOUT BF NASTRO 6",
"ALL MOTORULLO 1",
"ALL MOTORULLO 2",
"ALL MOTORULLO 3",
"ALL MOTORULLO 4",
"ALL MOTORULLO 5",
"ALL MOTORULLO 6",
"",
"",
"",
""
]
}
]
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
-1
View File
@@ -317,7 +317,6 @@
<Compile Include="utils.cs" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02.ini" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02_alarm.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02_MBlock.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_01_MBlock.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
IOB-WIN-NEXT/IobModbusTCP.cs
+28 -2
View File
@@ -104,14 +104,40 @@ namespace IOB_WIN_NEXT
case taskType.fixStopSetup:
case taskType.forceResetPzCount:
case taskType.forceSetPzCount:
case taskType.setProg:
case taskType.sendWatchDogMes2Plc:
case taskType.startSetup:
case taskType.stopSetup:
taskVal = $"taskReq: {tName} | key: {item.Key} | val: {item.Value} | SKIPPED | NO EXEC";
break;
case taskType.setProg:
case taskType.setPzComm:
case taskType.setArt:
case taskType.setComm:
taskVal = $"taskReq: {tName} | key: {item.Key} | val: {item.Value} | SKIPPED | NO EXEC";
// cerco se ho configurato parametri x invio...
if (memMap.mMapWrite.ContainsKey(item.Key))
{
memMap.mMapWrite[item.Key].value = item.Value;
// preparo obj oparametro da scrivere...
List<objItem> updatedPar = new List<objItem>();
objItem newParam = new objItem()
{
uid = item.Key,
name=item.Key,
value = item.Value,
reqValue = "",
writable = true,
lastRequest = DateTime.Now
};
updatedPar.Add(newParam);
// richiamo scrittura parametri su PLC
plcWriteParams(ref updatedPar);
taskVal = $"REQUEST SET val: {item.Key} --> {item.Value}";
}
else
{
taskVal = $"taskReq: {tName} | key: {item.Key} | val: {item.Value} | NOT FOUND IN mMapWrite List | NO EXEC";
}
break;
case taskType.setParameter: