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

pus parser continued

Browse Source
This commit is contained in:
Robin Müller 2020-07-06 16:34:11 +02:00
parent 78283ddbee
commit f442a5889e
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
returnvalues/FwClassIds.h
View File

@ -64,6 +64,7 @@ enum {
LOCAL_POOL_OWNER_IF, //LPIF 58 LOCAL_POOL_OWNER_IF, //LPIF 58
POOL_VARIABLE_IF, //PVA 59 POOL_VARIABLE_IF, //PVA 59
HOUSEKEEPING_MANAGER, //HKM 60 HOUSEKEEPING_MANAGER, //HKM 60
PUS_PARSER, //PUSP 61
FW_CLASS_ID_COUNT //is actually count + 1 ! FW_CLASS_ID_COUNT //is actually count + 1 !
}; };

33
tmtcservices/PusParser.cpp
View File

@ -1,4 +1,5 @@
#include <framework/tmtcservices/PusParser.h> #include <framework/tmtcservices/PusParser.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
PusParser::PusParser(uint16_t maxExpectedPusPackets, PusParser::PusParser(uint16_t maxExpectedPusPackets,
bool storeSplitPackets): indexSizePairFIFO(maxExpectedPusPackets) { bool storeSplitPackets): indexSizePairFIFO(maxExpectedPusPackets) {
@ -6,5 +7,37 @@ PusParser::PusParser(uint16_t maxExpectedPusPackets,
ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame, ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
size_t frameSize) { size_t frameSize) {
if(frame == nullptr) {
sif::error << "PusParser::parsePusPackets: Frame pointers in invalid!"
<< std::endl;
return HasReturnvaluesIF::RETURN_FAILED;
}
// Size of a pus packet is the value in the packet length field plus 7.
uint16_t packetSize = (frame[4] << 8 | frame[5]) + 7;
if(packetSize > 0) {
indexSizePairFIFO.insert(indexSizePair(0, packetSize));
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
else {
return NO_PACKET_FOUND;
}
if(frameSize > packetSize) {
return readMultiplePackets(frameSize);
}
return HasReturnvaluesIF::RETURN_OK;
}
//ReturnValue_t PusParser::readMultiplePackets(size_t frameSize) {
// size_t endOfBuffer = frameSize - 1;
// size_t endIndex = firstPacketSize;
// size_t startIndex = 0;
// while (endIndex < endOfBuffer) {
// ReturnValue_t result = readNextPacket(&startIndex, &endIndex);
// if(result != RETURN_OK) {
// return;
// }
// }
//}

11
tmtcservices/PusParser.h
View File

@ -23,6 +23,9 @@
*/ */
class PusParser { class PusParser {
public: public:
static constexpr uint8_t INTERFACE_ID = CLASS_ID::PUS_PARSER;
static constexpr ReturnValue_t NO_PACKET_FOUND = MAKE_RETURN_CODE(0x00);
/** /**
* Parser constructor. * Parser constructor.
* @param maxExpectedPusPackets * @param maxExpectedPusPackets
@ -34,6 +37,12 @@ public:
*/ */
PusParser(uint16_t maxExpectedPusPackets, bool storeSplitPackets); PusParser(uint16_t maxExpectedPusPackets, bool storeSplitPackets);
/**
* Parse a given frame for PUS packets
* @param frame
* @param frameSize
* @return -@c NO_PACKET_FOUND if no packet was found.
*/
ReturnValue_t parsePusPackets(const uint8_t* frame, size_t frameSize); ReturnValue_t parsePusPackets(const uint8_t* frame, size_t frameSize);
private: private:
//! The first entry is the index inside the buffer while the second index //! The first entry is the index inside the buffer while the second index
@ -45,6 +54,8 @@ private:
fsfw::FIFO<indexSizePair> indexSizePairFIFO; fsfw::FIFO<indexSizePair> indexSizePairFIFO;
bool storeSplitPackets = false; bool storeSplitPackets = false;
ReturnValue_t readMultiplePackets(size_t frameSize);
}; };