diff --git a/IOB-WIN-BECKHOFF/AdapterFormNext.cs b/IOB-WIN-BECKHOFF/AdapterFormNext.cs
index ee4561f1..44f662de 100644
--- a/IOB-WIN-BECKHOFF/AdapterFormNext.cs
+++ b/IOB-WIN-BECKHOFF/AdapterFormNext.cs
@@ -29,14 +29,14 @@ namespace IOB_WIN_BECKHOFF
{
case tipoAdapter.BECKHOFF:
case tipoAdapter.BECKHOFF_CPA:
- iobObj = new IobBeckhoff.BeckhoffCpa(this, IOBConf);
+ iobObj = new IobBeckhoff.BeckhoffCpa(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIMULA:
case tipoAdapter.ND:
default:
- iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf);
+ iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull);
btnStart.Enabled = false;
break;
}
diff --git a/IOB-WIN-BECKHOFF/Iob/GenericNext.cs b/IOB-WIN-BECKHOFF/Iob/GenericNext.cs
index 7e2ad9a5..d6892c21 100644
--- a/IOB-WIN-BECKHOFF/Iob/GenericNext.cs
+++ b/IOB-WIN-BECKHOFF/Iob/GenericNext.cs
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
namespace IOB_WIN_BECKHOFF.Iob
{
+ ///
+ /// Adapter generico del progetto IOB specifico
+ ///
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
public class GenericNext : IOB_WIN_FORM.Iob.Generic
{
- public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf)
+ public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
diff --git a/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs b/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
index 6b41fc42..0ec24dcd 100644
--- a/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
+++ b/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
using System.Collections.Generic;
@@ -17,9 +18,10 @@ namespace IOB_WIN_BECKHOFF.IobBeckhoff
///
/// Estende l'init della classe base
///
- ///
- ///
- public Beckhoff(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public Beckhoff(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IobBeckhoff Adapter");
// gestione invio ritardato contapezzi
diff --git a/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs b/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
index d7bc629b..ccf92b57 100644
--- a/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
+++ b/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -12,9 +13,10 @@ namespace IOB_WIN_BECKHOFF.IobBeckhoff
///
/// Estende l'init della classe base
///
- ///
- ///
- public BeckhoffCpa(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public BeckhoffCpa(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("START IobBeckhoffCPA Adapter specifico");
diff --git a/IOB-WIN-FTP/AdapterFormNext.cs b/IOB-WIN-FTP/AdapterFormNext.cs
index 53066a47..96bda2b9 100644
--- a/IOB-WIN-FTP/AdapterFormNext.cs
+++ b/IOB-WIN-FTP/AdapterFormNext.cs
@@ -28,14 +28,14 @@ namespace IOB_WIN_FTP
switch (tipoScelto)
{
case tipoAdapter.FTP:
- iobObj = new Iob.Ftp(this, IOBConf);
+ iobObj = new Iob.Ftp(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIMULA:
case tipoAdapter.ND:
default:
- iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf);
+ iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull);
btnStart.Enabled = false;
break;
}
diff --git a/IOB-WIN-FTP/Iob/Ftp.cs b/IOB-WIN-FTP/Iob/Ftp.cs
index b54c0618..81893175 100644
--- a/IOB-WIN-FTP/Iob/Ftp.cs
+++ b/IOB-WIN-FTP/Iob/Ftp.cs
@@ -1,5 +1,6 @@
using EgwProxy.Ftp;
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -23,9 +24,10 @@ namespace IOB_WIN_FTP.Iob
/// - gestione dei task da svolgere da configurazione json specifica
/// - specializzazione da conf e non da codice
///
- ///
- ///
- public Ftp(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public Ftp(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init IobFtp Client");
// imposto
diff --git a/IOB-WIN-FTP/Iob/GenericNext.cs b/IOB-WIN-FTP/Iob/GenericNext.cs
index 5d6fef21..4020799f 100644
--- a/IOB-WIN-FTP/Iob/GenericNext.cs
+++ b/IOB-WIN-FTP/Iob/GenericNext.cs
@@ -1,5 +1,6 @@
using EgwProxy.Ftp;
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
using System.IO;
using System.Linq;
@@ -9,8 +10,13 @@ namespace IOB_WIN_FTP.Iob
{
public class GenericNext : IOB_WIN_FORM.Iob.Generic
{
-
- public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf)
+ ///
+ /// Adapter generico del progetto IOB specifico
+ ///
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
diff --git a/IOB-WIN-MBUS/AdapterFormNext.cs b/IOB-WIN-MBUS/AdapterFormNext.cs
index 086d6891..7a19266f 100644
--- a/IOB-WIN-MBUS/AdapterFormNext.cs
+++ b/IOB-WIN-MBUS/AdapterFormNext.cs
@@ -8,14 +8,14 @@ using System.Threading.Tasks;
namespace IOB_WIN_MBUS
{
- public class AdapterFormNext: IOB_WIN_FORM.AdapterForm
+ public class AdapterFormNext : IOB_WIN_FORM.AdapterForm
{
///
/// Avvio MainForm
///
///
- public AdapterFormNext(string codIOB): base(codIOB)
+ public AdapterFormNext(string codIOB) : base(codIOB)
{
}
///
@@ -29,59 +29,59 @@ namespace IOB_WIN_MBUS
{
case tipoAdapter.MODBUS_TCP:
- iobObj = new IobModbusTCP.ModbusTCP(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCP(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_CEDAX:
- iobObj = new IobModbusTCP.ModbusTCPCedax(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPCedax(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_CENTERFRIGO:
- iobObj = new IobModbusTCP.ModbusTCPCenterfrigo(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPCenterfrigo(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_FIMAT:
- iobObj = new IobModbusTCP.ModbusTCPFimat(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPFimat(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_HAM:
- iobObj = new IobModbusTCP.ModbusTCPHam(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPHam(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_HELPI:
- iobObj = new IobModbusTCP.ModbusTCPHelpi(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPHelpi(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_IMAS_AEROMEC:
- iobObj = new IobModbusTCP.ModbusTCPImaxAeromec(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPImaxAeromec(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_RIMOR:
- iobObj = new IobModbusTCP.ModbusTCPRimor(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPRimor(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_SAIM:
- iobObj = new IobModbusTCP.ModbusTCPSaim(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPSaim(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_ZETAPACK:
- iobObj = new IobModbusTCP.ModbusTCPZetapack(this, IOBConf);
+ iobObj = new IobModbusTCP.ModbusTCPZetapack(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIMULA:
case tipoAdapter.ND:
default:
- iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf);
+ iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull);
btnStart.Enabled = false;
break;
}
diff --git a/IOB-WIN-MBUS/Iob/GenericNext.cs b/IOB-WIN-MBUS/Iob/GenericNext.cs
index 19d9739d..1db6ca5b 100644
--- a/IOB-WIN-MBUS/Iob/GenericNext.cs
+++ b/IOB-WIN-MBUS/Iob/GenericNext.cs
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
namespace IOB_WIN_MBUS.Iob
{
public class GenericNext : IOB_WIN_FORM.Iob.Generic
{
- public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf)
+ ///
+ /// Adapter generico del progetto IOB specifico
+ ///
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs
index 2bbfc891..62f92548 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs
@@ -1,5 +1,6 @@
using EasyModbus;
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -26,9 +27,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCP(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCP(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
lgInfo("NEW IOB ModBus TCP");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs
index c56b2585..2b7974ea 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -24,9 +25,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPCedax(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPCedax(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Cedax");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs
index ba59e6c3..9e93e138 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -27,9 +28,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPCenterfrigo(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPCenterfrigo(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Centerfrigo");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs
index 7f84317e..5c58577c 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
using System.Globalization;
using System.IO;
@@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPFimat(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPFimat(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP FIMAT");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs
index b834795d..70effd44 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPHam(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPHam(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP HAM");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs
index 96ecd39e..f6d36949 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs
@@ -1,5 +1,6 @@
using EasyModbus;
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
using System.Linq;
@@ -41,9 +42,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPHelpi(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPHelpi(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Helpi");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs
index 814545ae..50794a6d 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs
@@ -1,5 +1,6 @@
using EasyModbus;
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPImaxAeromec(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPImaxAeromec(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP IMAS Aeromec");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs
index b5946683..5f1014e1 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPRimor(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPRimor(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Rimor");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs
index 12c9b744..a10c9f2a 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -21,9 +22,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPSaim(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPSaim(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Saim");
diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs
index 19a667ee..d5ef465d 100644
--- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs
+++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using System;
namespace IOB_WIN_MBUS.IobModbusTCP
@@ -21,9 +22,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP
///
/// Classe base con i metodi x ModBusTCP
///
- ///
- ///
- public ModbusTCPZetapack(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public ModbusTCPZetapack(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Zetapack");
diff --git a/IOB-WIN-MITSUBISHI/AdapterFormNext.cs b/IOB-WIN-MITSUBISHI/AdapterFormNext.cs
index 32b693c5..2a64b2db 100644
--- a/IOB-WIN-MITSUBISHI/AdapterFormNext.cs
+++ b/IOB-WIN-MITSUBISHI/AdapterFormNext.cs
@@ -28,14 +28,14 @@ namespace IOB_WIN_MITSUBISHI
switch (tipoScelto)
{
case tipoAdapter.MITSUBISHI:
- iobObj = new Mitsubishi(this, IOBConf);
+ iobObj = new Mitsubishi(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIMULA:
case tipoAdapter.ND:
default:
- iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf);
+ iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull);
btnStart.Enabled = false;
break;
}
diff --git a/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs b/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs
index 01c11574..26f1de78 100644
--- a/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs
+++ b/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
namespace IOB_WIN_MITSUBISHI.Iob
{
public class GenericNext : IOB_WIN_FORM.Iob.Generic
{
- public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf)
+ ///
+ /// Adapter generico del progetto IOB specifico
+ ///
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
diff --git a/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs b/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs
index c370dec7..3d209f97 100644
--- a/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs
+++ b/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
+using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -15,9 +16,10 @@ namespace IOB_WIN_MITSUBISHI.Iob
///
/// Estende l'init della classe base...
///
- ///
- ///
- public Mitsubishi(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+ /// Form chiamante
+ /// Configurazione (legacy)
+ /// Configurazione (v 4.x)
+ public Mitsubishi(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Start init Mitsubishi");
// gestione invio ritardato contapezzi