detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 05:08:06 +01:00
Code Issues Actions Packages Releases Activity

jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted

Browse Source
This commit is contained in:
maliakal_d
2018-03-14 17:20:26 +01:00
parent dd6301d66d
commit 40210ae26f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@@ -487,9 +487,11 @@ int adcPhase(int st){ /**carlos needed clkphase 1 and 2? cehck with Aldo */
printf("Setting ADC Phase to %d\n",st);
if (st > 65535 || st < -65535)
return clkPhase[0];
clkPhase[1] = st - clkPhase[0];
printf(" phase %d\n", clkPhase[1] );
clkPhase[1] = st - clkPhase[0];
if (clkPhase[1] == 0)
return clkPhase[0];
configurePll();
clkPhase[0] = st;
return clkPhase[0];
@@ -1249,7 +1251,7 @@ void configurePll() {
u_int32_t val;
int32_t phase=0, inv=0;
printf(" phase in %d\n", clkPhase[1]);
printf("Configuring PLL with phase in %d\n", clkPhase[1]);
if (clkPhase[1]>0) {
inv=0;
phase=clkPhase[1];