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

changed dacs and adcs values to be an int between sockets

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@222 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-15 17:07:55 +00:00
parent 73424d0376
commit 5407fdcf6e
7 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -1213,8 +1213,8 @@ int setDACRegister(int idac, int val, int imod) {
}
double getTemperature(int tempSensor, int imod){
double val;
int getTemperature(int tempSensor, int imod){
int val;
char cTempSensor[2][100]={"ADCs/ASICs","VRs/FPGAs"};
imod=0;//ignoring more than 1 mod for now
int i,j,repeats=6;
@ -1241,7 +1241,7 @@ double getTemperature(int tempSensor, int imod){
}
bus_w(TEMP_IN_REG,(T1_CLK_BIT)|(T1_CS_BIT)|(T2_CLK_BIT)|(T2_CS_BIT));//standby
val=((double)tempVal)/4.0;
val=((int)tempVal)/4.0;
#ifdef VERBOSE
printf("Temperature of module:%d for the %s is %.2fC\n",imod,cTempSensor[tempSensor],val);