diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 1d62487..7f36479 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2222
+ 1.2.2210.2223
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index ecd766a..ea22985 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2210.2222
+ Version: 1.2.2210.2223
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 70d01cf..4cced33 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2222
+1.2.2210.2223
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index e33ceb6..978c134 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2222
+ 1.2.2210.2223
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.DECODER/NLog.config b/MP.MONO.DECODER/NLog.config
index a91cac7..6af3f47 100644
--- a/MP.MONO.DECODER/NLog.config
+++ b/MP.MONO.DECODER/NLog.config
@@ -51,7 +51,7 @@
-->
-
+
\ No newline at end of file
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index fd9a4f2..676a50b 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -669,8 +669,6 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
// decodifico allarmi ricevuti
var alarmListRaw = JsonConvert.DeserializeObject>(currArgs.newMessage);
- Log.Debug($"Ricezione update allarmi | count {alarmListRaw.Count}");
-
// effettuo selezione dei SOLI allarmi distinct (in caso di cambio posizione...)
List alarmList = new List();
if (alarmListRaw != null && alarmListRaw.Count > 0)
@@ -681,6 +679,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
.OrderBy(x => x)
.ToList();
}
+ Log.Info($"Ricezione update allarmi | {alarmListRaw.Count} --> {alarmList.Count}");
// salvo set allarmi correnti...
setAlarms("LastReceived", alarmList);
@@ -699,9 +698,12 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
}
// rileggo da REDIS la conf attuale allarmi già attivi da area ALARM_CURR_KEY
+
+ // FIXME TODO !!! usare una lista thread safe?!?!?
List lastAlarms = getAlarms("Sent");
List startedAlarms = new List();
List ceasedAlarms = new List();
+ string serAlarms = "";
// ciclo x ogni allarme ricevuto x vedere se sia INIZIATO o vada filtrato x muted
if (alarmList != null)
@@ -753,6 +755,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
};
alarmRecList.Add(newAlarmRec);
startedAlarms.Add(currNewAlarm);
+ lastAlarms.Add(currNewAlarm);
needsWrite = true;
}
}
@@ -767,6 +770,11 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
}
}
+ // salvo
+ serAlarms = JsonConvert.SerializeObject(lastAlarms);
+ // invio sulla message pipeline corretta TUTTI gli allarmi serializzati
+ alarmsSendPipe.saveAndSendMessage(Constants.ALARM_CURR_KEY, serAlarms);
+
// calcolo allarmi cessati...
if (lastAlarms != null)
{
@@ -790,12 +798,6 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
}
}
- // se ho NUOVI allarmi iniziati li aggiungo all'ultimo elenco e invio + registro
- foreach (var item in startedAlarms)
- {
- lastAlarms.Add(item);
- }
-
Log.Debug($"Stato lastAlarms | count {lastAlarms.Count}");
// gli allarmi cessati avvio un task di verifica dopo periodo di blink
@@ -811,8 +813,8 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
MemAddress = "ND",
Index = 0,
// usare alarmList o lastAlarms
- Status = (uint)lastAlarms.Count,
- ValDecoded = lastAlarms.Count > 0 ? string.Join(", ", lastAlarms) : "All OK"
+ Status = (uint)alarmList.Count,
+ ValDecoded = alarmList.Count > 0 ? string.Join(", ", alarmList) : "All OK"
};
alarmLogList.Add(newAlarmLog);
}
@@ -821,7 +823,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
{
lastAlarms = lastAlarms.OrderBy(x => x).ToList();
// serializzo l'elenco allarmi...
- string serAlarms = JsonConvert.SerializeObject(lastAlarms);
+ serAlarms = JsonConvert.SerializeObject(lastAlarms);
// se vuoto metto controllo x chiusura
if (lastAlarms.Count() == 0)
@@ -831,9 +833,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
await checkCloseAllAlarm();
});
}
-#if false
- string serAlarms = JsonConvert.SerializeObject(alarmList);
-#endif
+
// invio sulla message pipeline corretta TUTTI gli allarmi serializzati
alarmsSendPipe.saveAndSendMessage(Constants.ALARM_CURR_KEY, serAlarms);
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 390c6e7..d00b57c 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2222
+ 1.2.2210.2223
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index ecd766a..ea22985 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2222
+ Version: 1.2.2210.2223
Release Note:
-
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 70d01cf..4cced33 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2222
+1.2.2210.2223
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index f547e9e..58abb0d 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2222
+ 1.2.2210.2223
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html
false