merge fix

slsDetectorServers/ctbDetectorServer/RegisterDefs.h

@@ -165,11 +165,9 @@
 #define PATTERN_OUT_LSB_REG (0x20 << MEM_MAP_SHIFT)
 #define PATTERN_OUT_MSB_REG (0x21 << MEM_MAP_SHIFT)
 
-/* Frames From Start 64 bit RO register TODO */
-//#define FRAMES_FROM_START_LSB_REG           (0x22 << MEM_MAP_SHIFT) // Not
-// used in FW #define FRAMES_FROM_START_MSB_REG           (0x23 <<
-// MEM_MAP_SHIFT)
-//// Not used in FW
+/* Frame number of next acquisition register (64 bit register) */
+#define NEXT_FRAME_NUMB_LOCAL_LSB_REG (0x22 << MEM_MAP_SHIFT)
+#define NEXT_FRAME_NUMB_LOCAL_MSB_REG (0x23 << MEM_MAP_SHIFT)
 
 /* Frames From Start PG 64 bit RO register. Reset using CONTROL_CRST. TODO */
 #define FRAMES_FROM_START_PG_LSB_REG (0x24 << MEM_MAP_SHIFT)

slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c

@@ -45,7 +45,6 @@ char initErrorMessage[MAX_STR_LENGTH];
 
 #ifdef VIRTUAL
 pthread_t pthread_virtual_tid;
-int64_t virtual_currentFrameNumber = 2;
 #endif
 
 // 1g readout
@@ -434,16 +433,21 @@ void initControlServer() {
 }
 
 void initStopServer() {
-
-    usleep(CTRL_SRVR_INIT_TIME_US);
-    if (mapCSP0() == FAIL) {
-        LOG(logERROR,
-            ("Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"));
-        exit(EXIT_FAILURE);
-    }
+    if (!updateFlag && initError == OK) {
+        usleep(CTRL_SRVR_INIT_TIME_US);
+        if (mapCSP0() == FAIL) {
+            initError = FAIL;
+            strcpy(initErrorMessage,
+                   "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n");
+            LOG(logERROR, (initErrorMessage));
+            initCheckDone = 1;
+            return;
+        }
 #ifdef VIRTUAL
-    sharedMemory_setStop(0);
+        sharedMemory_setStop(0);
 #endif
+    }
+    initCheckDone = 1;
 }
 
 /* set up detector */
@@ -581,6 +585,7 @@ void setupDetector() {
         LOG(logERROR, ("%s\n\n", initErrorMessage));
         initError = FAIL;
     }
