From 0e3824198ae5ea45cff0fb28e2eb6499d7bc20d6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 Sep 2025 19:12:47 +0200 Subject: [PATCH] Update vari IOB (OPC-UA, MBus, SHelly) x recepire modifiche - SDK - REDIS --- IOB-UT-NEXT/IOB-UT-NEXT.csproj | 4 ++-- IOB-UT-NEXT/packages.config | 2 +- IOB-WIN-FORM/IOB-WIN-FORM.csproj | 4 ++-- IOB-WIN-FORM/packages.config | 2 +- IOB-WIN-MBUS/App.config | 2 +- IOB-WIN-MBUS/DATA/CONF/MAIN.ini | 3 ++- IOB-WIN-MBUS/IOB-WIN-MBUS.csproj | 18 ++++++++++----- IOB-WIN-MBUS/packages.config | 4 ++-- IOB-WIN-MBUS/postBuildTgt.bat | 4 +++- IOB-WIN-OPC-UA/DATA/CONF/1042.json | 29 +------------------------ IOB-WIN-OPC-UA/DATA/CONF/1042.test.json | 26 ++++------------------ IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj | 6 ++--- IOB-WIN-OPC-UA/packages.config | 4 ++-- IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj | 6 ++--- IOB-WIN-SHELLY/packages.config | 4 ++-- 15 files changed, 41 insertions(+), 77 deletions(-) diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj index 9e5a6d08..3c85664e 100644 --- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj +++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj @@ -62,8 +62,8 @@ ..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll - - ..\packages\MapoSDK.6.14.2508.516\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll diff --git a/IOB-UT-NEXT/packages.config b/IOB-UT-NEXT/packages.config index c89f90bc..53e76d9e 100644 --- a/IOB-UT-NEXT/packages.config +++ b/IOB-UT-NEXT/packages.config @@ -1,6 +1,6 @@  - + diff --git a/IOB-WIN-FORM/IOB-WIN-FORM.csproj b/IOB-WIN-FORM/IOB-WIN-FORM.csproj index cd7c13de..eca6a5b6 100644 --- a/IOB-WIN-FORM/IOB-WIN-FORM.csproj +++ b/IOB-WIN-FORM/IOB-WIN-FORM.csproj @@ -38,8 +38,8 @@ ..\packages\FluentFTP.52.1.0\lib\net462\FluentFTP.dll - - ..\packages\MapoSDK.6.14.2508.516\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll ..\packages\MathNet.Numerics.5.0.0\lib\net461\MathNet.Numerics.dll diff --git a/IOB-WIN-FORM/packages.config b/IOB-WIN-FORM/packages.config index 343fb3a4..b6fda30e 100644 --- a/IOB-WIN-FORM/packages.config +++ b/IOB-WIN-FORM/packages.config @@ -2,7 +2,7 @@ - + diff --git a/IOB-WIN-MBUS/App.config b/IOB-WIN-MBUS/App.config index ea57d79b..d0a0d0e1 100644 --- a/IOB-WIN-MBUS/App.config +++ b/IOB-WIN-MBUS/App.config @@ -172,7 +172,7 @@ - + diff --git a/IOB-WIN-MBUS/DATA/CONF/MAIN.ini b/IOB-WIN-MBUS/DATA/CONF/MAIN.ini index 0af816d9..ebfdae50 100644 --- a/IOB-WIN-MBUS/DATA/CONF/MAIN.ini +++ b/IOB-WIN-MBUS/DATA/CONF/MAIN.ini @@ -24,7 +24,8 @@ CLI_INST=SteamWareSim ;STARTLIST=WPS ;STARTLIST=Tend_FIMAT_01 ;STARTLIST=PIZ04 -STARTLIST=4001-ENR +;STARTLIST=4001-ENR ;STARTLIST=3029-ENR +STARTLIST=3010-ENR MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj b/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj index 6bf32919..bc23bb06 100644 --- a/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj +++ b/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj @@ -47,8 +47,8 @@ ..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll - - ..\packages\MapoSDK.6.14.2505.2916\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -69,7 +69,7 @@ ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll - ..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.8.58\lib\net461\StackExchange.Redis.dll @@ -190,9 +190,15 @@ - - - + + Always + + + Always + + + Always + diff --git a/IOB-WIN-MBUS/packages.config b/IOB-WIN-MBUS/packages.config index 39070967..5d2b2f02 100644 --- a/IOB-WIN-MBUS/packages.config +++ b/IOB-WIN-MBUS/packages.config @@ -1,7 +1,7 @@  - + @@ -9,7 +9,7 @@ - + diff --git a/IOB-WIN-MBUS/postBuildTgt.bat b/IOB-WIN-MBUS/postBuildTgt.bat index c705641e..5cd866cd 100644 --- a/IOB-WIN-MBUS/postBuildTgt.bat +++ b/IOB-WIN-MBUS/postBuildTgt.bat @@ -44,7 +44,9 @@ REM ROBOCOPY %2 \\10.51.90.5\Steamware\IOB-WIN-MBUS-DEB /MIR /log:RobocopyTransf REM ROBOCOPY %2 Z:\IOB-WIN-MBUS-DEB /MIR REM ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-MBUS-DEB /MIR REM ROBOCOPY %2 \\10.51.90.11\Steamware\IOB-WIN-MBUS-DEB /MIR -ROBOCOPY %2 \\10.51.90.16\Steamware\IOB-WIN-MBUS-DEB /MIR + +REM ROBOCOPY %2 \\10.51.90.16\Steamware\IOB-WIN-MBUS-DEB /MIR +ROBOCOPY %2 \\10.74.83.27\Steamware\IOB-WIN-MBUS-DEB /MIR goto END diff --git a/IOB-WIN-OPC-UA/DATA/CONF/1042.json b/IOB-WIN-OPC-UA/DATA/CONF/1042.json index 1ed8d259..cb7188a7 100644 --- a/IOB-WIN-OPC-UA/DATA/CONF/1042.json +++ b/IOB-WIN-OPC-UA/DATA/CONF/1042.json @@ -179,39 +179,12 @@ "ns=4;s=ext_stringa2_popup", "ns=4;s=ext_stringa3_popup", "ns=4;s=Hmi_Rcp_DmActName", - "ns=4;s=InvRuote_10_11_IOut", - "ns=4;s=InvRuote_12_13_IOut", - "ns=4;s=InvRuote_14_15_IOut", - "ns=4;s=InvRuote_16_17_IOut", - "ns=4;s=invRuote_18_1_IOut", - "ns=4;s=InvRuote_19_20_IOut", - "ns=4;s=InvRuote_2_3_IOut", - "ns=4;s=InvRuote_4_5_IOut", - "ns=4;s=InvRuote_6_7_IOut", - "ns=4;s=InvRuote_8_9_IOut", - "ns=4;s=invTavola_IOut", - "ns=4;s=num_pressione_robot2_sv", - "ns=4;s=num_pressione_robot3_sv", - "ns=4;s=num_pressione_robot4_sv", - "ns=4;s=num_pressione_sv", "ns=4;s=rele_automatico", "ns=4;s=rele_ciclo_automatico", "ns=4;s=rele_emergenza", "ns=4;s=rele_inserzione_pm", "ns=4;s=rele_manuale", - "ns=4;s=rele_reset_allarmi", - "ns=4;s=ruota_attiva_robot2_sv", - "ns=4;s=ruota_attiva_robot3_sv", - "ns=4;s=ruota_attiva_robot4_sv", - "ns=4;s=ruota_attiva_sv", - "ns=4;s=valore_pressione_robot2_sv", - "ns=4;s=valore_pressione_robot3_sv", - "ns=4;s=valore_pressione_robot4_sv", - "ns=4;s=valore_pressione_sv", - "ns=4;s=velocita_rot2_SV", - "ns=4;s=velocita_rot3_SV", - "ns=4;s=velocita_rot4_SV", - "ns=4;s=velocita_rot_SV" + "ns=4;s=rele_reset_allarmi" ], "mMapWrite": { diff --git a/IOB-WIN-OPC-UA/DATA/CONF/1042.test.json b/IOB-WIN-OPC-UA/DATA/CONF/1042.test.json index 8361a544..1ed8d259 100644 --- a/IOB-WIN-OPC-UA/DATA/CONF/1042.test.json +++ b/IOB-WIN-OPC-UA/DATA/CONF/1042.test.json @@ -2,7 +2,7 @@ "BrowseFullVal": "ns=4;s=NxController.GlobalVars", "BrowseNSIndex": 4, "BrowseValue": 5001, - "keyPartCount": "ext_prod_parziale_robot4", + "keyPartCount": "ext_prod_parziale_mes_robot4", "keyPartReq": "", "keyPartId": "", "keyProgName": "", @@ -168,7 +168,7 @@ "ns=4;s=ext_prod_parziale_robot1", "ns=4;s=ext_prod_parziale_robot2", "ns=4;s=ext_prod_parziale_robot3", - "ns=4;s=ext_prod_parziale_robot4", + "ns=4;s=ext_prod_parziale_mes_robot4", "ns=4;s=ext_prod_totale_robot1", "ns=4;s=ext_prod_totale_robot2", "ns=4;s=ext_prod_totale_robot3", @@ -252,7 +252,7 @@ "description": "Scrittura Commessa + Quantita + Articolo", "tipoMem": "String", "memAddr": "ns=4;s=ext_codice_lotto", - "ComposedVal": "[[setComm]] | [[setPzComm]] pz | [[setArt]]", + "ComposedVal": "[[setComm]] | Art: [[setArt]] x [[setPzComm]] pz ", "index": 0, "size": 50 }, @@ -278,7 +278,7 @@ "name": "OPC_SelProg", "description": "Prog Selezionato", "tipoMem": "Int", - "memAddr": "ns=4;s=ext_codice_lotto", + "memAddr": "ns=4;s=hmi_rcp_dmActive", "index": 0, "size": 50 } @@ -287,23 +287,5 @@ "setArt": "processOtherInfo", "setComm": "processOtherInfo", "setPzComm": "processOtherInfo" - }, - "StepActionList": { - "processOtherInfo": [ - { - "IdxAct": 1, - "Name": "Abilita Popup", - "FixVal": "True", - "MMapWrite": "showPopup", - "WaitTimeMs": 0 - }, - { - "IdxAct": 2, - "Name": "Disabilita Popup", - "FixVal": "False", - "MMapWrite": "showPopup", - "WaitTimeMs": 50 - } - ] } } \ No newline at end of file diff --git a/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj b/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj index ec98a386..a855df87 100644 --- a/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj +++ b/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj @@ -47,8 +47,8 @@ ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll - - ..\packages\MapoSDK.6.14.2506.2618\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -87,7 +87,7 @@ ..\packages\S7netplus.0.1.9\lib\net45\S7.Net.dll - ..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.8.58\lib\net461\StackExchange.Redis.dll ..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll diff --git a/IOB-WIN-OPC-UA/packages.config b/IOB-WIN-OPC-UA/packages.config index b378cf0d..e1e7533f 100644 --- a/IOB-WIN-OPC-UA/packages.config +++ b/IOB-WIN-OPC-UA/packages.config @@ -1,7 +1,7 @@  - + @@ -15,7 +15,7 @@ - + diff --git a/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj b/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj index 67fb94cd..a3c4c540 100644 --- a/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj +++ b/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj @@ -45,7 +45,7 @@ - ..\packages\EgwProxy.Shelly.3.7.2508.708\lib\EgwProxy.Shelly.dll + ..\packages\EgwProxy.Shelly.3.7.2509.219\lib\EgwProxy.Shelly.dll ..\packages\Flurl.4.0.0\lib\net461\Flurl.dll @@ -53,8 +53,8 @@ ..\packages\Flurl.Http.4.0.2\lib\net461\Flurl.Http.dll - - ..\packages\MapoSDK.6.14.2508.516\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll diff --git a/IOB-WIN-SHELLY/packages.config b/IOB-WIN-SHELLY/packages.config index 18ba6cab..5056913d 100644 --- a/IOB-WIN-SHELLY/packages.config +++ b/IOB-WIN-SHELLY/packages.config @@ -1,9 +1,9 @@  - + - +