diff --git a/IOB-WIN-PING/AdapterFormNext.cs b/IOB-WIN-PING/AdapterFormNext.cs
index 04c53817..56a1a985 100644
--- a/IOB-WIN-PING/AdapterFormNext.cs
+++ b/IOB-WIN-PING/AdapterFormNext.cs
@@ -8,16 +8,22 @@ using System.Threading.Tasks;
namespace IOB_WIN_SHELLY
{
- public class AdapterFormNext: IOB_WIN_FORM.AdapterForm
+ public class AdapterFormNext : IOB_WIN_FORM.AdapterForm
{
+ #region Public Constructors
///
/// Avvio MainForm
///
///
- public AdapterFormNext(string codIOB): base(codIOB)
+ public AdapterFormNext(string codIOB) : base(codIOB)
{
}
+
+ #endregion Public Constructors
+
+ #region Protected Methods
+
///
/// carica IOB richiesto
///
@@ -27,7 +33,6 @@ namespace IOB_WIN_SHELLY
{
switch (tipoScelto)
{
-
case tipoAdapter.PingWatchdog:
iobObj = new IOB_WIN_FORM.Iob.PingWatchDog(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
@@ -40,17 +45,10 @@ namespace IOB_WIN_SHELLY
btnStart.Enabled = false;
break;
}
- lblCncText = $"CNC: {IOBConf.tipoIob} [{IOBConf.cncIpAddr}:{IOBConf.cncPort}]";
- lblSrvUrlText = $"SRV: {IOBConf.serverData.MPIP} | URL: {IOBConf.serverData.MPURL}{IOBConf.serverData.CMDBASE}";
-
- // aggancio evento refresh
- iobObj.eh_refreshed += IobObj_eh_refreshed;
-
- // carico i default values su interfaccia
- setDefaults();
-
- displayTaskAndLog($"Caricata conf per adapter {tipoScelto}");
+ UpdateDisplTypeIobSel();
}
}
+
+ #endregion Protected Methods
}
-}
+}
\ No newline at end of file
diff --git a/IOB-WIN-PING/App.config b/IOB-WIN-PING/App.config
index 93faf2cd..8415873f 100644
--- a/IOB-WIN-PING/App.config
+++ b/IOB-WIN-PING/App.config
@@ -115,15 +115,15 @@
-
+
-
+
-
+
@@ -131,15 +131,15 @@
-
+
-
+
-
+
@@ -153,6 +153,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IOB-WIN-PING/DATA/CONF/FTP-PING.ini b/IOB-WIN-PING/DATA/CONF/FTP-PING.ini
index efe46cca..734b30bc 100644
--- a/IOB-WIN-PING/DATA/CONF/FTP-PING.ini
+++ b/IOB-WIN-PING/DATA/CONF/FTP-PING.ini
@@ -56,4 +56,4 @@ NAME=master
Customer=SteamWare
HostOS=WIN
HostName=IOB-WIN-SIMULA
-HostAddr=10.74.82.76
\ No newline at end of file
+HostAddr=10.74.82.76
diff --git a/IOB-WIN-PING/DATA/DAT/PersistData.dat b/IOB-WIN-PING/DATA/DAT/PersistData.dat
deleted file mode 100644
index 5f282702..00000000
--- a/IOB-WIN-PING/DATA/DAT/PersistData.dat
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/IOB-WIN-PING/DATA/DAT/SimData.dat b/IOB-WIN-PING/DATA/DAT/SimData.dat
deleted file mode 100644
index c59e4823..00000000
--- a/IOB-WIN-PING/DATA/DAT/SimData.dat
+++ /dev/null
@@ -1,959 +0,0 @@
-;------------------------------------------------------------------------------------
-; filevalori simulati x provare sistema dati e filtraggio... commenti iniziano per ';', valori formato data#valore#counter
-; NOTE FILE:
-; - bit come macchine std IOB
-; B0 = POWERON
-; B1 = RUN
-; B2 = CONTAPEZZO
-; B3 = ALLARME
-; B4 = MANUALE
-; B5 = NA
-; B6 = NA
-; B7 = NA
-; - segnali alternanti su 00011100
-;------------------------------------------------------------------------------------
-;
-;----------------------------
-; inizio da spenta
-0
-0
-; indico accesa
-1
-1
-1
-; allarme (BLINK)
-9
-9
-9
-9
-9
-1
-1
-1
-1
-1
-1
-9
-9
-9
-9
-9
-1
-1
-1
-1
-1
-19
-9
-9
-9
-9
-1
-1
-1
-1
-1
-1
-; allarme manuale (2 blink, periodo diverso)
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-; indico manuale
-17
-17
-17
-17
-17
-17
-17
-17
-17
-17
-1
-1
-1
-1
-1
-1
-1
-1
-17
-17
-17
-17
-17
-17
-17
-17
-17
-17
-1
-1
-1
-1
-1
-1
-1
-1
-17
-17
-17
-17
-17
-17
-17
-17
-17
-17
-1
-1
-1
-1
-1
-1
-1
-1
-; RUN!
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-; contapezzo
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-; RUN
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-; contapezzo
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-; RUN
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-; contapezzo
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-; RUN
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-; allarme (BLINK)
-9
-9
-9
-9
-9
-1
-1
-1
-1
-1
-1
-9
-9
-9
-9
-9
-1
-1
-1
-1
-1
-19
-9
-9
-9
-9
-1
-1
-1
-1
-1
-1
-; allarme manuale (2 blink, periodo diverso)
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-25
-25
-17
-17
-9
-9
-1
-1
-; indico manuale
-17
-17
-17
-17
-17
-17
-17
-17
-17
-17
-1
-1
-1
-1
-1
-1
-1
-1
-17
-17
-17
-17
-17
-17
-17
-17
-17
-17
-1
-1
-1
-1
-1
-1
-1
-1
-17
-17
-17
-17
-17
-17
-17
-17
-17
-17
-1
-1
-1
-1
-1
-1
-1
-1
-; RUN!
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-; contapezzo
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-; RUN
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-; contapezzo
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-7
-7
-7
-7
-7
-3
-3
-3
-3
-3
-3
-; RUN
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
\ No newline at end of file
diff --git a/IOB-WIN-PING/ILLink/ILLink.Descriptors.LibraryBuild.xml b/IOB-WIN-PING/ILLink/ILLink.Descriptors.LibraryBuild.xml
new file mode 100644
index 00000000..a42d7f0e
--- /dev/null
+++ b/IOB-WIN-PING/ILLink/ILLink.Descriptors.LibraryBuild.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/IOB-WIN-PING/IOB-WIN-PING.csproj b/IOB-WIN-PING/IOB-WIN-PING.csproj
index dd6f71f1..d1efb61a 100644
--- a/IOB-WIN-PING/IOB-WIN-PING.csproj
+++ b/IOB-WIN-PING/IOB-WIN-PING.csproj
@@ -47,11 +47,14 @@
..\packages\MapoSDK.6.14.2411.518\lib\MapoSDK.dll
-
- ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -66,35 +69,38 @@
..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll
-
- ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
+ ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll
+
+ ..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
-
- ..\packages\System.IO.Pipelines.5.0.1\lib\net461\System.IO.Pipelines.dll
+
+ ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll
-
- ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
+
+ ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll
-
- ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
+
+ ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
-
- ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll
+
+ ..\packages\System.Threading.Channels.9.0.0\lib\net462\System.Threading.Channels.dll
-
- ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
+ ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll
@@ -119,6 +125,7 @@
+
Always
@@ -172,12 +179,6 @@
Always
-
- Always
-
-
- Always
-
Always
@@ -241,7 +242,6 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
@@ -253,5 +253,4 @@
-
\ No newline at end of file
diff --git a/IOB-WIN-PING/packages.config b/IOB-WIN-PING/packages.config
index bc12d868..abd21f22 100644
--- a/IOB-WIN-PING/packages.config
+++ b/IOB-WIN-PING/packages.config
@@ -1,20 +1,22 @@
-
-
+
+
+
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file