detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

merge with developer

Browse Source
This commit is contained in:
maliakal_d
2022-01-24 11:39:13 +01:00
parent 26aa129004 c554bbb2d3
commit 6c0356ff90
80 changed files with 16018 additions and 15875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/src/Module.cpp
View File

@ -690,7 +690,23 @@ void Module::setImageTestMode(const int value) {
}
int Module::getADC(dacIndex index) const {
return sendToDetectorStop<int>(F_GET_ADC, index);
switch (index) {
case TEMPERATURE_ADC:
case TEMPERATURE_FPGA:
case TEMPERATURE_FPGAEXT:
case TEMPERATURE_10GE:
case TEMPERATURE_DCDC:
case TEMPERATURE_SODL:
case TEMPERATURE_SODR:
case TEMPERATURE_FPGA2:
case TEMPERATURE_FPGA3:
// only the temperatures go to the control server, others need
// configuration of adc in control server
return sendToDetectorStop<int>(F_GET_ADC, index);
default:
return sendToDetector<int>(F_GET_ADC, index);
}
}
int Module::getOnChipDAC(slsDetectorDefs::dacIndex index, int chipIndex) const {