Bugfix for Packet ID getters

- Also added related unittests
2021-11-18 19:56:24 +01:00
parent 186b3565e0
commit 05c4f4fadc
3 changed files with 13 additions and 2 deletions
--- a/src/fsfw/tmtcpacket/SpacePacket.h
+++ b/src/fsfw/tmtcpacket/SpacePacket.h
@ -73,7 +73,7 @@ namespace spacepacket {

 constexpr uint16_t getSpacePacketIdFromApid(bool isTc, uint16_t apid,
        bool secondaryHeaderFlag = true) {
-    return (((isTc << 5) & 0x10) | ((secondaryHeaderFlag << 4) & 0x08) |
+    return ((isTc << 4) | (secondaryHeaderFlag << 3) |
            ((apid >> 8) & 0x07)) << 8 | (apid & 0x00ff);
 }