detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 17:18:00 +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

19
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -1968,3 +1968,22 @@ int Feb_Control_PrintCorrectedValues(){
return 1;
}
int Feb_Control_GetLeftFPGATemp(){
unsigned int temperature=0;
Feb_Interface_ReadRegister(Module_GetTopLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature);
temperature = temperature >> 16;
//division done in client to send int over network
return temperature;
}
int Feb_Control_GetRightFPGATemp(){
unsigned int temperature=0;
Feb_Interface_ReadRegister(Module_GetTopRightAddress (&modules[1]),FEB_REG_STATUS, &temperature);
temperature = temperature >> 16;
//division done in client to send int over network
return (int)temperature;
}

5
slsDetectorSoftware/eigerDetectorServer/FebControl.h
View File

@ -192,4 +192,7 @@ int Feb_Control_GetModuleNumber();
void Feb_Control_SetRateCorrectionVariable(int activate_rate_correction);
int Feb_Control_PrintCorrectedValues();
#endif
int Feb_Control_GetLeftFPGATemp();
int Feb_Control_GetRightFPGATemp();
#endif

2
slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h
View File

@ -149,3 +149,5 @@
#define FRAME_NUM_RESET_OFFSET 0xA0
//temp so far
#define FEB_REG_STATUS 0xa

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.0 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.1
View File

Binary file not shown.

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -449,6 +449,12 @@ int getADC(enum detAdcIndex ind, int imod){
case TEMP_FPGA:
retval=getBebFPGATemp()*1000;
break;
case TEMP_FPGAFEBL:
retval=Feb_Control_GetLeftFPGATemp();
break;
case TEMP_FPGAFEBR:
retval=Feb_Control_GetRightFPGATemp();
break;
case TEMP_FPGAEXT:
case TEMP_10GE:
case TEMP_DCDC:

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -40,7 +40,7 @@
enum detDacIndex{SVP,VTR,VRF,VRS,SVN,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,RXB_RB,RXB_LB,VCMP_RR,VCP,VCN,VIS,VTHRESHOLD};
enum detAdcIndex{TEMP_FPGAEXT, TEMP_10GE, TEMP_DCDC, TEMP_SODL, TEMP_SODR, TEMP_FPGA};
enum detAdcIndex{TEMP_FPGAEXT, TEMP_10GE, TEMP_DCDC, TEMP_SODL, TEMP_SODR, TEMP_FPGA, TEMP_FPGAFEBL, TEMP_FPGAFEBR};
enum detNetworkParameter{TXN_LEFT, TXN_RIGHT, TXN_FRAME,FLOWCTRL_10G};