From 016d0d7face36f5dab3bcbd135c0db70017aff7e Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 14 Jul 2021 15:28:09 +0200 Subject: [PATCH] jungfrau server: temporary fix made to reset core when stopping state machine. problem: stopping in trigger mode and then switching to auto mode blocks data streaming from detector --- RELEASE.txt | 8 ++++++++ .../jungfrauDetectorServer/slsDetectorFunctionList.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/RELEASE.txt b/RELEASE.txt index b48f1069c..da7f997d6 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -54,6 +54,14 @@ This document describes the differences between 5.2.0 and 5.1.0 releases. + Jungfrau Server + ---------------- + + 1. Stopping in trigger mode and then switching to auto timing mode + blocks data streaming from detector. Workaround fix made in + detector server to reset core until firmware release. + + 3. Firmware Requirements diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index aa5c97006..f9ac4032e 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -1832,6 +1832,8 @@ int stopStateMachine() { bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_STOP_ACQ_MSK); LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG))); + + resetCore(); return OK; }