merge fix

2025-06-23 10:07:59 +02:00 · 2022-03-17 08:41:49 +01:00
parent 401467c700 c9769579e3
commit 39d3ee2b15
35 changed files with 449 additions and 138 deletions
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
@ -998,7 +998,16 @@ void resetPeripheral() {

 /* set parameters -  dr, roi */

-int setDynamicRange(int dr) { return DYNAMIC_RANGE; }
+int setDynamicRange(int dr) {
+    if (dr == 16)
+        return OK;
+    return FAIL;
+}
+
+int getDynamicRange(int *retval) {
+    *retval = DYNAMIC_RANGE;
+    return OK;
+}

 /* parameters - timer */
 void setNumFrames(int64_t val) {