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

interchanged both the temp_adc and temp_fpga values, since they were reading alternate values

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@63 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2011-11-25 10:55:22 +00:00
parent fdeba63bff
commit f1654363e0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
View File

@ -32,7 +32,7 @@ enum {VREF_DS, VCASCN_PB, VCASCP_PB, VOUT_CM, VCASC_OUT, VIN_CM, VREF_COMP, IB_T
#define DACADDR {0,1,0,1,0,1,0,1,0,1,0,1,0,1} #define DACADDR {0,1,0,1,0,1,0,1,0,1,0,1,0,1}
//Register Definitions for temp,hv,dac gain //Register Definitions for temp,hv,dac gain
enum {TEMP_ADC, TEMP_FPGA, HIGH_VOLTAGE, CONFGAIN}; enum {TEMP_FPGA, TEMP_ADC, HIGH_VOLTAGE, CONFGAIN};
//dynamic range //dynamic range
#define MAX5523 #define MAX5523

6
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -846,12 +846,12 @@ int set_dac(int fnum) {
case G_IB_TESTC: case G_IB_TESTC:
idac=IB_TESTC; idac=IB_TESTC;
break; break;
case TEMPERATURE_ADC:
ireg=TEMP_ADC;
break;
case TEMPERATURE_FPGA: case TEMPERATURE_FPGA:
ireg=TEMP_FPGA; ireg=TEMP_FPGA;
break; break;
case TEMPERATURE_ADC:
ireg=TEMP_ADC;
break;
case HV_POT: case HV_POT:
ireg=HIGH_VOLTAGE; ireg=HIGH_VOLTAGE;
break; break;