detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 11:50:03 +02:00
Code Issues Actions Packages Releases Activity

Ctb: allow adc mask enable to be 0 for 1 and 10GbE (#750)

Browse Source 
* ctb: allow adc mask enable to be 0 for 1 and 10GbE
This commit is contained in:
maliakal_d 2023-05-22 11:26:57 +02:00 committed by GitHub
parent fb25a01db5
commit a0f250a487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 9 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.

8
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -723,10 +723,6 @@ int getDynamicRange(int *retval) {
} }
int setADCEnableMask(uint32_t mask) { int setADCEnableMask(uint32_t mask) {
if (mask == 0u) {
LOG(logERROR, ("Cannot set 1gb adc mask to 0\n"));
return FAIL;
}
LOG(logINFO, ("Setting adcEnableMask 1G to 0x%08x\n", mask)); LOG(logINFO, ("Setting adcEnableMask 1G to 0x%08x\n", mask));
adcEnableMask_1g = mask; adcEnableMask_1g = mask;
// 1Gb enabled // 1Gb enabled
@ -741,10 +737,6 @@ int setADCEnableMask(uint32_t mask) {
uint32_t getADCEnableMask() { return adcEnableMask_1g; } uint32_t getADCEnableMask() { return adcEnableMask_1g; }
void setADCEnableMask_10G(uint32_t mask) { void setADCEnableMask_10G(uint32_t mask) {
if (mask == 0u) {
LOG(logERROR, ("Cannot set 10gb adc mask to 0\n"));
return;
}
// convert 32 bit mask to 8 bit mask // convert 32 bit mask to 8 bit mask
uint8_t actualMask = 0; uint8_t actualMask = 0;
if (mask != 0) { if (mask != 0) {

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -2,7 +2,6 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
/** API versions */ /** API versions */
#define RELEASE "developer" #define RELEASE "developer"
#define APICTB "developer 0x230224"
#define APIGOTTHARD "developer 0x230224" #define APIGOTTHARD "developer 0x230224"
#define APIGOTTHARD2 "developer 0x230224" #define APIGOTTHARD2 "developer 0x230224"
#define APIMYTHEN3 "developer 0x230224" #define APIMYTHEN3 "developer 0x230224"
@ -11,3 +10,4 @@
#define APIEIGER "developer 0x230224" #define APIEIGER "developer 0x230224"
#define APIJUNGFRAU "developer 0x230508" #define APIJUNGFRAU "developer 0x230508"
#define APIMOENCH "developer 0x230508" #define APIMOENCH "developer 0x230508"
#define APICTB "developer 0x230522"