From 1360fbac8759041aa2cff1d85663ba243a39c53c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 25 Jun 2021 16:56:48 +0200 Subject: [PATCH] eiger: block trigger till next wait for trigger and give error if it wasnt ready when trigger sent --- slsDetectorServers/eigerDetectorServer/FebControl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c index 263a39ac5..cfbbd38d7 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.c +++ b/slsDetectorServers/eigerDetectorServer/FebControl.c @@ -1064,16 +1064,18 @@ int Feb_Control_SoftwareTrigger(int block) { if (block) { int readyForTrigger = 0; if (!Feb_Control_IsReadyForTrigger(&readyForTrigger)) { - LOG(logERROR, ("Could not read FEB_REG_STATUS reg after - givign " "trigger!\n")); return 0; + LOG(logERROR, ("Could not read FEB_REG_STATUS reg after giving " + "trigger!\n")); + return 0; } while (!readyForTrigger) { LOG(logWARNING, ("Not yet ready\n")); usleep(100); if (!Feb_Control_IsReadyForTrigger(&readyForTrigger)) { - LOG(logERROR, ("Could not read FEB_REG_STATUS reg - after " "givign trigger!\n")); return 0; + LOG(logERROR, ("Could not read FEB_REG_STATUS reg after " + "giving trigger!\n")); + return 0; } } LOG(logINFO, ("Ready for trigger!\n"));