From a472cd84dc9d07b1da2e7fa3ebbfca3bb13f2602 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 9 Jan 2025 19:30:43 +0100
Subject: [PATCH] Inizio rimozione riferimenti MBus da NEXT

---
 IOB-WIN-FORM/IOB-WIN-FORM.csproj              |  2 +-
 IOB-WIN-FORM/app.config                       | 36 +++----
 IOB-WIN-NEXT/AdapterFormNext.cs               |  4 +-
 IOB-WIN-NEXT/IOB-WIN-NEXT.csproj              | 97 +------------------
 .../{specialConfig.cs => connParamS7.cs}      |  4 +-
 5 files changed, 25 insertions(+), 118 deletions(-)
 rename IOB-WIN-NEXT/{specialConfig.cs => connParamS7.cs} (99%)

diff --git a/IOB-WIN-FORM/IOB-WIN-FORM.csproj b/IOB-WIN-FORM/IOB-WIN-FORM.csproj
index bec16da8..614da66a 100644
--- a/IOB-WIN-FORM/IOB-WIN-FORM.csproj
+++ b/IOB-WIN-FORM/IOB-WIN-FORM.csproj
@@ -116,7 +116,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
diff --git a/IOB-WIN-FORM/app.config b/IOB-WIN-FORM/app.config
index dbf050b1..d8274adc 100644
--- a/IOB-WIN-FORM/app.config
+++ b/IOB-WIN-FORM/app.config
@@ -4,16 +4,24 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib;libs" xmlns="urn:schemas-microsoft-com:asm.v1" />
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <assemblyIdentity name="Microsoft.Web.WebView2.WinForms" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.2903.40" newVersion="1.0.2903.40" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Web.WebView2.Core" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.0.2903.40" newVersion="1.0.2903.40" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Web.WebView2.WinForms" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.2903.40" newVersion="1.0.2903.40" />
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -24,16 +32,16 @@
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -43,18 +51,6 @@
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
diff --git a/IOB-WIN-NEXT/AdapterFormNext.cs b/IOB-WIN-NEXT/AdapterFormNext.cs
index 3f446aa1..20f9af6c 100644
--- a/IOB-WIN-NEXT/AdapterFormNext.cs
+++ b/IOB-WIN-NEXT/AdapterFormNext.cs
@@ -89,6 +89,7 @@ namespace IOB_WIN_NEXT
                         btnStart.Enabled = true;
                         break;
 
+#if false
                     case tipoAdapter.MODBUS_TCP:
                         iobObj = new IobModbusTCP.ModbusTCP(this, IOBConf);
                         btnStart.Enabled = true;
@@ -137,7 +138,8 @@ namespace IOB_WIN_NEXT
                     case tipoAdapter.MODBUS_TCP_ZETAPACK:
                         iobObj = new IobModbusTCP.ModbusTCPZetapack(this, IOBConf);
                         btnStart.Enabled = true;
-                        break;
+                        break; 
+#endif
 
                     case tipoAdapter.OMRON:
                         iobObj = new Iob.Omron(this, IOBConf);
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 0e55dab8..6910a93b 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -416,14 +416,6 @@
     <Compile Include="IobSql\SqlServPama.cs" />
     <Compile Include="IobSql\IcoelDb.cs" />
     <Compile Include="IobNet\IcoelSoap.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPFimat.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPRimor.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPSaim.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPZetapack.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPImaxAeromec.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPCenterfrigo.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPHelpi.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPCedax.cs" />
     <Compile Include="IobSiemens\SiemensNWSE.cs" />
     <Compile Include="Iob\Mitsubishi.cs" />
     <Compile Include="MainFormNext.cs">
@@ -433,8 +425,6 @@
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="IobBeckhoff\BeckhoffCpa.cs" />
     <Compile Include="IobFile\FileEurom63.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCPHam.cs" />
-    <Compile Include="IobModbusTCP\ModbusTCP.cs" />
     <Compile Include="Iob\Omron.cs" />
     <Compile Include="IobBeckhoff\Beckhoff.cs" />
     <Compile Include="IobSiemens\SiemensAt2001.cs" />
