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

possible fix for power switch component

Browse Source
This commit is contained in:
Robin Müller 2023-03-14 11:44:13 +01:00
parent 9a8d775eb1
commit 8382d61b92
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [unreleased] # [unreleased]
## Fixed
- Use `modetree::connectModeTreeParent` in `PowerSwitcherComponent` to connect mode tree parent.
# [v6.0.0] # [v6.0.0]
## Fixes ## Fixes

3
src/fsfw/power/PowerSwitcherComponent.cpp
View File

@ -2,6 +2,7 @@
#include <fsfw/ipc/QueueFactory.h> #include <fsfw/ipc/QueueFactory.h>
#include <fsfw/power/PowerSwitchIF.h> #include <fsfw/power/PowerSwitchIF.h>
#include <fsfw/subsystem/helper.h>
PowerSwitcherComponent::PowerSwitcherComponent(object_id_t objectId, PowerSwitchIF* pwrSwitcher, PowerSwitcherComponent::PowerSwitcherComponent(object_id_t objectId, PowerSwitchIF* pwrSwitcher,
power::Switch_t pwrSwitch) power::Switch_t pwrSwitch)
@ -111,7 +112,7 @@ const HasHealthIF* PowerSwitcherComponent::getOptHealthIF() const { return this;
const HasModesIF& PowerSwitcherComponent::getModeIF() const { return *this; } const HasModesIF& PowerSwitcherComponent::getModeIF() const { return *this; }
ReturnValue_t PowerSwitcherComponent::connectModeTreeParent(HasModeTreeChildrenIF& parent) { ReturnValue_t PowerSwitcherComponent::connectModeTreeParent(HasModeTreeChildrenIF& parent) {
return parent.registerChild(*this); return modetree::connectModeTreeParent(parent, *this, &healthHelper, modeHelper);
} }
object_id_t PowerSwitcherComponent::getObjectId() const { return SystemObject::getObjectId(); } object_id_t PowerSwitcherComponent::getObjectId() const { return SystemObject::getObjectId(); }