From 5cf15022879855a3d85a6b71c5fcee0f91731229 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 9 Dec 2019 11:30:54 +0100 Subject: [PATCH] ctb bug fix: 10g adc enable mask --- .../bin/ctbDetectorServer_developer | Bin 188832 -> 188832 bytes .../slsDetectorFunctionList.c | 3 ++- slsSupportLib/include/versionAPI.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index cdec4ff2ac80e7ce2a568c0576a5ea7eb5ae3694..482ce7454de8efbf458b4128405fdc7eb6612d54 100755 GIT binary patch delta 76 zcmZ2*n0vut?g^UA?-ajIpBTU-vC(A-rxd3UV*=v~1_l8JFaWX~9!fGWJmeJG%*55f d!^pF_Ta4G7iBqU~mT&tkU&igTe3{s$004E66{Y|H delta 76 zcmZ2*n0vut?g^UA_cm;uJ~4nvVx!9vPAPRk#stO}3=9GcU;tz}Jd|W$c&IM8nTe}| dhmn7Cw-~QEle%E@EZ_E7zKq*v`7*Ih0RWMD7C!(0 diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 7f63555d6..09583b861 100755 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -700,8 +700,9 @@ void setADCEnableMask_10G(uint32_t mask) { int ich = 0; for (ich = 0; ich < NCHAN_ANALOG; ich = ich + 4) { if ((1 << ich) & mask) { - actualMask |= (1 << ival++); + actualMask |= (1 << ival); } + ++ival; } } diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 2f676c084..5ee684ff4 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -6,7 +6,7 @@ #define APIMOENCH 0x190820 #define APIGOTTHARD2 0x191127 #define APIMYTHEN3 0x191127 -#define APICTB 0x191127 #define APIGOTTHARD 0x191127 #define APIJUNGFRAU 0x191127 #define APIEIGER 0x191129 +#define APICTB 0x191209