lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from dls-controls/fix/temperatureControl

Browse Source 
Added check in constructor before setting temperature
This commit is contained in:
Mark Rivers
2020-03-19 12:57:59 -05:00
committed by GitHub
parent 112ab065de 1b58f21f6d
commit 22abc2a3c4
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
andorApp/src/andorCCD.cpp
View File

@@ -244,10 +244,22 @@ AndorCCD::AndorCCD(const char *portName, const char *installPath, int cameraSeri
/* Get current temperature */
float temperature;
checkStatus(GetTemperatureF(&temperature));
printf("%s:%s: current temperature is %f\n", driverName, functionName, temperature);
setDoubleParam(ADTemperature, temperature);
int coolerStatus;
int maxTemp = 0;
int minTemp = 0;
checkStatus(IsCoolerOn(&coolerStatus));
if (coolerStatus){
checkStatus(GetTemperatureF(&temperature));
checkStatus(GetTemperatureRange(&minTemp, &maxTemp));
printf("%s:%s: current temperature is %f\n", driverName, functionName, temperature);
if (static_cast<int>(temperature) < minTemp) {
setDoubleParam(ADTemperature, minTemp);
} else if (static_cast<int>(temperature) < maxTemp) {
setDoubleParam(ADTemperature, maxTemp);
} else {
setDoubleParam(ADTemperature, temperature);
}
}
callParamCallbacks();
} catch (const std::string &e) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,