detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-07 17:28:39 +01:00
Code Issues Actions Packages Releases Activity

xilinx: start state machine started with start_f bit in flow control and not anymore the start_p from matterhornspictrl reg (so now if the user messes up the pattern, it will be stuck forever) (#1366)
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Details
Build on local RHEL8 / build (push) Successful in 3m32s
Details
Build on RHEL9 / build (push) Successful in 3m39s
Details
Build on RHEL8 / build (push) Successful in 5m3s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-01-22 10:00:25 +01:00
committed by GitHub
parent fd304b3d95
commit b70d3c5ad3
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
View File

Binary file not shown.

7
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -1585,12 +1585,7 @@ int startStateMachine() {
#endif #endif
LOG(logINFOBLUE, ("Starting readout\n")); LOG(logINFOBLUE, ("Starting readout\n"));
bus_w(FLOW_CONTROL_REG, bus_r(FLOW_CONTROL_REG) | START_F_MSK);
// MM:readout via pattern does not work right now due to firmware bug,
// readout via MatterhornCTRL for the moment
// bus_w(FLOW_CONTROL_REG, bus_r(FLOW_CONTROL_REG) | START_F_MSK);
bus_w(MATTERHORNSPICTRL, bus_r(MATTERHORNSPICTRL) | STARTREAD_P_MSK);
return OK; return OK;
} }

2
slsSupportLib/include/sls/versionAPI.h
View File

@@ -7,6 +7,6 @@
#define APIGOTTHARD2 "0.0.0 0x250909" #define APIGOTTHARD2 "0.0.0 0x250909"
#define APIMOENCH "0.0.0 0x250909" #define APIMOENCH "0.0.0 0x250909"
#define APIEIGER "0.0.0 0x250909" #define APIEIGER "0.0.0 0x250909"
#define APIXILINXCTB "0.0.0 0x260121" #define APIXILINXCTB "0.0.0 0x260122"
#define APIJUNGFRAU "0.0.0 0x250909" #define APIJUNGFRAU "0.0.0 0x250909"
#define APIMYTHEN3 "0.0.0 0x250922" #define APIMYTHEN3 "0.0.0 0x250922"