diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 5c8b7f7bb..222e4ea38 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 8a52e64b0..331ee4420 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -2218,7 +2218,7 @@ int getMaxPhase(enum CLKINDEX ind) { MAX_PHASE_SHIFTS_STEPS; char *clock_names[] = {CLK_NAMES}; - LOG(logDEBUG1, ("Max Phase Shift (%s): %d (Clock: %d MHz, VCO:%d Hz)\n", + LOG(logDEBUG1, ("Max Phase Shift (%s): %d (Clock: %d Hz, VCO:%d Hz)\n", clock_names[ind], ret, clkFrequency[ind], PLL_VCO_FREQ_HZ)); return ret; @@ -2260,7 +2260,7 @@ int setFrequency(enum CLKINDEX ind, int val) { // check adc clk too high if (ind == ADC_CLK && val > MAXIMUM_ADC_CLK) { - LOG(logERROR, ("Frequency %d MHz too high for ADC\n", val)); + LOG(logERROR, ("Frequency %d Hz too high for ADC\n", val)); return FAIL; } @@ -2308,7 +2308,7 @@ int getFrequency(enum CLKINDEX ind) { // checking against 0 here ensures compatibility with old firmware, TODO: // remove this check at some point if (measuredFreqHz != 0) { - // Round to nearest MHz. (should we round at all ?) + // Round to nearest Hz. (should we round at all ?) clkFrequency[ind] = measuredFreqHz; } #endif diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 28c2a4532..e79d0456b 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 89017dad9..0ccb3f3a7 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 0x260427" +#define APICTB "0.0.0 0x260428" #define APIGOTTHARD2 "0.0.0 0x260427" #define APIMOENCH "0.0.0 0x260424" #define APIEIGER "0.0.0 0x260424" -#define APIXILINXCTB "0.0.0 0x260427" +#define APIXILINXCTB "0.0.0 0x260428" #define APIJUNGFRAU "0.0.0 0x260424" #define APIMYTHEN3 "0.0.0 0x260427"