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

more style

Browse Source
This commit is contained in:
Ulrich Mohr 2023-02-09 15:44:39 +01:00
parent dfb1633f00
commit 3a2393885f
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fsfw/pus/CService200ModeCommanding.cpp
View File

@ -19,7 +19,7 @@ ReturnValue_t CService200ModeCommanding::isValidSubservice(uint8_t subservice) {
switch (subservice) { switch (subservice) {
case (Subservice::COMMAND_MODE_COMMAND): case (Subservice::COMMAND_MODE_COMMAND):
case (Subservice::COMMAND_MODE_READ): case (Subservice::COMMAND_MODE_READ):
case (Subservice::COMMAND_MODE_ANNCOUNCE): case (Subservice::COMMAND_MODE_ANNOUNCE):
return returnvalue::OK; return returnvalue::OK;
default: default:
return AcceptsTelecommandsIF::INVALID_SUBSERVICE; return AcceptsTelecommandsIF::INVALID_SUBSERVICE;
@ -53,6 +53,7 @@ ReturnValue_t CService200ModeCommanding::checkInterfaceAndAcquireMessageQueue(
ReturnValue_t CService200ModeCommanding::prepareCommand(CommandMessage *message, uint8_t subservice, ReturnValue_t CService200ModeCommanding::prepareCommand(CommandMessage *message, uint8_t subservice,
const uint8_t *tcData, size_t tcDataLen, const uint8_t *tcData, size_t tcDataLen,
uint32_t *state, object_id_t objectId) { uint32_t *state, object_id_t objectId) {
bool recursive = false;
switch (subservice) { switch (subservice) {
case (Subservice::COMMAND_MODE_COMMAND): { case (Subservice::COMMAND_MODE_COMMAND): {
ModePacket modeCommandPacket; ModePacket modeCommandPacket;
@ -66,24 +67,19 @@ ReturnValue_t CService200ModeCommanding::prepareCommand(CommandMessage *message,
modeCommandPacket.getMode(), modeCommandPacket.getSubmode()); modeCommandPacket.getMode(), modeCommandPacket.getSubmode());
return returnvalue::OK; return returnvalue::OK;
} }
case (Subservice::COMMAND_MODE_ANNCOUNCE): case (Subservice::COMMAND_MODE_ANNOUNCE_RECURSIVELY):
case (Subservice::COMMAND_MODE_ANNOUNCE_RECURSIVELY): { recursive = true;
bool recursive = true; [[fallthrough]];
if (subservice == Subservice::COMMAND_MODE_ANNCOUNCE) { case (Subservice::COMMAND_MODE_ANNOUNCE):
recursive = false;
}
ModeMessage::setModeAnnounceMessage(*message, recursive); ModeMessage::setModeAnnounceMessage(*message, recursive);
return EXECUTION_COMPLETE; return EXECUTION_COMPLETE;
} case (Subservice::COMMAND_MODE_READ):
case (Subservice::COMMAND_MODE_READ): {
ModeMessage::setModeReadMessage(*message); ModeMessage::setModeReadMessage(*message);
return returnvalue::OK; return returnvalue::OK;
} default:
default: {
return CommandingServiceBase::INVALID_SUBSERVICE; return CommandingServiceBase::INVALID_SUBSERVICE;
} }
} }
}
ReturnValue_t CService200ModeCommanding::handleReply(const CommandMessage *reply, ReturnValue_t CService200ModeCommanding::handleReply(const CommandMessage *reply,
Command_t previousCommand, uint32_t *state, Command_t previousCommand, uint32_t *state,

2
src/fsfw/pus/CService200ModeCommanding.h
View File

@ -52,7 +52,7 @@ class CService200ModeCommanding : public CommandingServiceBase {
COMMAND_MODE_READ = 3, COMMAND_MODE_READ = 3,
//!< [EXPORT] : [COMMAND] Trigger an ModeInfo Event. //!< [EXPORT] : [COMMAND] Trigger an ModeInfo Event.
//! This command does NOT have a reply //! This command does NOT have a reply
COMMAND_MODE_ANNCOUNCE = 4, COMMAND_MODE_ANNOUNCE = 4,
//!< [EXPORT] : [COMMAND] Trigger a ModeInfo Event and to send this //!< [EXPORT] : [COMMAND] Trigger a ModeInfo Event and to send this
//! command to every child. This command does NOT have a reply. //! command to every child. This command does NOT have a reply.
COMMAND_MODE_ANNOUNCE_RECURSIVELY = 5, COMMAND_MODE_ANNOUNCE_RECURSIVELY = 5,