diff --git a/src/fsfw/modes/ModeHelper.cpp b/src/fsfw/modes/ModeHelper.cpp index ea5926c8..10f64ee1 100644 --- a/src/fsfw/modes/ModeHelper.cpp +++ b/src/fsfw/modes/ModeHelper.cpp @@ -4,7 +4,7 @@ #include "fsfw/modes/HasModesIF.h" #include "fsfw/serviceinterface/ServiceInterface.h" -ModeHelper::ModeHelper(HasModesIF* owner) +ModeHelper::ModeHelper(HasModesIF *owner) : commandedMode(HasModesIF::MODE_OFF), commandedSubmode(HasModesIF::SUBMODE_NONE), owner(owner), @@ -12,7 +12,7 @@ ModeHelper::ModeHelper(HasModesIF* owner) ModeHelper::~ModeHelper() {} -ReturnValue_t ModeHelper::handleModeCommand(CommandMessage* command) { +ReturnValue_t ModeHelper::handleModeCommand(CommandMessage *command) { CommandMessage reply; Mode_t mode; Submode_t submode; @@ -108,31 +108,31 @@ bool ModeHelper::isForced() { return forced; } void ModeHelper::setForced(bool forced) { this->forced = forced; } #ifdef FSFW_INTROSPECTION - std::vector> ModeHelper::getModes() const override { - std::vector> modeVector; - auto modeDefinitionHelper = owner->getModeDefinitionHelper(); - EnumIF *mode = modeDefinitionHelper.mode; - for (size_t i = 0; i < mode->getSize(); i++) { - modeVector.push_back( - std::pair(mode->getElements()[i], mode->getDescriptions()[i])); - } - modeDefinitionHelper.free(); - return modeVector; +std::vector> ModeHelper::getModes() const { + std::vector> modeVector; + auto modeDefinitionHelper = owner->getModeDefinitionHelper(); + EnumIF *mode = modeDefinitionHelper.mode; + for (size_t i = 0; i < mode->getSize(); i++) { + modeVector.push_back( + std::pair(mode->getElements()[i], mode->getDescriptions()[i])); } + modeDefinitionHelper.free(); + return modeVector; +} - std::vector> ModeHelper::getSubmodes(Mode_t mode) const override { - auto modeDefinitionHelper = owner->getModeDefinitionHelper(); - EnumIF *submode = modeDefinitionHelper.submode; - std::vector> submodeVector; - for (size_t i = 0; i < submode->getSize(); i++) { - uint32_t ignored; - if (owner->checkModeCommand(mode, submode->getElements()[i], &ignored) == - HasReturnvaluesIF::RETURN_OK) { - submodeVector.push_back(std::pair(submode->getElements()[i], - submode->getDescriptions()[i])); - } +std::vector> ModeHelper::getSubmodes(Mode_t mode) const { + auto modeDefinitionHelper = owner->getModeDefinitionHelper(); + EnumIF *submode = modeDefinitionHelper.submode; + std::vector> submodeVector; + for (size_t i = 0; i < submode->getSize(); i++) { + uint32_t ignored; + if (owner->checkModeCommand(mode, submode->getElements()[i], &ignored) == + HasReturnvaluesIF::RETURN_OK) { + submodeVector.push_back(std::pair(submode->getElements()[i], + submode->getDescriptions()[i])); } - modeDefinitionHelper.free(); - return submodeVector; } + modeDefinitionHelper.free(); + return submodeVector; +} #endif \ No newline at end of file