Merge pull request #430 from sy-c/master

v0.46.1

Author: sy-c

CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 
 # Define project
 project(ReadoutCard
-  VERSION 0.46.0
+  VERSION 0.46.1
   DESCRIPTION "O2 ReadoutCard library"
   LANGUAGES C CXX
 )

doc/releaseNotes.md

@@ -96,3 +96,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## v0.46.0 - 19/03/2025
 - class DmaChannelInterface: added getCounterFirstOrbit(), c.f. JIRA OMON-800
+
+## v0.46.1 - 03/04/2025
+- o2-roc-config: new PLL config used for test-mode-ORC501, cf [ORC-511](https://its.cern.ch/jira/browse/ORC-511)

src/Cru/Ttc.cxx

@@ -24,6 +24,7 @@
 #include "register_maps/Si5345-RevD_ttc_pll1_zdb-Registers.h"
 #include "register_maps/Si5345-RevD_ttc_pll2_zdb-Registers.h"
 #include "register_maps/Si5344-RevD-TFC_40-Registers.h"
+#include "register_maps/Si5345-RevD-_local_pll-oct-2024-320M-LPGBTCRU-Registers.h"
 
 namespace o2
 {
@@ -65,6 +66,12 @@ void Ttc::configurePlls(uint32_t clock)
     registerMap2 = getTtcClockPll2RegisterMap();
   }
 
+  extern bool testModeORC501; // testMode flag used for some FW dev, cf JIRA ORC-501
+  if (testModeORC501) { // testMode flag used for some FW dev, cf JIRA ORC-501 + JIRA ORC-511
+    registerMap1 = getORC511PllRegisterMap();
+    registerMap2 = getORC511PllRegisterMap();
+  }
+
   I2c p1 = I2c(Cru::Registers::SI5345_1.address, chipAddress, mBar, 0, registerMap1);
   I2c p2 = I2c(Cru::Registers::SI5345_2.address, chipAddress, mBar, 0, registerMap2);
   I2c p3 = I2c(Cru::Registers::SI5344.address, chipAddress, mBar, 0, registerMap3);