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

fixed front end board temp

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-25 13:55:27 +02:00
parent 04165a9da8
commit 9d8faae375
8 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -1893,6 +1893,9 @@ int Feb_Control_PrintCorrectedValues(){
}
//So if software says now 40.00 you neeed to convert to mdegrees 40000(call it A1) and then
//A1/65536/0.00198421639-273.15
int Feb_Control_GetLeftFPGATemp(){
unsigned int temperature=0;
if(Module_TopAddressIsValid(&modules[1]))
@ -1900,6 +1903,7 @@ int Feb_Control_GetLeftFPGATemp(){
else
Feb_Interface_ReadRegister(Module_GetBottomLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature);
temperature = temperature >> 16;
temperature = ((((float)(temperature)/65536.0f)/0.00198421639f ) - 273.15f)*1000; // Static conversation, copied from xps sysmon standalone driver
//division done in client to send int over network
return (int)temperature;
}
@ -1911,6 +1915,7 @@ int Feb_Control_GetRightFPGATemp(){
else
Feb_Interface_ReadRegister(Module_GetBottomRightAddress (&modules[1]),FEB_REG_STATUS, &temperature);
temperature = temperature >> 16;
temperature = ((((float)(temperature)/65536.0f)/0.00198421639f ) - 273.15f)*1000; // Static conversation, copied from xps sysmon standalone driver
//division done in client to send int over network
return (int)temperature;
}