udp_cleardst in fpga (#490)

* set number of destination in fpga as well when using udp_cleardst

* ensures fpga destinations are also cleared up

* binaries in

ctbGui/ctbAcquisition.cpp

@@ -828,14 +828,14 @@ void ctbAcquisition::setCanvas(TCanvas* c) {
   myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)%p)->canvasClicked()",this));
   // myCanvas->AddExec("ex","canvasClicked()");
 }
-void ctbAcquisition::dataCallback(detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) {
+void ctbAcquisition::dataCallback(sls::detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) {
 
   // return 
   ((ctbAcquisition*)pArgs)->plotData(data,index);
 }
 
 
-int ctbAcquisition::plotData(detectorData *data, int index) {
+int ctbAcquisition::plotData(sls::detectorData *data, int index) {
 
   /*
 ******************************************************************

ctbGui/ctbAcquisition.h

@@ -28,8 +28,8 @@ class TGTextButton;
 namespace sls
 {
    class Detector;
+   class detectorData;
 };
-class detectorData;
 
 template <class dataType> class slsDetectorData;
 
@@ -201,10 +201,10 @@ class ctbAcquisition : public TGGroupFrame {
    void setBitGraph (int i ,int en, Pixel_t col);
    void startAcquisition();
    static   void progressCallback(double,void*);
-   static void dataCallback(detectorData*, long unsigned int, unsigned int,  void*);
+   static void dataCallback(sls::detectorData*, long unsigned int, unsigned int,  void*);
    int StopFlag;
    
-   int plotData(detectorData*, int);
+   int plotData(sls::detectorData*, int);
 
    void setPatternFile(const char* t);
 

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -9249,8 +9249,25 @@ int clear_all_udp_dst(int file_des) {
         if (check_detector_idle("clear all udp destinations") == OK) {
             memset(udpDetails, 0, sizeof(udpDetails));
             // minimum 1 destination in fpga
-            numUdpDestinations = 1;
+            int numdest = 1;
-            configure_mac();
+            // set number of destinations
+#if defined(JUNGFRAUD) || defined(EIGERD)
+            if (setNumberofDestinations(numdest) == FAIL) {
+                ret = FAIL;
+                strcpy(mess, "Could not clear udp destinations to 1 entry.\n");
+                LOG(logERROR, (mess));
+            } else
+#endif
+            {
+                numUdpDestinations = numdest;
+                LOG(logINFOBLUE, ("Number of UDP Destinations: %d\n",
+                                    numUdpDestinations));
+                ret = configureMAC();
+                if (ret == FAIL) {
+                    strcpy(mess, "Could not clear all destinations in the fpga.\n");
+                    LOG(logERROR, (mess));
+                }
+            }
         }
     }
     return Server_SendResult(file_des, INT32, NULL, 0);

slsSupportLib/include/sls/versionAPI.h

@@ -2,13 +2,13 @@
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 /** API versions */
 #define GITBRANCH    "developer"
-#define APICTB 0x220524
-#define APIGOTTHARD 0x220524
-#define APIJUNGFRAU 0x220524
-#define APIMOENCH 0x220519
-#define APIEIGER 0x220524
-#define APIGOTTHARD2 0x220602
-#define APIMYTHEN3 0x220607
 #define APILIB 0x220609
 #define APIRECEIVER 0x220609
 #define APIGUI 0x220609
+#define APICTB 0x220705
+#define APIGOTTHARD 0x220705
+#define APIGOTTHARD2 0x220705
+#define APIJUNGFRAU 0x220705
+#define APIMYTHEN3 0x220705
+#define APIMOENCH 0x220602
+#define APIEIGER 0x220705

updateSubmodule.sh

@@ -0,0 +1,2 @@
+git submodule update --init
+