Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/Shelly_03'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-02-14 08:21:38 +01:00
parent 98d4a555ec e74dd51032
commit e5196cd756
109 changed files with 600 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-BECKHOFF/AdapterFormNext.cs
+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;
}
IOB-WIN-BECKHOFF/Iob/GenericNext.cs
+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)
{
}
IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs
+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
IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs
+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");
IOB-WIN-FANUC/AdapterFormNext.cs
+2 -2
View File
@@ -29,14 +29,14 @@ namespace IOB_WIN_FANUC
{
case tipoAdapter.FANUC:
iobObj = new Iob.Fanuc(this, IOBConf);
iobObj = new Iob.Fanuc(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;
}
IOB-WIN-FANUC/Iob/Fanuc.cs
+5 -3
View File
@@ -1,5 +1,6 @@
using EgwProxy.MultiCncLib.CNC;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -15,9 +16,10 @@ namespace IOB_WIN_FANUC.Iob
/// <summary>
/// estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public Fanuc(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 Fanuc(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
lgInfo("Start init Fanuc");
// i dati RAW principali sono 6 byte...
IOB-WIN-FANUC/Iob/GenericNext.cs
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_FANUC.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)
{
}
IOB-WIN-FILE/AdapterFormNext.cs
+4 -4
View File
@@ -28,24 +28,24 @@ namespace IOB_WIN_FILE
switch (tipoScelto)
{
case tipoAdapter.FILE_GEN:
iobObj = new IobFile.FileGen(this, IOBConf);
iobObj = new IobFile.FileGen(this, IOBConf,IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.FILE_EUROM63:
iobObj = new IobFile.FileEurom63(this, IOBConf);
iobObj = new IobFile.FileEurom63(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.FILE_SOITAAB:
iobObj = new IobFile.IobFileSoitaab(this, IOBConf);
iobObj = new IobFile.IobFileSoitaab(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;
}
IOB-WIN-FILE/Iob/GenericNext.cs
+8 -1
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using System;
using System.IO;
using System.Linq;
@@ -9,7 +10,13 @@ namespace IOB_WIN_FILE.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)
{
}
IOB-WIN-FILE/IobFile/FileEurom63.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -17,9 +18,10 @@ namespace IOB_WIN_FILE.IobFile
/// <summary>
/// Estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public FileEurom63(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 FileEurom63(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("INIT IobFileEurom63");
appPath = Path.GetDirectoryName(Application.ExecutablePath);
IOB-WIN-FILE/IobFile/FileGen.cs
+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;
@@ -22,9 +23,10 @@ namespace IOB_WIN_FILE.IobFile
/// <summary>
/// Estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public FileGen(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 FileGen(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
lgInfo("INIT FileGen");
//reloadAdapterConf();
IOB-WIN-FILE/IobFile/IobFileSoitaab.cs
+5 -3
View File
@@ -2,6 +2,7 @@
using EgwProxy.SqlDb.DbModels;
#endif
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -27,9 +28,10 @@ namespace IOB_WIN_FILE.IobFile
/// <summary>
/// Costruttore dell'IOB FileBased SOITAAB
/// </summary>
/// <param name="caller">AdapterForm chiamante</param>
/// <param name="IOBConf">Configurazione IOB per avvio</param>
public IobFileSoitaab(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 IobFileSoitaab(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
DateTime adesso = DateTime.Now;
string VetoReadSec = getOptPar("VetoReadSec");
IOB-WIN-FORM/AdapterForm.cs
+2 -1
View File
@@ -1728,7 +1728,8 @@ namespace IOB_WIN_FORM
string confJson = JsonConvert.SerializeObject(IOBConf, Formatting.Indented);
string path = fileMover.GetExecutingDirectoryName(); // Directory.GetCurrentDirectory();
string fileName = Path.GetFileName(iniConfFile).Replace(".ini", ".iob");
string dirPath = Path.Combine(path, "DATA", IOBConf.serverData.ClientInstall);
//string dirPath = Path.Combine(path, "DATA", IOBConf.serverData.ClientInstall);
string dirPath = Path.Combine(path, "DATA", "CONF_RUN");
string fullPath = Path.Combine(dirPath, fileName);
// verifica directory
baseUtils.checkDir(dirPath);
IOB-WIN-FORM/Iob/Generic.cs
+16 -6
View File
@@ -3010,6 +3010,7 @@ namespace IOB_WIN_FORM.Iob
// FixMe Todo: generalizzare parametri nell'obj?
bool enableByApp = utils.CRB("enableDynData");
bool enableByIob = (getOptPar("ENABLE_DYN_DATA") == "TRUE");
bool sendDynDataRec = (getOptPar("SEND_DYN_DATA_FLOG") == "TRUE");
bool forceSendByIob = (getOptPar("FORCE_DYN_DATA") == "TRUE");
bool disableDynData = (getOptPar("DISABLE_DYN_DATA") == "TRUE");
bool copyDynToProd = (getOptPar("COPY_DYN2PROD_DATA") == "TRUE");
@@ -3066,9 +3067,13 @@ namespace IOB_WIN_FORM.Iob
// per ogni valore del dizionario mostro ed accodo!
foreach (var item in currDynData)
{
sVal = string.Format("[DYNDATA]{0}|{1}", item.Key, item.Value);
// chiamo accodamento...
accodaFLog(sVal, qEncodeFLog(item.Key, item.Value));
// controllo se vietato dynData
if (sendDynDataRec || item.Key != "DYNDATA")
{
sVal = string.Format("[DYNDATA]{0}|{1}", item.Key, item.Value);
// chiamo accodamento...
accodaFLog(sVal, qEncodeFLog(item.Key, item.Value));
}
}
}
// altrimenti verifico SE sia cambiato il valore dei DynData...
@@ -3079,9 +3084,14 @@ namespace IOB_WIN_FORM.Iob
// per ogni valore del dizionario mostro ed accodo!
foreach (var item in currDynData)
{
sVal = string.Format("[DYNDATA]{0}|{1}", item.Key, item.Value);
// chiamo accodamento...
accodaFLog(sVal, qEncodeFLog(item.Key, item.Value));
// controllo se vietato dynData
if (sendDynDataRec || item.Key != "DYNDATA")
{
sVal = string.Format("[DYNDATA]{0}|{1}", item.Key, item.Value);
// chiamo accodamento...
accodaFLog(sVal, qEncodeFLog(item.Key, item.Value));
}
}
}
// salvo array...
IOB-WIN-FTP/AdapterFormNext.cs
+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;
}
IOB-WIN-FTP/Iob/Ftp.cs
+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
IOB-WIN-FTP/Iob/GenericNext.cs
+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)
{
}
IOB-WIN-KAWASAKI/AdapterFormNext.cs
+4 -4
View File
@@ -2,14 +2,14 @@
namespace IOB_WIN_KAWASAKI
{
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>
@@ -23,14 +23,14 @@ namespace IOB_WIN_KAWASAKI
{
case tipoAdapter.KAWASAKI:
iobObj = new Iob.Kawasaki(this, IOBConf);
iobObj = new Iob.Kawasaki(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;
}
IOB-WIN-KAWASAKI/Iob/GenericNext.cs
+8 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using System;
using System.IO;
using System.Linq;
@@ -8,10 +9,14 @@ namespace IOB_WIN_KAWASAKI.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)
{
}
}
}
IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
+6 -4
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -13,9 +14,10 @@ namespace IOB_WIN_KAWASAKI.Iob
/// <summary>
/// estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public Kawasaki(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 Kawasaki(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// gestione invio ritardato contapezzi
pzCountDelay = utils.CRI("pzCountDelay");
@@ -342,7 +344,7 @@ namespace IOB_WIN_KAWASAKI.Iob
else
{
lgError("Impossibile effettuare RESET contapezzi KAWASAKI, mancanza parametro OPT:ENABLE_PZ_RESET");
}
}
#endif
return answ;
}
IOB-WIN-MBUS/AdapterFormNext.cs
+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;
}
IOB-WIN-MBUS/Iob/GenericNext.cs
+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)
{
}
IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs
+5 -3
View File
@@ -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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs
+5 -3
View File
@@ -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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs
+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");
IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs
+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 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");
IOB-WIN-MITSUBISHI/AdapterFormNext.cs
+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;
}
IOB-WIN-MITSUBISHI/Iob/GenericNext.cs
+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)
{
}
IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs
+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
IOB-WIN-MTC/AdapterFormNext.cs
+2 -2
View File
@@ -28,14 +28,14 @@ namespace IOB_WIN_MTC
switch (tipoScelto)
{
case tipoAdapter.MTConnect:
iobObj = new Iob.MTConn(this, IOBConf);
iobObj = new Iob.MTConn(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;
}
IOB-WIN-MTC/Iob/GenericNext.cs
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_MTC.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)
{
}
IOB-WIN-MTC/Iob/MTConn.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using MTConnect.Clients;
using MTConnect.Devices;
@@ -24,9 +25,10 @@ namespace IOB_WIN_MTC.Iob
/// <summary>
/// Estende l'init della classe base, impiegando il pacchetto Nuget TrackHound https://github.com/TrakHound/MTConnect.NET
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public MTConn(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 MTConn(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
// gestione invio ritardato contapezzi
pzCountDelay = utils.CRI("pzCountDelay");
IOB-WIN-NEXT/AdapterFormNext.cs
+2 -10
View File
@@ -34,22 +34,14 @@ namespace IOB_WIN_NEXT
switch (tipoScelto)
{
case tipoAdapter.SIMULA:
iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf);
iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
#if false
case tipoAdapter.BECKHOFF:
case tipoAdapter.BECKHOFF_CPA:
iobObj = new IobBeckhoff.BeckhoffCpa(this, IOBConf);
btnStart.Enabled = true;
break;
#endif
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;
}
IOB-WIN-NEXT/Iob/GenericNext.cs
+8 -82
View File
@@ -3,6 +3,7 @@ using EgwProxy.Ftp;
#endif
using EgwProxy.MultiCncLib.App.Native;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using IOB_WIN_FORM;
using MapoSDK;
using MathNet.Numerics.Statistics;
@@ -32,90 +33,15 @@ namespace IOB_WIN_NEXT.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)
{
}
#if false
/// <summary>
/// Effettua upload verso server FTP della macchina dei files nella folder indicata
/// </summary>
/// <param name="folderDir"></param>
/// <returns></returns>
protected override bool iobSendFTP(string folderDir)
{
bool answ = false;
//leggo CONF
string ftpServ = getOptPar("FTP_SERVER");
string ftpUser = getOptPar("FTP_USER");
string ftpPass = getOptPar("FTP_PWD");
string ftpCert = getOptPar("FTP_CERT");
string doSkip = getOptPar("FTP_SKIP");
string remDir = getOptPar("FTP_REM_DIR");
string locDir = getOptPar("FTP_LOC_DIR");
// procedo SE TROVO conf...
if (string.IsNullOrEmpty($"{ftpServ}{ftpUser}{ftpPass}"))
{
lgError($"Impossibile eseguire iobSendFTP x mancanza parametri | ftpServ: {ftpServ} | ftpUser: {ftpUser} | ftpPass: {ftpPass}");
}
else
{
bool ftpSkip = false;
bool.TryParse(doSkip, out ftpSkip);
var ftpClient = new Manager(ftpServ, ftpUser, ftpPass, ftpCert, ftpSkip);
var testServer = ftpClient.ServerOk();
if (testServer)
{
lgInfo($"FTP: server found at {ftpServ}");
var srvType = ftpClient.ServerType();
lgInfo($"FTP Server type: {srvType}");
var preTest = ftpClient.DirExists(remDir);
if (!preTest)
{
var dirCreate = ftpClient.CreateDir(remDir);
lgInfo($"FTP: created remote dir {remDir}");
}
// test directory...
string basePath = Application.StartupPath;
string localPath = Path.Combine(basePath, locDir);
lgInfo($"basePath: {basePath} | localPath: {localPath}");
var fileList = Directory.GetFiles(localPath, "*.csv");
int numfile = 0;
foreach (var file in fileList)
{
string fName = file.Split('\\').Last();
string remName = $"{remDir}\\{fName}";
ftpClient.SendFile(file, remName);
numfile++;
}
var dirUploaded = (numfile == fileList.Count());
if (dirUploaded)
{
lgInfo($"FTP: uploaded dir content {locDir} --> {remDir}");
}
// se ok --> sposto invio
DateTime adesso = DateTime.Now;
string archBasePath = Path.Combine(basePath, "DATA", "HIST", $"{adesso:yyyy}");
baseUtils.checkDir(archBasePath);
string archPath = Path.Combine(archBasePath, $"{adesso:MMddHHmmss}");
baseUtils.checkDir(archPath);
lgInfo($"Richiesta Dir Move | {localPath} | {archPath}");
foreach (var item in fileList)
{
string fName = item.Split('\\').Last();
string destName = $"{archPath}\\{fName}";
File.Move(item, destName);
}
//Directory.Move(localPath, archBasePath);
lgInfo($"FTP: Archived dir content {localPath} --> {archPath}");
}
}
return answ;
}
#endif
}
}
IOB-WIN-OMRON/AdapterFormNext.cs
+4 -4
View File
@@ -8,14 +8,14 @@ using System.Threading.Tasks;
namespace IOB_WIN_OMRON
{
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,14 +29,14 @@ namespace IOB_WIN_OMRON
{
case tipoAdapter.OMRON:
iobObj = new Iob.Omron(this, IOBConf);
iobObj = new Iob.Omron(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;
}
IOB-WIN-OMRON/Iob/GenericNext.cs
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_OMRON.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)
{
}
IOB-WIN-OMRON/Iob/Omron.cs
+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_OMRON.Iob
/// <summary>
/// estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public Omron(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 Omron(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// gestione invio ritardato contapezzi
pzCountDelay = utils.CRI("pzCountDelay");
IOB-WIN-OPC-UA/AdapterFormNext.cs
+19 -19
View File
@@ -29,100 +29,100 @@ namespace IOB_WIN_OPC_UA
{
case tipoAdapter.OpcUa:
iobObj = new IobOpc.OpcUa(this, IOBConf);
iobObj = new IobOpc.OpcUa(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaCMS:
case tipoAdapter.OpcUaSCM:
iobObj = new IobOpc.OpcUaCMS(this, IOBConf);
iobObj = new IobOpc.OpcUaCMS(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaEwon:
iobObj = new IobOpc.OpcUaEwon(this, IOBConf);
iobObj = new IobOpc.OpcUaEwon(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaEwonAdige:
iobObj = new IobOpc.OpcUaEwonAdige(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonAdige(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaEwonBLM:
iobObj = new IobOpc.OpcUaEwonBLM(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonBLM(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaEwonMonti:
iobObj = new IobOpc.OpcUaEwonMonti(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonMonti(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaEwonMecolpress:
iobObj = new IobOpc.OpcUaEwonMecolpress(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonMecolpress(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaKwp:
iobObj = new IobOpc.OpcUaKpw(this, IOBConf);
iobObj = new IobOpc.OpcUaKpw(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaKwpRama:
iobObj = new IobOpc.OpcUaKpwRama(this, IOBConf);
iobObj = new IobOpc.OpcUaKpwRama(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaImasAeromec:
iobObj = new IobOpc.OpcUaImas(this, IOBConf);
iobObj = new IobOpc.OpcUaImas(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaMBH:
iobObj = new IobOpc.OpcUaMBH(this, IOBConf);
iobObj = new IobOpc.OpcUaMBH(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaMBHCimolai:
iobObj = new IobOpc.OpcUaMBHCimolai(this, IOBConf);
iobObj = new IobOpc.OpcUaMBHCimolai(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaOmron:
iobObj = new IobOpc.OpcUaOmron(this, IOBConf);
iobObj = new IobOpc.OpcUaOmron(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaOmronIcoel:
iobObj = new IobOpc.OpcUaOmronIcoel(this, IOBConf);
iobObj = new IobOpc.OpcUaOmronIcoel(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaSiemens:
iobObj = new IobOpc.OpcUaSiemens(this, IOBConf);
iobObj = new IobOpc.OpcUaSiemens(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaSiemensOMP:
iobObj = new IobOpc.OpcUaSiemensOMP(this, IOBConf);
iobObj = new IobOpc.OpcUaSiemensOMP(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaSiemensRama:
iobObj = new IobOpc.OpcUaSiemensRama(this, IOBConf);
iobObj = new IobOpc.OpcUaSiemensRama(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.OpcUaUlma:
iobObj = new IobOpc.OpcUaUlma(this, IOBConf);
iobObj = new IobOpc.OpcUaUlma(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;
}
IOB-WIN-OPC-UA/Iob/GenericNext.cs
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_OPC_UA.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)
{
}
IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using NLog.Time;
@@ -30,9 +31,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// <summary>
/// Estende l'init della classe base, impiegando il pacchetto Nuget OPC-UA foundation https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUa(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 OpcUa(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa");
// gestione invio ritardato contapezzi
IOB-WIN-OPC-UA/IobOpc/OpcUaCMS.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per CMS/SCM (es. Eidos termoformatrice)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaCMS(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 OpcUaCMS(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// inizializzo classe base...
if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE")))
IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per EWON (es Monti, Tenditalia)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaEwon(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 OpcUaEwon(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// inizializzo classe base...
if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE")))
IOB-WIN-OPC-UA/IobOpc/OpcUaEwonAdige.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Opc.Ua;
using System.Collections.Generic;
@@ -15,9 +16,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per EWON (es Adige/BLM, Stel)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaEwonAdige(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 OpcUaEwonAdige(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init Ewon versione Adige/BLM");
IOB-WIN-OPC-UA/IobOpc/OpcUaEwonBLM.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System.Collections.Generic;
@@ -13,9 +14,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per EWON (es Monti, Tenditalia)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaEwonBLM(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 OpcUaEwonBLM(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init Ewon versione BLM (Mecart)");
IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMecolpress.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Opc.Ua;
using System.Collections.Generic;
@@ -15,9 +16,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per EWON (es Monti, Tenditalia)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaEwonMecolpress(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 OpcUaEwonMecolpress(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init Ewon versione Mecolpress (STEL)");
IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMonti.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -16,9 +17,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per EWON (es Monti, Tenditalia)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaEwonMonti(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 OpcUaEwonMonti(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init Ewon versione Monti (Tenditalia)");
// inizializzo classe base...
IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per IMAS OPC-UA (es Jetco)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaImas(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 OpcUaImas(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa IMAS");
// inizializzo classe base...
IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per adapter KepWare OPC-UA (es RAMA RED by Unitech x TFT)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaKpw(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 OpcUaKpw(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa Kepware");
// inizializzo classe base...
IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -20,9 +21,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per adapter KepWare OPC-UA (es RAMA RED by Unitech x TFT)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaKpwRama(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 OpcUaKpwRama(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa Kepware x RAMA");
// inizializzo classe base...
IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per MBH OPC-UA (es OPC, Cimolai per Baglietto)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaMBH(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 OpcUaMBH(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa MBH");
// inizializzo classe base...
IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -18,9 +19,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per MBH (es Cimolai, Baglietto)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaMBHCimolai(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 OpcUaMBHCimolai(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa MBH versione Cimolai (Baglietto)");
IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per Omron (es ICOEL)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaOmron(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 OpcUaOmron(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// inizializzo classe base...
if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE")))
IOB-WIN-OPC-UA/IobOpc/OpcUaOmronIcoel.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Opc.Ua;
using System;
@@ -206,9 +207,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// Estende l'init della classe base, impiegando il pacchetto Nuget OPC-UA foundation con la
/// gestione specifica per Omron (es ICOEL) https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaOmronIcoel(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 OpcUaOmronIcoel(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// inizializzo classe base...
if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE")))
IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs
+5 -3
View File
@@ -2,6 +2,7 @@
using EgwProxy.MultiCncLib.OPENcontrol;
#endif
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -21,9 +22,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per Siemens OPC-UA (es OPC x Cereria Finassi e Unitech x Rama)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaSiemens(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 OpcUaSiemens(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa Siemens");
// inizializzo classe base...
IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensOMP.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -15,9 +16,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// Estende l'init della classe base, impiegando il pacchetto Nuget OPC-UA foundation con la
/// gestione specifica per EWON (es Monti, Tenditalia) https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaSiemensOMP(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 OpcUaSiemensOMP(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa Siemens versione OMP (Cereria Finassi)");
IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs
+3 -4
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -20,10 +21,8 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// Estende l'init della classe base, impiegando il pacchetto Nuget OPC-UA foundation con la
/// gestione specifica per adapter Siemens integrato OPC-UA (es RAMA RED by Unitech x TFT)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaSiemensRama(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf)
/// </summary>, IobConfTree IobConfFull
public OpcUaSiemensRama(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa Siemens x RAMA");
doByteRead = true;
IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
@@ -17,9 +18,10 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// gestione specifica per ULMA OPC-UA (es Giacovelli)
/// https://github.com/OPCFoundation/UA-.NETStandard
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public OpcUaUlma(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 OpcUaUlma(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("Init OpcUa ULMA");
// inizializzo classe base...
IOB-WIN-OSAI/AdapterFormNext.cs
+2 -2
View File
@@ -31,14 +31,14 @@ namespace IOB_WIN_OSAI
case tipoAdapter.OSAI_CNDEX:
case tipoAdapter.OSAI_VB6:
// versione EgwProxy.OsaiCncLib
iobObj = new Iob.OSAI(this, IOBConf);
iobObj = new Iob.OSAI(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;
}
IOB-WIN-OSAI/Iob/GenericNext.cs
+8 -3
View File
@@ -1,13 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_OSAI.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)
{
}
}
}
IOB-WIN-OSAI/Iob/OSAI.cs
+5 -3
View File
@@ -1,6 +1,7 @@
using CndexLinkDotNet;
using EgwProxy.OsaiCncLib;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -30,9 +31,10 @@ namespace IOB_WIN_OSAI.Iob
/// <summary>
/// estende l'init della classe base...
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public OSAI(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 OSAI(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
// gestione invio ritardato contapezzi
pzCountDelay = utils.CRI("pzCountDelay");
IOB-WIN-PING/AdapterFormNext.cs
+2 -2
View File
@@ -29,14 +29,14 @@ namespace IOB_WIN_SHELLY
{
case tipoAdapter.PingWatchdog:
iobObj = new IOB_WIN_FORM.Iob.PingWatchDog(this, IOBConf);
iobObj = new IOB_WIN_FORM.Iob.PingWatchDog(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;
}
IOB-WIN-PING/Iob/GenericNext.cs
+9 -1
View File
@@ -1,13 +1,21 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_SHELLY.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)
{
}
}
}
IOB-WIN-PING/postBuildTgt.bat
-44
View File
@@ -1,50 +1,6 @@
@echo off
echo Inizio processing After Build: configurazione %1 , directory %2
RD /S /Q %2"\lib\ar"
RD /S /Q %2"\lib\cs"
RD /S /Q %2"\lib\da"
RD /S /Q %2"\lib\de"
RD /S /Q %2"\lib\es"
RD /S /Q %2"\lib\fr"
RD /S /Q %2"\lib\it"
RD /S /Q %2"\lib\ja-JP"
RD /S /Q %2"\lib\ko"
RD /S /Q %2"\lib\lv"
RD /S /Q %2"\lib\nl"
RD /S /Q %2"\lib\pl"
RD /S /Q %2"\lib\pt"
RD /S /Q %2"\lib\pt-BR"
RD /S /Q %2"\lib\ru"
RD /S /Q %2"\lib\sk"
RD /S /Q %2"\lib\sv"
RD /S /Q %2"\lib\th"
RD /S /Q %2"\lib\tr"
RD /S /Q %2"\lib\zh"
RD /S /Q %2"\lib\zh-TW"
MOVE /Y %2"ar" %2"lib\"
MOVE /Y %2"cs" %2"lib\"
MOVE /Y %2"da" %2"lib\"
MOVE /Y %2"de" %2"lib\"
MOVE /Y %2"es" %2"lib\"
MOVE /Y %2"fr" %2"lib\"
MOVE /Y %2"it" %2"lib\"
MOVE /Y %2"ja-JP" %2"lib\"
MOVE /Y %2"ko" %2"lib\"
MOVE /Y %2"lv" %2"lib\"
MOVE /Y %2"nl" %2"lib\"
MOVE /Y %2"pl" %2"lib\"
MOVE /Y %2"pt" %2"lib\"
MOVE /Y %2"pt-BR" %2"lib\"
MOVE /Y %2"ru" %2"lib\"
MOVE /Y %2"sk" %2"lib\"
MOVE /Y %2"sv" %2"lib\"
MOVE /Y %2"th" %2"lib\"
MOVE /Y %2"tr" %2"lib\"
MOVE /Y %2"zh" %2"lib\"
MOVE /Y %2"zh-TW" %2"lib\"
if %1 == "Release" goto ReleaseExec
if %1 == Release goto ReleaseExec
IOB-WIN-SHELLY/App.config
+4
View File
@@ -158,6 +158,10 @@
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.ini
+2 -3
View File
@@ -57,10 +57,9 @@ MIN_DURATA_ODL=960
; test x datasync...
DATA_SYNC_AT_START=true
; gestione DynData simulati
; gestione DynData
ENABLE_DYN_DATA=TRUE
FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
SEND_DYN_DATA_FLOG=FALSE
; indica parametri gestione TcMan
TC_MAX_TC_FACTOR=3.9
TC_LAMBDA=0.4
IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json
+2 -22
View File
@@ -9,6 +9,7 @@
"func": "MAX",
"tipoMem": "Real",
"minVal": 0,
"period": 90,
"maxVal": 999999999,
"unit": "KWh",
"displOrdinal": 1
@@ -19,32 +20,11 @@
"memAddr": "Power",
"func": "POINT",
"tipoMem": "Real",
"period": 90,
"minVal": 0,
"maxVal": 999999,
"unit": "W",
"displOrdinal": 2
},
"RT_Voltage": {
"name": "RT_Voltage",
"description": "Tensione Istantanea",
"memAddr": "Voltage",
"func": "POINT",
"tipoMem": "Real",
"minVal": 0,
"maxVal": 1000,
"unit": "V",
"displOrdinal": 3
},
"RT_Current": {
"name": "RT_Current",
"description": "Corrente Istantanea",
"memAddr": "Current",
"func": "POINT",
"tipoMem": "Real",
"minVal": 0,
"maxVal": 200,
"unit": "A",
"displOrdinal": 4
}
},
"optKVP": {
IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj
+16 -7
View File
@@ -16,7 +16,7 @@
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -34,9 +34,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote_DEBUG|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Remote_DEBUG\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="EgwProxy.Shelly, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.Shelly.3.7.2502.1210\lib\EgwProxy.Shelly.dll</HintPath>
<HintPath>..\packages\EgwProxy.Shelly.3.7.2502.1408\lib\EgwProxy.Shelly.dll</HintPath>
</Reference>
<Reference Include="Flurl, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Flurl.4.0.0\lib\net461\Flurl.dll</HintPath>
@@ -59,6 +68,9 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
@@ -70,8 +82,8 @@
<Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
<Reference Include="System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.9.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
@@ -232,8 +244,6 @@
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
</Target>
<Target Name="AfterBuild">
<ItemGroup>
@@ -245,5 +255,4 @@
<Exec Command="$(ProjectDir)postBuildTgt.bat $(ConfigurationName) $(TargetDir)">
</Exec>
</Target>
<Import Project="..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" />
</Project>
IOB-WIN-SHELLY/packages.config
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EgwProxy.Shelly" version="3.7.2502.1210" targetFramework="net462" />
<package id="EgwProxy.Shelly" version="3.7.2502.1408" targetFramework="net462" />
<package id="Flurl" version="4.0.0" targetFramework="net462" />
<package id="Flurl.Http" version="4.0.2" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2411.518" targetFramework="net462" />
@@ -14,7 +14,7 @@
<package id="StackExchange.Redis" version="2.8.24" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="9.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.6.0" targetFramework="net462" />
IOB-WIN-SIEMENS/AdapterFormNext.cs
+19 -19
View File
@@ -8,14 +8,14 @@ using System.Threading.Tasks;
namespace IOB_WIN_SIEMENS
{
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,89 +29,89 @@ namespace IOB_WIN_SIEMENS
{
case tipoAdapter.SIEMENS:
iobObj = new IobSiemens.Siemens(this, IOBConf);
iobObj = new IobSiemens.Siemens(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_APROCHIM:
iobObj = new IobSiemens.SiemensAprochim(this, IOBConf);
iobObj = new IobSiemens.SiemensAprochim(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_AT2001:
iobObj = new IobSiemens.SiemensAt2001(this, IOBConf);
iobObj = new IobSiemens.SiemensAt2001(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_COMECA:
iobObj = new IobSiemens.SiemensComeca(this, IOBConf);
iobObj = new IobSiemens.SiemensComeca(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_COMUR:
iobObj = new IobSiemens.SiemensComur(this, IOBConf);
iobObj = new IobSiemens.SiemensComur(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_COSMAP:
iobObj = new IobSiemens.SiemensCosmap(this, IOBConf);
iobObj = new IobSiemens.SiemensCosmap(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_FAPE:
iobObj = new IobSiemens.SiemensFape(this, IOBConf);
iobObj = new IobSiemens.SiemensFape(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_FAPE_2:
iobObj = new IobSiemens.SiemensFapeV2(this, IOBConf);
iobObj = new IobSiemens.SiemensFapeV2(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_INGENIA:
iobObj = new IobSiemens.SiemensIngenia(this, IOBConf);
iobObj = new IobSiemens.SiemensIngenia(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_LASCO:
iobObj = new IobSiemens.SiemensLasco(this, IOBConf);
iobObj = new IobSiemens.SiemensLasco(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_NWSE:
iobObj = new IobSiemens.SiemensNWSE(this, IOBConf);
iobObj = new IobSiemens.SiemensNWSE(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_PRESSOIL_CEI:
iobObj = new IobSiemens.SiemensPressoilCei(this, IOBConf);
iobObj = new IobSiemens.SiemensPressoilCei(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_ROBOTSERVICE:
iobObj = new IobSiemens.SiemensRobotService(this, IOBConf);
iobObj = new IobSiemens.SiemensRobotService(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_SAET:
iobObj = new IobSiemens.SiemensSaet(this, IOBConf);
iobObj = new IobSiemens.SiemensSaet(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_SIMEC:
iobObj = new IobSiemens.SiemensSimec(this, IOBConf);
iobObj = new IobSiemens.SiemensSimec(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SIEMENS_TORRI:
iobObj = new IobSiemens.SiemensTorri(this, IOBConf);
iobObj = new IobSiemens.SiemensTorri(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;
}
IOB-WIN-SIEMENS/Iob/GenericNext.cs
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_SIEMENS.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)
{
}
IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using S7.Net;
@@ -37,9 +38,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public Siemens(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 Siemens(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull)
{
memMap = new plcMemMapExt();
writePre = true;
IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs
+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;
@@ -36,9 +37,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensAprochim(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 SiemensAprochim(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione APROCHIM");
// imposto i parametri speciali x calcolo...
IOB-WIN-SIEMENS/IobSiemens/SiemensAt2001.cs
+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;
@@ -24,9 +25,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensAt2001(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 SiemensAt2001(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione VIPA AT2001");
lastPLCWatchDog = DateTime.Now.AddMinutes(-1);
IOB-WIN-SIEMENS/IobSiemens/SiemensComeca.cs
+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;
@@ -41,9 +42,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensComeca(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 SiemensComeca(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione Comeca");
}
IOB-WIN-SIEMENS/IobSiemens/SiemensComur.cs
+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;
@@ -55,9 +56,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensComur(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 SiemensComur(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione COMUR");
}
IOB-WIN-SIEMENS/IobSiemens/SiemensCosmap.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -41,9 +42,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensCosmap(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 SiemensCosmap(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione Cosmap");
}
IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -30,9 +31,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensFape(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 SiemensFape(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione FAPE 1.0 - 2018");
}
IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -54,9 +55,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensFapeV2(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 SiemensFapeV2(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
string sFapeVers = getOptPar("FAPE_VERS");
if (!string.IsNullOrEmpty(sFapeVers))
IOB-WIN-SIEMENS/IobSiemens/SiemensIngenia.cs
+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;
@@ -64,9 +65,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensIngenia(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 SiemensIngenia(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione VIPA INGENIA");
lastPLCWatchDog = DateTime.Now.AddMinutes(-1);
IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs
+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;
@@ -28,9 +29,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensLasco(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 SiemensLasco(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione LASCO");
lastPLCWatchDog = DateTime.Now.AddMinutes(-1);
IOB-WIN-SIEMENS/IobSiemens/SiemensNWSE.cs
+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;
@@ -42,9 +43,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensNWSE(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 SiemensNWSE(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione NWS");
IOB-WIN-SIEMENS/IobSiemens/SiemensPressoilCei.cs
+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;
@@ -24,9 +25,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensPressoilCei(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 SiemensPressoilCei(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione PRESSOIL - CEI");
}
IOB-WIN-SIEMENS/IobSiemens/SiemensRobotService.cs
+5 -3
View File
@@ -1,4 +1,5 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -50,9 +51,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensRobotService(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 SiemensRobotService(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione RobotService");
IOB-WIN-SIEMENS/IobSiemens/SiemensSaet.cs
+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;
@@ -65,9 +66,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensSaet(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 SiemensSaet(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
lgInfo("NEW IOB SIEMENS versione SAET");
lastPLCWatchDog = DateTime.Now.AddMinutes(-1);
IOB-WIN-SIEMENS/IobSiemens/SiemensSimec.cs
+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_SIEMENS.IobSiemens
/// <summary>
/// Classe base con i metodi x Siemens
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensSimec(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 SiemensSimec(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
/* --------------------------------------------------------------------------------
* Controlli SIEMENS SIMEC
IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs
+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;
@@ -23,9 +24,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens
/// <summary>
/// estende l'init della classe base con i metodi x Siemens specifici x Torri
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public SiemensTorri(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 SiemensTorri(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
// gestione restart OpcUa client...
if (!string.IsNullOrEmpty(getOptPar("ENABLE_ALARM_LEGACY")))
IOB-WIN-SQL/AdapterFormNext.cs
+5 -5
View File
@@ -28,29 +28,29 @@ namespace IOB_WIN_SQL
switch (tipoScelto)
{
case tipoAdapter.FILE_SOITAAB:
iobObj = new IobFile.IobFileSoitaab(this, IOBConf);
iobObj = new IobFile.IobFileSoitaab(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.IcoelDb:
iobObj = new IobSql.IcoelDb(this, IOBConf);
iobObj = new IobSql.IcoelDb(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SQLSERVER_LANTEK:
iobObj = new IobSql.SqlServLantek(this, IOBConf);
iobObj = new IobSql.SqlServLantek(this, IOBConf, IOBConfFull);
btnStart.Enabled = true;
break;
case tipoAdapter.SQLSERVER_PAMA:
iobObj = new IobSql.SqlServPama(this, IOBConf);
iobObj = new IobSql.SqlServPama(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;
}
IOB-WIN-SQL/Iob/GenericNext.cs
+8 -1
View File
@@ -1,11 +1,18 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
namespace IOB_WIN_SQL.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)
{
}
IOB-WIN-SQL/Iob/IobFileSoitaab.cs
+5 -3
View File
@@ -2,6 +2,7 @@
using EgwProxy.SqlDb.DbModels;
#endif
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -27,9 +28,10 @@ namespace IOB_WIN_SQL.IobFile
/// <summary>
/// Costruttore dell'IOB FileBased SOITAAB
/// </summary>
/// <param name="caller">AdapterForm chiamante</param>
/// <param name="IOBConf">Configurazione IOB per avvio</param>
public IobFileSoitaab(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 IobFileSoitaab(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
DateTime adesso = DateTime.Now;
string VetoReadSec = getOptPar("VetoReadSec");
IOB-WIN-SQL/IobSql/IcoelDb.cs
+5 -3
View File
@@ -1,5 +1,6 @@
using EgwProxy.Icoel;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using System;
using System.Collections.Generic;
@@ -22,9 +23,10 @@ namespace IOB_WIN_SQL.IobSql
/// <summary>
/// Costruttore dell'IOB Icoel DB
/// </summary>
/// <param name="caller">AdapterForm chiamante</param>
/// <param name="IOBConf">Configurazione IOB per avvio</param>
public IcoelDb(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 IcoelDb(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
/* --------------------------------------
* todo's
IOB-WIN-SQL/IobSql/SqlServLantek.cs
+5 -3
View File
@@ -1,6 +1,7 @@
using EgwProxy.SqlDb.Controllers;
using EgwProxy.SqlDb.DbModels;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -25,9 +26,10 @@ namespace IOB_WIN_SQL.IobSql
/// <summary>
/// Costruttore dell'IOB DB LANTEK
/// </summary>
/// <param name="caller">AdapterForm chiamante</param>
/// <param name="IOBConf">Configurazione IOB per avvio</param>
public SqlServLantek(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 SqlServLantek(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
DateTime adesso = DateTime.Now;
string SyncStateServ = getOptPar("SyncStateServer");
IOB-WIN-SQL/IobSql/SqlServPama.cs
+5 -3
View File
@@ -1,6 +1,7 @@
using EgwProxy.SqlDb.Controllers;
using EgwProxy.SqlDb.DbModels;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using Newtonsoft.Json;
using System;
@@ -26,9 +27,10 @@ namespace IOB_WIN_SQL.IobSql
/// <summary>
/// Costruttore dell'IOB DB PAMA
/// </summary>
/// <param name="caller">AdapterForm chiamante</param>
/// <param name="IOBConf">Configurazione IOB per avvio</param>
public SqlServPama(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 SqlServPama(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull)
{
string SyncStateServ = getOptPar("SyncStateServer");
string SyncStateDb = getOptPar("SyncStateDb");
IOB-WIN-SQL/postBuildTgt.bat
-45
View File
@@ -1,51 +1,6 @@
@echo off
echo Inizio processing After Build: configurazione %1 , directory %2
RD /S /Q %2"\lib\ar"
RD /S /Q %2"\lib\cs"
RD /S /Q %2"\lib\da"
RD /S /Q %2"\lib\de"
RD /S /Q %2"\lib\es"
RD /S /Q %2"\lib\fr"
RD /S /Q %2"\lib\it"
RD /S /Q %2"\lib\ja-JP"
RD /S /Q %2"\lib\ko"
RD /S /Q %2"\lib\lv"
RD /S /Q %2"\lib\nl"
RD /S /Q %2"\lib\pl"
RD /S /Q %2"\lib\pt"
RD /S /Q %2"\lib\pt-BR"
RD /S /Q %2"\lib\ru"
RD /S /Q %2"\lib\sk"
RD /S /Q %2"\lib\sv"
RD /S /Q %2"\lib\th"
RD /S /Q %2"\lib\tr"
RD /S /Q %2"\lib\zh"
RD /S /Q %2"\lib\zh-TW"
MOVE /Y %2"ar" %2"lib\"
MOVE /Y %2"cs" %2"lib\"
MOVE /Y %2"da" %2"lib\"
MOVE /Y %2"de" %2"lib\"
MOVE /Y %2"es" %2"lib\"
MOVE /Y %2"fr" %2"lib\"
MOVE /Y %2"it" %2"lib\"
MOVE /Y %2"ja-JP" %2"lib\"
MOVE /Y %2"ko" %2"lib\"
MOVE /Y %2"lv" %2"lib\"
MOVE /Y %2"nl" %2"lib\"
MOVE /Y %2"pl" %2"lib\"
MOVE /Y %2"pt" %2"lib\"
MOVE /Y %2"pt-BR" %2"lib\"
MOVE /Y %2"ru" %2"lib\"
MOVE /Y %2"sk" %2"lib\"
MOVE /Y %2"sv" %2"lib\"
MOVE /Y %2"th" %2"lib\"
MOVE /Y %2"tr" %2"lib\"
MOVE /Y %2"zh" %2"lib\"
MOVE /Y %2"zh-TW" %2"lib\"
if %1 == "Release" goto ReleaseExec
if %1 == Release goto ReleaseExec
if %1 == "Debug" goto DebugExec
IOB-WIN-WPS/AdapterFormNext.cs
+4 -4
View File
@@ -8,14 +8,14 @@ using System.Threading.Tasks;
namespace IOB_WIN_WPS
{
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,14 +29,14 @@ namespace IOB_WIN_WPS
{
case tipoAdapter.WPS:
iobObj = new IobNet.WebPageScrap(this, IOBConf);
iobObj = new IobNet.WebPageScrap(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;
}

Some files were not shown because too many files have changed in this diff Show More