From 6c524196a7868dfb18eb33835225685c6a1894df Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 12 Dec 2024 17:43:34 +0100 Subject: [PATCH] minor adaptions --- src/fsfw/housekeeping.h | 11 +++-------- src/fsfw/housekeeping/Dataset.h | 12 ++++++------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/fsfw/housekeeping.h b/src/fsfw/housekeeping.h index 0627d523..79d32912 100644 --- a/src/fsfw/housekeeping.h +++ b/src/fsfw/housekeeping.h @@ -1,9 +1,4 @@ -#ifndef FSFW_INC_FSFW_HOUSEKEEPING_H_ -#define FSFW_INC_FSFW_HOUSEKEEPING_H_ +#pragma once -#include "src/core/housekeeping/HousekeepingMessage.h" -#include "src/core/housekeeping/HousekeepingPacketDownlink.h" -#include "src/core/housekeeping/HousekeepingSetPacket.h" -#include "src/core/housekeeping/HousekeepingSnapshot.h" - -#endif /* FSFW_INC_FSFW_HOUSEKEEPING_H_ */ +#include "fsfw/housekeeping/Dataset.h" +#include "fsfw/housekeeping/DatasetElement.h" \ No newline at end of file diff --git a/src/fsfw/housekeeping/Dataset.h b/src/fsfw/housekeeping/Dataset.h index 9a64a345..5eed44a2 100644 --- a/src/fsfw/housekeeping/Dataset.h +++ b/src/fsfw/housekeeping/Dataset.h @@ -17,12 +17,6 @@ class Dataset : public SerializeIF { [[nodiscard]] dp::structure_id_t getStructureId() const { return sid; } - void setAllChildrenValidity(bool valid) { - for (auto &serializable : serializables) { - serializable.get().setValid(valid); - } - } - void addSerializable(const std::reference_wrapper serializable) { serializables.push_back(serializable); } @@ -95,6 +89,12 @@ class Dataset : public SerializeIF { return SerializeIF::serialize(buffer, serSize, maxSize, streamEndianness); } + void setChildrenValidity(bool valid) { + for (auto &serializable : serializables) { + serializable.get().setValid(true); + } + } + [[nodiscard]] size_t getSerializedSize() const override { size_t size = 0; for (auto &serializable : serializables) {