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

formatting

Browse Source
This commit is contained in:
maliakal_d
2023-10-25 09:36:51 +02:00
parent 4023ed0775
commit 35ed926047
9 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -2928,7 +2928,8 @@ int softwareTrigger(int block) {
usleep(100);
#ifndef VIRTUAL
// block till frame sent out & back to wait for trigger (or not busy anymore)
// block till frame sent out & back to wait for trigger (or not busy
// anymore)
if (block) {
uint32_t retval = bus_r(STATUS_REG);
while ((retval & RUN_BUSY_MSK) && !(retval & WAITING_FOR_TRIGGER_MSK)) {
@ -2971,11 +2972,10 @@ enum runStatus getRunStatus() {
LOG(logINFOBLUE, ("Status: ERROR\n"));
s = ERROR;
}
// running
else if (retval & RUN_BUSY_MSK) {
if ((retval &
WAITING_FOR_TRIGGER_MSK) ||
if ((retval & WAITING_FOR_TRIGGER_MSK) ||
(retval & WAITING_FOR_START_FRAME_MSK)) {
LOG(logINFOBLUE, ("Status: WAITING\n"));
s = WAITING;