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

ctb bug fix: 10g adc enable mask

Browse Source
This commit is contained in:
maliakal_d 2019-12-09 11:30:54 +01:00
parent 8881542156
commit 5cf1502287
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -700,8 +700,9 @@ void setADCEnableMask_10G(uint32_t mask) {
int ich = 0; int ich = 0;
for (ich = 0; ich < NCHAN_ANALOG; ich = ich + 4) { for (ich = 0; ich < NCHAN_ANALOG; ich = ich + 4) {
if ((1 << ich) & mask) { if ((1 << ich) & mask) {
actualMask |= (1 << ival++); actualMask |= (1 << ival);
} }
++ival;
} }
} }

2
slsSupportLib/include/versionAPI.h
View File

@ -6,7 +6,7 @@
#define APIMOENCH 0x190820 #define APIMOENCH 0x190820
#define APIGOTTHARD2 0x191127 #define APIGOTTHARD2 0x191127
#define APIMYTHEN3 0x191127 #define APIMYTHEN3 0x191127
#define APICTB 0x191127
#define APIGOTTHARD 0x191127 #define APIGOTTHARD 0x191127
#define APIJUNGFRAU 0x191127 #define APIJUNGFRAU 0x191127
#define APIEIGER 0x191129 #define APIEIGER 0x191129
#define APICTB 0x191209