eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Bugfix #25

Merged
muellerr merged 10 commits from mueller/master into eive/develop 2021-11-19 13:46:06 +01:00
Conversation 0 Commits 10 Files Changed 7 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15687f6f6e - Show all commits

4
src/fsfw/tmtcpacket/SpacePacket.h
View File

@ -77,12 +77,12 @@ constexpr uint16_t getSpacePacketIdFromApid(bool isTc, uint16_t apid,
((apid >> 8) & 0x07)) << 8 | (apid & 0x00ff); ((apid >> 8) & 0x07)) << 8 | (apid & 0x00ff);
} }
constexpr uint16_t getTcSpacketIdFromApid(uint16_t apid, constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid,
bool secondaryHeaderFlag = true) { bool secondaryHeaderFlag = true) {
return getSpacePacketIdFromApid(true, apid, secondaryHeaderFlag); return getSpacePacketIdFromApid(true, apid, secondaryHeaderFlag);
} }
constexpr uint16_t getTmSpacketIdFromApid(uint16_t apid, constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid,
bool secondaryHeaderFlag = true) { bool secondaryHeaderFlag = true) {
return getSpacePacketIdFromApid(false, apid, secondaryHeaderFlag); return getSpacePacketIdFromApid(false, apid, secondaryHeaderFlag);
} }