wip print

slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c

@@ -2551,8 +2551,7 @@ int readSample(int ns) {
 
     // read digital output
     if (digitalEnable && ns < ndSamples) {
-
+        /*if (!(ns % 1000)) {
-        if (!(ns % 1000)) {
             LOG(logDEBUG1,
                 ("Reading sample ns:%d of %d DEmtpy:%d DFull:%d Status:0x%x\n",
                  ns, ndSamples,
@@ -2563,6 +2562,25 @@ int readSample(int ns) {
                    FIFO_DIN_STATUS_FIFO_FULL_MSK) >>
                   FIFO_DIN_STATUS_FIFO_FULL_OFST),
                  bus_r(STATUS_REG)));
+        }*/
+
+        // wait for data
+        int fifoEmtpy = 1;
+        int times = 0;
+        while (fifoEmtpy) {
+            fifoEmtpy = ((bus_r(FIFO_DIN_STATUS_REG) &
+                          FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >>
+                         FIFO_DIN_STATUS_FIFO_EMPTY_OFST);
+            if (!fifoEmtpy)
+                break;
+            if (times == 0)
+                printf("\n");
+            ++times;
+            printf(".");
+            usleep(200);
+            /*if (times % 10 == 0) {
+                printf(".");
+            }*/
         }
 
         // read fifo and write it to current position of data pointer

slsReceiverSoftware/src/GeneralData.h

@@ -622,7 +622,7 @@ class ChipTestBoardData : public GeneralData {
             readoutType == slsDetectorDefs::DIGITAL_AND_TRANSCEIVER) {
             nDigitalChans = NCHAN_DIGITAL;
             nDigitalBytes = (sizeof(uint64_t) * nDigitalSamples);
-            LOG(logDEBUG1) << "Number of Digital Channels:" << nDigitalChans
+            LOG(logINFORED) << "Number of Digital Channels:" << nDigitalChans
                             << " Databytes: " << nDigitalBytes;
         }
         // transceiver channels
@@ -643,7 +643,7 @@ class ChipTestBoardData : public GeneralData {
         imageSize = nAnalogBytes + nDigitalBytes + nTransceiverBytes;
         packetsPerFrame = ceil((double)imageSize / (double)dataSize);
 
-        LOG(logDEBUG1) << "Total Number of Channels:" << nPixelsX
+        LOG(logINFORED) << "Total Number of Channels:" << nPixelsX
                         << " Databytes: " << imageSize;
     };
 };