detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

adc command line bug, ctb api added to client

Browse Source
This commit is contained in:
maliakal_d 2019-02-06 17:25:36 +01:00
parent 0c1a3b7756
commit a76cc90972
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -81,6 +81,9 @@ int slsDetector::checkDetectorVersionCompatibility() {
case GOTTHARD: case GOTTHARD:
arg = APIGOTTHARD; arg = APIGOTTHARD;
break; break;
case CHIPTESTBOARD:
arg = APICTB;
break;
default: default:
FILE_LOG(logERROR) << "Check version compatibility is not implemented for this detector"; FILE_LOG(logERROR) << "Check version compatibility is not implemented for this detector";
setErrorMask((getErrorMask()) | (VERSION_COMPATIBILITY)); setErrorMask((getErrorMask()) | (VERSION_COMPATIBILITY));

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4063,7 +4063,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
if (sscanf(args[0],"adc:%d",&idac)==1) { if (sscanf(args[0],"adc:%d",&idac)==1) {
// printf("chiptestboard!\n"); // printf("chiptestboard!\n");
adc=(dacIndex)(idac+1000); adc=(dacIndex)(idac+1000);
if (idac < SLOW_ADC0 || idac > SLOW_ADC_TEMP) if (idac < (SLOW_ADC0 - 1000) || idac > (SLOW_ADC_TEMP - 1000))
return (std::string ("cannot set adc, must be between ") + std::to_string(SLOW_ADC0 - 1000) + return (std::string ("cannot set adc, must be between ") + std::to_string(SLOW_ADC0 - 1000) +
std::string (" and ") + std::to_string(SLOW_ADC_TEMP - 1000)); std::string (" and ") + std::to_string(SLOW_ADC_TEMP - 1000));
} else if (cmd=="temp_adc") } else if (cmd=="temp_adc")