diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c index aa4064258..d6c39d082 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c @@ -148,6 +148,8 @@ int main(int argc, char *argv[]) { strcpy(version, APIMYTHEN3); #elif GOTTHARD2D strcpy(version, APIGOTTHARD2); +#elif XILINX_CHIPTESTBOARDD + strcpy(version, APIXILINXCTB); #endif LOG(logINFO, ("SLS Detector Server Version: %s\n", version)); exit(EXIT_SUCCESS); diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 8fe66047a..6e6d9a824 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 6016d10fb..8104e8c7a 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -915,10 +915,10 @@ void Implementation::CreateUDPSockets() { } void Implementation::SetupWriter() { - + try { - //check if filePath empty and throw error - if(filePath.empty()){ + // check if filePath empty and throw error + if (filePath.empty()) { throw ReceiverError("File path cannot be empty"); } // check if folder exists and throw if it cant create diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 17637b81c..16ecdd976 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -7,6 +7,6 @@ #define APIGOTTHARD2 "developer 0x250310" #define APIMYTHEN3 "developer 0x250310" #define APIMOENCH "developer 0x250310" -#define APIXILINXCTB "developer 0x250310" #define APIEIGER "developer 0x250310" #define APIJUNGFRAU "developer 0x250311" +#define APIXILINXCTB "developer 0x250311"