Skip to content
Snippets Groups Projects
Commit ec5883d0 authored by Sedictious's avatar Sedictious
Browse files

Rename ECSS_CRC_INCLUDE to ECSS_CRC_INCLUDED

parent 31bee53b
No related branches found
No related tags found
No related merge requests found
...@@ -149,6 +149,6 @@ ...@@ -149,6 +149,6 @@
/** /**
* @brief Defines whether the optional CRC field is included * @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 #endif // ECSS_SERVICES_ECSS_DEFINITIONS_H
...@@ -195,7 +195,7 @@ String<CCSDS_MAX_MESSAGE_SIZE> MessageParser::compose(const Message& message) { ...@@ -195,7 +195,7 @@ String<CCSDS_MAX_MESSAGE_SIZE> MessageParser::compose(const Message& message) {
String<CCSDS_MAX_MESSAGE_SIZE> ccsdsMessage(header, 6); String<CCSDS_MAX_MESSAGE_SIZE> ccsdsMessage(header, 6);
ccsdsMessage.append(ecssMessage); ccsdsMessage.append(ecssMessage);
#if ECSS_CRC_INCLUDE #if ECSS_CRC_INCLUDED
// Append CRC field // Append CRC field
uint16_t crcField = CRCHelper::calculateCRC(reinterpret_cast<uint8_t*>(ccsdsMessage.data()), 6 + uint16_t crcField = CRCHelper::calculateCRC(reinterpret_cast<uint8_t*>(ccsdsMessage.data()), 6 +
packetDataLength); packetDataLength);
......
...@@ -36,7 +36,7 @@ TEST_CASE("TC Message parsing into a string", "[MessageParser]") { ...@@ -36,7 +36,7 @@ TEST_CASE("TC Message parsing into a string", "[MessageParser]") {
message.dataSize = 5; message.dataSize = 5;
String<CCSDS_MAX_MESSAGE_SIZE> createdPacket = MessageParser::compose(message); String<CCSDS_MAX_MESSAGE_SIZE> createdPacket = MessageParser::compose(message);
#if ECSS_CRC_INCLUDE #if ECSS_CRC_INCLUDED
CHECK(createdPacket.size() == 18); CHECK(createdPacket.size() == 18);
CHECK(memcmp(createdPacket.data(), wantedPacket, 16) == 0); CHECK(memcmp(createdPacket.data(), wantedPacket, 16) == 0);
...@@ -78,7 +78,7 @@ TEST_CASE("TM Message parsing into a string", "[MessageParser]") { ...@@ -78,7 +78,7 @@ TEST_CASE("TM Message parsing into a string", "[MessageParser]") {
message.dataSize = 7; message.dataSize = 7;
String<CCSDS_MAX_MESSAGE_SIZE> createdPacket = MessageParser::compose(message); String<CCSDS_MAX_MESSAGE_SIZE> createdPacket = MessageParser::compose(message);
#if ECSS_CRC_INCLUDE #if ECSS_CRC_INCLUDED
CHECK(createdPacket.size() == 20); CHECK(createdPacket.size() == 20);
CHECK(memcmp(createdPacket.data(), wantedPacket, 18) == 0); CHECK(memcmp(createdPacket.data(), wantedPacket, 18) == 0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment