From a09165489781887734720de6b794f96f2e428ca8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Mar 2023 09:06:32 +0100 Subject: [PATCH 1/3] fix conf HMI Rimor --- .../DATA/CONF/IMI_RIMOR_SAB_02_MBlock.json | 2 +- .../DATA/CONF/IMI_RIMOR_SAB_02_alarm.json | 52 ------------------- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_alarm.json diff --git a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_MBlock.json b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_MBlock.json index ccd2b5e4..ca6572f2 100644 --- a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_MBlock.json +++ b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_MBlock.json @@ -1,5 +1,5 @@ { "ReadBlocks": { - "40000": 10 + "40900": 70 } } \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_alarm.json b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_alarm.json deleted file mode 100644 index 3503d427..00000000 --- a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02_alarm.json +++ /dev/null @@ -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", - "", - "", - "", - "" - ] - } -] \ No newline at end of file From ee6c32c1dc90441ee3ed464743fe8b5c14ac2fb1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Mar 2023 09:09:04 +0100 Subject: [PATCH 2/3] Ancora udpate rimor sab HMI --- IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.ini | 2 - IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json | 88 +++----------------- IOB-WIN-NEXT/IOB-WIN-NEXT.csproj | 1 - 3 files changed, 11 insertions(+), 80 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.ini b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.ini index ed45f42f..1d78e867 100644 --- a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.ini +++ b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.ini @@ -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 diff --git a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json index 40ae8860..e182418a 100644 --- a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json +++ b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json @@ -1,90 +1,24 @@ { "mMapWrite": { + "setArt": { + "name": "setArt", + "description": "Articolo", + "memAddr": "40901", + "tipoMem": "String", + "index": 1, + "size": 12 + }, "setComm": { "name": "setComm", "description": "Commessa", - "memAddr": "40050", + "memAddr": "40921", "tipoMem": "String", - "index": 50, - "size": 20 + "index": 21, + "size": 12 } }, "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" } } \ No newline at end of file diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index 7a82452e..69fd64ec 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -317,7 +317,6 @@ - PreserveNewest From 27d23fe29f21b7601e5dd05d5590a7fcd3598517 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 2 Mar 2023 12:15:44 +0100 Subject: [PATCH 3/3] Update conf x settaggi RIMOR --- IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json | 12 ++++++-- IOB-WIN-NEXT/IobModbusTCP.cs | 30 ++++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json index e182418a..5bfe30c8 100644 --- a/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json +++ b/IOB-WIN-NEXT/DATA/CONF/IMI_RIMOR_SAB_02.json @@ -5,7 +5,7 @@ "description": "Articolo", "memAddr": "40901", "tipoMem": "String", - "index": 1, + "index": 901, "size": 12 }, "setComm": { @@ -13,8 +13,16 @@ "description": "Commessa", "memAddr": "40921", "tipoMem": "String", - "index": 21, + "index": 921, "size": 12 + }, + "setProg": { + "name": "setProg", + "description": "Qty", + "memAddr": "40941", + "tipoMem": "String", + "index": 941, + "size": 30 } }, "mMapRead": { diff --git a/IOB-WIN-NEXT/IobModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP.cs index 3ebf13fd..0d8f735e 100644 --- a/IOB-WIN-NEXT/IobModbusTCP.cs +++ b/IOB-WIN-NEXT/IobModbusTCP.cs @@ -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 updatedPar = new List(); + 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: