mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

finalized PUS C TM support

Browse Source
This commit is contained in:
Robin Müller
2021-04-13 00:19:09 +02:00
parent f906605097
commit ed186b04df
13 changed files with 196 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tmtcpacket/pus/TmPacketPusC.cpp
View File

@ -54,8 +54,8 @@ uint8_t* TmPacketPusC::getPacketTimeRaw() const{
}
void TmPacketPusC::initializeTmPacket(uint16_t apid, uint8_t service,
uint8_t subservice, uint16_t packetSubcounter, uint16_t destinationId = 0,
uint8_t timeRefField = 0) {
uint8_t subservice, uint16_t packetSubcounter, uint16_t destinationId,
uint8_t timeRefField) {
//Set primary header:
initSpacePacketHeader(false, true, apid);
//Set data Field Header:
@ -67,13 +67,15 @@ void TmPacketPusC::initializeTmPacket(uint16_t apid, uint8_t service,
// status. To change to PUS-C, set 0b00100000.
// Set CCSDS_secondary header flag to 0, version number to 001 and ack
// to 0000
/* Only account for last 4 bytes */
timeRefField &= 0b1111;
tmData->dataField.versionTimeReferenceField = VERSION_NUMBER_BYTE | timeRefField;
tmData->dataField.serviceType = service;
tmData->dataField.serviceSubtype = subservice;
tmData->dataField.subcounter = packetSubcounter;
tmData->dataField.destinationId = destinationId;
//Timestamp packet
if (checkAndSetStamper()) {
if (TmPacketBase::checkAndSetStamper()) {
timeStamper->addTimeStamp(tmData->dataField.time,
sizeof(tmData->dataField.time));
}