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

pus version in config is constexpr now

Browse Source
This commit is contained in:
Robin Müller 2022-06-13 16:45:09 +02:00
parent 15d69e64f3
commit eb46f0c473
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/tmtcpacket/pus/tc/TcPacketSerializer.cpp
View File

@ -27,7 +27,7 @@ ReturnValue_t TcPacketSerializer::initialize() {
return result; return result;
} }
initializeTcPacket(cfg.apid, cfg.sequenceCount, cfg.ack, cfg.service, cfg.subservice, initializeTcPacket(cfg.apid, cfg.sequenceCount, cfg.ack, cfg.service, cfg.subservice,
cfg.pusVersion, cfg.sourceId); PusConfig::PUS_VERSION, cfg.sourceId);
if (cfg.appData != nullptr and cfg.appDataLen > 0) { if (cfg.appData != nullptr and cfg.appDataLen > 0) {
std::memcpy(&tcData->appData, cfg.appData, cfg.appDataLen); std::memcpy(&tcData->appData, cfg.appData, cfg.appDataLen);
} }

8
src/fsfw/tmtcpacket/pus/tc/TcPacketSerializer.h
View File

@ -14,13 +14,17 @@ struct PusConfig {
uint16_t sourceId = 0; uint16_t sourceId = 0;
uint8_t* appData = nullptr; uint8_t* appData = nullptr;
size_t appDataLen = 0; size_t appDataLen = 0;
pus::PusVersion pusVersion = pus::PusVersion::PUS_C_VERSION; #if FSFW_USE_PUS_C_TELECOMMANDS == 1
static constexpr pus::PusVersion PUS_VERSION = pus::PusVersion::PUS_C_VERSION;
#else
static constexpr pus::PusVersion PUS_VERSION = pus::PusVersion::PUS_A_VERSION;
#endif
uint8_t ack = TcPacketPus::ACK_ALL; uint8_t ack = TcPacketPus::ACK_ALL;
}; };
class TcPacketSerializer : public TcPacketPus, public SerializeIF, public HasReturnvaluesIF { class TcPacketSerializer : public TcPacketPus, public SerializeIF, public HasReturnvaluesIF {
public: public:
TcPacketSerializer(uint8_t* data, size_t size, PusConfig& cfg); TcPacketSerializer(uint8_t* store, size_t maxSize, PusConfig& cfg);
ReturnValue_t initialize(); ReturnValue_t initialize();