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

mythen3, gotthard2: bug fix- changing wrong pll phases when changing frequency

Browse Source
This commit is contained in:
maliakal_d 2020-07-13 15:47:43 +02:00
parent bef35eb3d6
commit 293fda0c7a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -1710,7 +1710,7 @@ int setClockDivider(enum CLKINDEX ind, int val) {
} }
// phase is reset by pll (when setting output frequency) // phase is reset by pll (when setting output frequency)
if (ind >= READOUT_C0) { if (ind < SYSTEM_C0) {
clkPhase[READOUT_C0] = 0; clkPhase[READOUT_C0] = 0;
clkPhase[READOUT_C1] = 0; clkPhase[READOUT_C1] = 0;
} else { } else {
@ -2500,4 +2500,4 @@ int getTotalNumberOfChannels() {
} }
int getNumberOfChips() { return NCHIP; } int getNumberOfChips() { return NCHIP; }
int getNumberOfDACs() { return NDAC; } int getNumberOfDACs() { return NDAC; }
int getNumberOfChannelsPerChip() { return NCHAN; } int getNumberOfChannelsPerChip() { return NCHAN; }

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -1929,7 +1929,7 @@ int setClockDivider(enum CLKINDEX ind, int val) {
clkDivider[ind])); clkDivider[ind]));
// phase is reset by pll (when setting output frequency) // phase is reset by pll (when setting output frequency)
if (ind >= READOUT_C0) { if (ind < SYSTEM_C0) {
clkPhase[READOUT_C0] = 0; clkPhase[READOUT_C0] = 0;
clkPhase[READOUT_C1] = 0; clkPhase[READOUT_C1] = 0;
} else { } else {

4
slsSupportLib/include/versionAPI.h
View File

@ -5,8 +5,8 @@
#define APIGUI 0x200409 #define APIGUI 0x200409
#define APICTB 0x200703 #define APICTB 0x200703
#define APIGOTTHARD 0x200703 #define APIGOTTHARD 0x200703
#define APIGOTTHARD2 0x200703
#define APIJUNGFRAU 0x200703 #define APIJUNGFRAU 0x200703
#define APIMOENCH 0x200702 #define APIMOENCH 0x200702
#define APIEIGER 0x200703 #define APIEIGER 0x200703
#define APIMYTHEN3 0x200708 #define APIGOTTHARD2 0x200713
#define APIMYTHEN3 0x200713