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

set struct reporting continued

Browse Source
This commit is contained in:
Robin Müller
2020-09-26 15:27:06 +02:00
parent 08d0e09493
commit 6fd39dfac3
5 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
power/PowerComponentIF.h
View File

@ -3,12 +3,11 @@
#include "../serialize/SerializeIF.h"
#include "../parameters/HasParametersIF.h"
#include "../objectmanager/SystemObjectIF.h"
class PowerComponentIF : public SerializeIF, public HasParametersIF {
public:
virtual ~PowerComponentIF() {
}
virtual ~PowerComponentIF() {}
virtual object_id_t getDeviceObjectId() = 0;

3
power/PowerSwitcher.cpp
View File

@ -23,7 +23,7 @@ ReturnValue_t PowerSwitcher::getStateOfSwitches() {
switch (result) {
case ONE_SWITCH:
return power->getSwitchState(firstSwitch);
case TWO_SWITCHES:
case TWO_SWITCHES: {
ReturnValue_t firstSwitchState = power->getSwitchState(firstSwitch);
ReturnValue_t secondSwitchState = power->getSwitchState(firstSwitch);
if ((firstSwitchState == PowerSwitchIF::SWITCH_ON)
@ -37,6 +37,7 @@ ReturnValue_t PowerSwitcher::getStateOfSwitches() {
else {
return HasReturnvaluesIF::RETURN_FAILED;
}
}
default:
return HasReturnvaluesIF::RETURN_FAILED;
}