merge fix

2026-01-16 08:39:21 +01: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/gotthardDetectorServer/bin/gotthardDetectorServer_developer
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
@@ -839,7 +839,16 @@ void setMasterSlaveConfiguration() {

 /* 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;
+}

 int setROI(ROI arg) {