Merge pull request #414 from sy-c/master

v0.44.0
AliceO2Group · Jun 2, 2023 · d18cee4 · d18cee4
2 parents 5104f2d + 97c2e81
commit d18cee4
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -562,6 +562,7 @@ metric format for the CRORC and the CRU is different, as different parameters ar
 | `"pciAddress"`   | -                  | string |
 | `"status"`       | 0/1 (DOWN/UP)      | int    |
 | `"opticalPower"` | -                  | double |
+| `"orbitSor"`     | -                  | int    |
 
 | Tag key               | Value                 |
 | --------------------- | --------------------- |

diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -48,3 +48,8 @@ This file describes the main feature changes for released versions of ReadoutCar
 - Added some counters for roc-status:
   - link (with --monitoring option only): pktProcessed, pktErrorProtocol, pktErrorCheck1, pktErrorCheck2, pktErrorOversize, orbitSor (including for UL link 15)
   - onu (with --onu option, all output modes, including --monitoring): glitchCounter
+
+## v0.44.0 - 02/06/2023
+- Added some counters for roc-status:
+  - link (with --monitoring option only): orbitSOR for CRORC
+- Updated list of firmwares for CRORC
diff --git a/src/CommandLineUtilities/ProgramStatus.cxx b/src/CommandLineUtilities/ProgramStatus.cxx
@@ -162,6 +162,7 @@ class ProgramStatus : public Program
                              .addValue(card.pciAddress.toString(), "pciAddress")
                              .addValue(link.status, "status")
                              .addValue(opticalPower, "opticalPower")
+                             .addValue((uint64_t)link.orbitSor, "orbitSor")
                              .addTag(tags::Key::SerialId, card.serialId.getSerial())
                              .addTag(tags::Key::CRORC, card.sequenceId)
                              .addTag(tags::Key::ID, id)

diff --git a/src/Crorc/Common.h b/src/Crorc/Common.h
@@ -32,6 +32,7 @@ enum LinkStatus {
 struct Link {
   LinkStatus status = LinkStatus::Down;
   float opticalPower = 0.0;
+  uint32_t orbitSor = 0;
 };
 
 struct ReportInfo {

diff --git a/src/Crorc/Constants.h b/src/Crorc/Constants.h
@@ -429,6 +429,7 @@ static constexpr Register SERIAL_NUMBER(0x000000FC);
 
 static constexpr Register ACQ_RATE(0x00000050);
 static constexpr Register PKTS_RECEIVED(0x00000054);
+static constexpr Register ORBIT_SOR(0x00000060);
 
 } // namespace Registers
 } //namespace Crorc

diff --git a/src/Crorc/CrorcBar.cxx b/src/Crorc/CrorcBar.cxx
@@ -146,6 +146,12 @@ Crorc::ReportInfo CrorcBar::report(bool forConfig)
   }
 
   getOpticalPowers(linkMap);
+
+  for (auto& el : linkMap) {
+    auto& link = el.second;
+    link.orbitSor = readRegister(Crorc::Registers::ORBIT_SOR.index);
+  }
+
   Crorc::ReportInfo reportInfo = {
     linkMap,
     getCrorcId(),

diff --git a/src/FirmwareChecker.cxx b/src/FirmwareChecker.cxx
@@ -41,6 +41,8 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({
                                        { "221ff280", "v2.10.0" },
                                        { "cfa0bc9c", "2.10.1" },
                                        { "2d4c9028", "2.11.0" },
+                                       { "c7ff5689", "2.12.0" },
+                                       { "ac9dd573", "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.43.0"
+#define O2_READOUTCARD_VERSION "0.44.0"
 
 namespace o2
 {