Merge pull request #396 from slsdetectorgroup/ctbupdate

updatemode

RELEASE.txt

@@ -40,6 +40,7 @@ This document describes the differences between v7.0.0 and v6.x.x
 - when in discard partial frames or empty mode, the frame number doesnt increase by 1, it increases to that number (so its faster)
 - file write disabled by default
 - start non blocking acquisition at modular level
+- hostname cmd failed when connecting to servers in update mode (ctb, moench, jungfrau, eiger)
 - missingpackets signed (negative => extra packets)
 
 

slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c

@@ -67,7 +67,13 @@ int defaultDacValues[NDAC] = DEFAULT_DAC_VALS;
 int vLimit = 0;
 enum detectorSettings thisSettings = UNINITIALIZED;
 int highvoltage = 0;
+
+// getNumberofchannels return 0 for y in --update mode (virtual servers)
+#ifdef VIRTUAL
+int nSamples = DEFAULT_NUM_SAMPLES;
+#else
 int nSamples = 1;
+#endif
 int detPos[2] = {0, 0};
 
 int isInitCheckDone() { return initCheckDone; }

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -80,28 +80,32 @@ char scanErrMessage[MAX_STR_LENGTH] = "";
 /* initialization functions */
 
 int updateModeAllowedFunction(int file_des) {
-    unsigned int listsize = 19;
+    enum detFuncs allowedFuncs[] = {F_EXEC_COMMAND,
-    enum detFuncs list[] = {F_EXEC_COMMAND,
+                                    F_GET_DETECTOR_TYPE,
-                            F_GET_DETECTOR_TYPE,
+                                    F_GET_FIRMWARE_VERSION,
-                            F_GET_FIRMWARE_VERSION,
+                                    F_GET_SERVER_VERSION,
-                            F_GET_SERVER_VERSION,
+                                    F_GET_SERIAL_NUMBER,
-                            F_GET_SERIAL_NUMBER,
+                                    F_WRITE_REGISTER,
-                            F_WRITE_REGISTER,
+                                    F_READ_REGISTER,
-                            F_READ_REGISTER,
+                                    F_LOCK_SERVER,
-                            F_LOCK_SERVER,
+                                    F_GET_LAST_CLIENT_IP,
-                            F_GET_LAST_CLIENT_IP,
+                                    F_PROGRAM_FPGA,
-                            F_PROGRAM_FPGA,
+                                    F_RESET_FPGA,
-                            F_RESET_FPGA,
+                                    F_CHECK_VERSION,
-                            F_CHECK_VERSION,
+                                    F_COPY_DET_SERVER,
-                            F_COPY_DET_SERVER,
+                                    F_REBOOT_CONTROLLER,
-                            F_REBOOT_CONTROLLER,
+                                    F_GET_KERNEL_VERSION,
-                            F_GET_KERNEL_VERSION,
+                                    F_UPDATE_KERNEL,
-                            F_UPDATE_KERNEL,
+                                    F_UPDATE_DETECTOR_SERVER,
-                            F_UPDATE_DETECTOR_SERVER,
+                                    F_GET_UPDATE_MODE,
-                            F_GET_UPDATE_MODE,
+                                    F_SET_UPDATE_MODE,
-                            F_SET_UPDATE_MODE};
+                                    F_GET_NUM_CHANNELS,
-    for (unsigned int i = 0; i < listsize; ++i) {
+                                    F_GET_NUM_INTERFACES,
-        if ((unsigned int)fnum == list[i]) {
+                                    F_ACTIVATE};
+    size_t allowedFuncsSize = sizeof(allowedFuncs) / sizeof(enum detFuncs);
+
+    for (unsigned int i = 0; i < allowedFuncsSize; ++i) {
+        if ((unsigned int)fnum == allowedFuncs[i]) {
             return OK;
         }
     }

slsSupportLib/include/sls/versionAPI.h

@@ -6,10 +6,10 @@
 #define APIRECEIVER 0x211124
 #define APIGUI 0x211124
 
-#define APICTB 0x220203
+#define APICTB 0x220223
-#define APIGOTTHARD 0x220203
+#define APIGOTTHARD 0x220223
-#define APIGOTTHARD2 0x220203
+#define APIGOTTHARD2 0x220223
-#define APIJUNGFRAU 0x220203
+#define APIJUNGFRAU 0x220223
-#define APIMYTHEN3 0x220203
+#define APIMYTHEN3 0x220223
-#define APIMOENCH 0x220203
+#define APIMOENCH 0x220223
-#define APIEIGER 0x220207
+#define APIEIGER 0x220223