|
|
|
@@ -1,8 +1,8 @@
|
|
|
|
|
#include "PusParser.h"
|
|
|
|
|
#include <fsfw/serviceinterface/ServiceInterface.h>
|
|
|
|
|
|
|
|
|
|
PusParser::PusParser(uint16_t maxExpectedPusPackets,
|
|
|
|
|
bool storeSplitPackets): indexSizePairFIFO(maxExpectedPusPackets) {
|
|
|
|
|
PusParser::PusParser(uint16_t maxExpectedPusPackets, bool storeSplitPackets):
|
|
|
|
|
indexSizePairFIFO(maxExpectedPusPackets) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
|
|
|
|
@@ -39,17 +39,19 @@ ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
|
|
|
|
|
indexSizePairFIFO.insert(indexSizePair(0, frameSize));
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
#if FSFW_VERBOSE_LEVEL >= 1
|
|
|
|
|
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
|
|
|
|
sif::debug << "TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
sif::warning << "TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
<< "larger than remaining frame," << std::endl;
|
|
|
|
|
sif::debug << "Throwing away packet. Detected packet size: "
|
|
|
|
|
sif::warning << "Throwing away packet. Detected packet size: "
|
|
|
|
|
<< packetSize << std::endl;
|
|
|
|
|
#else
|
|
|
|
|
sif::printDebug("TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
sif::printWarning("TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
"larger than remaining frame.\n");
|
|
|
|
|
sif::printDebug("Throwing away packet. Detected packet size: %lu",
|
|
|
|
|
sif::printWarning("Throwing away packet. Detected packet size: %lu",
|
|
|
|
|
static_cast<unsigned long>(packetSize));
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#endif /* FSFW_VERBOSE_LEVEL >= 1 */
|
|
|
|
|
}
|
|
|
|
|
return SPLIT_PACKET;
|
|
|
|
|
}
|
|
|
|
@@ -108,16 +110,18 @@ ReturnValue_t PusParser::readNextPacket(const uint8_t *frame,
|
|
|
|
|
indexSizePairFIFO.insert(indexSizePair(currentIndex, remainingSize));
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
#if FSFW_VERBOSE_LEVEL >= 1
|
|
|
|
|
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
|
|
|
|
sif::debug << "TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
sif::warning << "TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
<< "larger than remaining frame." << std::endl;
|
|
|
|
|
sif::debug << "Throwing away packet. Detected packet size: "
|
|
|
|
|
sif::warning << "Throwing away packet. Detected packet size: "
|
|
|
|
|
<< nextPacketSize << std::endl;
|
|
|
|
|
#else
|
|
|
|
|
sif::printDebug("TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
sif::printWarning("TcSerialPollingTask::readNextPacket: Next packet "
|
|
|
|
|
"larger than remaining frame.\n");
|
|
|
|
|
sif::printDebug("Throwing away packet. Detected packet size: %lu\n",
|
|
|
|
|
sif::printWarning("Throwing away packet. Detected packet size: %lu\n",
|
|
|
|
|
static_cast<unsigned long>(nextPacketSize));
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return SPLIT_PACKET;
|
|
|
|
|