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

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

2
slsDetectorSoftware/eigerDetectorServer/Beb.c
View File

@ -1115,7 +1115,7 @@ int Beb_GetBebFPGATemp()
}else{ }else{
//read data //read data
ret = Beb_Read32(csp0base, FPGA_TEMP_OFFSET); ret = Beb_Read32(csp0base, FPGA_TEMP_OFFSET);
temperature = ((((float)(ret)/65536.0f)/0.00198421639f ) - 273.15f); // Static conversation, copied from xps sysmon standalone driver temperature = ((((float)(ret)/65536.0f)/0.00198421639f ) - 273.15f)*1000; // Static conversation, copied from xps sysmon standalone driver
//close file pointer //close file pointer
Beb_close(fd,csp0base); Beb_close(fd,csp0base);
} }

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(){ int Feb_Control_GetLeftFPGATemp(){
unsigned int temperature=0; unsigned int temperature=0;
if(Module_TopAddressIsValid(&modules[1])) if(Module_TopAddressIsValid(&modules[1]))
@ -1900,6 +1903,7 @@ int Feb_Control_GetLeftFPGATemp(){
else else
Feb_Interface_ReadRegister(Module_GetBottomLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature); Feb_Interface_ReadRegister(Module_GetBottomLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature);
temperature = temperature >> 16; 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 //division done in client to send int over network
return (int)temperature; return (int)temperature;
} }
@ -1911,6 +1915,7 @@ int Feb_Control_GetRightFPGATemp(){
else else
Feb_Interface_ReadRegister(Module_GetBottomRightAddress (&modules[1]),FEB_REG_STATUS, &temperature); Feb_Interface_ReadRegister(Module_GetBottomRightAddress (&modules[1]),FEB_REG_STATUS, &temperature);
temperature = temperature >> 16; 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 //division done in client to send int over network
return (int)temperature; return (int)temperature;
} }

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.3 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.4
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 9f1b82c18ab0893d65bfadeb646b8ea244614632 Repsitory UUID: d3b24894af8a588e6945240c3b80c2b7024608c4
Revision: 294 Revision: 295
Branch: developer Branch: 3.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1443 Last Changed Rev: 1448
Last Changed Date: 2017-07-10 10:50:39.000000002 +0200 ./Makefile Last Changed Date: 2017-07-25 13:53:46.000000002 +0200 ./Beb.c

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" #define SVNREPUUID "d3b24894af8a588e6945240c3b80c2b7024608c4"
//#define SVNREV 0x1443 //#define SVNREV 0x1448
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1443 #define SVNREV 0x1448
#define SVNDATE 0x20170710 #define SVNDATE 0x20170725
// //

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -715,7 +715,7 @@ int getADC(enum ADCINDEX ind, int imod){
switch(ind){ switch(ind){
case TEMP_FPGA: case TEMP_FPGA:
retval=getBebFPGATemp()*1000; retval=getBebFPGATemp();
break; break;
case TEMP_FPGAFEBL: case TEMP_FPGAFEBL:
retval=Feb_Control_GetLeftFPGATemp(); retval=Feb_Control_GetLeftFPGATemp();

10
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 5380c93aa2acce275be11dd519cb49ad2a5a15d5 Repsitory UUID: d3b24894af8a588e6945240c3b80c2b7024608c4
Revision: 1442 Revision: 1443
Branch: developer Branch: 3.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1447 Last Changed Rev: 1448
Last Changed Date: 2017-07-13 14:40:24.000000002 +0200 ./threadFiles/ThreadPool.o Last Changed Date: 2017-07-25 12:31:20.000000002 +0200 ./threadFiles/ThreadPool.o

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "5380c93aa2acce275be11dd519cb49ad2a5a15d5" #define SVNREPUUIDLIB "d3b24894af8a588e6945240c3b80c2b7024608c4"
//#define SVNREV 0x1447 //#define SVNREV 0x1448
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1447 #define SVNREVLIB 0x1448
#define SVNDATELIB 0x20170713 #define SVNDATELIB 0x20170725
// //