eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

basic changes for heater handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-11-16 16:36:59 +01:00
parent 7384c5ce16
commit 311d03e680
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mission/devices/HeaterHandler.cpp
View File

@ -321,6 +321,10 @@ HeaterHandler::SwitchState HeaterHandler::checkSwitchState(heater::Switchers swi
return heaterVec.at(switchNr).switchState; return heaterVec.at(switchNr).switchState;
} }
ReturnValue_t HeaterHandler::switchHeater(heater::Switchers heater, ReturnValue_t onOff) {
return sendSwitchCommand(heater, onOff);
}
bool HeaterHandler::allSwitchesOff() { bool HeaterHandler::allSwitchesOff() {
bool allSwitchesOrd = false; bool allSwitchesOrd = false;
MutexGuard mg(heaterMutex); MutexGuard mg(heaterMutex);

3
mission/devices/HeaterHandler.h
View File

@ -40,6 +40,7 @@ class HeaterHandler : public ExecutableObjectIF,
public PowerSwitchIF, public PowerSwitchIF,
public SystemObject, public SystemObject,
public HasActionsIF { public HasActionsIF {
friend class ThermalController;
public: public:
static const uint8_t INTERFACE_ID = CLASS_ID::HEATER_HANDLER; static const uint8_t INTERFACE_ID = CLASS_ID::HEATER_HANDLER;
@ -59,6 +60,8 @@ class HeaterHandler : public ExecutableObjectIF,
virtual ~HeaterHandler(); virtual ~HeaterHandler();
protected:
ReturnValue_t switchHeater(heater::Switchers heater, ReturnValue_t onOff);
ReturnValue_t performOperation(uint8_t operationCode = 0) override; ReturnValue_t performOperation(uint8_t operationCode = 0) override;
ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override; ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override;

2
tmtc

@ -1 +1 @@
Subproject commit 66a1362e7e977e427a66fd3176a9e7b6bc1b5998 Subproject commit d5813e1a422beae7d0cb092a885e0956e9f1ddc1