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

hmm this is problematic

Browse Source
This commit is contained in:
Robin Müller
2022-07-18 14:05:43 +02:00
parent 3c72a42ce1
commit 7e2fdc06cd
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fsfw/tmtcpacket/SpacePacketCreator.cpp
View File

@ -23,8 +23,7 @@ SpacePacketCreator::SpacePacketCreator(ccsds::PacketType packetType, bool secHea
return;
}
version = version_;
packetId =
(version_ << 13) | (static_cast<uint8_t>(packetType) << 12) | (secHeaderFlag << 11) | apid;
packetId = (static_cast<uint16_t>(packetType) << 12) | (static_cast<uint16_t>(secHeaderFlag) << 11) | apid;
packetSeqCtrl = static_cast<uint8_t>(seqFlags) << 14 | seqCount;
dataLen = dataLen_;
}
@ -53,3 +52,4 @@ ReturnValue_t SpacePacketCreator::deSerialize(const uint8_t **buffer, size_t *si
SerializeIF::Endianness streamEndianness) {
return HasReturnvaluesIF::RETURN_FAILED;
}
bool SpacePacketCreator::isValid() const { return valid; }

3
src/fsfw/tmtcpacket/SpacePacketCreator.h
View File

@ -11,7 +11,7 @@ class SpacePacketCreator : public SerializeIF, public SpacePacketIF {
uint8_t version = 0);
SpacePacketCreator(uint16_t packetId, uint16_t packetSeqCtrl, uint16_t dataLen,
uint8_t version = 0);
bool valid;
[[nodiscard]] bool isValid() const;
[[nodiscard]] uint16_t getPacketId() const override;
[[nodiscard]] uint16_t getPacketSeqCtrl() const override;
[[nodiscard]] uint16_t getPacketDataLen() const override;
@ -22,6 +22,7 @@ class SpacePacketCreator : public SerializeIF, public SpacePacketIF {
Endianness streamEndianness) override;
private:
bool valid;
uint16_t packetId;
uint16_t packetSeqCtrl;
uint16_t dataLen;