diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer new file mode 100755 index 000000000..a2370acc2 Binary files /dev/null and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 83f8aca38..9e788d959 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -591,10 +591,9 @@ void setupDetector() { LTC2620_Configure(); // dacs only - LOG(logINFOBLUE, ("Powering down all dacs\n")); + LOG(logINFOBLUE, ("Setting all dacs to min (0 mV)\n")); for (int idac = 0; idac < NDAC_ONLY; ++idac) { - initError = - setDAC(idac, LTC2620_GetPowerDownValue(), false, initErrorMessage); + initError = setDAC(idac, 0, false, initErrorMessage); if (initError == FAIL) return; } diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 658096edd..16f976b73 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index 3d8b1d493..1c1a55a8a 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -412,10 +412,9 @@ void setupDetector() { return; } // dacs only - LOG(logINFOBLUE, ("Powering down all dacs\n")); + LOG(logINFOBLUE, ("Setting all dacs to min (0 mV)\n")); for (int idac = 0; idac < NDAC_ONLY; ++idac) { - initError = setDAC(idac, LTC2620_D_GetPowerDownValue(), false, - initErrorMessage); + initError = setDAC(idac, 0, false, initErrorMessage); if (initError == FAIL) return; } @@ -602,25 +601,6 @@ int powerChip(int on, char *mess) { LOG(logINFOBLUE, ("Powering chip: off\n")); bus_w(addr, bus_r(addr) & ~mask); chipConfigured = 0; - if (FAIL == XILINX_FMC_disable_all(mess, MAX_STR_LENGTH)) { - return FAIL; - } -#ifdef VIRTUAL - setTransceiverAlignment(0); -#endif - // transceiver alignment should be reset at power off - if (isTransceiverAligned()) { - sprintf(mess, "Transceiver alignment not reset\n"); - LOG(logERROR, (mess)); - - // to be removed when fixed later - LOG(logWARNING, - ("Bypassing this error for now. To be fixed later...\n")); - return OK; - - return FAIL; - } - LOG(logINFO, ("\tTransceiver alignment has been reset\n")); } return OK; } diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index d61f4d50c..0361e13be 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -3,10 +3,10 @@ /** API versions */ #define APILIB "0.0.0 0x250909" #define APIRECEIVER "0.0.0 0x250822" -#define APICTB "0.0.0 0x260227" +#define APICTB "0.0.0 0x260317" #define APIGOTTHARD2 "0.0.0 0x260227" #define APIMOENCH "0.0.0 0x260227" #define APIEIGER "0.0.0 0x260227" -#define APIXILINXCTB "0.0.0 0x260227" +#define APIXILINXCTB "0.0.0 0x260317" #define APIJUNGFRAU "0.0.0 0x260227" #define APIMYTHEN3 "0.0.0 0x260227"