Merge branch 'developer' into eiger

slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c

@@ -2136,10 +2136,7 @@ void *start_timer(void *arg) {
             int srcOffset2 = npixelsx;
 
             // loop packet
-            {
-
-                int i = 0;
-                i != numPacketsPerFrame; ++i) {
+            for (int i = 0; i != numPacketsPerFrame; ++i) {
                 // set header
                 char packetData[packetsize];
                 memset(packetData, 0, packetsize);
@@ -2170,8 +2167,7 @@ void *start_timer(void *arg) {
                 int dstOffset = sizeof(sls_detector_header);
                 int dstOffset2 = sizeof(sls_detector_header);
                 {
-                        for (int psize = 0; psize < datasize;
-                             psize += npixelsx) {
+                    for (int psize = 0; psize < datasize; psize += npixelsx) {
 
                         if (dr == 32 && tgEnable == 0) {
                             memcpy(packetData + dstOffset,
@@ -2207,7 +2203,6 @@ void *start_timer(void *arg) {
                 usleep(eiger_virtual_transmission_delay_right);
                 sendUDPPacket(1, packetData2, packetsize);
             }
-            }
             LOG(logINFO, ("Sent frame: %d\n", iframes));
             clock_gettime(CLOCK_REALTIME, &end);
             int64_t timeNs = ((end.tv_sec - begin.tv_sec) * 1E9 +

slsSupportLib/include/versionAPI.h

@@ -3,10 +3,10 @@
 #define APILIB       0x200409
 #define APIRECEIVER  0x200409
 #define APIGUI       0x200409
-#define APIEIGER     0x200610
 #define APICTB 0x200610
 #define APIGOTTHARD 0x200610
-#define APIGOTTHARD2 0x200610
 #define APIJUNGFRAU 0x200610
 #define APIMYTHEN3 0x200610
 #define APIMOENCH 0x200610
+#define APIGOTTHARD2 0x200610
+#define APIEIGER 0x200615