Skip to content

v0.46.1 #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sy-c merged 2 commits into from
Apr 3, 2025
Merged

v0.46.1 #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f588c59
new PLL config cf JIRA ORC-511
sy-c Apr 3, 2025
7877087
v0.46.1
sy-c Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif()

# Define project
project(ReadoutCard
VERSION 0.46.0
VERSION 0.46.1
DESCRIPTION "O2 ReadoutCard library"
LANGUAGES C CXX
)
Expand Down
3 changes: 3 additions & 0 deletions doc/releaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
7 changes: 7 additions & 0 deletions src/Cru/Ttc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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);
Expand Down
Loading
Loading