Merge pull request #409 from sy-c/master

sy-c · web-flow · commit c828f1af6802 · 2023-03-16T10:52:56.000+01:00
v0.42.2
diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -37,6 +37,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 ## v0.42.1 - 06/03/2023
 - Fixed bug with roc-config JSON: crorc-id wrongly set in "cru" section. Now named crorcId and to be set under "crorc" section.
 
-## next version
+## v0.42.2 - 16/03/2023
 - Fix for crorId field in configuration file.
 - o2-roc-list-cards is able to identify previous versions of the firmware. Their version number is displayed and they are flagged as "old", when not on the compatibility list any more.
diff --git a/src/FirmwareChecker.cxx b/src/FirmwareChecker.cxx
@@ -73,7 +73,13 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({
 
   // if the parsed list is not empty update the compatible fimrware list
   if (!parsedList.empty()) {
-    mCompatibleFirmwareList = parsedList;
+    // append existing list...
+    for (const auto& p: parsedList) {
+      if ((p.first.length()) && (p.second.length())) {
+        mCompatibleFirmwareList.insert(p);
+      }
+    }
+    //mCompatibleFirmwareList = parsedList;
   }
 }
 
diff --git a/src/ReadoutCardVersion.cxx b/src/ReadoutCardVersion.cxx
@@ -11,7 +11,7 @@
 
 #include "ReadoutCard/Version.h"
 
-#define O2_READOUTCARD_VERSION "0.42.1"
+#define O2_READOUTCARD_VERSION "0.42.2"
 
 namespace o2
 {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,13 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({`
`73`	`73`
`74`	`74`	`// if the parsed list is not empty update the compatible fimrware list`
`75`	`75`	`if (!parsedList.empty()) {`
`76`		`- mCompatibleFirmwareList = parsedList;`
	`76`	`+ // append existing list...`
	`77`	`+ for (const auto& p: parsedList) {`
	`78`	`+ if ((p.first.length()) && (p.second.length())) {`
	`79`	`+ mCompatibleFirmwareList.insert(p);`
	`80`	`+ }`
	`81`	`+ }`
	`82`	`+ //mCompatibleFirmwareList = parsedList;`
`77`	`83`	`}`
`78`	`84`	`}`
`79`	`85`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include "ReadoutCard/Version.h"`
`13`	`13`
`14`		`-#define O2_READOUTCARD_VERSION "0.42.1"`
	`14`	`+#define O2_READOUTCARD_VERSION "0.42.2"`
`15`	`15`
`16`	`16`	`namespace o2`
`17`	`17`	`{`