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

Update FSFW #45

Merged
meierj merged 26 commits from mueller/master into eive/develop 2022-03-25 14:56:19 +01:00
Conversation 0 Commits 26 Files Changed 11 +8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6dd6f28db0 - Show all commits

7
src/fsfw/power/PowerSwitcher.cpp
View File

@ -55,6 +55,13 @@ void PowerSwitcher::turnOff() {
state = WAIT_OFF; state = WAIT_OFF;
} }
bool PowerSwitcher::active() {
if(state == WAIT_OFF or state == WAIT_ON) {
return true;
}
return false;
}
PowerSwitcher::SwitchReturn_t PowerSwitcher::howManySwitches() { PowerSwitcher::SwitchReturn_t PowerSwitcher::howManySwitches() {
if (secondSwitch == power::NO_SWITCH) { if (secondSwitch == power::NO_SWITCH) {
return ONE_SWITCH; return ONE_SWITCH;

1
src/fsfw/power/PowerSwitcher.h
View File

@ -22,6 +22,7 @@ class PowerSwitcher : public HasReturnvaluesIF {
State_t setStartState = SWITCH_IS_OFF); State_t setStartState = SWITCH_IS_OFF);
void turnOn(); void turnOn();
void turnOff(); void turnOff();
bool active();
void doStateMachine(); void doStateMachine();
State_t getState(); State_t getState();
ReturnValue_t checkSwitchState(); ReturnValue_t checkSwitchState();