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

Merge pull request 'updated function names' (#509) from eive/fsfw:mueller/constexpr-func-name into development

Browse Source 
Reviewed-on: fsfw/fsfw#509
This commit is contained in:
Ulrich Mohr 2021-10-25 14:05:14 +02:00
commit 7bff632042
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);
} }