diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 6ac75d33c..40b4e315f 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 8934cb5a3..d667d1349 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -519,8 +519,10 @@ void setSpeed(enum speedVariable ind, int val, int mode) { switch(ind) { case CLOCK_DIVIDER: setClockDivider(val); + break; case ADC_PHASE: setAdcPhase(val, mode); + break; default: return; } @@ -1337,7 +1339,7 @@ void setClockDivider(int val) { FILE_LOG(logINFO, ("\tSet ADC Ofst Reg to 0x%x\n", bus_r(ADC_OFST_REG))); setAdcPhase(ADC_PHASE_FULL_SPEED, 0); - FILE_LOG(logINFO, ("\tSet ADC Phase Reg to 0x%x\n", ADC_PHASE_FULL_SPEED)); + FILE_LOG(logINFO, ("\tSet ADC Phase Reg to %d\n", ADC_PHASE_FULL_SPEED)); break; case HALF_SPEED: @@ -1353,7 +1355,7 @@ void setClockDivider(int val) { FILE_LOG(logINFO, ("\tSet ADC Ofst Reg to 0x%x\n", bus_r(ADC_OFST_REG))); setAdcPhase(ADC_PHASE_HALF_SPEED, 0); - FILE_LOG(logINFO, ("\tSet ADC Phase Reg to 0x%x\n", ADC_PHASE_HALF_SPEED)); + FILE_LOG(logINFO, ("\tSet ADC Phase Reg to %d\n", ADC_PHASE_HALF_SPEED)); break; case QUARTER_SPEED: @@ -1369,7 +1371,7 @@ void setClockDivider(int val) { FILE_LOG(logINFO, ("\tSet ADC Ofst Reg to 0x%x\n", bus_r(ADC_OFST_REG))); setAdcPhase(ADC_PHASE_QUARTER_SPEED, 0); - FILE_LOG(logINFO, ("\tSet ADC Phase Reg to 0x%x\n", ADC_PHASE_QUARTER_SPEED)); + FILE_LOG(logINFO, ("\tSet ADC Phase Reg to %d\n", ADC_PHASE_QUARTER_SPEED)); break; } diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 8aa2e449e..08ceab081 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -7,5 +7,5 @@ #define APIGUI 0x190405 #define APIEIGER 0x190516 -#define APIJUNGFRAU 0x190528 #define APICTB 0x190528 +#define APIJUNGFRAU 0x190528