From 1cb0bc84b1fde2255d75d40bf972e1b9106dee14 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 7 Sep 2022 18:29:52 +0200 Subject: [PATCH 1/4] OPC-UA Cimolai: - conf OPC-UA aggiornata - fix gestione contapezzi --- .../DATA/CONF/BAGLIETTO_CIMOLAI_01.ini | 2 +- .../DATA/CONF/BAGLIETTO_CIMOLAI_01.json | 55 +++++++------------ IOB-WIN-NEXT/IOB-WIN-NEXT.csproj | 3 + IOB-WIN-NEXT/IobGeneric.cs | 14 +++++ IOB-WIN-NEXT/IobOpcUa.cs | 7 ++- IOB-WIN-NEXT/IobOpcUaMBH.cs | 2 +- 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini index 3dd560c2..d24dd833 100644 --- a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini +++ b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini @@ -50,7 +50,7 @@ CHANGE_ODL_MODE=TIME CHANGE_ODL_HOURS=24 CHANGE_ODL_IDLE_MIN=5 PZCOUNT_MODE=OPC -DISABLE_PZCOUNT=FALSE +DISABLE_PZCOUNT=TRUE ENABLE_SEND_PZC_BLOCK=TRUE MIN_SEND_PZC_BLOCK=0 MAX_SEND_PZC_BLOCK=100 diff --git a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json index a6d46af2..8bf8e128 100644 --- a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json +++ b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json @@ -2,21 +2,21 @@ "BrowseFullVal": "ns=2;i=1001", "BrowseNSIndex": 2, "BrowseValue": 1001, - "keyPartCount": "Conteggio", - "keyPartReq": "Set Quantità Lotto", - "keyPartId": "Generale: Nome Ricetta", - "keyProgName": "Generale: Nome Ricetta", + "keyPartCount": "", + "keyPartReq": "", + "keyPartId": "", + "keyProgName": "", "keyRunMode": "", "pingAsPowerOn": true, - "forcePingOk": true, + "forcePingOk": false, "condWork": [ { - "keyName": "Selettore in Automatico", - "targetValue": "True" + "keyName": "ns=2;s=Tags.PLC/DB13/Gen/Marcia_AUX", + "targetValue": "2" }, { - "keyName": "Memoria Ciclo Automatico", - "targetValue": "True" + "keyName": "ns=2;s=Tags.PLC/DB231/InCorso", + "targetValue": "1" } ], "condPowerOn": { @@ -25,27 +25,28 @@ }, "condReady": { "checkMode": "AND", - "checkList": [] + "checkList": [ + { + "keyName": "ns=2;s=Tags.PLC/DB13/Gen/Marcia_AUX", + "targetValue": "2" + } + ] }, "condManual": { "checkMode": "AND", - "checkList": [ - { - "keyName": "Selettore in Manuale", - "targetValue": "True" - } - ] + "checkList": [] }, "condEStop": { "checkMode": "AND", "checkList": [] }, "condError": { - "checkMode": "AND", + "checkMode": "OR", + "negateValue": true, "checkList": [ { - "keyName": "Memoria Allarme Attivo", - "targetValue": "True" + "keyName": "ns=2;s=Tags.PLC/DB13/Gen/ComProfibusMessage", + "targetValue": "0" } ] }, @@ -63,12 +64,7 @@ }, "condSetup": { "checkMode": "AND", - "checkList": [ - { - "keyName": "Fine Lotto (1=Stop Ciclo)", - "targetValue": "1" - } - ] + "checkList": [] }, "fluxLogVeto": [ "" @@ -104,14 +100,5 @@ "MemConfRead": "ns=4;s=tomes_1_Watchdog", "MemConfWrite": "ns=4;s=tomach_1_watchdog", "MaxVal": 9999 - }, - "actStopProd": { - "ns=4;i=14": "1" - }, - "actSetRecipe": { - "ns=4;i=10": "1" - }, - "actResetCounter": { - "ns=4;i=13": "1" } } \ 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 6d50caf8..c1345a08 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -350,6 +350,9 @@ PreserveNewest + + Always + Always diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs index b943a182..7a77bda8 100644 --- a/IOB-WIN-NEXT/IobGeneric.cs +++ b/IOB-WIN-NEXT/IobGeneric.cs @@ -3942,6 +3942,20 @@ namespace IOB_WIN_NEXT /// protected int watchDogPeriod = 2; + /// + /// Boolean x indicare contapezzi abilitato a livello di conf apoplicazione + /// + protected bool enablePzCountByApp = true; + + /// + /// Boolean x indicare contapezzi abilitato forzatamente da IOB + /// + protected bool enablePzCountByIob = true; + /// + /// Boolean x indicare contapezzi disabilitato forzatamente da IOB + /// + protected bool disablePzCounteByIob = false; + #endregion Protected Fields #region Protected Properties diff --git a/IOB-WIN-NEXT/IobOpcUa.cs b/IOB-WIN-NEXT/IobOpcUa.cs index c8dd8d34..35763859 100644 --- a/IOB-WIN-NEXT/IobOpcUa.cs +++ b/IOB-WIN-NEXT/IobOpcUa.cs @@ -28,6 +28,11 @@ namespace IOB_WIN_NEXT { // gestione invio ritardato contapezzi pzCountDelay = utils.CRI("pzCountDelay"); + + enablePzCount = utils.CRB("enableContapezzi"); + enablePzCountByIob = (getOptPar("ENABLE_PZCOUNT") == "TRUE"); + disablePzCounteByIob = (getOptPar("DISABLE_PZCOUNT") == "TRUE"); + // gestione data filtering... if (!string.IsNullOrEmpty(getOptPar("ENABLE_DATA_FILTER"))) { @@ -157,7 +162,7 @@ namespace IOB_WIN_NEXT /// public override void processContapezzi() { - if (utils.CRB("enableContapezzi")) + if ((enablePzCountByApp || enablePzCountByIob) && !(disablePzCounteByIob)) { // da ridefinire la gestione base del contapezzi OPC-UA... } diff --git a/IOB-WIN-NEXT/IobOpcUaMBH.cs b/IOB-WIN-NEXT/IobOpcUaMBH.cs index 07f9deb7..13e53759 100644 --- a/IOB-WIN-NEXT/IobOpcUaMBH.cs +++ b/IOB-WIN-NEXT/IobOpcUaMBH.cs @@ -47,7 +47,7 @@ namespace IOB_WIN_NEXT /// public override void processContapezzi() { - if (utils.CRB("enableContapezzi")) + if ((enablePzCountByApp || enablePzCountByIob) && !(disablePzCounteByIob)) { // check condizione validazione if (checkMultiCondition(opcUaParams.condCountEnabled) || opcUaParams.condCountEnabled.checkList.Count == 0) From 1e7bf45e8b30bebd6578b8e84cea1805d188adc5 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 7 Sep 2022 18:36:16 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Cimolai:=20-=20conf=20OPC-UA=20ora=20=C3=A8?= =?UTF-8?q?=20corretta=20(da=20completare)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json | 8 ++++---- IOB-WIN-NEXT/IobOpcUa.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json index 8bf8e128..77cea455 100644 --- a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json +++ b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json @@ -11,11 +11,11 @@ "forcePingOk": false, "condWork": [ { - "keyName": "ns=2;s=Tags.PLC/DB13/Gen/Marcia_AUX", + "keyName": "PLC/DB13/Gen/Marcia_AUX", "targetValue": "2" }, { - "keyName": "ns=2;s=Tags.PLC/DB231/InCorso", + "keyName": "PLC/DB231/InCorso", "targetValue": "1" } ], @@ -27,7 +27,7 @@ "checkMode": "AND", "checkList": [ { - "keyName": "ns=2;s=Tags.PLC/DB13/Gen/Marcia_AUX", + "keyName": "PLC/DB13/Gen/Marcia_AUX", "targetValue": "2" } ] @@ -45,7 +45,7 @@ "negateValue": true, "checkList": [ { - "keyName": "ns=2;s=Tags.PLC/DB13/Gen/ComProfibusMessage", + "keyName": "PLC/DB13/Gen/ComProfibusMessage", "targetValue": "0" } ] diff --git a/IOB-WIN-NEXT/IobOpcUa.cs b/IOB-WIN-NEXT/IobOpcUa.cs index 35763859..8d5d4675 100644 --- a/IOB-WIN-NEXT/IobOpcUa.cs +++ b/IOB-WIN-NEXT/IobOpcUa.cs @@ -29,7 +29,7 @@ namespace IOB_WIN_NEXT // gestione invio ritardato contapezzi pzCountDelay = utils.CRI("pzCountDelay"); - enablePzCount = utils.CRB("enableContapezzi"); + enablePzCountByApp = utils.CRB("enableContapezzi"); enablePzCountByIob = (getOptPar("ENABLE_PZCOUNT") == "TRUE"); disablePzCounteByIob = (getOptPar("DISABLE_PZCOUNT") == "TRUE"); From 9f7bfebf973fd1d1a00dbc7931cb274d89a98f18 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 8 Sep 2022 11:25:07 +0200 Subject: [PATCH 3/4] Fix configurazione x OMP FInassi --- IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.ini | 2 +- IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.json | 3 ++- IOB-WIN-NEXT/DATA/CONF/MAIN.ini | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.ini b/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.ini index 7399149d..4989bcc7 100644 --- a/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.ini +++ b/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.ini @@ -53,7 +53,7 @@ PZCOUNT_MODE=OPC DISABLE_PZCOUNT=FALSE ENABLE_SEND_PZC_BLOCK=TRUE MIN_SEND_PZC_BLOCK=0 -MAX_SEND_PZC_BLOCK=100 +MAX_SEND_PZC_BLOCK=10000 ENABLE_DYN_DATA=FALSE FORCE_DYN_DATA=TRUE ENABLE_DATA_FILTER=TRUE diff --git a/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.json b/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.json index 3c5e2133..939e97a0 100644 --- a/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.json +++ b/IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.json @@ -54,7 +54,8 @@ }, "condWarmUpCoolDown": { "checkMode": "OR", - "checkList": [] + "checkList": [], + "negateValue": true }, "condWarning": { "checkMode": "AND", diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index 5e4d363b..61da321e 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -40,7 +40,7 @@ CLI_INST=SteamWareSim ;STARTLIST=GIACO_NWSE ;STARTLIST=SIM_DP_01 ;STARTLIST=FINASSI_HELPI_01 -;STARTLIST=FINASSI_OMP_01 -STARTLIST=BAGLIETTO_CIMOLAI_01 +STARTLIST=FINASSI_OMP_01 +;STARTLIST=BAGLIETTO_CIMOLAI_01 MAXCNC=10 \ No newline at end of file From 3c5004253d6c01a722e829fc34ee365710af98cf Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 8 Sep 2022 11:25:39 +0200 Subject: [PATCH 4/4] Test x OMP... --- IOB-WIN-NEXT/IOB-WIN-NEXT.csproj | 1 + IOB-WIN-NEXT/RemoteDebugInfo.txt | 18 ++++++++++++++++++ IOB-WIN-NEXT/postBuildTgt.bat | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 IOB-WIN-NEXT/RemoteDebugInfo.txt diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index c1345a08..821b1d30 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -441,6 +441,7 @@ + Always diff --git a/IOB-WIN-NEXT/RemoteDebugInfo.txt b/IOB-WIN-NEXT/RemoteDebugInfo.txt new file mode 100644 index 00000000..427f0406 --- /dev/null +++ b/IOB-WIN-NEXT/RemoteDebugInfo.txt @@ -0,0 +1,18 @@ +Per effettuare debug remoto: + +1) verificare che sia presente nel server remoto il sw RemoteDebugTool +2) verificare sia avviato e configurato +3) verificare esistenza cartella C:\Steamware\IOB-WIN-NEXT-DEB\ +4) impostare path di avvio come C:\Steamware\IOB-WIN-NEXT-DEB\IOB-WIN-NEXT.exe +5) impostare la remote machine con ip: porta, ad esempio sotto si trovano i aprametri x i vari clienti +6) modificare il path dello script di replica post build +7) impostare nel file di avvio la machcina corretta: DATA/CONF/MAIN.ini (in fondo, sezione [IOB] ad esempio STARTLIST=FINASSI_OMP_01) + + + +Remote Machine conf: + Baglietto: + - 192.168.60.15:4026 + + Cereria Finassi: + - 10.150.0.1:4026 diff --git a/IOB-WIN-NEXT/postBuildTgt.bat b/IOB-WIN-NEXT/postBuildTgt.bat index e7fcaf66..a7faeeb5 100644 --- a/IOB-WIN-NEXT/postBuildTgt.bat +++ b/IOB-WIN-NEXT/postBuildTgt.bat @@ -57,9 +57,9 @@ REM copia script verso server remoto echo Debug remoto: effettuo robocopy sync (verificare remote per cliente) REM FINASSI -REM ROBOCOPY . \\10.150.0.1\Steamware\IOB-WIN-NEXT-DEB /MIR +ROBOCOPY . \\10.150.0.1\Steamware\IOB-WIN-NEXT-DEB /MIR REM Baglietto -ROBOCOPY . \\192.168.60.15\Steamware\IOB-WIN-NEXT-DEB /MIR +REM ROBOCOPY . \\192.168.60.15\Steamware\IOB-WIN-NEXT-DEB /MIR goto END