From b2ea180754a0ca7540220645b948becbc22cd936 Mon Sep 17 00:00:00 2001 From: Alberto Nidasio <alberto.nidasio@skywarder.eu> Date: Sun, 24 Jul 2022 15:49:23 +0000 Subject: [PATCH] [CanProtocol] Made function on CanMessage const --- .../drivers/canbus/CanProtocol/CanProtocolData.h | 10 +++++----- .../drivers/canbus/CanProtocol/test-can-protocol.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/shared/drivers/canbus/CanProtocol/CanProtocolData.h b/src/shared/drivers/canbus/CanProtocol/CanProtocolData.h index 1a2b3b62e..ce602864c 100644 --- a/src/shared/drivers/canbus/CanProtocol/CanProtocolData.h +++ b/src/shared/drivers/canbus/CanProtocol/CanProtocolData.h @@ -130,31 +130,31 @@ struct CanMessage uint8_t length = 0; ///< Length of the message content. uint64_t payload[65]; - uint8_t getPriority() + uint8_t getPriority() const { return id >> static_cast<uint8_t>(CanProtocolShiftInformation::PRIORITY); } - uint8_t getPrimaryType() + uint8_t getPrimaryType() const { return (id | static_cast<uint32_t>(CanProtocolIdMask::PRIMARY_TYPE)) >> static_cast<uint8_t>(CanProtocolShiftInformation::PRIMARY_TYPE); } - uint8_t getSource() + uint8_t getSource() const { return (id | static_cast<uint32_t>(CanProtocolIdMask::SOURCE)) >> static_cast<uint8_t>(CanProtocolShiftInformation::SOURCE); } - uint8_t getDestination() + uint8_t getDestination() const { return (id | static_cast<uint32_t>(CanProtocolIdMask::DESTINATION)) >> static_cast<uint8_t>(CanProtocolShiftInformation::DESTINATION); } - uint8_t getSecondaryType() + uint8_t getSecondaryType() const { return (id | static_cast<uint32_t>(CanProtocolIdMask::SECONDARY_TYPE)) >> diff --git a/src/tests/drivers/canbus/CanProtocol/test-can-protocol.cpp b/src/tests/drivers/canbus/CanProtocol/test-can-protocol.cpp index 2fcc42450..bc1bc8b1c 100644 --- a/src/tests/drivers/canbus/CanProtocol/test-can-protocol.cpp +++ b/src/tests/drivers/canbus/CanProtocol/test-can-protocol.cpp @@ -29,14 +29,14 @@ using namespace miosix; using namespace Boardcore; using namespace Canbus; -void print(CanMessage data) +void print(const CanMessage& msg) { printf("Received packet:\n"); - printf("\tpriority: %d\n", data.getPriority()); - printf("\tprimary type: %d\n", data.getPrimaryType()); - printf("\tsource: %d\n", data.getSource()); - printf("\tdestination: %d\n", data.getDestination()); - printf("\tsecondary type: %d\n", data.getSecondaryType()); + printf("\tpriority: %d\n", msg.getPriority()); + printf("\tprimary type: %d\n", msg.getPrimaryType()); + printf("\tsource: %d\n", msg.getSource()); + printf("\tdestination: %d\n", msg.getDestination()); + printf("\tsecondary type: %d\n", msg.getSecondaryType()); printf("\n"); } -- GitLab