From 5818265a7d65b7f0781052129242bf28e9aea275 Mon Sep 17 00:00:00 2001 From: "spahr@ksat-stuttgart.de" Date: Mon, 31 Mar 2025 13:31:51 +0200 Subject: [PATCH] Add interface to modeHelper for FDH; add interface to ModeHelper for set msgQueId for --- src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp | 4 +++- src/fsfw/devicehandlers/FreshDeviceHandlerBase.h | 5 +++++ src/fsfw/modes/ModeHelper.cpp | 2 +- src/fsfw/modes/ModeHelper.h | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp index a245fa5f..d885b920 100644 --- a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp +++ b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp @@ -190,4 +190,6 @@ ReturnValue_t FreshDeviceHandlerBase::getParameter(uint8_t domainId, uint8_t uni return INVALID_DOMAIN_ID; } -datapool::SharedPool* FreshDeviceHandlerBase::getOptionalSharedPool() { return nullptr; } \ No newline at end of file +datapool::SharedPool* FreshDeviceHandlerBase::getOptionalSharedPool() { return nullptr; } + +ModeHelper& FreshDeviceHandlerBase::getModeHelper() { return this->modeHelper; } \ No newline at end of file diff --git a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.h b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.h index d37138a6..9c2385c0 100644 --- a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.h +++ b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.h @@ -97,6 +97,11 @@ class FreshDeviceHandlerBase : public SystemObject, ReturnValue_t connectModeTreeParent(HasModeTreeChildrenIF& parent) override; ModeTreeChildIF& getModeTreeChildIF() override; + /** + * @brief Return an interface to the ModeHelper. + */ + ModeHelper& getModeHelper(); + protected: ActionHelper actionHelper; ModeHelper modeHelper; diff --git a/src/fsfw/modes/ModeHelper.cpp b/src/fsfw/modes/ModeHelper.cpp index aa1eb0cd..60b5c7a9 100644 --- a/src/fsfw/modes/ModeHelper.cpp +++ b/src/fsfw/modes/ModeHelper.cpp @@ -111,6 +111,6 @@ bool ModeHelper::isForced() { return forced; } void ModeHelper::setForced(bool forced) { this->forced = forced; } -void ModeHelper::setPowerswitchQueueId(MessageQueueId_t queueId) { +void ModeHelper::setPowerSwitchQueueId(MessageQueueId_t queueId) { powerswitchQueueId = queueId; } diff --git a/src/fsfw/modes/ModeHelper.h b/src/fsfw/modes/ModeHelper.h index c5d6bce3..13966915 100644 --- a/src/fsfw/modes/ModeHelper.h +++ b/src/fsfw/modes/ModeHelper.h @@ -28,7 +28,7 @@ class ModeHelper { /** * Set to MessageQueue::NO_QUEUE if no powerswitch is commanding the obejct. */ - void setPowerswitchQueueId(MessageQueueId_t queueId); + void setPowerSwitchQueueId(MessageQueueId_t queueId); ReturnValue_t initialize(MessageQueueId_t parentQueueId);