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

gotthard2:hv

Browse Source
This commit is contained in:
maliakal_d
2019-09-02 12:57:24 +02:00
parent 4a112104ad
commit bd95126da2
9 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/src/DAC6571.c
View File

@ -3,6 +3,8 @@
#include "common.h"
#include "sls_detector_defs.h"
#include "string.h"
/* DAC6571 HV DEFINES */
#define DAC6571_MIN_DAC_VAL (0x0)
#define DAC6571_MAX_DAC_VAL (0x3FF)
@ -42,7 +44,7 @@ int DAC6571_Set (int val) {
//open file
FILE* fd=fopen(DAC6571_DriverFileName,"w");
if (fd==NULL) {
FILE_LOG(logERROR, ("Could not open file for writing to set high voltage\n"));
FILE_LOG(logERROR, ("Could not open file %s for writing to set high voltage\n", DAC6571_DriverFileName));
return FAIL;
}
//convert to string, add 0 and write to file

13
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -654,7 +654,7 @@ int set_dac(int file_des) {
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError();
#if defined(MYTHEN3D) || defined(GOTTHARD2D)
#if defined(MYTHEN3D)
functionNotImplemented();
#else
@ -779,6 +779,9 @@ int set_dac(int file_des) {
case HIGH_VOLTAGE:
case V_LIMIT:
break;
#elif GOTTHARD2D
case HIGH_VOLTAGE:
break;
#endif
default:
#ifdef JUNGFRAUD
@ -841,7 +844,7 @@ int set_dac(int file_des) {
case HIGH_VOLTAGE:
retval = setHighVoltage(val);
FILE_LOG(logDEBUG1, ("High Voltage: %d\n", retval));
#if defined(JUNGFRAUD) || defined (CHIPTESTBOARDD) || defined(MOENCHD)
#if defined(JUNGFRAUD) || defined (CHIPTESTBOARDD) || defined(MOENCHD) || defined(GOTTHARD2D)
validate(val, retval, "set high voltage", DEC);
#endif
#ifdef GOTTHARDD
@ -945,7 +948,10 @@ int set_dac(int file_des) {
validate(val, retval, "set vlimit", DEC);
break;
#endif
#ifdef GOTTHARD2D
default:
break;
#elif
// dacs
default:
if (mV && val > DAC_MAX_MV) {
@ -1001,6 +1007,7 @@ int set_dac(int file_des) {
}
FILE_LOG(logDEBUG1, ("Dac (%d): %d %s\n\n", serverDacIndex, retval, (mV ? "mV" : "dac units")));
break;
#endif
}
}
}