fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

thermal sensor update #402

Merged
gaisser merged 13 commits from mueller/thermal-handler into development 2021-04-20 16:10:21 +02:00
Conversation 1 Commits 13 Files Changed 1 +9 -12
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64efb8ec7f - Show all commits

21
thermal/TemperatureSensor.h
View File

@ -69,14 +69,14 @@ public:
* @param outputSet Output dataset for the output temperature to fetch it with read()
* @param thermalModule respective thermal module, if it has one
*/
TemperatureSensor(object_id_t setObjectid,
inputType *inputValue, gp_id_t variableGpid, PoolVariableIF* inputVariable,
TemperatureSensor(object_id_t setObjectid,lp_var_t<limitType>* inputTemperature,
gp_id_t variableGpid, PoolVariableIF* inputVariable,
uint8_t vectorIndex, Parameters parameters = {0, 0, 0, 0, 0, 0},
LocalPoolDataSetBase *outputSet = NULL, ThermalModuleIF *thermalModule = NULL) :
LocalPoolDataSetBase *outputSet = nullptr, ThermalModuleIF *thermalModule = nullptr) :
AbstractTemperatureSensor(setObjectid, thermalModule), parameters(parameters),
inputValue(inputValue), poolVariable(inputVariable),
inputTemperature(inputTemperature),
outputTemperature(variableGpid, outputSet, PoolVariableIF::VAR_WRITE),
sensorMonitor(setObjectid, DOMAIN_ID_SENSOR, poolVariable,
sensorMonitor(setObjectid, DOMAIN_ID_SENSOR, variableGpid,
DEFAULT_CONFIRMATION_COUNT, parameters.lowerLimit, parameters.upperLimit,
TEMP_SENSOR_LOW, TEMP_SENSOR_HIGH),
oldTemperature(20), uptimeOfOldTemperature({ thermal::INVALID_TEMPERATURE, 0 }) {
@ -110,10 +110,7 @@ protected:
UsedParameters parameters;
inputType* inputValue;
PoolVariableIF* poolVariable;
lp_var_t<limitType>* inputTemperature;
lp_var_t<float> outputTemperature;
LimitMonitor<limitType> sensorMonitor;
@ -122,18 +119,18 @@ protected:
timeval uptimeOfOldTemperature;
void doChildOperation() {
ReturnValue_t result = poolVariable->read(MutexIF::TimeoutType::WAITING, 20);
ReturnValue_t result = inputTemperature->read(MutexIF::TimeoutType::WAITING, 20);
if(result != HasReturnvaluesIF::RETURN_OK) {
return;
}
if ((not poolVariable->isValid()) or
if ((not inputTemperature->isValid()) or
(not healthHelper.healthTable->isHealthy(getObjectId()))) {
setInvalid();
return;
}
outputTemperature = calculateOutputTemperature(*inputValue);
outputTemperature = calculateOutputTemperature(inputTemperature->value);
outputTemperature.setValid(PoolVariableIF::VALID);
timeval uptime;