From 14d10d2f8fd0fc8544d24dcaa612ec5105822991 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 20 Jan 2022 17:21:37 +0100 Subject: [PATCH 1/2] fix for slow adcs and any other adcs that went to stop server, but needed control server for configuration of the adc --- slsDetectorSoftware/src/Module.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 1f357e5de..0b17f7f96 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -690,7 +690,22 @@ void Module::setImageTestMode(const int value) { } int Module::getADC(dacIndex index) const { - return sendToDetectorStop(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 + return sendToDetectorStop(F_GET_ADC, index); + + default: + return sendToDetector(F_GET_ADC, index); + } } int Module::getOnChipDAC(slsDetectorDefs::dacIndex index, int chipIndex) const { From 50c1056eb2abf5485c43fe149e5cba35eb263f97 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 20 Jan 2022 17:23:41 +0100 Subject: [PATCH 2/2] minor --- slsDetectorSoftware/src/Module.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 0b17f7f96..29c02de91 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -700,7 +700,8 @@ int Module::getADC(dacIndex index) const { case TEMPERATURE_SODR: case TEMPERATURE_FPGA2: case TEMPERATURE_FPGA3: - // only the temperatures go to the control server + // only the temperatures go to the control server, others need + // configuration of adc in control server return sendToDetectorStop(F_GET_ADC, index); default: