Skip to content
Snippets Groups Projects
Commit e63fdd80 authored by Dimitrios Sourlantzis's avatar Dimitrios Sourlantzis
Browse files

Merge branch 'packet-length' into 'master'

Change packet length calculation and tests

Closes #181

See merge request acubesat/obc/ecss-services!130
parents 89c6553d 4c6fe67f
No related branches found
No related tags found
No related merge requests found
...@@ -213,7 +213,7 @@ String<CCSDSMaxMessageSize> MessageParser::compose(const Message& message) { ...@@ -213,7 +213,7 @@ String<CCSDSMaxMessageSize> MessageParser::compose(const Message& message) {
packetId |= (1U << 11U); // Secondary header flag packetId |= (1U << 11U); // Secondary header flag
packetId |= (message.packetType == Message::TC) ? (1U << 12U) : (0U); // Ignore-MISRA packetId |= (message.packetType == Message::TC) ? (1U << 12U) : (0U); // Ignore-MISRA
uint16_t packetSequenceControl = message.packetSequenceCount | (3U << 14U); uint16_t packetSequenceControl = message.packetSequenceCount | (3U << 14U);
uint16_t packetDataLength = ecssMessage.size(); uint16_t packetDataLength = ecssMessage.size() - 1;
// Compile the header // Compile the header
header[0] = packetId >> 8U; header[0] = packetId >> 8U;
......
...@@ -19,7 +19,7 @@ TEST_CASE("TC message parsing", "[MessageParser]") { ...@@ -19,7 +19,7 @@ TEST_CASE("TC message parsing", "[MessageParser]") {
} }
TEST_CASE("TC Message parsing into a string", "[MessageParser]") { TEST_CASE("TC Message parsing into a string", "[MessageParser]") {
uint8_t wantedPacket[] = {0x18, 0x07, 0xe0, 0x07, 0x00, 0x0a, 0x20, 0x81, uint8_t wantedPacket[] = {0x18, 0x07, 0xe0, 0x07, 0x00, 0x09, 0x20, 0x81,
0x1f, 0x00, 0x07, 0x68, 0x65, 0x6c, 0x6c, 0x6f}; 0x1f, 0x00, 0x07, 0x68, 0x65, 0x6c, 0x6c, 0x6f};
Message message; Message message;
...@@ -75,7 +75,7 @@ TEST_CASE("TM message parsing", "[MessageParser]") { ...@@ -75,7 +75,7 @@ TEST_CASE("TM message parsing", "[MessageParser]") {
} }
TEST_CASE("TM Message parsing into a string", "[MessageParser]") { TEST_CASE("TM Message parsing into a string", "[MessageParser]") {
uint8_t wantedPacket[] = {0x08, 0x02, 0xc0, 0x4d, 0x00, 0x12, 0x20, 0x16, uint8_t wantedPacket[] = {0x08, 0x02, 0xc0, 0x4d, 0x00, 0x11, 0x20, 0x16,
0x11,0x00, 0x00,0x00, 0x02,0x00, 0x00,0x00, 0x11,0x00, 0x00,0x00, 0x02,0x00, 0x00,0x00,
0x00, 0x68,0x65, 0x6c, 0x6c, 0x6f, 0x68, 0x69}; 0x00, 0x68,0x65, 0x6c, 0x6c, 0x6f, 0x68, 0x69};
//save time //save time
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment