diff --git a/IOB-WIN-BECKHOFF/AdapterFormNext.cs b/IOB-WIN-BECKHOFF/AdapterFormNext.cs index ee4561f1..44f662de 100644 --- a/IOB-WIN-BECKHOFF/AdapterFormNext.cs +++ b/IOB-WIN-BECKHOFF/AdapterFormNext.cs @@ -29,14 +29,14 @@ namespace IOB_WIN_BECKHOFF { case tipoAdapter.BECKHOFF: case tipoAdapter.BECKHOFF_CPA: - iobObj = new IobBeckhoff.BeckhoffCpa(this, IOBConf); + iobObj = new IobBeckhoff.BeckhoffCpa(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.SIMULA: case tipoAdapter.ND: default: - iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf); + iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull); btnStart.Enabled = false; break; } diff --git a/IOB-WIN-BECKHOFF/Iob/GenericNext.cs b/IOB-WIN-BECKHOFF/Iob/GenericNext.cs index 7e2ad9a5..d6892c21 100644 --- a/IOB-WIN-BECKHOFF/Iob/GenericNext.cs +++ b/IOB-WIN-BECKHOFF/Iob/GenericNext.cs @@ -1,11 +1,18 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; namespace IOB_WIN_BECKHOFF.Iob { + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) public class GenericNext : IOB_WIN_FORM.Iob.Generic { - public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs b/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs index 6b41fc42..0ec24dcd 100644 --- a/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs +++ b/IOB-WIN-BECKHOFF/IobBeckhoff/Beckhoff.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; using System.Collections.Generic; @@ -17,9 +18,10 @@ namespace IOB_WIN_BECKHOFF.IobBeckhoff /// /// Estende l'init della classe base /// - /// - /// - public Beckhoff(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Beckhoff(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IobBeckhoff Adapter"); // gestione invio ritardato contapezzi diff --git a/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs b/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs index d7bc629b..ccf92b57 100644 --- a/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs +++ b/IOB-WIN-BECKHOFF/IobBeckhoff/BeckhoffCpa.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using System; using System.Collections.Generic; @@ -12,9 +13,10 @@ namespace IOB_WIN_BECKHOFF.IobBeckhoff /// /// Estende l'init della classe base /// - /// - /// - public BeckhoffCpa(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public BeckhoffCpa(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("START IobBeckhoffCPA Adapter specifico"); diff --git a/IOB-WIN-FANUC/AdapterFormNext.cs b/IOB-WIN-FANUC/AdapterFormNext.cs index 7d87620b..60e09003 100644 --- a/IOB-WIN-FANUC/AdapterFormNext.cs +++ b/IOB-WIN-FANUC/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-FANUC/Iob/Fanuc.cs b/IOB-WIN-FANUC/Iob/Fanuc.cs index c07be1c0..9d9d34b1 100644 --- a/IOB-WIN-FANUC/Iob/Fanuc.cs +++ b/IOB-WIN-FANUC/Iob/Fanuc.cs @@ -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 /// /// estende l'init della classe base... /// - /// - /// - public Fanuc(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Fanuc(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { lgInfo("Start init Fanuc"); // i dati RAW principali sono 6 byte... diff --git a/IOB-WIN-FANUC/Iob/GenericNext.cs b/IOB-WIN-FANUC/Iob/GenericNext.cs index 95d7ff9d..55854ad7 100644 --- a/IOB-WIN-FANUC/Iob/GenericNext.cs +++ b/IOB-WIN-FANUC/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-FILE/AdapterFormNext.cs b/IOB-WIN-FILE/AdapterFormNext.cs index 6c9396cd..3033418c 100644 --- a/IOB-WIN-FILE/AdapterFormNext.cs +++ b/IOB-WIN-FILE/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-FILE/Iob/GenericNext.cs b/IOB-WIN-FILE/Iob/GenericNext.cs index 523363a5..d24b82cb 100644 --- a/IOB-WIN-FILE/Iob/GenericNext.cs +++ b/IOB-WIN-FILE/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-FILE/IobFile/FileEurom63.cs b/IOB-WIN-FILE/IobFile/FileEurom63.cs index f96c139f..dbcf3551 100644 --- a/IOB-WIN-FILE/IobFile/FileEurom63.cs +++ b/IOB-WIN-FILE/IobFile/FileEurom63.cs @@ -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 /// /// Estende l'init della classe base... /// - /// - /// - public FileEurom63(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public FileEurom63(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("INIT IobFileEurom63"); appPath = Path.GetDirectoryName(Application.ExecutablePath); diff --git a/IOB-WIN-FILE/IobFile/FileGen.cs b/IOB-WIN-FILE/IobFile/FileGen.cs index 8903419d..66b5ba90 100644 --- a/IOB-WIN-FILE/IobFile/FileGen.cs +++ b/IOB-WIN-FILE/IobFile/FileGen.cs @@ -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 /// /// Estende l'init della classe base... /// - /// - /// - public FileGen(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public FileGen(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { lgInfo("INIT FileGen"); //reloadAdapterConf(); diff --git a/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs b/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs index 59b2b4c4..97b865aa 100644 --- a/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs +++ b/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs @@ -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 /// /// Costruttore dell'IOB FileBased SOITAAB /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public IobFileSoitaab(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public IobFileSoitaab(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { DateTime adesso = DateTime.Now; string VetoReadSec = getOptPar("VetoReadSec"); diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs index c2a91f11..4771bb95 100644 --- a/IOB-WIN-FORM/AdapterForm.cs +++ b/IOB-WIN-FORM/AdapterForm.cs @@ -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); diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index a878ccb8..38edc588 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -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... diff --git a/IOB-WIN-FTP/AdapterFormNext.cs b/IOB-WIN-FTP/AdapterFormNext.cs index 53066a47..96bda2b9 100644 --- a/IOB-WIN-FTP/AdapterFormNext.cs +++ b/IOB-WIN-FTP/AdapterFormNext.cs @@ -28,14 +28,14 @@ namespace IOB_WIN_FTP switch (tipoScelto) { case tipoAdapter.FTP: - iobObj = new Iob.Ftp(this, IOBConf); + iobObj = new Iob.Ftp(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.SIMULA: case tipoAdapter.ND: default: - iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf); + iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull); btnStart.Enabled = false; break; } diff --git a/IOB-WIN-FTP/Iob/Ftp.cs b/IOB-WIN-FTP/Iob/Ftp.cs index b54c0618..81893175 100644 --- a/IOB-WIN-FTP/Iob/Ftp.cs +++ b/IOB-WIN-FTP/Iob/Ftp.cs @@ -1,5 +1,6 @@ using EgwProxy.Ftp; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using Newtonsoft.Json; using System; @@ -23,9 +24,10 @@ namespace IOB_WIN_FTP.Iob /// - gestione dei task da svolgere da configurazione json specifica /// - specializzazione da conf e non da codice /// - /// - /// - public Ftp(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Ftp(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init IobFtp Client"); // imposto diff --git a/IOB-WIN-FTP/Iob/GenericNext.cs b/IOB-WIN-FTP/Iob/GenericNext.cs index 5d6fef21..4020799f 100644 --- a/IOB-WIN-FTP/Iob/GenericNext.cs +++ b/IOB-WIN-FTP/Iob/GenericNext.cs @@ -1,5 +1,6 @@ using EgwProxy.Ftp; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; using System.IO; using System.Linq; @@ -9,8 +10,13 @@ namespace IOB_WIN_FTP.Iob { public class GenericNext : IOB_WIN_FORM.Iob.Generic { - - public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-KAWASAKI/AdapterFormNext.cs b/IOB-WIN-KAWASAKI/AdapterFormNext.cs index 25804525..35c10b43 100644 --- a/IOB-WIN-KAWASAKI/AdapterFormNext.cs +++ b/IOB-WIN-KAWASAKI/AdapterFormNext.cs @@ -2,14 +2,14 @@ namespace IOB_WIN_KAWASAKI { - public class AdapterFormNext: IOB_WIN_FORM.AdapterForm + public class AdapterFormNext : IOB_WIN_FORM.AdapterForm { /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } /// @@ -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; } diff --git a/IOB-WIN-KAWASAKI/Iob/GenericNext.cs b/IOB-WIN-KAWASAKI/Iob/GenericNext.cs index 81c91c76..c41a233c 100644 --- a/IOB-WIN-KAWASAKI/Iob/GenericNext.cs +++ b/IOB-WIN-KAWASAKI/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } - } } \ No newline at end of file diff --git a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs index aee8810d..55c8bfe6 100644 --- a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs +++ b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs @@ -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 /// /// estende l'init della classe base... /// - /// - /// - public Kawasaki(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + 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; } diff --git a/IOB-WIN-MBUS/AdapterFormNext.cs b/IOB-WIN-MBUS/AdapterFormNext.cs index 086d6891..7a19266f 100644 --- a/IOB-WIN-MBUS/AdapterFormNext.cs +++ b/IOB-WIN-MBUS/AdapterFormNext.cs @@ -8,14 +8,14 @@ using System.Threading.Tasks; namespace IOB_WIN_MBUS { - public class AdapterFormNext: IOB_WIN_FORM.AdapterForm + public class AdapterFormNext : IOB_WIN_FORM.AdapterForm { /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } /// @@ -29,59 +29,59 @@ namespace IOB_WIN_MBUS { case tipoAdapter.MODBUS_TCP: - iobObj = new IobModbusTCP.ModbusTCP(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCP(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_CEDAX: - iobObj = new IobModbusTCP.ModbusTCPCedax(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPCedax(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_CENTERFRIGO: - iobObj = new IobModbusTCP.ModbusTCPCenterfrigo(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPCenterfrigo(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_FIMAT: - iobObj = new IobModbusTCP.ModbusTCPFimat(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPFimat(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_HAM: - iobObj = new IobModbusTCP.ModbusTCPHam(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPHam(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_HELPI: - iobObj = new IobModbusTCP.ModbusTCPHelpi(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPHelpi(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_IMAS_AEROMEC: - iobObj = new IobModbusTCP.ModbusTCPImaxAeromec(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPImaxAeromec(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_RIMOR: - iobObj = new IobModbusTCP.ModbusTCPRimor(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPRimor(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_SAIM: - iobObj = new IobModbusTCP.ModbusTCPSaim(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPSaim(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.MODBUS_TCP_ZETAPACK: - iobObj = new IobModbusTCP.ModbusTCPZetapack(this, IOBConf); + iobObj = new IobModbusTCP.ModbusTCPZetapack(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.SIMULA: case tipoAdapter.ND: default: - iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf); + iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull); btnStart.Enabled = false; break; } diff --git a/IOB-WIN-MBUS/Iob/GenericNext.cs b/IOB-WIN-MBUS/Iob/GenericNext.cs index 19d9739d..1db6ca5b 100644 --- a/IOB-WIN-MBUS/Iob/GenericNext.cs +++ b/IOB-WIN-MBUS/Iob/GenericNext.cs @@ -1,11 +1,18 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; namespace IOB_WIN_MBUS.Iob { public class GenericNext : IOB_WIN_FORM.Iob.Generic { - public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs index 2bbfc891..62f92548 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCP.cs @@ -1,5 +1,6 @@ using EasyModbus; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using Newtonsoft.Json; using System; @@ -26,9 +27,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCP(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCP(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { lgInfo("NEW IOB ModBus TCP"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs index c56b2585..2b7974ea 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCedax.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -24,9 +25,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPCedax(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPCedax(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { lgInfo("NEW IOB ModBus TCP Cedax"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs index ba59e6c3..9e93e138 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPCenterfrigo.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -27,9 +28,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPCenterfrigo(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPCenterfrigo(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP Centerfrigo"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs index 7f84317e..5c58577c 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFimat.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; using System.Globalization; using System.IO; @@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPFimat(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPFimat(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP FIMAT"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs index b834795d..70effd44 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHam.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPHam(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPHam(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP HAM"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs index 96ecd39e..f6d36949 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPHelpi.cs @@ -1,5 +1,6 @@ using EasyModbus; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; using System.Linq; @@ -41,9 +42,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPHelpi(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPHelpi(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP Helpi"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs index 814545ae..50794a6d 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPImaxAeromec.cs @@ -1,5 +1,6 @@ using EasyModbus; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPImaxAeromec(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPImaxAeromec(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP IMAS Aeromec"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs index b5946683..5f1014e1 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPRimor.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -22,9 +23,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPRimor(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPRimor(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP Rimor"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs index 12c9b744..a10c9f2a 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPSaim.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -21,9 +22,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPSaim(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPSaim(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP Saim"); diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs index 19a667ee..d5ef465d 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPZetapack.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using System; namespace IOB_WIN_MBUS.IobModbusTCP @@ -21,9 +22,10 @@ namespace IOB_WIN_MBUS.IobModbusTCP /// /// Classe base con i metodi x ModBusTCP /// - /// - /// - public ModbusTCPZetapack(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public ModbusTCPZetapack(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB ModBus TCP Zetapack"); diff --git a/IOB-WIN-MITSUBISHI/AdapterFormNext.cs b/IOB-WIN-MITSUBISHI/AdapterFormNext.cs index 32b693c5..2a64b2db 100644 --- a/IOB-WIN-MITSUBISHI/AdapterFormNext.cs +++ b/IOB-WIN-MITSUBISHI/AdapterFormNext.cs @@ -28,14 +28,14 @@ namespace IOB_WIN_MITSUBISHI switch (tipoScelto) { case tipoAdapter.MITSUBISHI: - iobObj = new Mitsubishi(this, IOBConf); + iobObj = new Mitsubishi(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.SIMULA: case tipoAdapter.ND: default: - iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf); + iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull); btnStart.Enabled = false; break; } diff --git a/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs b/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs index 01c11574..26f1de78 100644 --- a/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs +++ b/IOB-WIN-MITSUBISHI/Iob/GenericNext.cs @@ -1,11 +1,18 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; namespace IOB_WIN_MITSUBISHI.Iob { public class GenericNext : IOB_WIN_FORM.Iob.Generic { - public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs b/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs index c370dec7..3d209f97 100644 --- a/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs +++ b/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using System; using System.Collections.Generic; @@ -15,9 +16,10 @@ namespace IOB_WIN_MITSUBISHI.Iob /// /// Estende l'init della classe base... /// - /// - /// - public Mitsubishi(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Mitsubishi(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Start init Mitsubishi"); // gestione invio ritardato contapezzi diff --git a/IOB-WIN-MTC/AdapterFormNext.cs b/IOB-WIN-MTC/AdapterFormNext.cs index cae97dfb..126a2ae5 100644 --- a/IOB-WIN-MTC/AdapterFormNext.cs +++ b/IOB-WIN-MTC/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-MTC/Iob/GenericNext.cs b/IOB-WIN-MTC/Iob/GenericNext.cs index 880ff747..a3950ca0 100644 --- a/IOB-WIN-MTC/Iob/GenericNext.cs +++ b/IOB-WIN-MTC/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-MTC/Iob/MTConn.cs b/IOB-WIN-MTC/Iob/MTConn.cs index dce1cf26..7f0376e3 100644 --- a/IOB-WIN-MTC/Iob/MTConn.cs +++ b/IOB-WIN-MTC/Iob/MTConn.cs @@ -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 /// /// Estende l'init della classe base, impiegando il pacchetto Nuget TrackHound https://github.com/TrakHound/MTConnect.NET /// - /// - /// - public MTConn(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public MTConn(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { // gestione invio ritardato contapezzi pzCountDelay = utils.CRI("pzCountDelay"); diff --git a/IOB-WIN-NEXT/AdapterFormNext.cs b/IOB-WIN-NEXT/AdapterFormNext.cs index 087e345e..baec509a 100644 --- a/IOB-WIN-NEXT/AdapterFormNext.cs +++ b/IOB-WIN-NEXT/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-NEXT/Iob/GenericNext.cs b/IOB-WIN-NEXT/Iob/GenericNext.cs index 30eb1aab..7b642d19 100644 --- a/IOB-WIN-NEXT/Iob/GenericNext.cs +++ b/IOB-WIN-NEXT/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } -#if false - /// - /// Effettua upload verso server FTP della macchina dei files nella folder indicata - /// - /// - /// - 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 - } } \ No newline at end of file diff --git a/IOB-WIN-OMRON/AdapterFormNext.cs b/IOB-WIN-OMRON/AdapterFormNext.cs index 2c34589c..4669d42e 100644 --- a/IOB-WIN-OMRON/AdapterFormNext.cs +++ b/IOB-WIN-OMRON/AdapterFormNext.cs @@ -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 { /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } /// @@ -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; } diff --git a/IOB-WIN-OMRON/Iob/GenericNext.cs b/IOB-WIN-OMRON/Iob/GenericNext.cs index 668a18af..27cf4ebb 100644 --- a/IOB-WIN-OMRON/Iob/GenericNext.cs +++ b/IOB-WIN-OMRON/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-OMRON/Iob/Omron.cs b/IOB-WIN-OMRON/Iob/Omron.cs index 6285ae44..5952f28a 100644 --- a/IOB-WIN-OMRON/Iob/Omron.cs +++ b/IOB-WIN-OMRON/Iob/Omron.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using System; using System.Collections.Generic; @@ -15,9 +16,10 @@ namespace IOB_WIN_OMRON.Iob /// /// estende l'init della classe base... /// - /// - /// - public Omron(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Omron(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { // gestione invio ritardato contapezzi pzCountDelay = utils.CRI("pzCountDelay"); diff --git a/IOB-WIN-OPC-UA/AdapterFormNext.cs b/IOB-WIN-OPC-UA/AdapterFormNext.cs index 97aafc2a..3c383b0e 100644 --- a/IOB-WIN-OPC-UA/AdapterFormNext.cs +++ b/IOB-WIN-OPC-UA/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-OPC-UA/Iob/GenericNext.cs b/IOB-WIN-OPC-UA/Iob/GenericNext.cs index 46891381..5178a504 100644 --- a/IOB-WIN-OPC-UA/Iob/GenericNext.cs +++ b/IOB-WIN-OPC-UA/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs index 8df478ee..e146b9ee 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs @@ -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 /// /// Estende l'init della classe base, impiegando il pacchetto Nuget OPC-UA foundation https://github.com/OPCFoundation/UA-.NETStandard /// - /// - /// - public OpcUa(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUa(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa"); // gestione invio ritardato contapezzi diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaCMS.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaCMS.cs index ee1f3923..ac199596 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaCMS.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaCMS.cs @@ -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 /// - /// - /// - public OpcUaCMS(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaCMS(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { // inizializzo classe base... if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE"))) diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs index 767c5ea2..d83c08fb 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs @@ -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 /// - /// - /// - public OpcUaEwon(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaEwon(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { // inizializzo classe base... if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE"))) diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonAdige.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonAdige.cs index 067c497c..7fa3021d 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonAdige.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonAdige.cs @@ -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 /// - /// - /// - public OpcUaEwonAdige(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaEwonAdige(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init Ewon versione Adige/BLM"); diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonBLM.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonBLM.cs index b21a40ba..bc269a5e 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonBLM.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonBLM.cs @@ -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 /// - /// - /// - public OpcUaEwonBLM(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaEwonBLM(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init Ewon versione BLM (Mecart)"); diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMecolpress.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMecolpress.cs index 06e50d10..95cc9fd1 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMecolpress.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMecolpress.cs @@ -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 /// - /// - /// - public OpcUaEwonMecolpress(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaEwonMecolpress(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init Ewon versione Mecolpress (STEL)"); diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMonti.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMonti.cs index 2b2444a2..88ab6358 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMonti.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwonMonti.cs @@ -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 /// - /// - /// - public OpcUaEwonMonti(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaEwonMonti(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init Ewon versione Monti (Tenditalia)"); // inizializzo classe base... diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs index eaca9f18..dea87a5b 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs @@ -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 /// - /// - /// - public OpcUaImas(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaImas(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa IMAS"); // inizializzo classe base... diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs index c9d79f24..cd2f9145 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs @@ -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 /// - /// - /// - public OpcUaKpw(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaKpw(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa Kepware"); // inizializzo classe base... diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs index 514fd593..101d8551 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs @@ -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 /// - /// - /// - public OpcUaKpwRama(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaKpwRama(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa Kepware x RAMA"); // inizializzo classe base... diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs index 9217f28d..ef1ebf37 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs @@ -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 /// - /// - /// - public OpcUaMBH(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaMBH(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa MBH"); // inizializzo classe base... diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs index 02552ef7..7bc285cb 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs @@ -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 /// - /// - /// - public OpcUaMBHCimolai(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaMBHCimolai(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa MBH versione Cimolai (Baglietto)"); diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs index 863ce47c..f36e9a40 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs @@ -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 /// - /// - /// - public OpcUaOmron(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaOmron(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { // inizializzo classe base... if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE"))) diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaOmronIcoel.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaOmronIcoel.cs index c8cab97f..624d3c1f 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaOmronIcoel.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaOmronIcoel.cs @@ -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 /// - /// - /// - public OpcUaOmronIcoel(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaOmronIcoel(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { // inizializzo classe base... if (!string.IsNullOrEmpty(getOptPar("CHANGE_ODL_MODE"))) diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs index 614f4615..2b70f081 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs @@ -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 /// - /// - /// - public OpcUaSiemens(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaSiemens(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa Siemens"); // inizializzo classe base... diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensOMP.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensOMP.cs index 7153c769..e51c4748 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensOMP.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensOMP.cs @@ -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 /// - /// - /// - public OpcUaSiemensOMP(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaSiemensOMP(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa Siemens versione OMP (Cereria Finassi)"); diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs index a9f125fd..a9bfd0b4 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs @@ -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 - /// - /// - /// - public OpcUaSiemensRama(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// , IobConfTree IobConfFull + public OpcUaSiemensRama(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa Siemens x RAMA"); doByteRead = true; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs index a1dd7437..807cea98 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs @@ -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 /// - /// - /// - public OpcUaUlma(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OpcUaUlma(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("Init OpcUa ULMA"); // inizializzo classe base... diff --git a/IOB-WIN-OSAI/AdapterFormNext.cs b/IOB-WIN-OSAI/AdapterFormNext.cs index 4b6c00ca..3c287f05 100644 --- a/IOB-WIN-OSAI/AdapterFormNext.cs +++ b/IOB-WIN-OSAI/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-OSAI/Iob/GenericNext.cs b/IOB-WIN-OSAI/Iob/GenericNext.cs index a2ef3d3b..93035df3 100644 --- a/IOB-WIN-OSAI/Iob/GenericNext.cs +++ b/IOB-WIN-OSAI/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } - } } \ No newline at end of file diff --git a/IOB-WIN-OSAI/Iob/OSAI.cs b/IOB-WIN-OSAI/Iob/OSAI.cs index 05e525b1..85f1f5cd 100644 --- a/IOB-WIN-OSAI/Iob/OSAI.cs +++ b/IOB-WIN-OSAI/Iob/OSAI.cs @@ -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 /// /// estende l'init della classe base... /// - /// - /// - public OSAI(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public OSAI(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { // gestione invio ritardato contapezzi pzCountDelay = utils.CRI("pzCountDelay"); diff --git a/IOB-WIN-PING/AdapterFormNext.cs b/IOB-WIN-PING/AdapterFormNext.cs index fa3128f7..04c53817 100644 --- a/IOB-WIN-PING/AdapterFormNext.cs +++ b/IOB-WIN-PING/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-PING/Iob/GenericNext.cs b/IOB-WIN-PING/Iob/GenericNext.cs index d5c6b110..789f3ead 100644 --- a/IOB-WIN-PING/Iob/GenericNext.cs +++ b/IOB-WIN-PING/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } } + } \ No newline at end of file diff --git a/IOB-WIN-PING/postBuildTgt.bat b/IOB-WIN-PING/postBuildTgt.bat index d56896d2..3458a192 100644 --- a/IOB-WIN-PING/postBuildTgt.bat +++ b/IOB-WIN-PING/postBuildTgt.bat @@ -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 diff --git a/IOB-WIN-SHELLY/App.config b/IOB-WIN-SHELLY/App.config index e518e50c..19c2bd59 100644 --- a/IOB-WIN-SHELLY/App.config +++ b/IOB-WIN-SHELLY/App.config @@ -158,6 +158,10 @@ + + + + diff --git a/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.ini b/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.ini index 6d8e952d..27a1fd6f 100644 --- a/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.ini +++ b/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.ini @@ -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 diff --git a/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json b/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json index 6e665a8b..02bd0365 100644 --- a/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json +++ b/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json @@ -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": { diff --git a/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj b/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj index 4e0520d9..b03a2b89 100644 --- a/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj +++ b/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj @@ -16,7 +16,7 @@ - AnyCPU + x86 true full false @@ -34,9 +34,18 @@ prompt 4 + + true + bin\Remote_DEBUG\ + DEBUG;TRACE + full + x86 + 7.3 + prompt + - ..\packages\EgwProxy.Shelly.3.7.2502.1210\lib\EgwProxy.Shelly.dll + ..\packages\EgwProxy.Shelly.3.7.2502.1408\lib\EgwProxy.Shelly.dll ..\packages\Flurl.4.0.0\lib\net461\Flurl.dll @@ -59,6 +68,9 @@ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll @@ -70,8 +82,8 @@ ..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll - - ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.9.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll @@ -232,8 +244,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - @@ -245,5 +255,4 @@ - \ No newline at end of file diff --git a/IOB-WIN-SHELLY/packages.config b/IOB-WIN-SHELLY/packages.config index f1fc55b6..f57e66e6 100644 --- a/IOB-WIN-SHELLY/packages.config +++ b/IOB-WIN-SHELLY/packages.config @@ -1,6 +1,6 @@  - + @@ -14,7 +14,7 @@ - + diff --git a/IOB-WIN-SIEMENS/AdapterFormNext.cs b/IOB-WIN-SIEMENS/AdapterFormNext.cs index b7ab1568..938f2c0e 100644 --- a/IOB-WIN-SIEMENS/AdapterFormNext.cs +++ b/IOB-WIN-SIEMENS/AdapterFormNext.cs @@ -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 { /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } /// @@ -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; } diff --git a/IOB-WIN-SIEMENS/Iob/GenericNext.cs b/IOB-WIN-SIEMENS/Iob/GenericNext.cs index 96f2df36..b4bc390c 100644 --- a/IOB-WIN-SIEMENS/Iob/GenericNext.cs +++ b/IOB-WIN-SIEMENS/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs index e45c7d13..0a3d9d38 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public Siemens(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Siemens(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf,IobConfFull) { memMap = new plcMemMapExt(); writePre = true; diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs index a419c880..65a0d80a 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensAprochim(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensAprochim(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione APROCHIM"); // imposto i parametri speciali x calcolo... diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensAt2001.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensAt2001.cs index 5c0a4a8e..5a17c2d3 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensAt2001.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensAt2001.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensAt2001(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensAt2001(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione VIPA AT2001"); lastPLCWatchDog = DateTime.Now.AddMinutes(-1); diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensComeca.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensComeca.cs index c50ae98f..1c9f3da0 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensComeca.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensComeca.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensComeca(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensComeca(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione Comeca"); } diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensComur.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensComur.cs index b0368498..41dfd18e 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensComur.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensComur.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensComur(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensComur(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione COMUR"); } diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensCosmap.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensCosmap.cs index a390166f..1b85275a 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensCosmap.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensCosmap.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensCosmap(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensCosmap(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione Cosmap"); } diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs index 63448721..30c8a0d5 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensFape(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensFape(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione FAPE 1.0 - 2018"); } diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs index ebd82abf..5b75b13e 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensFapeV2(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensFapeV2(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { string sFapeVers = getOptPar("FAPE_VERS"); if (!string.IsNullOrEmpty(sFapeVers)) diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensIngenia.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensIngenia.cs index 055843fa..e66c9e94 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensIngenia.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensIngenia.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensIngenia(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensIngenia(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione VIPA INGENIA"); lastPLCWatchDog = DateTime.Now.AddMinutes(-1); diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs index 8e2ccd12..b778886e 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensLasco(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensLasco(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione LASCO"); lastPLCWatchDog = DateTime.Now.AddMinutes(-1); diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensNWSE.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensNWSE.cs index 37d29f46..bb14f12e 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensNWSE.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensNWSE.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensNWSE(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensNWSE(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione NWS"); diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensPressoilCei.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensPressoilCei.cs index 2a767459..880168a8 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensPressoilCei.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensPressoilCei.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensPressoilCei(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensPressoilCei(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione PRESSOIL - CEI"); } diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensRobotService.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensRobotService.cs index f2627d86..00c92c85 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensRobotService.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensRobotService.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensRobotService(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensRobotService(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione RobotService"); diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensSaet.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensSaet.cs index 712c16f6..f1f39da9 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensSaet.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensSaet.cs @@ -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 /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensSaet(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensSaet(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("NEW IOB SIEMENS versione SAET"); lastPLCWatchDog = DateTime.Now.AddMinutes(-1); diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensSimec.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensSimec.cs index 1b437d42..4e4888af 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensSimec.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensSimec.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using System; using System.Collections.Generic; @@ -15,9 +16,10 @@ namespace IOB_WIN_SIEMENS.IobSiemens /// /// Classe base con i metodi x Siemens /// - /// - /// - public SiemensSimec(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensSimec(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { /* -------------------------------------------------------------------------------- * Controlli SIEMENS SIMEC diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs index 86184be6..ac9d7473 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs @@ -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 /// /// estende l'init della classe base con i metodi x Siemens specifici x Torri /// - /// - /// - public SiemensTorri(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SiemensTorri(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { // gestione restart OpcUa client... if (!string.IsNullOrEmpty(getOptPar("ENABLE_ALARM_LEGACY"))) diff --git a/IOB-WIN-SQL/AdapterFormNext.cs b/IOB-WIN-SQL/AdapterFormNext.cs index ae446f83..93dbbaaa 100644 --- a/IOB-WIN-SQL/AdapterFormNext.cs +++ b/IOB-WIN-SQL/AdapterFormNext.cs @@ -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; } diff --git a/IOB-WIN-SQL/Iob/GenericNext.cs b/IOB-WIN-SQL/Iob/GenericNext.cs index 0b55233f..5899e222 100644 --- a/IOB-WIN-SQL/Iob/GenericNext.cs +++ b/IOB-WIN-SQL/Iob/GenericNext.cs @@ -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) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-SQL/Iob/IobFileSoitaab.cs b/IOB-WIN-SQL/Iob/IobFileSoitaab.cs index d998f30e..71143280 100644 --- a/IOB-WIN-SQL/Iob/IobFileSoitaab.cs +++ b/IOB-WIN-SQL/Iob/IobFileSoitaab.cs @@ -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 /// /// Costruttore dell'IOB FileBased SOITAAB /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public IobFileSoitaab(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public IobFileSoitaab(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { DateTime adesso = DateTime.Now; string VetoReadSec = getOptPar("VetoReadSec"); diff --git a/IOB-WIN-SQL/IobSql/IcoelDb.cs b/IOB-WIN-SQL/IobSql/IcoelDb.cs index 43367bc3..1e211d90 100644 --- a/IOB-WIN-SQL/IobSql/IcoelDb.cs +++ b/IOB-WIN-SQL/IobSql/IcoelDb.cs @@ -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 /// /// Costruttore dell'IOB Icoel DB /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public IcoelDb(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public IcoelDb(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { /* -------------------------------------- * todo's diff --git a/IOB-WIN-SQL/IobSql/SqlServLantek.cs b/IOB-WIN-SQL/IobSql/SqlServLantek.cs index 64007b8f..2f345b3e 100644 --- a/IOB-WIN-SQL/IobSql/SqlServLantek.cs +++ b/IOB-WIN-SQL/IobSql/SqlServLantek.cs @@ -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 /// /// Costruttore dell'IOB DB LANTEK /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public SqlServLantek(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SqlServLantek(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { DateTime adesso = DateTime.Now; string SyncStateServ = getOptPar("SyncStateServer"); diff --git a/IOB-WIN-SQL/IobSql/SqlServPama.cs b/IOB-WIN-SQL/IobSql/SqlServPama.cs index ee9abb43..bff4642f 100644 --- a/IOB-WIN-SQL/IobSql/SqlServPama.cs +++ b/IOB-WIN-SQL/IobSql/SqlServPama.cs @@ -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 /// /// Costruttore dell'IOB DB PAMA /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public SqlServPama(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public SqlServPama(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { string SyncStateServ = getOptPar("SyncStateServer"); string SyncStateDb = getOptPar("SyncStateDb"); diff --git a/IOB-WIN-SQL/postBuildTgt.bat b/IOB-WIN-SQL/postBuildTgt.bat index 2a03f9c8..a8fb7e4e 100644 --- a/IOB-WIN-SQL/postBuildTgt.bat +++ b/IOB-WIN-SQL/postBuildTgt.bat @@ -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 diff --git a/IOB-WIN-WPS/AdapterFormNext.cs b/IOB-WIN-WPS/AdapterFormNext.cs index 45315784..dd771d3c 100644 --- a/IOB-WIN-WPS/AdapterFormNext.cs +++ b/IOB-WIN-WPS/AdapterFormNext.cs @@ -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 { /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } /// @@ -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; } diff --git a/IOB-WIN-WPS/Iob/GenericNext.cs b/IOB-WIN-WPS/Iob/GenericNext.cs index 477de0d7..37f9f911 100644 --- a/IOB-WIN-WPS/Iob/GenericNext.cs +++ b/IOB-WIN-WPS/Iob/GenericNext.cs @@ -1,11 +1,18 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; namespace IOB_WIN_WPS.Iob { public class GenericNext : IOB_WIN_FORM.Iob.Generic { - public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-WPS/IobNet/WebPageScrap.cs b/IOB-WIN-WPS/IobNet/WebPageScrap.cs index a7adb5c9..8cdea882 100644 --- a/IOB-WIN-WPS/IobNet/WebPageScrap.cs +++ b/IOB-WIN-WPS/IobNet/WebPageScrap.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using Newtonsoft.Json; using OpenQA.Selenium; @@ -33,9 +34,10 @@ namespace IOB_WIN_WPS.IobNet /// /// Estende l'init della classe base... /// - /// - /// - public WebPageScrap(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public WebPageScrap(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo("INIT IobWPS"); //reloadAdapterConf(); diff --git a/IOB-WIN-WPS/postBuildTgt.bat b/IOB-WIN-WPS/postBuildTgt.bat index d56896d2..d6897a0e 100644 --- a/IOB-WIN-WPS/postBuildTgt.bat +++ b/IOB-WIN-WPS/postBuildTgt.bat @@ -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 diff --git a/IOB-WIN-WS/AdapterFormNext.cs b/IOB-WIN-WS/AdapterFormNext.cs index 955af657..36f2fe1e 100644 --- a/IOB-WIN-WS/AdapterFormNext.cs +++ b/IOB-WIN-WS/AdapterFormNext.cs @@ -8,14 +8,14 @@ using System.Threading.Tasks; namespace IOB_WIN_WS { - public class AdapterFormNext: IOB_WIN_FORM.AdapterForm + public class AdapterFormNext : IOB_WIN_FORM.AdapterForm { /// /// Avvio MainForm /// /// - public AdapterFormNext(string codIOB): base(codIOB) + public AdapterFormNext(string codIOB) : base(codIOB) { } /// @@ -29,29 +29,29 @@ namespace IOB_WIN_WS { case tipoAdapter.IcoelSoap: - iobObj = new IobWs.IcoelSoap(this, IOBConf); + iobObj = new IobWs.IcoelSoap(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.REST: - iobObj = new IobWs.RestBase(this, IOBConf); + iobObj = new IobWs.RestBase(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.REST_CITIZEN: - iobObj = new IobWs.Citizen(this, IOBConf); + iobObj = new IobWs.Citizen(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.SOAP_GOMBA: - iobObj = new IobWs.Gomba(this, IOBConf); + iobObj = new IobWs.Gomba(this, IOBConf, IOBConfFull); btnStart.Enabled = true; break; case tipoAdapter.SIMULA: case tipoAdapter.ND: default: - iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf); + iobObj = new IOB_WIN_FORM.Iob.Simula(this, IOBConf, IOBConfFull); btnStart.Enabled = false; break; } diff --git a/IOB-WIN-WS/Iob/GenericNext.cs b/IOB-WIN-WS/Iob/GenericNext.cs index ae14193c..a3fb5265 100644 --- a/IOB-WIN-WS/Iob/GenericNext.cs +++ b/IOB-WIN-WS/Iob/GenericNext.cs @@ -1,11 +1,17 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; namespace IOB_WIN_WS.Iob { public class GenericNext : IOB_WIN_FORM.Iob.Generic { - - public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf): base((IOB_WIN_FORM.AdapterForm)caller, IOBConf) + /// + /// Adapter generico del progetto IOB specifico + /// + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public GenericNext(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base((IOB_WIN_FORM.AdapterForm)caller, IOBConf, IobConfFull) { } diff --git a/IOB-WIN-WS/IobWs/Citizen.cs b/IOB-WIN-WS/IobWs/Citizen.cs index 079e0651..7629e160 100644 --- a/IOB-WIN-WS/IobWs/Citizen.cs +++ b/IOB-WIN-WS/IobWs/Citizen.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using Newtonsoft.Json; using System; @@ -22,9 +23,10 @@ namespace IOB_WIN_WS.IobWs /// /// Costruttore dell'IOB SOAP della bilancia RestCitizen /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public Citizen(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Citizen(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo($"Richiesto Adapter IobRest.RestCitizen con i parametri seguenti | ADDR: {IOBConf.cncIpAddr} | PORT: {IOBConf.cncPort}"); lastPING = DateTime.Now.AddHours(-1); diff --git a/IOB-WIN-WS/IobWs/Gomba.cs b/IOB-WIN-WS/IobWs/Gomba.cs index 1e0f6427..1d11286d 100644 --- a/IOB-WIN-WS/IobWs/Gomba.cs +++ b/IOB-WIN-WS/IobWs/Gomba.cs @@ -1,5 +1,6 @@ using EgwProxy.Gomba.GombaServ; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using Newtonsoft.Json; using System; @@ -21,9 +22,10 @@ namespace IOB_WIN_WS.IobWs /// /// Costruttore dell'IOB SOAP della bilancia GOMBA /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public Gomba(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public Gomba(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo($"Richiesto Adapter IobSoap.Gomba con i parametri seguenti | ADDR: {IOBConf.cncIpAddr} | PORT: {IOBConf.cncPort}"); redKeyPesate = redisMan.redHash($"IOB:Status:{cIobConf.codIOB}:ListPesate"); diff --git a/IOB-WIN-WS/IobWs/IcoelSoap.cs b/IOB-WIN-WS/IobWs/IcoelSoap.cs index a741aa40..729aedf8 100644 --- a/IOB-WIN-WS/IobWs/IcoelSoap.cs +++ b/IOB-WIN-WS/IobWs/IcoelSoap.cs @@ -1,6 +1,7 @@ using EgwProxy.Icoel; using EgwProxy.Icoel.SizerService; using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using System; using System.Collections.Generic; @@ -18,9 +19,10 @@ namespace IOB_WIN_WS.IobWs /// /// Costruttore dell'IOB Icoel SOAP /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public IcoelSoap(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public IcoelSoap(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { /* -------------------------------------- * todo's diff --git a/IOB-WIN-WS/IobWs/RestBase.cs b/IOB-WIN-WS/IobWs/RestBase.cs index d6cff91a..0fa7f6a7 100644 --- a/IOB-WIN-WS/IobWs/RestBase.cs +++ b/IOB-WIN-WS/IobWs/RestBase.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT; +using IOB_UT_NEXT.Config; using MapoSDK; using Newtonsoft.Json; using RestSharp; @@ -21,9 +22,10 @@ namespace IOB_WIN_WS.IobWs /// /// Costruttore dell'IOB Rest generico /// - /// AdapterForm chiamante - /// Configurazione IOB per avvio - public RestBase(AdapterFormNext caller, IobConfiguration IOBConf) : base(caller, IOBConf) + /// Form chiamante + /// Configurazione (legacy) + /// Configurazione (v 4.x) + public RestBase(AdapterFormNext caller, IobConfiguration IOBConf, IobConfTree IobConfFull) : base(caller, IOBConf, IobConfFull) { lgInfo($"Richiesto Adapter IobRest.Base con i parametri seguenti | ADDR: {IOBConf.cncIpAddr} | PORT: {IOBConf.cncPort}"); lastPING = DateTime.Now.AddHours(-1);