From 970dff7ab6c0fcffd9db42e277c62794f15b79fc Mon Sep 17 00:00:00 2001 From: Sylvain Chapeland Date: Tue, 6 Jun 2023 10:13:58 +0200 Subject: [PATCH 1/4] crorc hash fix --- src/FirmwareChecker.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FirmwareChecker.cxx b/src/FirmwareChecker.cxx index 1476027f..d6e09822 100644 --- 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 From db7a7f45c301dee15adc6def6933d792c84f8041 Mon Sep 17 00:00:00 2001 From: Sylvain Chapeland Date: Tue, 6 Jun 2023 10:16:01 +0200 Subject: [PATCH 2/4] crorc hash fix --- doc/releaseNotes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md index c245265c..3ddf5835 100644 --- a/doc/releaseNotes.md +++ b/doc/releaseNotes.md @@ -53,3 +53,6 @@ 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 + +## next version +- Updated list of CRORC firmwares: hash truncated to 7 chars, because CRORC does not report all 8. From 4e4be10f2a6a36bc848c45a92424052d646b9f99 Mon Sep 17 00:00:00 2001 From: Sylvain Chapeland Date: Fri, 16 Jun 2023 11:33:08 +0200 Subject: [PATCH 3/4] added link 15 pciaddr --- src/CommandLineUtilities/ProgramStatus.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CommandLineUtilities/ProgramStatus.cxx b/src/CommandLineUtilities/ProgramStatus.cxx index b053a969..1c0b638f 100644 --- 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()) From 05eb407fd641cba13f747623e93b866144856db2 Mon Sep 17 00:00:00 2001 From: Sylvain Chapeland Date: Fri, 16 Jun 2023 11:37:47 +0200 Subject: [PATCH 4/4] v0.44.1 --- doc/releaseNotes.md | 4 +++- src/ReadoutCardVersion.cxx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md index 3ddf5835..12126502 100644 --- a/doc/releaseNotes.md +++ b/doc/releaseNotes.md @@ -54,5 +54,7 @@ This file describes the main feature changes for released versions of ReadoutCar - link (with --monitoring option only): orbitSOR for CRORC - Updated list of firmwares for CRORC -## next version +## 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/ReadoutCardVersion.cxx b/src/ReadoutCardVersion.cxx index f56b8fec..ff623767 100644 --- 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 {