diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs
index 07fe90b1..5c480e94 100644
--- a/IOB-UT-NEXT/Iob/BaseObj.cs
+++ b/IOB-UT-NEXT/Iob/BaseObj.cs
@@ -203,7 +203,7 @@ namespace IOB_UT_NEXT.Iob
///
/// Coda degli esiti di ping x calcolo stato macchina
///
- public DataQueue PingQueue;
+ public DataQueue QueuePing;
///
/// Determina se utilizzare blocchi di memoria IOT contigui (e quindi processing
@@ -636,7 +636,7 @@ namespace IOB_UT_NEXT.Iob
QueueMessages = new DataQueue(codIob, "QueueMessages", false, redisMan);
QueueRawTransf = new DataQueue(codIob, "QueueRawTransf", false, redisMan);
QueueULog = new DataQueue(codIob, "QueueULog", false, redisMan);
- PingQueue = new DataQueue(codIob, "PingQueue", false, redisMan);
+ QueuePing = new DataQueue(codIob, "QueuePing", false, redisMan);
}
#endregion Protected Methods
diff --git a/IOB-WIN-FORM/Iob/Generic.Protected.cs b/IOB-WIN-FORM/Iob/Generic.Protected.cs
index 62cdcdd8..4ef98cfc 100644
--- a/IOB-WIN-FORM/Iob/Generic.Protected.cs
+++ b/IOB-WIN-FORM/Iob/Generic.Protected.cs
@@ -5158,7 +5158,7 @@ namespace IOB_WIN_FORM.Iob
QueueMessages = new DataQueue(codIob, "QueueMessages", false, redisMan);
QueueRawTransf = new DataQueue(codIob, "QueueRawTransf", false, redisMan);
QueueULog = new DataQueue(codIob, "QueueULog", false, redisMan);
- PingQueue = new DataQueue(codIob, "PingQueue", false, redisMan);
+ QueuePing = new DataQueue(codIob, "QueuePing", false, redisMan);
}
// imposto contatori blink a zero...
i_counters = new int[32];
diff --git a/IOB-WIN-FORM/Iob/PingWatchDog.cs b/IOB-WIN-FORM/Iob/PingWatchDog.cs
index bb40ac23..18b890fe 100644
--- a/IOB-WIN-FORM/Iob/PingWatchDog.cs
+++ b/IOB-WIN-FORM/Iob/PingWatchDog.cs
@@ -40,7 +40,7 @@ namespace IOB_WIN_FORM.Iob
bInOn = IOBConfFull.Special.PingConf.B_PowerOn;
vetoCheckSec = IOBConfFull.Special.PingConf.VetoCheckSec;
// fix coda ping
- PingQueue = new DataQueue(IOBConfFull.General.FilenameIOB, "PingQueue", false, redisMan);
+ QueuePing = new DataQueue(IOBConfFull.General.FilenameIOB, "QueuePing", false, redisMan);
lgDebug($"L'adapter effettuera' PING di controllo all'indirizzo {IOBConfFull.Device.Connect.IpAddr} per forzare stato poweroff dopo {PoweroffTimeoutSec} sec");
}
@@ -82,7 +82,7 @@ namespace IOB_WIN_FORM.Iob
sw.Start();
byte[] MemBlock = new byte[2];
// faccio comunque ping se non ne ho collezionati a sufficienza...
- if (PingQueue.Count < maxQueuePing)
+ if (QueuePing.Count < maxQueuePing)
{
// in primis salvo data ping comunque...
lastPING = DateTime.Now;
@@ -159,7 +159,7 @@ namespace IOB_WIN_FORM.Iob
if (!connectionOk)
{
//// resetto coda...
- //PingQueue = new DataQueue("000", "PingQueue", false);
+ //QueuePing = new DataQueue("000", "QueuePing", false);
// controllo che il ping sia stato tentato almeno pingTestSec fa...
if (DateTime.Now.Subtract(lastPING).TotalSeconds > utils.CRI("pingTestSec"))
{
@@ -169,7 +169,7 @@ namespace IOB_WIN_FORM.Iob
}
lgDebug("PING: tryConnect step 04");
- lgDebug("PING: Reset PingQueue");
+ lgDebug("PING: Reset QueuePing");
Stopwatch sw = new Stopwatch();
sw.Start();
@@ -228,14 +228,14 @@ namespace IOB_WIN_FORM.Iob
if (B_input == 0 && pingOk)
{
B_input = 1;
- PingQueue = new DataQueue(IOBConfFull.General.FilenameIOB, "PingQueue", false, redisMan);
- lgTrace($"PingQueue resetted on addTest");
+ QueuePing = new DataQueue(IOBConfFull.General.FilenameIOB, "QueuePing", false, redisMan);
+ lgTrace($"QueuePing resetted on addTest");
}
- PingQueue.Enqueue($"{score}");
- while (PingQueue.Count > maxQueuePing)
+ QueuePing.Enqueue($"{score}");
+ while (QueuePing.Count > maxQueuePing)
{
string res = "";
- PingQueue.TryDequeue(out res);
+ QueuePing.TryDequeue(out res);
}
}
@@ -248,10 +248,10 @@ namespace IOB_WIN_FORM.Iob
protected bool pingStatusOk()
{
bool answ = true;
- long numVal = PingQueue.Count;
+ long numVal = QueuePing.Count;
if (numVal > maxQueuePing / 2)
{
- var listaValori = PingQueue.ToList();
+ var listaValori = QueuePing.ToList();
long numOk = listaValori.Where(x => x == "1").Count();
long numKo = numVal - numOk;
answ = numOk >= numKo;
diff --git a/IOB-WIN-FTP/DATA/CONF/MAIN.ini b/IOB-WIN-FTP/DATA/CONF/MAIN.ini
index 2cb4f81c..ebc0bef6 100644
--- a/IOB-WIN-FTP/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-FTP/DATA/CONF/MAIN.ini
@@ -20,4 +20,3 @@ CLI_INST=SteamWareSim
STARTLIST=FTP_SONATEST
MAXCNC=10
-
diff --git a/IOB-WIN-FTP/Iob/Ftp.cs b/IOB-WIN-FTP/Iob/Ftp.cs
index 26ae1825..cb1297c8 100644
--- a/IOB-WIN-FTP/Iob/Ftp.cs
+++ b/IOB-WIN-FTP/Iob/Ftp.cs
@@ -452,7 +452,7 @@ namespace IOB_WIN_FTP.Iob
if (!connectionOk)
{
//// resetto coda...
- //PingQueue = new DataQueue("000", "PingQueue", false);
+ //QueuePing = new DataQueue("000", "QueuePing", false);
// controllo che il ping sia stato tentato almeno pingTestSec fa...
if (DateTime.Now.Subtract(lastPING).TotalSeconds > vetoPingSec)
{
@@ -462,7 +462,7 @@ namespace IOB_WIN_FTP.Iob
}
lgDebug("FTP: tryConnect step 04");
- lgDebug("FTP: Reset PingQueue");
+ lgDebug("FTP: Reset QueuePing");
bool pingOK = testPingMachine == IPStatus.Success;
addTest(pingOK);
@@ -638,14 +638,14 @@ namespace IOB_WIN_FTP.Iob
if (B_input == 0 && pingOk)
{
B_input = 1;
- PingQueue = new DataQueue(IOBConfFull.General.FilenameIOB, "PingQueue", false, redisMan);
- lgTrace($"PingQueue resetted on addTest");
+ QueuePing = new DataQueue(IOBConfFull.General.FilenameIOB, "QueuePing", false, redisMan);
+ lgTrace($"QueuePing resetted on addTest");
}
- PingQueue.Enqueue($"{score}");
- while (PingQueue.Count > maxQueuePing)
+ QueuePing.Enqueue($"{score}");
+ while (QueuePing.Count > maxQueuePing)
{
string res = "";
- PingQueue.TryDequeue(out res);
+ QueuePing.TryDequeue(out res);
}
}
@@ -935,10 +935,10 @@ namespace IOB_WIN_FTP.Iob
private bool pingStatusOk()
{
bool answ = false;
- long numVal = PingQueue.Count;
+ long numVal = QueuePing.Count;
if (numVal > maxQueuePing / 2)
{
- var listaValori = PingQueue.ToList();
+ var listaValori = QueuePing.ToList();
long numOk = listaValori.Where(x => x == "1").Count();
long numKo = numVal - numOk;
answ = numOk >= numKo;
diff --git a/IOB-WIN-MTC/DATA/CONF/MAIN.ini b/IOB-WIN-MTC/DATA/CONF/MAIN.ini
index 68924ab3..5893f9f9 100644
--- a/IOB-WIN-MTC/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-MTC/DATA/CONF/MAIN.ini
@@ -25,4 +25,3 @@ STARTLIST=SIMUL_01
;STARTLIST=3024
MAXCNC=10
-
diff --git a/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini b/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini
index 65b695c2..1a6e344d 100644
--- a/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini
@@ -32,4 +32,3 @@ CLI_INST=SteamWareSim
STARTLIST=1042
MAXCNC=10
-
diff --git a/IOB-WIN-PING/DATA/CONF/MAIN.ini b/IOB-WIN-PING/DATA/CONF/MAIN.ini
index f7213b4a..ec3f6146 100644
--- a/IOB-WIN-PING/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-PING/DATA/CONF/MAIN.ini
@@ -19,4 +19,3 @@ STARTLIST=FTP-PING
;STARTLIST=3024-PING
MAXCNC=10
-
diff --git a/IOB-WIN-SHELLY/Iob/ShellyClient.cs b/IOB-WIN-SHELLY/Iob/ShellyClient.cs
index bae4448e..d112feb9 100644
--- a/IOB-WIN-SHELLY/Iob/ShellyClient.cs
+++ b/IOB-WIN-SHELLY/Iob/ShellyClient.cs
@@ -175,7 +175,7 @@ namespace IOB_WIN_SHELLY.Iob
if (!connectionOk)
{
//// resetto coda...
- //PingQueue = new DataQueue("000", "PingQueue", false);
+ //QueuePing = new DataQueue("000", "QueuePing", false);
// controllo che il ping sia stato tentato almeno pingTestSec fa...
if (DateTime.Now.Subtract(lastPING).TotalSeconds > vetoPingSec)
{
@@ -185,7 +185,7 @@ namespace IOB_WIN_SHELLY.Iob
}
lgDebug("Shelly: tryConnect step 04");
- lgDebug("Shelly: Reset PingQueue");
+ lgDebug("Shelly: Reset QueuePing");
bool pingOK = testPingMachine == IPStatus.Success;
addTest(pingOK);
@@ -257,14 +257,14 @@ namespace IOB_WIN_SHELLY.Iob
if (B_input == 0 && pingOk)
{
B_input = 1;
- PingQueue = new DataQueue(IOBConfFull.General.FilenameIOB, "PingQueue", false, redisMan);
- lgTrace($"PingQueue resetted on addTest");
+ QueuePing = new DataQueue(IOBConfFull.General.FilenameIOB, "QueuePing", false, redisMan);
+ lgTrace($"QueuePing resetted on addTest");
}
- PingQueue.Enqueue($"{score}");
- while (PingQueue.Count > maxQueuePing)
+ QueuePing.Enqueue($"{score}");
+ while (QueuePing.Count > maxQueuePing)
{
string res = "";
- PingQueue.TryDequeue(out res);
+ QueuePing.TryDequeue(out res);
}
}
@@ -277,10 +277,10 @@ namespace IOB_WIN_SHELLY.Iob
private bool pingStatusOk()
{
bool answ = false;
- long numVal = PingQueue.Count;
+ long numVal = QueuePing.Count;
if (numVal > maxQueuePing / 2)
{
- var listaValori = PingQueue.ToList();
+ var listaValori = QueuePing.ToList();
long numOk = listaValori.Where(x => x == "1").Count();
long numKo = numVal - numOk;
answ = numOk >= numKo;
diff --git a/IOB-WIN-WPS/DATA/CONF/MAIN.ini b/IOB-WIN-WPS/DATA/CONF/MAIN.ini
index a4551270..73c016b4 100644
--- a/IOB-WIN-WPS/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-WPS/DATA/CONF/MAIN.ini
@@ -23,4 +23,3 @@ STARTLIST=3018
;STARTLIST=3019
MAXCNC=10
-