From f009dbef37c49e61b2d249a87becaaa792289a59 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Jul 2022 15:29:57 +0200
Subject: [PATCH] IOB-WIN-NEXT: - Refresh frequenza update lastPLC - refreh MAN

---
 IOB-UT-NEXT/IobWinStatus.cs  | 4 ++--
 IOB-UT-NEXT/RedisMan.cs      | 1 -
 IOB-WIN-NEXT/IobIcoelDb.cs   | 2 ++
 IOB-WIN-NEXT/IobModbusTCP.cs | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IOB-UT-NEXT/IobWinStatus.cs b/IOB-UT-NEXT/IobWinStatus.cs
index 2422f53b..26c25532 100644
--- a/IOB-UT-NEXT/IobWinStatus.cs
+++ b/IOB-UT-NEXT/IobWinStatus.cs
@@ -124,13 +124,13 @@ namespace IOB_UT_NEXT
             // controllo se sia ALMENO 1 sec...
             if (lastDataIn != item.lastDataIn)
             {
-                if (lastDataIn.Subtract(item.lastDataIn).TotalSeconds > 1)
+                if (lastDataIn.Subtract(item.lastDataIn).TotalMilliseconds > 100)
                     return false;
             }
             // controllo se sia ALMENO 1 sec...
             if (lastDataOut != item.lastDataOut)
             {
-                if (lastDataOut.Subtract(item.lastDataOut).TotalSeconds > 1)
+                if (lastDataOut.Subtract(item.lastDataOut).TotalMilliseconds > 100)
                     return false;
             }
             if (semIn != item.semIn)
diff --git a/IOB-UT-NEXT/RedisMan.cs b/IOB-UT-NEXT/RedisMan.cs
index 0de3697f..5131e261 100644
--- a/IOB-UT-NEXT/RedisMan.cs
+++ b/IOB-UT-NEXT/RedisMan.cs
@@ -169,7 +169,6 @@ namespace IOB_UT_NEXT
             {
                 string rawData = JsonConvert.SerializeObject(value);
                 saveAndSendMessage(redIobKey, redIobChannel, rawData);
-                //setRSV(redIobKey, rawData);
             }
         }
 
diff --git a/IOB-WIN-NEXT/IobIcoelDb.cs b/IOB-WIN-NEXT/IobIcoelDb.cs
index 7508a23b..3276646d 100644
--- a/IOB-WIN-NEXT/IobIcoelDb.cs
+++ b/IOB-WIN-NEXT/IobIcoelDb.cs
@@ -211,6 +211,7 @@ namespace IOB_WIN_NEXT
                                 if (adpRunning)
                                 {
                                     lgInfo("Connessione OK");
+                                    lastReadPLC = DateTime.Now;
                                 }
                             }
                             else
@@ -269,6 +270,7 @@ namespace IOB_WIN_NEXT
             sw.Start();
             elencoSyncState = dbProxy.DataController.SyncStateDoImportAll();
             sw.Stop();
+            lastReadPLC = DateTime.Now;
             lgInfo($"DB: esecuzione task dbProxy.DataController.SyncStateGetAll() in {sw.ElapsedMilliseconds} ms");
 
             if (elencoSyncState != null)
diff --git a/IOB-WIN-NEXT/IobModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP.cs
index 847af4ae..b18082c4 100644
--- a/IOB-WIN-NEXT/IobModbusTCP.cs
+++ b/IOB-WIN-NEXT/IobModbusTCP.cs
@@ -1451,6 +1451,7 @@ namespace IOB_WIN_NEXT
                     rawData = currPLC.ReadHoldingRegisters(startAddr - baseAddr, numReg);
                     stopwatch.Stop();
                     lgTrace($"Lettura in blocco HoldingRegisters| startAddr: {startAddr} | numReg {numReg} | rawData.lenght: {rawData.Length} | {stopwatch.ElapsedMilliseconds}ms");
+                    lastReadPLC = DateTime.Now;
                     // salvo in LUT la versione ESPLOSA 2 byte alla volta...
                     if (rawData.Length > 0)
                     {
@@ -1478,7 +1479,6 @@ namespace IOB_WIN_NEXT
                                 lgError($"Impossibile copiare dati, array di origine troppo corto: rawData.lenght: {rawData.Length} | base addr richiesto i*2: {i * 2} | errori currReadErrors: {currReadErrors}");
                             }
                         }
-                        lastReadPLC = DateTime.Now;
                     }
                 }
                 catch (Exception exc)