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

added sp reader unittests

Browse Source
This commit is contained in:
Robin Müller
2022-07-21 14:40:00 +02:00
parent 23f264096c
commit 08e0b0f1a0
5 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fsfw/tmtcpacket/ccsds/SpacePacketIF.h
View File

@ -22,6 +22,12 @@ class SpacePacketIF {
virtual ~SpacePacketIF() = default;
/**
* CCSDS header always has 6 bytes
* @return
*/
static constexpr size_t getHeaderLen() { return ccsds::HEADER_LEN; }
/**
* Returns the complete first two bytes of the packet, which together form
* the CCSDS packet ID

7
src/fsfw/tmtcpacket/ccsds/SpacePacketReader.cpp
View File

@ -8,6 +8,9 @@ SpacePacketReader::SpacePacketReader(const uint8_t* setAddress, size_t maxSize_)
}
ReturnValue_t SpacePacketReader::checkSize() const {
if (isNull()) {
return HasReturnvaluesIF::RETURN_FAILED;
}
if (getFullPacketLen() > bufSize) {
return SerializeIF::STREAM_TOO_SHORT;
}
@ -33,7 +36,9 @@ uint16_t SpacePacketReader::getPacketDataLen() const { return ccsds::getPacketLe
ReturnValue_t SpacePacketReader::setInternalFields(const uint8_t* data, size_t maxSize_) {
bufSize = maxSize_;
spHeader = reinterpret_cast<const ccsds::PrimaryHeader*>(data);
packetDataField = data + ccsds::HEADER_LEN;
if (maxSize_ > 6) {
packetDataField = data + ccsds::HEADER_LEN;
}
return checkSize();
}

5
src/fsfw/tmtcpacket/ccsds/SpacePacketReader.h
View File

@ -62,11 +62,6 @@ class SpacePacketReader : public SpacePacketIF,
*/
[[nodiscard]] size_t getBufSize() const;
/**
* CCSDS header always has 6 bytes
* @return
*/
static constexpr size_t getHeaderLen() { return ccsds::HEADER_LEN; }
[[nodiscard]] uint16_t getPacketIdRaw() const override;
[[nodiscard]] uint16_t getPacketSeqCtrlRaw() const override;
[[nodiscard]] uint16_t getPacketDataLen() const override;

2
src/fsfw/tmtcpacket/ccsds/header.cpp
View File

@ -1,7 +1,7 @@
#include "header.h"
uint16_t ccsds::getPacketId(const PrimaryHeader &header) {
return ((header.packetIdHAndVersion & 0x1F00) << 8) + header.packetIdL;
return ((header.packetIdHAndVersion & 0x1F) << 8) + header.packetIdL;
}
uint16_t ccsds::getPacketSeqCtrl(const PrimaryHeader &header) {