Merge pull request #415 from sy-c/master

v0.44.1
AliceO2Group · Jun 16, 2023 · 2aa179a · 2aa179a
2 parents d18cee4 + 05eb407
commit 2aa179a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -53,3 +53,8 @@ This file describes the main feature changes for released versions of ReadoutCar
 - Added some counters for roc-status:
   - link (with --monitoring option only): orbitSOR for CRORC
 - Updated list of firmwares for CRORC
+
+## v0.44.1 - 16/06/2023
+- Updated list of CRORC firmwares: hash truncated to 7 chars, because CRORC does not report all 8.
+- roc-status:
+  - added pciAddress for user logic link 15
diff --git a/src/CommandLineUtilities/ProgramStatus.cxx b/src/CommandLineUtilities/ProgramStatus.cxx
@@ -475,6 +475,7 @@ class ProgramStatus : public Program
       if (reportInfo.userLogicEnabled) {
         if (mOptions.monitoring) {
           monitoring->send(Metric{ "link" }
+                             .addValue(card.pciAddress.toString(), "pciAddress")
                              .addValue((uint64_t)reportInfo.userLogicOrbitSor, "orbitSor")
                              .addTag(tags::Key::SerialId, card.serialId.getSerial())
                              .addTag(tags::Key::Endpoint, card.serialId.getEndpoint())

diff --git a/src/FirmwareChecker.cxx b/src/FirmwareChecker.cxx
@@ -35,14 +35,14 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({
                                        { "9052c0dd", "v3.18.1" },
                                        { "47df4106", "v3.19.0" },
                                        { "adc37d07", "v3.19.0" },
-                                       /* CRORC */
+                                       /* CRORC - keep 7 chars only for the hash */
                                        { "267f8e5", "v2.9.1" },
                                        { "cecc295", "v2.9.0" },
-                                       { "221ff280", "v2.10.0" },
-                                       { "cfa0bc9c", "2.10.1" },
-                                       { "2d4c9028", "2.11.0" },
-                                       { "c7ff5689", "2.12.0" },
-                                       { "ac9dd573", "2.12.1" },
+                                       { "221ff28", "v2.10.0" },
+                                       { "cfa0bc9", "2.10.1" },
+                                       { "2d4c902", "2.11.0" },
+                                       { "c7ff568", "2.12.0" },
+                                       { "ac9dd57", "2.12.1" },
                                      })
 
                                      // second list for older firmware

diff --git a/src/ReadoutCardVersion.cxx b/src/ReadoutCardVersion.cxx
@@ -11,7 +11,7 @@
 
 #include "ReadoutCard/Version.h"
 
-#define O2_READOUTCARD_VERSION "0.44.0"
+#define O2_READOUTCARD_VERSION "0.44.1"
 
 namespace o2
 {