@@ -453,7 +443,7 @@
     <Compile Include="IobSiemens\SiemensAprochim.cs" />
     <Compile Include="IobSiemens\SiemensFape.cs" />
     <Compile Include="Output.cs" />
-    <Compile Include="specialConfig.cs" />
+    <Compile Include="connParamS7.cs" />
     <Compile Include="IobSiemens\SiemensTorri.cs" />
     <Compile Include="IobSiemens\Siemens.cs" />
     <Compile Include="Iob\Fanuc.cs" />
@@ -470,7 +460,6 @@
     <None Include="DATA\CONF\3010_alarm.json" />
     <None Include="DATA\CONF\3028.json" />
     <None Include="DATA\CONF\3028.ini" />
-    <None Include="DATA\CONF\GIACO_CENTERFRIGO_MBlock_all.json" />
     <None Include="DATA\CONF\FTP_SONATEST.ini" />
     <None Include="DATA\CONF\FTP_SONATEST.json" />
     <None Include="DATA\CONF\GT613.ini" />
@@ -504,28 +493,6 @@
     <None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.json" />
     <None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.ini" />
     <None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.json" />
-    <None Include="DATA\CONF\PIZ10.ini" />
-    <None Include="DATA\CONF\PIZ10.json" />
-    <None Include="DATA\CONF\PIZ10_alarm.json" />
-    <None Include="DATA\CONF\PIZ10_MBlock.json" />
-    <None Include="DATA\CONF\Tend_FIMAT_01.ini" />
-    <None Include="DATA\CONF\Tend_FIMAT_01.json" />
-    <None Include="DATA\CONF\Tend_FIMAT_01_alarm.json" />
-    <None Include="DATA\CONF\Tend_FIMAT_01_MBlock.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_02.ini" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_02.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_02_MBlock.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_01.ini" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_01.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_01_alarm.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_VER_01_MBlock.json" />
-    <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_MBlock.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_SAB_01_MBlock.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_SAB_01_alarm.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_SAB_01.json" />
-    <None Include="DATA\CONF\IMI_RIMOR_SAB_01.ini" />
     <None Include="DATA\CONF\VL28.ini" />
     <None Include="DATA\CONF\VL28.json" />
     <None Include="DATA\MES_Setup\setupConsumi.json" />
@@ -535,35 +502,6 @@
     </None>
     <None Include="DATA\CONF\1033.json" />
     <None Include="DATA\CONF\1033.ini" />
-    <None Include="DATA\CONF\3026-MBus.ini" />
-    <None Include="DATA\CONF\3026-MBus.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_001.ini" />
-    <None Include="DATA\CONF\GIACO_CEDAX_001.json" />
-    <None Include="DATA\CONF\3026-MBus_alarm.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_001_alarm.json" />
-    <None Include="DATA\CONF\3026-MBus_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_001_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_002.ini" />
-    <None Include="DATA\CONF\GIACO_CEDAX_002.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_002_alarm.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_002_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_003.ini" />
-    <None Include="DATA\CONF\GIACO_CEDAX_003.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_003_alarm.json" />
-    <None Include="DATA\CONF\GIACO_CEDAX_003_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_CENTERFRIGO_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_CENTERFRIGO_alarm.json" />
-    <None Include="DATA\CONF\GIACO_CENTERFRIGO.ini" />
-    <None Include="DATA\CONF\GIACO_CENTERFRIGO.json" />
-    <None Include="DATA\CONF\GIACO_SAIM_003.ini" />
-    <None Include="DATA\CONF\GIACO_SAIM_003.json" />
-    <None Include="DATA\CONF\GIACO_SAIM_001.ini" />
-    <None Include="DATA\CONF\GIACO_SAIM_001.json" />
-    <None Include="DATA\CONF\GIACO_SAIM_003_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_SAIM_001_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_SAIM_002.ini" />
-    <None Include="DATA\CONF\GIACO_SAIM_002.json" />
-    <None Include="DATA\CONF\GIACO_SAIM_002_MBlock.json" />
     <None Include="DATA\CONF\GIACO_ICOEL_002.json" />
     <None Include="DATA\CONF\1034.ini" />
     <None Include="DATA\CONF\1034.json" />
@@ -574,32 +512,12 @@
     </None>
     <None Include="DATA\CONF\3023.ini" />
     <None Include="DATA\CONF\3023.json" />
