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

ctor improved

Browse Source
This commit is contained in:
Robin Müller 2020-06-15 11:11:42 +02:00
parent 6ecf1cf534
commit c9d8bd59f0
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipc/CommandMessage.cpp
View File

@ -10,31 +10,18 @@ CommandMessage::CommandMessage(MessageQueueMessageIF* receiverMessage):
return; return;
} }
if(receiverMessage->getMaximumMessageSize() < if(receiverMessage->getMaximumMessageSize() <
MINIMUM_COMMAND_MESSAGE_SIZE) { getMinimumMessageSize()) {
sif::error << "CommandMessage::ComandMessage: Passed message buffer" sif::error << "CommandMessage::ComandMessage: Passed message buffer"
" can not hold minimum "<< MINIMUM_COMMAND_MESSAGE_SIZE " can not hold minimum "<< MINIMUM_COMMAND_MESSAGE_SIZE
<< " bytes!" << std::endl; << " bytes!" << std::endl;
return; return;
} }
internalMessage->setMessageSize(MINIMUM_COMMAND_MESSAGE_SIZE); internalMessage->setMessageSize(getMinimumMessageSize());
} }
CommandMessage::CommandMessage(MessageQueueMessageIF* messageToSet, CommandMessage::CommandMessage(MessageQueueMessageIF* messageToSet,
Command_t command, uint32_t parameter1, uint32_t parameter2): Command_t command, uint32_t parameter1, uint32_t parameter2):
CommandMessageBase(messageToSet) { CommandMessage(messageToSet) {
if(messageToSet == nullptr) {
sif::error << "CommandMessage::CommandMessage: Don't pass a nullptr"
" as the message queue message, pass the address of an actual"
" message!" << std::endl;
}
if(messageToSet->getMaximumMessageSize() <
MINIMUM_COMMAND_MESSAGE_SIZE) {
sif::error << "CommandMessage::ComandMessage: Passed message buffer"
" can not hold minimum "<< MINIMUM_COMMAND_MESSAGE_SIZE
<< " bytes!" << std::endl;
return;
}
internalMessage->setMessageSize(MINIMUM_COMMAND_MESSAGE_SIZE);
setCommand(command); setCommand(command);
setParameter(parameter1); setParameter(parameter1);
setParameter2(parameter2); setParameter2(parameter2);