From bd1d95112be2f52e76126bfe0b8fbc2ab4d2f27c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 23 May 2026 21:31:59 +0200 Subject: [PATCH] Ancora spostamento variabili dateTime in helper --- IOB-UT-NEXT/Iob/BaseObj.cs | 15 ----- IOB-UT-NEXT/Iob/DateTimeHelper.cs | 66 +++++++++++++++------ IOB-WIN-FORM/AdapterForm.cs | 2 +- IOB-WIN-FORM/Iob/Generic.cs | 16 ++--- IOB-WIN-FORM/Iob/PingWatchDog.cs | 4 +- IOB-WIN-FORM/Iob/Simula.cs | 34 +++-------- IOB-WIN-FTP/Iob/Ftp.cs | 4 +- IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs | 2 +- IOB-WIN-OPC-UA/IobOpc/OpcUa.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensSW.cs | 4 +- IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs | 4 +- IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs | 4 +- IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs | 4 +- IOB-WIN/IobGeneric.cs | 20 ++----- IOB-WIN/IobSimula.cs | 19 +++--- 21 files changed, 106 insertions(+), 120 deletions(-) diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs index 56cecc0a..961a815a 100644 --- a/IOB-UT-NEXT/Iob/BaseObj.cs +++ b/IOB-UT-NEXT/Iob/BaseObj.cs @@ -129,21 +129,6 @@ namespace IOB_UT_NEXT.Iob /// public string lastSignInVal = ""; - /// - /// DateTime Ultimo valore simulazione generato - /// - public DateTime lastSim; - - /// - /// dataOra ultimo segnale inviato al SERVER... - /// - public DateTime lastWatchDog; - - /// - /// dataOra ultimo segnale inviato a macchina/PLC... - /// - public DateTime lastWatchDogPLC = DateTime.Now; - /// /// Massimo numero di px da inviare in blocco /// diff --git a/IOB-UT-NEXT/Iob/DateTimeHelper.cs b/IOB-UT-NEXT/Iob/DateTimeHelper.cs index 55cfebe5..4b3198af 100644 --- a/IOB-UT-NEXT/Iob/DateTimeHelper.cs +++ b/IOB-UT-NEXT/Iob/DateTimeHelper.cs @@ -11,32 +11,23 @@ namespace IOB_UT_NEXT.Iob /// public class DateTimeHelper { + #region Public Fields /// /// Data/ora ultimo avvio adapter /// public DateTime AvvioAdp = DateTime.Now; - /// - /// Data/ora ultimo spegnimento adapter - /// - public DateTime StopAdp = DateTime.Now; - - /// - /// Indicazione VETO check status IOB x evitare loop troppo stretti... - /// - public DateTime VetoCheckIOB = DateTime.Now.AddDays(-1); - - /// - /// Indicazione VETO check sync ricette x evitare loop troppo stretti... - /// - public DateTime VetoCheckSyncRecipe = DateTime.Now.AddHours(-1); - /// /// dataOra ultima verifica CNC disconnesso... /// public DateTime lastDisconnCheck; + /// + /// ultimo controllo decremento eventi + /// + public DateTime lastEvCheck; + /// /// Data/ora ultima volta che IOB è stato dichiarato online /// @@ -57,7 +48,6 @@ namespace IOB_UT_NEXT.Iob /// public DateTime lastPING = DateTime.Now.AddHours(-1); - /// /// Ultimo controllo ping x evitare ping flood... /// @@ -67,5 +57,47 @@ namespace IOB_UT_NEXT.Iob /// DataOra ultima lettura da PLC /// public DateTime lastReadPLC; + + /// + /// Ultimo istante in cui sono stati ridotti dati simulazione duration + /// + public DateTime lastRedDuration; + + /// + /// DateTime Ultimo valore simulazione generato + /// + public DateTime lastSim; + + /// + /// Ultimo istante in cui sono stati generati dati di simulazione + /// + public DateTime lastSimData; + + /// + /// dataOra ultimo segnale inviato al SERVER... + /// + public DateTime lastWatchDog; + + /// + /// dataOra ultimo segnale inviato a macchina/PLC... + /// + public DateTime lastWatchDogPLC = DateTime.Now; + + /// + /// Data/ora ultimo spegnimento adapter + /// + public DateTime StopAdp = DateTime.Now; + + /// + /// Indicazione VETO check status IOB x evitare loop troppo stretti... + /// + public DateTime VetoCheckIOB = DateTime.Now.AddDays(-1); + + /// + /// Indicazione VETO check sync ricette x evitare loop troppo stretti... + /// + public DateTime VetoCheckSyncRecipe = DateTime.Now.AddHours(-1); + + #endregion Public Fields } -} +} \ No newline at end of file diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs index e3f11db7..ed23e1f1 100644 --- a/IOB-WIN-FORM/AdapterForm.cs +++ b/IOB-WIN-FORM/AdapterForm.cs @@ -2167,7 +2167,7 @@ namespace IOB_WIN_FORM queueUlLen = ulQueueLen, counterIOB = iobObj.contapezziIOB, counterMAC = iobObj.contapezziPLC, - lastUpdate = lastIobStatus.lastUpdate > iobObj.lastWatchDog ? lastIobStatus.lastUpdate : iobObj.lastWatchDog, + lastUpdate = lastIobStatus.lastUpdate > iobObj.DtHelp.lastWatchDog ? lastIobStatus.lastUpdate : iobObj.DtHelp.lastWatchDog, online = utils.IOB_Online, lastDataIn = iobObj.DtHelp.lastReadPLC, lastDataOut = iobObj.DtHelp.lastIobOnline, diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index b4780ffc..ccfc53be 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -3197,7 +3197,7 @@ namespace IOB_WIN_FORM.Iob // riporto cosa inviato currDispData.newUrlCallData = lastUrl; // aggiorno data ultimo watchdog... - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } catch { @@ -3288,7 +3288,7 @@ namespace IOB_WIN_FORM.Iob nSendOut++; currDispData.newUrlCallData = lastUrl; // aggiorno data ultimo watchdog... - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } catch { @@ -3361,7 +3361,7 @@ namespace IOB_WIN_FORM.Iob parentForm.commPlcActive = false; adpRunning = true; DtHelp.AvvioAdp = adesso; - lastWatchDog = scaduto; + DtHelp.lastWatchDog = scaduto; DtHelp.lastPING = scaduto; DtHelp.lastReadPLC = scaduto; DtHelp.lastDisconnCheck = scaduto; @@ -9220,7 +9220,7 @@ namespace IOB_WIN_FORM.Iob { bool sendOnMachineOff = false; // controllo se è passato oltre watchdog e non ho inviato nulla --> RE-INVIO (ultimo inviato)!!!! - if (DateTime.Now.Subtract(lastWatchDog).TotalSeconds > IOBConfFull.General.WatchDogSec) + if (DateTime.Now.Subtract(DtHelp.lastWatchDog).TotalSeconds > IOBConfFull.General.WatchDogSec) { string wdStatus = "elapsed"; string sVal = string.Format("[WDST]{0}", wdStatus); @@ -9234,7 +9234,7 @@ namespace IOB_WIN_FORM.Iob trackDynData("WDST", wdStatus); } } - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; sendOnMachineOff = true; lgInfo("Impostato sendOnMachineOff a true"); } @@ -9266,7 +9266,7 @@ namespace IOB_WIN_FORM.Iob listaValori.Add(currVal); } await sendDataBlock(urlType.FLog, listaValori); - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } else { @@ -9277,7 +9277,7 @@ namespace IOB_WIN_FORM.Iob // svuoto! NO redis QueueFLog = new DataQueue(IOBConfFull.General.FilenameIOB, "QueueFLog", false, redisMan); //QueueFLog = new DataQueue(IOBConfFull.General.FilenameIOB, "QueueFLog", IOBConfFull.General.EnabRedisQue, redisMan); - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } } else @@ -9285,7 +9285,7 @@ namespace IOB_WIN_FORM.Iob // INVIO SINGOLO...!!! QueueFLog.TryDequeue(out currVal); await sendToMoonPro(urlType.FLog, currVal); - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } } else diff --git a/IOB-WIN-FORM/Iob/PingWatchDog.cs b/IOB-WIN-FORM/Iob/PingWatchDog.cs index 45d4b268..1595b91a 100644 --- a/IOB-WIN-FORM/Iob/PingWatchDog.cs +++ b/IOB-WIN-FORM/Iob/PingWatchDog.cs @@ -121,7 +121,7 @@ namespace IOB_WIN_FORM.Iob { connectionOk = true; DtHelp.lastReadPLC = DateTime.Now; - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } else { @@ -157,7 +157,7 @@ namespace IOB_WIN_FORM.Iob base.startAdapter(resetQueue); // 2023.09.05 imposto anche primo ping e check disconnected... DateTime adesso = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; DtHelp.lastReadPLC = adesso; DtHelp.lastDisconnCheck = adesso; // faccio un primo check POST ritardo diff --git a/IOB-WIN-FORM/Iob/Simula.cs b/IOB-WIN-FORM/Iob/Simula.cs index 6f54a321..6b086426 100644 --- a/IOB-WIN-FORM/Iob/Simula.cs +++ b/IOB-WIN-FORM/Iob/Simula.cs @@ -73,9 +73,9 @@ namespace IOB_WIN_FORM.Iob DateTime adesso = DateTime.Now; lastPzCountSend = adesso; lastWarnODL = adesso; - lastEvCheck = adesso; - lastSimData = adesso; - lastRedDuration = adesso; + DtHelp.lastEvCheck = adesso; + DtHelp.lastSimData = adesso; + DtHelp.lastRedDuration = adesso; // abilito subito scrittura coda IN queueInEnabCurr = true; // setup allarmi simulati @@ -151,7 +151,6 @@ namespace IOB_WIN_FORM.Iob } } - #endregion Public Constructors #region Public Methods @@ -378,7 +377,7 @@ namespace IOB_WIN_FORM.Iob // valore non presente in vers default... se gestito fare override Dictionary outVal = new Dictionary(); // verificare periodo SIM parametri... se passato li invio altrimenti NO... FIX a 20 sec - if (lastSimData.AddSeconds(waitSimPar) < DateTime.Now && memMap != null) + if (DtHelp.lastSimData.AddSeconds(waitSimPar) < DateTime.Now && memMap != null) { Random rnd = new Random(); // controllo conf memorie json (se ci sono...) @@ -460,7 +459,7 @@ namespace IOB_WIN_FORM.Iob } catch { } - lastSimData = DateTime.Now; + DtHelp.lastSimData = DateTime.Now; } return outVal; } @@ -549,7 +548,7 @@ namespace IOB_WIN_FORM.Iob /// public override void processVHF() { - if (lastEvCheck.AddMilliseconds(periodoMSec) < DateTime.Now) + if (DtHelp.lastEvCheck.AddMilliseconds(periodoMSec) < DateTime.Now) { // decremento contatore ultimo evento if (bit2 != null) @@ -572,7 +571,7 @@ namespace IOB_WIN_FORM.Iob if (simRS != null) simRS.wait--; - lastEvCheck = DateTime.Now; + DtHelp.lastEvCheck = DateTime.Now; } } @@ -768,21 +767,6 @@ namespace IOB_WIN_FORM.Iob protected bool disableSimStatus = false; - /// - /// ultimo controllo decremento eventi - /// - protected DateTime lastEvCheck; - - /// - /// Ultimo istante in cui sono stati ridotti dati simulazione duration - /// - protected DateTime lastRedDuration; - - /// - /// Ultimo istante in cui sono stati generati dati di simulazione - /// - protected DateTime lastSimData; - /// /// Cartella logfile x test import (tipo Soitaab) /// @@ -1036,7 +1020,7 @@ namespace IOB_WIN_FORM.Iob /// protected void tryRedDuration(int bit2proc) { - if (lastRedDuration.AddMilliseconds(periodoMSec / 20) < DateTime.Now) + if (DtHelp.lastRedDuration.AddMilliseconds(periodoMSec / 20) < DateTime.Now) { switch (bit2proc) { @@ -1067,7 +1051,7 @@ namespace IOB_WIN_FORM.Iob default: break; } - lastRedDuration = DateTime.Now; + DtHelp.lastRedDuration = DateTime.Now; } } diff --git a/IOB-WIN-FTP/Iob/Ftp.cs b/IOB-WIN-FTP/Iob/Ftp.cs index e3fce130..d3b96925 100644 --- a/IOB-WIN-FTP/Iob/Ftp.cs +++ b/IOB-WIN-FTP/Iob/Ftp.cs @@ -413,7 +413,7 @@ namespace IOB_WIN_FTP.Iob } DtHelp.lastReadPLC = adesso; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; } else { @@ -444,7 +444,7 @@ namespace IOB_WIN_FTP.Iob base.startAdapter(resetQueue); // 2023.09.05 imposto anche primo ping e check disconnected... DateTime adesso = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; //DtHelp.lastPING = adesso; DtHelp.lastReadPLC = adesso; DtHelp.lastDisconnCheck = adesso; diff --git a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs index 287f0554..6805f1a0 100644 --- a/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs +++ b/IOB-WIN-MBUS/IobModbustTCP/ModbusTCPFrer.cs @@ -87,7 +87,7 @@ namespace IOB_WIN_MBUS.IobModbusTCP B_input = 0; } DtHelp.lastReadPLC = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; } diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs index 60ab4abc..54a04200 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs @@ -1636,9 +1636,9 @@ namespace IOB_WIN_OPC_UA.IobOpc if (opcUaParams.WatchDog.IsEnabled) { lgTrace("WatchDog 01"); - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs index d66471a4..3b0e50ea 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaEwon.cs @@ -143,9 +143,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs index 0e202dae..0687e89f 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaImas.cs @@ -147,9 +147,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs index 37739e83..0a5c1868 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpw.cs @@ -137,9 +137,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs index 2349a0c1..29e09d15 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBH.cs @@ -147,9 +147,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs index 47bed9d1..a1025ffe 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaOmron.cs @@ -144,9 +144,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs index 1203447e..565c89a5 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs @@ -360,9 +360,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensSW.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensSW.cs index 99a1fd2e..3408b26b 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensSW.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensSW.cs @@ -160,9 +160,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs index 5feb1303..df0d7a0a 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaUlma.cs @@ -146,9 +146,9 @@ namespace IOB_WIN_OPC_UA.IobOpc // se abilitato watchdog... if (opcUaParams.WatchDog.IsEnabled) { - if (adesso.Subtract(lastWatchDogPLC).TotalSeconds > 2) + if (adesso.Subtract(DtHelp.lastWatchDogPLC).TotalSeconds > 2) { - lastWatchDogPLC = adesso; + DtHelp.lastWatchDogPLC = adesso; WatchDog++; WatchDog = WatchDog > opcUaParams.WatchDog.MaxVal ? 0 : WatchDog; diff --git a/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs b/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs index 4776ea7f..ed52a548 100644 --- a/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs +++ b/IOB-WIN-SHELLY/Iob/ShellyClientGen1.cs @@ -160,7 +160,7 @@ namespace IOB_WIN_SHELLY.Iob B_input = 0; } DtHelp.lastReadPLC = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; } public override void startAdapter(bool resetQueue) @@ -168,7 +168,7 @@ namespace IOB_WIN_SHELLY.Iob base.startAdapter(resetQueue); // 2023.09.05 imposto anche primo ping e check disconnected... DateTime adesso = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; //DtHelp.lastPING = adesso; DtHelp.lastReadPLC = adesso; DtHelp.lastDisconnCheck = adesso; diff --git a/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs b/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs index a475ba4b..4be5341a 100644 --- a/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs +++ b/IOB-WIN-SHELLY/Iob/ShellyClientGen2.cs @@ -235,7 +235,7 @@ namespace IOB_WIN_SHELLY.Iob B_input = 0; } DtHelp.lastReadPLC = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; } public override void startAdapter(bool resetQueue) @@ -243,7 +243,7 @@ namespace IOB_WIN_SHELLY.Iob base.startAdapter(resetQueue); // 2023.09.05 imposto anche primo ping e check disconnected... DateTime adesso = DateTime.Now; - lastWatchDog = adesso; + DtHelp.lastWatchDog = adesso; //DtHelp.lastPING = adesso; DtHelp.lastReadPLC = adesso; DtHelp.lastDisconnCheck = adesso; diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 3c307a5a..f11f9415 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -249,16 +249,6 @@ namespace IOB_WIN /// public string lastSignInVal = ""; - /// - /// DateTime Ultimo valore simulazione generato - /// - public DateTime lastSim; - - /// - /// dataOra ultimo segnale inviato... - /// - public DateTime lastWatchDog; - /// /// Massimo numero di px da inviare in blocco /// @@ -1832,13 +1822,13 @@ namespace IOB_WIN private void svuotaCodaFLog() { //controllo se è passato oltre watchdog e non ho inviato nulla --> RE-INVIO (ultimo inviato)!!!! - if (DateTime.Now.Subtract(lastWatchDog).TotalSeconds > utils.CRI("watchdogMaxSec")) + if (DateTime.Now.Subtract(DtHelp.lastWatchDog).TotalSeconds > utils.CRI("watchdogMaxSec")) { string wdStatus = "elapsed"; string sVal = string.Format("[WDST]{0}", wdStatus); // chiamo accodamento... accodaFLog(sVal, qEncodeFLog("WDST", wdStatus)); - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } // verifico SE la coda abbia dei valori... if (QueueFLog.Count > 0) @@ -4295,7 +4285,7 @@ namespace IOB_WIN // riporto cosa inviato currDispData.newUrlCallData = lastUrl; // aggiorno data ultimo watchdog... - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } catch { @@ -4384,7 +4374,7 @@ namespace IOB_WIN #endif currDispData.newUrlCallData = lastUrl; // aggiorno data ultimo watchdog... - lastWatchDog = DateTime.Now; + DtHelp.lastWatchDog = DateTime.Now; } catch { @@ -4437,7 +4427,7 @@ namespace IOB_WIN parentForm.commPlcActive = false; adpRunning = true; DtHelp.AvvioAdp = DateTime.Now; - lastWatchDog = DtHelp.AvvioAdp; + DtHelp.lastWatchDog = DtHelp.AvvioAdp; DtHelp.lastPING = DtHelp.AvvioAdp; DtHelp.lastReadPLC = DtHelp.AvvioAdp.AddMinutes(-1); DtHelp.lastDisconnCheck = DtHelp.AvvioAdp; diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs index dfd82792..f0ff7617 100644 --- a/IOB-WIN/IobSimula.cs +++ b/IOB-WIN/IobSimula.cs @@ -47,12 +47,7 @@ namespace IOB_WIN /// /// ultimo controllo decremento eventi /// - protected DateTime lastEvCheck; - - /// - /// Ultimo istante in cui sono stati generati dati di simulazione - /// - protected DateTime lastSimData; + protected DateTime DtHelp.lastEvCheck; /// /// Durata minima ODL x reset quando pezzi iob > pezzi macchina... @@ -114,8 +109,8 @@ namespace IOB_WIN DateTime adesso = DateTime.Now; lastPzCountSend = adesso; lastWarnODL = adesso; - lastEvCheck = adesso; - lastSimData = adesso; + DtHelp.lastEvCheck = adesso; + DtHelp.lastSimData = adesso; // sistemo parametri x simulazione... if (cIobConf.optPar.Count > 0) { @@ -642,7 +637,7 @@ namespace IOB_WIN // valore non presente in vers default... se gestito fare override Dictionary outVal = new Dictionary(); // verificare periodo SIM parametri... se passato li invio altrimenti NO... FIX a 20 sec - if (lastSimData.AddSeconds(waitSimPar) < DateTime.Now) + if (DtHelp.lastSimData.AddSeconds(waitSimPar) < DateTime.Now) { Random rnd = new Random(); // controllo conf memorie json (se ci sono...) @@ -667,7 +662,7 @@ namespace IOB_WIN } catch { } - lastSimData = DateTime.Now; + DtHelp.lastSimData = DateTime.Now; } return outVal; } @@ -706,14 +701,14 @@ namespace IOB_WIN /// public override void processVHF() { - if (lastEvCheck.AddMilliseconds(periodoMSec) < DateTime.Now) + if (DtHelp.lastEvCheck.AddMilliseconds(periodoMSec) < DateTime.Now) { // decremento contatore ultimo evento bit2.wait--; bit3.wait--; bit4.wait--; bit5.wait--; - lastEvCheck = DateTime.Now; + DtHelp.lastEvCheck = DateTime.Now; } }