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

Update vari IOB (OPC-UA, MBus, SHelly) x recepire modifiche

Browse Source 
- SDK
- REDIS
This commit is contained in:
Samuele Locatelli
2025-09-10 19:12:47 +02:00
parent dd3fe5e7e2
commit 0e3824198a
15 changed files with 41 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/IOB-UT-NEXT.csproj
+2 -2
View File
@@ -62,8 +62,8 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2508.516, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2508.516\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2509.1018, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
IOB-UT-NEXT/packages.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MapoSDK" version="6.14.2508.516" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2509.1018" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.0" targetFramework="net462" />
IOB-WIN-FORM/IOB-WIN-FORM.csproj
+2 -2
View File
@@ -38,8 +38,8 @@
<Reference Include="FluentFTP, Version=52.1.0.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
<HintPath>..\packages\FluentFTP.52.1.0\lib\net462\FluentFTP.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2508.516, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2508.516\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2509.1018, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MathNet.Numerics.5.0.0\lib\net461\MathNet.Numerics.dll</HintPath>
IOB-WIN-FORM/packages.config
+1 -1
View File
@@ -2,7 +2,7 @@
<packages>
<package id="EgwProxy.Ftp" version="3.6.2410.816" targetFramework="net462" />
<package id="FluentFTP" version="52.1.0" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2508.516" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2509.1018" targetFramework="net462" />
<package id="MathNet.Numerics" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.0" targetFramework="net462" />
IOB-WIN-MBUS/App.config
+1 -1
View File
@@ -172,7 +172,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentFTP" publicKeyToken="f4af092b1d8df44f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-52.0.0.0" newVersion="52.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-52.1.0.0" newVersion="52.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
IOB-WIN-MBUS/DATA/CONF/MAIN.ini
+2 -1
View File
@@ -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
IOB-WIN-MBUS/IOB-WIN-MBUS.csproj
+12 -6
View File
@@ -47,8 +47,8 @@
<Reference Include="EasyModbus, Version=5.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2505.2916, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2505.2916\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2509.1018, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -69,7 +69,7 @@
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.8.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -190,9 +190,15 @@
<None Include="DATA\CONF\3009-ENR.ini" />
<None Include="DATA\CONF\3009-ENR.json" />
<None Include="DATA\CONF\3009-ENR_MBlock.json" />
<None Include="DATA\CONF\3010-ENR.ini" />
<None Include="DATA\CONF\3010-ENR.json" />
<None Include="DATA\CONF\3010-ENR_MBlock.json" />
<None Include="DATA\CONF\3010-ENR.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3010-ENR.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3010-ENR_MBlock.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3011-ENR.ini" />
<None Include="DATA\CONF\3011-ENR.json" />
<None Include="DATA\CONF\3011-ENR_MBlock.json" />
IOB-WIN-MBUS/packages.config
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EasyModbusTCP" version="5.6.0" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2505.2916" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2509.1018" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.0" targetFramework="net462" />
@@ -9,7 +9,7 @@
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.3.4" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.24" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.58" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="9.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="9.0.0" targetFramework="net462" />
IOB-WIN-MBUS/postBuildTgt.bat
+3 -1
View File
@@ -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
IOB-WIN-OPC-UA/DATA/CONF/1042.json
+1 -28
View File
@@ -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": {
IOB-WIN-OPC-UA/DATA/CONF/1042.test.json
+4 -22
View File
@@ -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
}
]
}
}
IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj
+3 -3
View File
@@ -47,8 +47,8 @@
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2506.2618, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2506.2618\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2509.1018, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -87,7 +87,7 @@
<HintPath>..\packages\S7netplus.0.1.9\lib\net45\S7.Net.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.8.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="System">
<HintPath>..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll</HintPath>
IOB-WIN-OPC-UA/packages.config
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2506.2618" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2509.1018" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.0" targetFramework="net462" />
@@ -15,7 +15,7 @@
<package id="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" version="1.5.374.158" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
<package id="S7netplus" version="0.1.9" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.24" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.8.58" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="9.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="9.0.0" targetFramework="net462" />
IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj
+3 -3
View File
@@ -45,7 +45,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EgwProxy.Shelly, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.Shelly.3.7.2508.708\lib\EgwProxy.Shelly.dll</HintPath>
<HintPath>..\packages\EgwProxy.Shelly.3.7.2509.219\lib\EgwProxy.Shelly.dll</HintPath>
</Reference>
<Reference Include="Flurl, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Flurl.4.0.0\lib\net461\Flurl.dll</HintPath>
@@ -53,8 +53,8 @@
<Reference Include="Flurl.Http, Version=4.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Flurl.Http.4.0.2\lib\net461\Flurl.Http.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2508.516, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2508.516\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2509.1018, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
IOB-WIN-SHELLY/packages.config
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EgwProxy.Shelly" version="3.7.2508.708" targetFramework="net462" />
<package id="EgwProxy.Shelly" version="3.7.2509.219" targetFramework="net462" />
<package id="Flurl" version="4.0.0" targetFramework="net462" />
<package id="Flurl.Http" version="4.0.2" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2508.516" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2509.1018" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.0" targetFramework="net462" />