+    setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
 }
 
 int updateDatabytesandAllocateRAM() {
@@ -702,8 +707,16 @@ void resetPeripheral() {
 }
 
 /* set parameters -  dr, adcenablemask */
+int setDynamicRange(int dr) {
+    if (dr == 16)
+        return OK;
+    return FAIL;
+}
 
-int setDynamicRange(int dr) { return DYNAMIC_RANGE; }
+int getDynamicRange(int *retval) {
+    *retval = DYNAMIC_RANGE;
+    return OK;
+}
 
 int setADCEnableMask(uint32_t mask) {
     if (mask == 0u) {
@@ -898,6 +911,24 @@ int getReadoutMode() {
 }
 
 /* parameters - timer */
+int setNextFrameNumber(uint64_t value) {
+    LOG(logINFO,
+        ("Setting next frame number: %llu\n", (long long unsigned int)value));
+    setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG,
+                 NEXT_FRAME_NUMB_LOCAL_MSB_REG);
+#ifndef VIRTUAL
+    // for 1g udp interface
+    setUDPFrameNumber(value);
+#endif
+    return OK;
+}
+
+int getNextFrameNumber(uint64_t *retval) {
+    *retval = getU64BitReg(NEXT_FRAME_NUMB_LOCAL_LSB_REG,
+                           NEXT_FRAME_NUMB_LOCAL_MSB_REG);
+    return OK;
+}
+
 void setNumFrames(int64_t val) {
     if (val > 0) {
         LOG(logINFO, ("Setting number of frames %lld\n", (long long int)val));
@@ -1492,6 +1523,8 @@ enum timingMode getTiming() {
 
 /* configure mac */
 
+int getNumberofUDPInterfaces() { return 1; }
+
 void calcChecksum(udp_header *udp) {
     int count = IP_HEADER_SIZE;
     long int sum = 0;
@@ -1998,11 +2031,14 @@ void *start_timer(void *arg) {
     }
 
     // Send data
+    uint64_t frameNr = 0;
+    getNextFrameNumber(&frameNr);
     // loop over number of frames
-    for (int frameNr = 0; frameNr != numFrames; ++frameNr) {
+    for (int iframes = 0; iframes != numFrames; ++iframes) {
 
         // check if manual stop
         if (sharedMemory_getStop() == 1) {
+            setNextFrameNumber(frameNr + iframes + 1);
             break;
         }
 
@@ -2021,7 +2057,7 @@ void *start_timer(void *arg) {
             sls_detector_header *header = (sls_detector_header *)(packetData);
             header->detType = (uint16_t)myDetectorType;
             header->version = SLS_DETECTOR_HEADER_VERSION - 1;
-            header->frameNumber = virtual_currentFrameNumber;
+            header->frameNumber = frameNr + iframes;
             header->packetNumber = i;
             header->modId = 0;
             header->row = detPos[X];
@@ -2034,19 +2070,18 @@ void *start_timer(void *arg) {
 
             sendUDPPacket(0, 0, packetData, packetSize);
         }
-        LOG(logINFO, ("Sent frame: %d [%lld]\n", frameNr,
-                      (long long unsigned int)virtual_currentFrameNumber));
+        LOG(logINFO, ("Sent frame: %d [%lld]\n", iframes, frameNr + iframes));
         clock_gettime(CLOCK_REALTIME, &end);
         int64_t timeNs =
             ((end.tv_sec - begin.tv_sec) * 1E9 + (end.tv_nsec - begin.tv_nsec));
 
         // sleep for (period - exptime)
-        if (frameNr < numFrames) { // if there is a next frame
+        if (iframes < numFrames) { // if there is a next frame
             if (periodNs > timeNs) {
                 usleep((periodNs - timeNs) / 1000);
             }
         }
-        ++virtual_currentFrameNumber;
+        setNextFrameNumber(frameNr + numFrames);
     }
 
     closeUDPSocket(0);

slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h

@@ -108,21 +108,24 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS };
 #define I2C_SHUNT_RESISTER_OHMS (0.005)
 
 /** Default Parameters */
-#define DEFAULT_DATA_BYTES   (NCHIP * NCHAN * NUM_BITS_PER_PIXEL)
-#define DEFAULT_NUM_SAMPLES  (1)
-#define DEFAULT_NUM_FRAMES   (1)
-#define DEFAULT_EXPTIME      (0)
-#define DEFAULT_NUM_CYCLES   (1)
-#define DEFAULT_PERIOD       (1 * 1000 * 1000) // ns
-#define DEFAULT_DELAY        (0)
-#define DEFAULT_HIGH_VOLTAGE (0)
-#define DEFAULT_VLIMIT       (-100)
-#define DEFAULT_TIMING_MODE  (AUTO_TIMING)
-#define DEFAULT_TX_UDP_PORT  (0x7e9a)
-#define DEFAULT_RUN_CLK      (200) // 40
-#define DEFAULT_ADC_CLK      (40)  // 20
-#define DEFAULT_SYNC_CLK     (40)  // 20
-#define DEFAULT_DBIT_CLK     (200)
+#define DEFAULT_DATA_BYTES            (NCHIP * NCHAN * NUM_BITS_PER_PIXEL)
+#define DEFAULT_STARTING_FRAME_NUMBER (1)
+#define DEFAULT_NUM_SAMPLES           (1)
+#define DEFAULT_NUM_FRAMES            (1)
+#define DEFAULT_EXPTIME               (0)
+#define DEFAULT_NUM_CYCLES            (1)
+#define DEFAULT_PERIOD                (1 * 1000 * 1000) // ns
+#define DEFAULT_DELAY                 (0)
+#define DEFAULT_HIGH_VOLTAGE          (0)
+#define DEFAULT_VLIMIT                (-100)
+#define DEFAULT_TIMING_MODE           (AUTO_TIMING)
+#define DEFAULT_TX_UDP_PORT           (0x7e9a)
+#define DEFAULT_RUN_CLK               (200) // 40
+#define DEFAULT_ADC_CLK               (40)  // 20
+#define DEFAULT_SYNC_CLK              (40)  // 20
+#define DEFAULT_DBIT_CLK              (200)
+
+#define UDP_HEADER_MAX_FRAME_VALUE (0xFFFFFFFFFFFF)
 
 #define HIGHVOLTAGE_MIN (60)
 #define HIGHVOLTAGE_MAX (200) // min dac val