KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

some more replacements

Browse Source
This commit is contained in:
Robin Müller 2020-11-30 16:30:20 +01:00
parent f108ae883c
commit d1beb96c60
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
thermal/ThermalComponent.cpp
View File

@ -22,22 +22,21 @@ ThermalComponent::~ThermalComponent() {
} }
ReturnValue_t ThermalComponent::setTargetState(int8_t newState) { ReturnValue_t ThermalComponent::setTargetState(int8_t newState) {
// GlobDataSet mySet; targetState.setReadWriteMode(pool_rwm_t::VAR_READ_WRITE);
// gp_int8_t writableTargetState(targetState.getDataPoolId(), targetState.read();
// &mySet, PoolVariableIF::VAR_READ_WRITE); if ((targetState == STATE_REQUEST_OPERATIONAL)
// mySet.read(); and (newState != STATE_REQUEST_IGNORE)) {
// if ((writableTargetState == STATE_REQUEST_OPERATIONAL) return HasReturnvaluesIF::RETURN_FAILED;
// && (newState != STATE_REQUEST_IGNORE)) { }
// return HasReturnvaluesIF::RETURN_FAILED; switch (newState) {
// } case STATE_REQUEST_NON_OPERATIONAL:
// switch (newState) { targetState = newState;
// case STATE_REQUEST_NON_OPERATIONAL: targetState.setValid(true);
// writableTargetState = newState; targetState.commit(PoolVariableIF::VALID);
// mySet.commit(PoolVariableIF::VALID); return HasReturnvaluesIF::RETURN_OK;
// return HasReturnvaluesIF::RETURN_OK; default:
// default: return ThermalComponentCore::setTargetState(newState);
// return ThermalComponentCore::setTargetState(newState); }
// }
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
@ -79,13 +78,14 @@ ThermalComponentIF::State ThermalComponent::getState(float temperature,
} }
void ThermalComponent::checkLimits(ThermalComponentIF::State state) { void ThermalComponent::checkLimits(ThermalComponentIF::State state) {
//if (targetState == STATE_REQUEST_OPERATIONAL || targetState == STATE_REQUEST_IGNORE) { if ((targetState == STATE_REQUEST_OPERATIONAL) or
// ThermalComponentCore::checkLimits(state); (targetState == STATE_REQUEST_IGNORE)) {
// return; ThermalComponentCore::checkLimits(state);
//} return;
//If component is not operational, it checks the NOP limits. }
//temperatureMonitor.translateState(state, temperature.value, // If component is not operational, it checks the NOP limits.
// nopParameters.lowerNopLimit, nopParameters.upperNopLimit, false); temperatureMonitor.translateState(state, temperature.value,
nopParameters.lowerNopLimit, nopParameters.upperNopLimit, false);
} }
ThermalComponentIF::HeaterRequest ThermalComponent::getHeaterRequest( ThermalComponentIF::HeaterRequest ThermalComponent::getHeaterRequest(