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

2
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -362,6 +362,8 @@ enum dacIndex {
TEMPERATURE_DCDC, /**< temperature sensor (close to DCDC) */
TEMPERATURE_SODL, /**< temperature sensor (close to SODL) */
TEMPERATURE_SODR, /**< temperature sensor (close to SODR) */
TEMPERATURE_FPGA2, /**< temperature sensor (fpga2 (eiger:febl) */
TEMPERATURE_FPGA3, /**< temperature sensor (fpga3 (eiger:febr) */
V_POWER_A = 100, /**new chiptest board */
V_POWER_B = 101, /**new chiptest board */
V_POWER_C = 102, /**new chiptest board */

1
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -103,7 +103,6 @@ enum {
F_SET_RATE_CORRECT, /** < set/reset rate correction tau */
F_GET_RATE_CORRECT, /** < get rate correction tau */
F_ACTIVATE, /** < activate/deactivate readout */
F_SET_NETWORK_PARAMETER /**< set network parameters such as transmission delay, flow control */
/* Always append functions hereafter!!! */