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

fixed bug in gui that overwrites the individual sls file path values with the multi value, included a febl and febr temp read

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-10 08:39:46 +02:00
parent cd232fd732
commit 64fd82f92c
10 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1325,9 +1325,6 @@ int get_adc(int file_des) {
#endif
switch (ind) {
#ifdef EIGERD
case TEMPERATURE_FPGA:
iadc = TEMP_FPGA;
break;
case TEMPERATURE_FPGAEXT:
iadc = TEMP_FPGAEXT;
break;
@ -1343,6 +1340,15 @@ int get_adc(int file_des) {
case TEMPERATURE_SODR:
iadc = TEMP_SODR;
break;
case TEMPERATURE_FPGA:
iadc = TEMP_FPGA;
break;
case TEMPERATURE_FPGA2:
iadc = TEMP_FPGAFEBL;
break;
case TEMPERATURE_FPGA3:
iadc = TEMP_FPGAFEBR;
break;
#endif
#ifdef GOTTHARDD
case TEMPERATURE_FPGA: