detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

jungfrau bug fix: setting clkdivider also set adcphase: break inswitch

Browse Source
This commit is contained in:
maliakal_d
2019-05-28 14:14:08 +02:00
parent 938e1e87ff
commit 8c112efdb3
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -519,8 +519,10 @@ void setSpeed(enum speedVariable ind, int val, int mode) {
switch(ind) { switch(ind) {
case CLOCK_DIVIDER: case CLOCK_DIVIDER:
setClockDivider(val); setClockDivider(val);
break;
case ADC_PHASE: case ADC_PHASE:
setAdcPhase(val, mode); setAdcPhase(val, mode);
break;
default: default:
return; 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))); FILE_LOG(logINFO, ("\tSet ADC Ofst Reg to 0x%x\n", bus_r(ADC_OFST_REG)));
setAdcPhase(ADC_PHASE_FULL_SPEED, 0); 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; break;
case HALF_SPEED: 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))); FILE_LOG(logINFO, ("\tSet ADC Ofst Reg to 0x%x\n", bus_r(ADC_OFST_REG)));
setAdcPhase(ADC_PHASE_HALF_SPEED, 0); 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; break;
case QUARTER_SPEED: 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))); FILE_LOG(logINFO, ("\tSet ADC Ofst Reg to 0x%x\n", bus_r(ADC_OFST_REG)));
setAdcPhase(ADC_PHASE_QUARTER_SPEED, 0); 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; break;
} }

2
slsSupportLib/include/versionAPI.h
View File

@ -7,5 +7,5 @@
#define APIGUI 0x190405 #define APIGUI 0x190405
#define APIEIGER 0x190516 #define APIEIGER 0x190516
#define APIJUNGFRAU 0x190528
#define APICTB 0x190528 #define APICTB 0x190528
#define APIJUNGFRAU 0x190528