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

ctb v_limit dac tristate (#761)

Browse Source 
* ctb: allowing dac to tristate (-100) even if v_limit is set

* binary in

* formatting
This commit is contained in:
maliakal_d 2023-06-15 08:42:42 +02:00 committed by GitHub
parent d032f43f11
commit a5f26252b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 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.

2
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -1149,7 +1149,7 @@ int checkVLimitCompliant(int mV) {
} }
int checkVLimitDacCompliant(int dac) { int checkVLimitDacCompliant(int dac) {
if (vLimit > 0) { if (vLimit > 0 && dac != -1 && dac != LTC2620_GetPowerDownValue()) {
int mv = 0; int mv = 0;
// could not convert // could not convert
if (LTC2620_DacToVoltage(dac, &mv) == FAIL) if (LTC2620_DacToVoltage(dac, &mv) == FAIL)

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

@ -4,10 +4,10 @@
#define RELEASE "developer" #define RELEASE "developer"
#define APILIB "developer 0x230224" #define APILIB "developer 0x230224"
#define APIRECEIVER "developer 0x230224" #define APIRECEIVER "developer 0x230224"
#define APICTB "developer 0x230525"
#define APIGOTTHARD "developer 0x230525" #define APIGOTTHARD "developer 0x230525"
#define APIGOTTHARD2 "developer 0x230525" #define APIGOTTHARD2 "developer 0x230525"
#define APIMYTHEN3 "developer 0x230525" #define APIMYTHEN3 "developer 0x230525"
#define APIMOENCH "developer 0x230525" #define APIMOENCH "developer 0x230525"
#define APIEIGER "developer 0x230525" #define APIEIGER "developer 0x230525"
#define APIJUNGFRAU "developer 0x230525" #define APIJUNGFRAU "developer 0x230525"
#define APICTB "developer 0x230605"