From ec5883d0d66d0c5635de17284671597647ae828b Mon Sep 17 00:00:00 2001 From: Sedictious <ele.hatzy@gmail.com> Date: Sat, 22 Aug 2020 15:53:15 +0300 Subject: [PATCH] Rename ECSS_CRC_INCLUDE to ECSS_CRC_INCLUDED --- inc/ECSS_Definitions.hpp | 2 +- src/MessageParser.cpp | 2 +- test/MessageParser.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp index 14e36fa0..3ae97055 100644 --- a/inc/ECSS_Definitions.hpp +++ b/inc/ECSS_Definitions.hpp @@ -149,6 +149,6 @@ /** * @brief Defines whether the optional CRC field is included */ -#define ECSS_CRC_INCLUDE true +#define ECSS_CRC_INCLUDED true #endif // ECSS_SERVICES_ECSS_DEFINITIONS_H diff --git a/src/MessageParser.cpp b/src/MessageParser.cpp index 15849da9..b3a082ca 100644 --- a/src/MessageParser.cpp +++ b/src/MessageParser.cpp @@ -195,7 +195,7 @@ String<CCSDS_MAX_MESSAGE_SIZE> MessageParser::compose(const Message& message) { String<CCSDS_MAX_MESSAGE_SIZE> ccsdsMessage(header, 6); ccsdsMessage.append(ecssMessage); -#if ECSS_CRC_INCLUDE +#if ECSS_CRC_INCLUDED // Append CRC field uint16_t crcField = CRCHelper::calculateCRC(reinterpret_cast<uint8_t*>(ccsdsMessage.data()), 6 + packetDataLength); diff --git a/test/MessageParser.cpp b/test/MessageParser.cpp index 108224ab..f74f4451 100644 --- a/test/MessageParser.cpp +++ b/test/MessageParser.cpp @@ -36,7 +36,7 @@ TEST_CASE("TC Message parsing into a string", "[MessageParser]") { message.dataSize = 5; String<CCSDS_MAX_MESSAGE_SIZE> createdPacket = MessageParser::compose(message); -#if ECSS_CRC_INCLUDE +#if ECSS_CRC_INCLUDED CHECK(createdPacket.size() == 18); CHECK(memcmp(createdPacket.data(), wantedPacket, 16) == 0); @@ -78,7 +78,7 @@ TEST_CASE("TM Message parsing into a string", "[MessageParser]") { message.dataSize = 7; String<CCSDS_MAX_MESSAGE_SIZE> createdPacket = MessageParser::compose(message); -#if ECSS_CRC_INCLUDE +#if ECSS_CRC_INCLUDED CHECK(createdPacket.size() == 20); CHECK(memcmp(createdPacket.data(), wantedPacket, 18) == 0); -- GitLab