Comincio lavoro fix progetti dev x nuovo formato confTree

This commit is contained in:
Samuele Locatelli
2025-02-13 19:11:09 +01:00
parent 3485739219
commit 36548516aa
22 changed files with 121 additions and 66 deletions
+2 -2
View File
@@ -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;
}
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_BECKHOFF.Iob
{
/// <summary>
/// Adapter generico del progetto IOB specifico
/// </summary>
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
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)
{
}
+5 -3
View File
@@ -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
/// <summary>
/// Estende l'init della classe base
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public Beckhoff(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public Beckhoff(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IobBeckhoff Adapter");
// gestione invio ritardato contapezzi
+5 -3
View File
@@ -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
/// <summary>
/// Estende l'init della classe base
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public BeckhoffCpa(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public BeckhoffCpa(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("START IobBeckhoffCPA Adapter specifico");
+2 -2
View File
@@ -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;
}
+5 -3
View File
@@ -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
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public Ftp(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public Ftp(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init IobFtp Client");
// imposto
+8 -2
View File
@@ -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)
/// <summary>
/// Adapter generico del progetto IOB specifico
/// </summary>
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
+13 -13
View File
@@ -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
{
/// <summary>
/// Avvio MainForm
/// </summary>
/// <param name="codIOB"></param>
public AdapterFormNext(string codIOB): base(codIOB)
public AdapterFormNext(string codIOB) : base(codIOB)
{
}
/// <summary>
@@ -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;
}
+8 -1
View File
@@ -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)
/// <summary>
/// Adapter generico del progetto IOB specifico
/// </summary>
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCP(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCP(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
lgInfo("NEW IOB ModBus TCP");
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPCedax(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPCedax(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Cedax");
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPCenterfrigo(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPCenterfrigo(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Centerfrigo");
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPFimat(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPFimat(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP FIMAT");
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPHam(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPHam(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP HAM");
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPHelpi(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPHelpi(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Helpi");
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPImaxAeromec(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPImaxAeromec(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP IMAS Aeromec");
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPRimor(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPRimor(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Rimor");
+5 -3
View File
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPSaim(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPSaim(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Saim");
@@ -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
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCPZetapack(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public ModbusTCPZetapack(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB ModBus TCP Zetapack");
+2 -2
View File
@@ -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;
}
+8 -1
View File
@@ -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)
/// <summary>
/// Adapter generico del progetto IOB specifico
/// </summary>
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull)
{
}
+5 -3
View File
@@ -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
/// <summary>
/// Estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public Mitsubishi(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// <param name="caller">Form chiamante</param>
/// <param name="IOBConf">Configurazione (legacy)</param>
/// <param name="IobConfFull">Configurazione (v 4.x)</param>
public Mitsubishi(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Start init Mitsubishi");
// gestione invio ritardato contapezzi