diff --git a/IOB-WIN-BECKHOFF/AdapterFormNext.cs b/IOB-WIN-BECKHOFF/AdapterFormNext.cs
index d3365b26..05afee65 100644
--- a/IOB-WIN-BECKHOFF/AdapterFormNext.cs
+++ b/IOB-WIN-BECKHOFF/AdapterFormNext.cs
@@ -21,7 +21,7 @@ namespace IOB_WIN_BECKHOFF
///
/// carica IOB richiesto
///
- protected override void loadIobType()
+ protected override async Task loadIobType()
{
if (IOBConfFull != null)
{
@@ -40,16 +40,11 @@ namespace IOB_WIN_BECKHOFF
btnStart.Enabled = false;
break;
}
- lblCncText = $"CNC: {IOBConfFull.General.IobType} [{IOBConfFull.Device.Connect.IpAddr}:{IOBConfFull.Device.Connect.Port}]";
- lblSrvUrlText = $"SRV: {IOBConfFull.MapoMesConf.IpAddr} | URL: {IOBConfFull.MapoMesConf.ApiUrl("")}";
-
- // aggancio evento refresh
- iobObj.eh_refreshed += IobObj_eh_refreshed;
-
- // carico i default values su interfaccia
- setDefaults();
-
- displayTaskAndLog($"Caricata conf per adapter {tipoScelto}");
+ if (!await iobInitAsync())
+ {
+ return;
+ }
+ UpdateDisplTypeIobSel();
}
}
}
diff --git a/IOB-WIN-BECKHOFF/App.config b/IOB-WIN-BECKHOFF/App.config
index d6fcfea3..f66d9734 100644
--- a/IOB-WIN-BECKHOFF/App.config
+++ b/IOB-WIN-BECKHOFF/App.config
@@ -1,178 +1,186 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
\ No newline at end of file
+
diff --git a/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj b/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj
index 31bb9319..267ec3a9 100644
--- a/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj
+++ b/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj
@@ -8,10 +8,11 @@
WinExe
IOB_WIN_BECKHOFF
IOB-WIN-BECKHOFF
- v4.6.2
+ v4.7.2
512
true
true
+
AnyCPU
@@ -33,8 +34,8 @@
4
-
- ..\packages\MapoSDK.6.14.2505.2916\lib\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll
@@ -81,6 +82,7 @@
True
Resources.resx
+ True
App.config
diff --git a/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs b/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
index 48a3cc61..9fdae387 100644
--- a/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
+++ b/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
@@ -1,5 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Services.Files;
using System;
using System.Collections.Generic;
diff --git a/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs b/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
index ecfa6750..27984431 100644
--- a/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
+++ b/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
@@ -1,5 +1,7 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Objects;
+using IOB_UT_NEXT.Services.Files;
using MapoSDK;
using System;
using System.Collections.Generic;
diff --git a/IOB-WIN-BECKHOFF/Properties/Resources.Designer.cs b/IOB-WIN-BECKHOFF/Properties/Resources.Designer.cs
index 0b54d965..8e53eb9b 100644
--- a/IOB-WIN-BECKHOFF/Properties/Resources.Designer.cs
+++ b/IOB-WIN-BECKHOFF/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
//
//------------------------------------------------------------------------------
-namespace IOB_WIN_BECKHOFF.Properties
-{
-
-
+namespace IOB_WIN_BECKHOFF.Properties {
+ using System;
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -19,51 +19,43 @@ namespace IOB_WIN_BECKHOFF.Properties
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ internal class Resources {
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
+ internal Resources() {
}
-
+
///
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IOB_WIN_BECKHOFF.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
-
+
///
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
diff --git a/IOB-WIN-BECKHOFF/Properties/Settings.Designer.cs b/IOB-WIN-BECKHOFF/Properties/Settings.Designer.cs
index cad87ef8..0474e04a 100644
--- a/IOB-WIN-BECKHOFF/Properties/Settings.Designer.cs
+++ b/IOB-WIN-BECKHOFF/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
//
//------------------------------------------------------------------------------
-namespace IOB_WIN_BECKHOFF.Properties
-{
-
-
+namespace IOB_WIN_BECKHOFF.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
+
+ public static Settings Default {
+ get {
return defaultInstance;
}
}
diff --git a/IOB-WIN-BECKHOFF/packages.config b/IOB-WIN-BECKHOFF/packages.config
index b435bc4f..2dcb60a9 100644
--- a/IOB-WIN-BECKHOFF/packages.config
+++ b/IOB-WIN-BECKHOFF/packages.config
@@ -1,14 +1,14 @@
-
+
-
+
-
-
+
+