From 1caa45118b9bdeec471086b15da5893a23a82ca0 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Tue, 2 Mar 2021 14:58:49 +0100 Subject: [PATCH] makecommandid is constexpr now --- ipc/CommandMessageIF.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ipc/CommandMessageIF.h b/ipc/CommandMessageIF.h index 898f6982..468e2469 100644 --- a/ipc/CommandMessageIF.h +++ b/ipc/CommandMessageIF.h @@ -13,8 +13,7 @@ public: /** * Header consists of sender ID and command ID. */ - static constexpr size_t HEADER_SIZE = MessageQueueMessageIF::HEADER_SIZE + - sizeof(Command_t); + static constexpr size_t HEADER_SIZE = MessageQueueMessageIF::HEADER_SIZE + sizeof(Command_t); /** * This minimum size is derived from the interface requirement to be able * to set a rejected reply, which contains a returnvalue and the initial @@ -23,12 +22,12 @@ public: static constexpr size_t MINIMUM_COMMAND_MESSAGE_SIZE = CommandMessageIF::HEADER_SIZE + sizeof(ReturnValue_t) + sizeof(Command_t); - static Command_t makeCommandId(uint8_t messageId, uint8_t uniqueId) { + static constexpr Command_t makeCommandId(uint8_t messageId, uint8_t uniqueId) { return ((messageId << 8) | uniqueId); } static const uint8_t INTERFACE_ID = CLASS_ID::COMMAND_MESSAGE; - static const ReturnValue_t UNKNOWN_COMMAND = MAKE_RETURN_CODE(0x01); + static const ReturnValue_t UNKNOWN_COMMAND = MAKE_RETURN_CODE(1); static const uint8_t MESSAGE_ID = messagetypes::COMMAND; //! Used internally, shall be ignored