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

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +6100 -2873
289 changed files with 6100 additions and 2873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c72a42ce1 - Show all commits

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

@@ -29,9 +29,9 @@ SpacePacketCreator::SpacePacketCreator(ccsds::PacketType packetType, bool secHea
dataLen = dataLen_; dataLen = dataLen_;
} }
uint16_t SpacePacketCreator::getPacketId() const { return 0; } uint16_t SpacePacketCreator::getPacketId() const { return packetId; }
uint16_t SpacePacketCreator::getPacketSeqCtrl() const { return 0; } uint16_t SpacePacketCreator::getPacketSeqCtrl() const { return packetSeqCtrl; }
uint16_t SpacePacketCreator::getPacketDataLen() const { return 0; } uint16_t SpacePacketCreator::getPacketDataLen() const { return dataLen; }
ReturnValue_t SpacePacketCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize, ReturnValue_t SpacePacketCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
SerializeIF::Endianness streamEndianness) const { SerializeIF::Endianness streamEndianness) const {

10
tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
View File

@@ -14,7 +14,13 @@ TEST_CASE("CCSDS Test", "[ccsds]") {
SECTION("Header Creator Tests") { SECTION("Header Creator Tests") {
SpacePacketCreator base = SpacePacketCreator( SpacePacketCreator base = SpacePacketCreator(
ccsds::PacketType::TM, true, 0x22, ccsds::PacketType::TC, true, 0x02,
ccsds::SequenceFlags::CONTINUATION, 12, 0x42); ccsds::SequenceFlags::FIRST_SEGMENT, 0x34, 0x16);
REQUIRE(base.getApid() == 0x02);
REQUIRE(base.getSequenceFlags() == ccsds::SequenceFlags::FIRST_SEGMENT);
REQUIRE(base.getVersion() == 0b000);
REQUIRE(base.getSequenceCount() == 0x34);
REQUIRE(base.getPacketDataLen() == 0x16);
REQUIRE(base.getPacketType() == ccsds::PacketType::TC);
} }
} }