detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

Dev/g2 stop frame number (#980)

Browse Source 
* get/set next frame number in G2 (firmware only has set, no get)
* firmware has issues: each stop keeps 2 frame header in fifo and the resetting frame number happens after that
* removed the option to set burstmode to burst external or continuwous internal
* needs to be revisited before 9.0.0
This commit is contained in:
maliakal_d
2024-10-02 15:26:06 +02:00
committed by GitHub
parent e59de85a33
commit 5e024153bc
12 changed files with 235 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -269,7 +269,8 @@ int selectStoragecellStart(int pos);
int getMaxStoragecellStart();
#endif
#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) || \
defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) || \
defined(GOTTHARD2D)
int setNextFrameNumber(uint64_t value);
int getNextFrameNumber(uint64_t *value);
#endif

10
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -4710,7 +4710,8 @@ int set_next_frame_number(int file_des) {
LOG(logDEBUG1, ("Setting next frame number to %llu\n", arg));
#if !defined(EIGERD) && !defined(JUNGFRAUD) && !defined(MOENCHD) && \
!defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)
!defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) && \
!defined(GOTTHARD2D)
functionNotImplemented();
#else
// only set
@ -4789,7 +4790,8 @@ int get_next_frame_number(int file_des) {
LOG(logDEBUG1, ("Getting next frame number \n"));
#if !defined(EIGERD) && !defined(JUNGFRAUD) && !defined(MOENCHD) && \
!defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)
!defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) && \
!defined(GOTTHARD2D)
functionNotImplemented();
#else
// get
@ -6751,8 +6753,8 @@ int set_burst_mode(int file_des) {
if (Server_VerifyLock() == OK) {
switch (arg) {
case BURST_INTERNAL:
case BURST_EXTERNAL:
case CONTINUOUS_INTERNAL:
// case BURST_EXTERNAL:
// case CONTINUOUS_INTERNAL:
case CONTINUOUS_EXTERNAL:
break;
default: