solving merging conflicts from 3.1.0 to developer

2026-01-16 07:38:04 +01:00 · 2018-03-14 15:45:35 +01:00
parent 06cdf8ad92 85aa47b835
commit b58c3e8951
129 changed files with 1120 additions and 8750 deletions
--- a/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv3.0.1.0
+++ b/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv3.0.1.0
--- a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
@@ -593,9 +593,11 @@ int get_id(int file_des) {
    retval=getDetectorNumber();
    break;
  case DETECTOR_FIRMWARE_VERSION:
-    return  (getFirmwareVersion() & 0xFFFFFF);
+    retval = (getFirmwareVersion() & 0xFFFFFF);
+    break;
  case DETECTOR_SOFTWARE_VERSION:
-    return  (GITDATE & 0xFFFFFF);
+    retval = (GITDATE & 0xFFFFFF);
+    break;
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;