KSat/fsfw
18
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

update PUS5 TM format

Browse Source
This commit is contained in:
Robin Müller 2025-02-25 16:25:54 +01:00
parent 7b6981e162
commit faeca1b419
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/pus/Service5EventReporting.cpp
View File

@ -44,7 +44,7 @@ ReturnValue_t Service5EventReporting::performService() {
} }
ReturnValue_t Service5EventReporting::generateEventReport(EventMessage message) { ReturnValue_t Service5EventReporting::generateEventReport(EventMessage message) {
EventReport report(message.getEventId(), message.getReporter(), message.getParameter1(), EventReport report(message.getEvent(), message.getReporter(), message.getParameter1(),
message.getParameter2()); message.getParameter2());
storeHelper.preparePacket(psbParams.serviceId, message.getSeverity(), tmHelper.sendCounter); storeHelper.preparePacket(psbParams.serviceId, message.getSeverity(), tmHelper.sendCounter);
storeHelper.setSourceDataSerializable(report); storeHelper.setSourceDataSerializable(report);

14
src/fsfw/pus/servicepackets/Service5Packets.h
View File

@ -17,17 +17,13 @@
*/ */
class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3, 4 class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3, 4
public: public:
EventReport(EventId_t reportId_, object_id_t objectId_, uint32_t parameter1_, EventReport(Event event_, object_id_t objectId_, uint32_t parameter1_, uint32_t parameter2_)
uint32_t parameter2_) : event(event_), objectId(objectId_), parameter1(parameter1_), parameter2(parameter2_) {}
: reportId(reportId_),
objectId(objectId_),
parameter1(parameter1_),
parameter2(parameter2_) {}
ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
SerializeIF::Endianness streamEndianness) const override { SerializeIF::Endianness streamEndianness) const override {
ReturnValue_t result = ReturnValue_t result =
SerializeAdapter::serialize(&reportId, buffer, size, maxSize, streamEndianness); SerializeAdapter::serialize(&event, buffer, size, maxSize, streamEndianness);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
@ -48,7 +44,7 @@ class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3,
size_t getSerializedSize() const override { size_t getSerializedSize() const override {
uint32_t size = 0; uint32_t size = 0;
size += SerializeAdapter::getSerializedSize(&reportId); size += SerializeAdapter::getSerializedSize(&event);
size += SerializeAdapter::getSerializedSize(&objectId); size += SerializeAdapter::getSerializedSize(&objectId);
size += SerializeAdapter::getSerializedSize(&parameter1); size += SerializeAdapter::getSerializedSize(&parameter1);
size += SerializeAdapter::getSerializedSize(&parameter2); size += SerializeAdapter::getSerializedSize(&parameter2);
@ -61,7 +57,7 @@ class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3,
} }
private: private:
EventId_t reportId; Event event;
object_id_t objectId; object_id_t objectId;
uint32_t parameter1; uint32_t parameter1;
uint32_t parameter2; uint32_t parameter2;