-    <None Include="DATA\CONF\FINASSI_HELPI_01.ini" />
-    <None Include="DATA\CONF\FINASSI_HELPI_01.json" />
-    <None Include="DATA\CONF\FINASSI_HELPI_01_alarm.json" />
-    <None Include="DATA\CONF\FINASSI_HELPI_01_MBlock.json" />
     <None Include="DATA\CONF\GIACO_ICOEL_002.ini" />
     <None Include="DATA\CONF\GIACO_ICOEL_003.ini" />
     <None Include="DATA\CONF\GIACO_ICOEL_003.json" />
     <None Include="DATA\CONF\GIACO_NWSE.ini" />
     <None Include="DATA\CONF\GIACO_NWSE.json" />
     <None Include="DATA\CONF\GIACO_NWSE_alarm.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P2.ini" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P2.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P2_alarm.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P2_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P1.ini" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P1.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P1.ini" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P1.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P1_alarm.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P1_alarm.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P1_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L1_P1_MBlock.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P2.ini" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P2.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P2_alarm.json" />
-    <None Include="DATA\CONF\GIACO_ZPACK_L2_P2_MBlock.json" />
     <None Include="DATA\CONF\L018.ini" />
     <None Include="DATA\CONF\SIM_DP_02.json" />
     <None Include="DATA\CONF\SIM_DP_01.json" />
@@ -673,24 +591,12 @@
     <None Include="DATA\CONF\GT575.ini" />
     <None Include="DATA\CONF\GT578.ini" />
     <None Include="DATA\CONF\GT579.ini" />
-    <None Include="DATA\CONF\PIZ04_MBlock.json" />
-    <None Include="DATA\CONF\PIZ05_MBlock.json" />
-    <None Include="DATA\CONF\PIZ05.ini" />
-    <None Include="DATA\CONF\PIZ05.json" />
-    <None Include="DATA\CONF\PIZ04.ini" />
-    <None Include="DATA\CONF\PIZ04.json" />
     <None Include="DATA\CONF\PIZ03.ini" />
     <None Include="DATA\CONF\PIZ03.json" />
-    <None Include="DATA\CONF\PIZ05_alarm.json" />
-    <None Include="DATA\CONF\PIZ04_alarm.json" />
     <None Include="DATA\CONF\PIZ03_alarm.json" />
     <None Include="DATA\CONF\PIZ08.ini" />
     <None Include="DATA\CONF\PIZ08.json" />
     <None Include="DATA\CONF\PIZ08_alarm.json" />
-    <None Include="DATA\CONF\PIZ09.ini" />
-    <None Include="DATA\CONF\PIZ09.json" />
-    <None Include="DATA\CONF\PIZ09_alarm.json" />
-    <None Include="DATA\CONF\PIZ09_MBlock.json" />
     <None Include="DATA\CONF\SIM_PIZ08.ini" />
     <None Include="DATA\CONF\SIM_PIZ05.ini" />
     <None Include="DATA\CONF\SIM_PIZ04.ini" />
@@ -842,6 +748,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="IobModbusTCP\" />
     <Folder Include="prog\" />
   </ItemGroup>
   <ItemGroup>
diff --git a/IOB-WIN-NEXT/specialConfig.cs b/IOB-WIN-NEXT/connParamS7.cs
similarity index 99%
rename from IOB-WIN-NEXT/specialConfig.cs
rename to IOB-WIN-NEXT/connParamS7.cs
index 0327121e..05a3deb8 100644
--- a/IOB-WIN-NEXT/specialConfig.cs
+++ b/IOB-WIN-NEXT/connParamS7.cs
@@ -2,6 +2,7 @@
 
 namespace IOB_WIN_NEXT
 {
+#if false
     /// <summary>
     /// Implementazione classe connessione ModBus TCP,
     /// comprensiva dei parametri delle aree di memoria
@@ -56,7 +57,8 @@ namespace IOB_WIN_NEXT
         public int port;
 
         #endregion Public Fields
-    }
+    } 
+#endif
 
     /// <summary>
     /// Implementazione classe connessione SIEMENS con S7.net, comprensiva dei parametri delle aree