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

Niosmarie (#63)

Browse Source 
* HV for Mythen3 server

* HV for mythen3 server

* corrected upstreams

* missing endif
This commit is contained in:
Marie Andrä
2019-09-03 09:36:02 +02:00
committed by Dhanya Thattil
parent 40b62ef5a4
commit 4b987abf41
10 changed files with 98 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,13 +11,11 @@
// defines from the hardware
int DAC6571_SoftMaxVoltage = 0;
int DAC6571_HardMaxVoltage = 0;
char DAC6571_DriverFileName[MAX_STR_LENGTH];
void DAC6571_SetDefines(int softMaxV, int hardMaxV, char* driverfname) {
void DAC6571_SetDefines(int hardMaxV, char* driverfname) {
FILE_LOG(logINFOBLUE, ("Configuring High Voltage\n"));
DAC6571_SoftMaxVoltage = softMaxV;
DAC6571_HardMaxVoltage = hardMaxV;
memset(DAC6571_DriverFileName, 0, MAX_STR_LENGTH);
strcpy(DAC6571_DriverFileName, driverfname);
@ -30,10 +28,7 @@ int DAC6571_Set (int val) {
int dacvalue = 0;
// limit values
if (val > DAC6571_SoftMaxVoltage) {
val = DAC6571_SoftMaxVoltage;
}
// convert value
ConvertToDifferentRange(0, DAC6571_HardMaxVoltage,
DAC6571_MIN_DAC_VAL, DAC6571_MAX_DAC_VAL,
@ -48,7 +43,7 @@ int DAC6571_Set (int val) {
return FAIL;
}
//convert to string, add 0 and write to file
fprintf(fd, "%d0\n", dacvalue);
fprintf(fd, "%d\n", dacvalue);
fclose(fd);
return OK;

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

@ -668,9 +668,7 @@ int set_dac(int file_des) {
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError();
#if defined(MYTHEN3D)
functionNotImplemented();
#else
enum dacIndex ind = args[0];
int mV = args[1];
@ -796,6 +794,10 @@ int set_dac(int file_des) {
#elif GOTTHARD2D
case HIGH_VOLTAGE:
break;
#elif MYTHEN3D
case HIGH_VOLTAGE:
break;
#endif
default:
#ifdef JUNGFRAUD
@ -858,7 +860,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) || defined(GOTTHARD2D)
#if defined(JUNGFRAUD) || defined (CHIPTESTBOARDD) || defined(MOENCHD) || defined(GOTTHARD2D) || defined(MYTHEN3D)
validate(val, retval, "set high voltage", DEC);
#endif
#ifdef GOTTHARDD
@ -965,6 +967,9 @@ int set_dac(int file_des) {
#ifdef GOTTHARD2D
default:
break;
#elif MYTHEN3D
default:
break;
#else
// dacs
default:
@ -1025,7 +1030,6 @@ int set_dac(int file_des) {
}
}
}
#endif
return Server_SendResult(file_des, INT32, UPDATE, &retval, sizeof(retval));
}