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

Added Backend board FPGA temperature support

Browse Source
This commit is contained in:
l_brueckner_m
2015-04-20 18:20:02 +02:00
parent ee0c6c4a05
commit 39cd82f0b8
9 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1244,7 +1244,7 @@ int set_dac(int file_des) {
int get_adc(int file_des) {
int retval;
int retval=-1;
int ret=OK,ret1=OK;
int arg[2];
enum dacIndex ind;
@ -1271,6 +1271,12 @@ int get_adc(int file_des) {
#endif
switch (ind) {
#ifdef EIGERD
case TEMPERATURE_FPGA: //dac = TEMP_FPGA;
retval=getBebFPGATemp();
printf("Temperature: %d°C\n",retval);
break;
#endif
#ifdef GOTTHARDD
case TEMPERATURE_FPGA: //dac = TEMP_FPGA;
break;
@ -1284,7 +1290,7 @@ int get_adc(int file_des) {
break;
}
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (ret==OK) {
if ((ret==OK) && (retval==-1)) {
retval=getADC(idac,imod);
}
#endif