changed logger.h to clogger.h for c files

slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c

@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include "communication_funcs_UDP.h"
 #include "UDPPacketHeaderGenerator.h"

slsDetectorServers/eigerDetectorServer/Beb.c

@@ -1,4 +1,4 @@
-#include "logger.h"
+#include "clogger.h"
 #include "Beb.h"
 #include "FebRegisterDefs.h"
 #include "xparameters.h"

slsDetectorServers/eigerDetectorServer/CMakeLists.txt

@@ -1,8 +1,13 @@
 set(src 
     slsDetectorFunctionList.c
-    slsDetectorServer.c
+    ../slsDetectorServer/slsDetectorServer.c
-    slsDetectorServer_funcs.c
+    ../slsDetectorServer/slsDetectorServer_funcs.c
-    communication_funcs.c
+    ../slsDetectorServer/communication_funcs.c
+)
+
+include_directories(
+    ../slsDetectorServer
+    ../../slsSupportLib/include
 )
 
 add_executable(eigerDetectorServerMaster 

slsDetectorServers/eigerDetectorServer/FebControl.c

@@ -1,7 +1,7 @@
 #include "FebControl.h"
 #include "FebRegisterDefs.h"
 #include "slsDetectorServer_defs.h"
-#include "logger.h"
+#include "clogger.h"
 #include "Beb.h"
 
 #include <unistd.h>

slsDetectorServers/eigerDetectorServer/FebInterface.c

@@ -1,7 +1,7 @@
 #include "FebInterface.h"
 #include "LocalLinkInterface.h"
 #include "xparameters.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include <unistd.h>
 

slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c

@@ -1,6 +1,6 @@
 #include "LocalLinkInterface.h"
 #include "HardwareMMappingDefs.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include <unistd.h>
 #include <sys/mman.h>

slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c

@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 #include "common.h"
 
 #ifndef VIRTUAL

slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c

@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 #include "RegisterDefs.h"
 
 #ifndef VIRTUAL

slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt

@@ -1,8 +1,13 @@
 add_executable(jungfrauDetectorServer
     slsDetectorFunctionList.c
-    slsDetectorServer.c
+    ../slsDetectorServer/slsDetectorServer.c
-    slsDetectorServer_funcs.c
+    ../slsDetectorServer/slsDetectorServer_funcs.c
-    communication_funcs.c
+    ../slsDetectorServer/communication_funcs.c
+)
+
+include_directories(
+    ../slsDetectorServer/
+    ../../slsSupportLib/include
 )
 
 target_include_directories(jungfrauDetectorServer

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 #include <sys/select.h>
 #include "AD9257.h"		// commonServerFunctions.h, blackfin.h, ansi.h
 #include "LTC2620.h"    // dacs

slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c

@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include "communication_funcs_UDP.h"
 #include "UDPPacketHeaderGenerator.h"

slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logger.h"
+#include "clogger.h"
 #include "sls_detector_defs.h"
 
 

slsDetectorServers/slsDetectorServer/communication_funcs.c

@@ -1,5 +1,5 @@
 #include "communication_funcs.h" 
-#include "logger.h"
+#include "clogger.h"
 
 #include <string.h>
 #include <errno.h>

slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logger.h"
+#include "clogger.h"
 #include "sls_detector_defs.h"
 
 

slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h

@@ -1,7 +1,7 @@
 #include "sls_detector_defs.h"
 #include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
 #ifdef GOTTHARDD
-#include "logger.h"                 // runState(enum TLogLevel)
+#include "clogger.h"                 // runState(enum TLogLevel)
 #endif
 #include <stdlib.h>
 #include <stdio.h>					// FILE

slsDetectorServers/slsDetectorServer/slsDetectorServer.c

@@ -2,7 +2,7 @@
    The port number is passed as an argument */
 
 #include "sls_detector_defs.h"
-#include "logger.h"
+#include "clogger.h"
 #include "communication_funcs.h"
 #include "slsDetectorServer_funcs.h"
 #include "slsDetectorServer_defs.h"

slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c

@@ -1,7 +1,7 @@
 #include "slsDetectorServer_funcs.h"
 #include "slsDetectorFunctionList.h"
 #include "communication_funcs.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include <string.h>
 #include <arpa/inet.h>

slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "sls_detector_defs.h"
-#include "logger.h"
+#include "clogger.h"
 
 enum numberMode {DEC, HEX};
 #define GOODBYE 					(-200)

slsSupportLib/include/versionAPI.h

@@ -3,8 +3,8 @@
 #define APILIB 0x190723
 #define APIRECEIVER 0x190722
 #define APIGUI 0x190723
-#define APIJUNGFRAU 0x190819
+#define APICTB 0x190820
-#define APIGOTTHARD 0x190819
+#define APIGOTTHARD 0x190820
-#define APICTB 0x190819
+#define APIJUNGFRAU 0x190820
-#define APIMOENCH 0x190819
+#define APIMOENCH 0x190820
-#define APIEIGER 0x190819
+#define APIEIGER 0x190820