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

gotthard2: soft limit to list

Browse Source
This commit is contained in:
maliakal_d
2019-09-03 09:41:54 +02:00
parent 4b987abf41
commit 21ce0055b2
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -179,7 +179,7 @@ void setupDetector() {
FILE_LOG(logINFO, ("This Server is for 1 Gotthard2 module \n")); FILE_LOG(logINFO, ("This Server is for 1 Gotthard2 module \n"));
// hv // hv
DAC6571_SetDefines(HV_SOFT_MAX_VOLTAGE, HV_HARD_MAX_VOLTAGE, HV_DRIVER_FILE_NAME); DAC6571_SetDefines(HV_HARD_MAX_VOLTAGE, HV_DRIVER_FILE_NAME);
setHighVoltage(DEFAULT_HIGH_VOLTAGE); setHighVoltage(DEFAULT_HIGH_VOLTAGE);
//Initialization of acquistion parameters //Initialization of acquistion parameters
@ -297,6 +297,10 @@ int64_t getTimeLeft(enum timerIndex ind){
int setHighVoltage(int val){ int setHighVoltage(int val){
if (val > HV_SOFT_MAX_VOLTAGE) {
val = HV_SOFT_MAX_VOLTAGE;
}
#ifdef VIRTUAL #ifdef VIRTUAL
if (val >= 0) if (val >= 0)
highvoltage = val; highvoltage = val;

2
slsSupportLib/include/versionAPI.h
View File

@ -6,7 +6,7 @@
#define APIMOENCH 0x190820 #define APIMOENCH 0x190820
#define APICTB 0x190902 #define APICTB 0x190902
#define APIGOTTHARD 0x190902 #define APIGOTTHARD 0x190902
#define APIGOTTHARD2 0x190902
#define APIJUNGFRAU 0x190902 #define APIJUNGFRAU 0x190902
#define APIEIGER 0x190902 #define APIEIGER 0x190902
#define APIMYTHEN3 0x190903 #define APIMYTHEN3 0x190903
#define APIGOTTHARD2 0x190903