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

Update FSFW #25

Merged
muellerr merged 89 commits from mueller/master into master 2021-10-05 20:21:44 +02:00
Conversation 0 Commits 89 Files Changed 28 +4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cffd77ed32 - Show all commits

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

@ -69,6 +69,8 @@ protected:
SpacePacketData localData; SpacePacketData localData;
}; };
namespace spacepacket {
constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) { constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff); return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
} }
@ -77,4 +79,6 @@ constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff); return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
} }
}
#endif /* SPACEPACKET_H_ */ #endif /* SPACEPACKET_H_ */