Update x test OPC-UA in Donati (da completare) + inizio update shelly

IOB-WIN-FANUC/IOB-WIN-FANUC.csproj

@@ -226,6 +226,7 @@
     <None Include="DATA\CONF\GT613.ini" />
     <None Include="DATA\CONF\GT653.ini" />
     <None Include="DATA\CONF\GT658.ini" />
+    <None Include="DATA\CONF\GT727.ini" />
     <None Include="DATA\CONF\GT673.ini" />
     <None Include="DATA\CONF\L014.ini" />
     <None Include="DATA\CONF\L017.ini" />

IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini

@@ -28,6 +28,7 @@ CLI_INST=SteamWareSim
 ;STARTLIST=Tend_RAMA_10_47
 ;STARTLIST=3026
 ;STARTLIST=TFT_RAMA_001
-STARTLIST=SIM_DP_02
+;STARTLIST=SIM_DP_02
+STARTLIST=2015
 
 MAXCNC=10

IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj

@@ -201,8 +201,12 @@
     </Compile>
     <None Include="DATA\CONF\2014.ini" />
     <None Include="DATA\CONF\2014.json" />
-    <None Include="DATA\CONF\2015.ini" />
-    <None Include="DATA\CONF\2015.json" />
+    <None Include="DATA\CONF\2015.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="DATA\CONF\2015.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="DATA\CONF\3026.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

IOB-WIN-OPC-UA/postBuildTgt.bat

@@ -44,8 +44,8 @@ REM ROBOCOPY %2 \\10.51.90.5\Steamware\IOB-WIN-OPC-UA-DEB /MIR
 REM ROBOCOPY %2 \\10.51.90.5\Steamware\IOB-WIN-OPC-UA-DEB /MIR /log:RobocopyTransfer.log
 REM ROBOCOPY %2 Z:\IOB-WIN-OPC-UA-DEB /MIR
 REM ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-OPC-UA-DEB /MIR
-REM ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-OPC-UA-DEB /MIR
-ROBOCOPY %2 \\10.51.90.15\Steamware\IOB-WIN-OPC-UA-DEB /MIR
+ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-OPC-UA-DEB /MIR
+REM ROBOCOPY %2 \\10.51.90.15\Steamware\IOB-WIN-OPC-UA-DEB /MIR
 
 goto END
 

IOB-WIN-SHELLY/Iob/ShellyClient.cs

@@ -64,6 +64,8 @@ namespace IOB_WIN_SHELLY.Iob
                 DefaultTimeout = TimeSpan.FromMilliseconds(devData.PingMsTimeout * 10),
                 ServerUri = new Uri($"http://{devData.IpAddr}/rpc")
             };
+            // init secondo il tipo di Shelly...
+
             shellyCli = new Shelly1PmClient(new HttpClient(), options);
 
             // invio conf macchina all'inizio
@@ -81,7 +83,7 @@ namespace IOB_WIN_SHELLY.Iob
             if (DateTime.Now > lastReadPLC.AddSeconds(shellyCallDelay))
             {
                 // chiama lettura status completo e recupera info in memRead e le passa come DynData...
-                lastShellyResp = Task.Run(() => shellyCli.GetSwitchStatus(CancellationToken.None, 0)).Result;
+                lastShellyResp = Task.Run(() => ((Shelly1PmClient)shellyCli).GetSwitchStatus(CancellationToken.None, 0)).Result;
                 // NB: da verificare tipo di chiamata in base al tipo di shelly... TDB ora è cablato x Shelly1PM
                 if (lastShellyResp.IsSuccess)
                 {
@@ -245,7 +247,7 @@ namespace IOB_WIN_SHELLY.Iob
         /// <summary>
         /// Client interno x comunicazione con Shelly devices
         /// </summary>
-        private Shelly1PmClient shellyCli;
+        private ShellyClientBase shellyCli;
 
         /// <summary>
         /// Veto controllo status x log...

README.md

@@ -38,7 +38,7 @@ Appunti da rivedere:
  * inserito autologin by sysinternals (VA ESEGUITO POI)
  * inserito download MAPO-.IOB-WIN da SWS, protare a nexus (con md5...) finendo jenkinsfile di pubblicazione
 
-## Setup - old (da rivedere)
+## Setup - old (da rivedere o cancellare)
 
 - sul pc vanno installati preventivamente i files di test per il controller (es FANUC) x verificare corretta configurazione rete/porte/firewall del PC e del CN
 - vanno installati sw "standard", prendendoli da **\\\\freenas02\Software\Win\IOB**