From 09161f22d070089265202a7fb67a11ac53990c26 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 22 Dec 2020 15:58:52 +0100 Subject: [PATCH] updated tm storage --- tmstorage/TmStoreMessage.cpp | 2 +- tmstorage/TmStoreMessage.h | 15 +++++++++------ tmstorage/TmStorePackets.h | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tmstorage/TmStoreMessage.cpp b/tmstorage/TmStoreMessage.cpp index 753ac1b7..033cbb1d 100644 --- a/tmstorage/TmStoreMessage.cpp +++ b/tmstorage/TmStoreMessage.cpp @@ -1,5 +1,5 @@ +#include "TmStoreMessage.h" #include "../objectmanager/ObjectManagerIF.h" -#include "../tmstorage/TmStoreMessage.h" TmStoreMessage::~TmStoreMessage() { diff --git a/tmstorage/TmStoreMessage.h b/tmstorage/TmStoreMessage.h index 59354a20..d0178920 100644 --- a/tmstorage/TmStoreMessage.h +++ b/tmstorage/TmStoreMessage.h @@ -1,10 +1,11 @@ -#ifndef FRAMEWORK_TMSTORAGE_TMSTOREMESSAGE_H_ -#define FRAMEWORK_TMSTORAGE_TMSTOREMESSAGE_H_ +#ifndef FSFW_TMSTORAGE_TMSTOREMESSAGE_H_ +#define FSFW_TMSTORAGE_TMSTOREMESSAGE_H_ +#include "TmStorePackets.h" #include "../ipc/CommandMessage.h" #include "../storagemanager/StorageManagerIF.h" -#include "../tmstorage/TmStorePackets.h" #include "../objectmanager/SystemObjectIF.h" + class TmStoreMessage { public: static ReturnValue_t setEnableStoringMessage(CommandMessage* cmd, @@ -25,8 +26,10 @@ public: static void setDownlinkContentTimeMessage(CommandMessage* cmd, store_address_t storeId); static void setIndexReportMessage(CommandMessage* cmd, store_address_t storeId); - static ReturnValue_t setDeleteBlocksMessage(CommandMessage* cmd, uint32_t addressLow, uint32_t addressHigh); - static ReturnValue_t setDownlinkBlocksMessage(CommandMessage* cmd, uint32_t addressLow, uint32_t addressHigh); + static ReturnValue_t setDeleteBlocksMessage(CommandMessage* cmd, + uint32_t addressLow, uint32_t addressHigh); + static ReturnValue_t setDownlinkBlocksMessage(CommandMessage* cmd, + uint32_t addressLow, uint32_t addressHigh); static ReturnValue_t setIndexRequestMessage(CommandMessage* cmd); static void setDeleteContentTimeMessage(CommandMessage* cmd, store_address_t storeId); @@ -60,4 +63,4 @@ private: TmStoreMessage(); }; -#endif /* FRAMEWORK_TMSTORAGE_TMSTOREMESSAGE_H_ */ +#endif /* FSFW_TMSTORAGE_TMSTOREMESSAGE_H_ */ diff --git a/tmstorage/TmStorePackets.h b/tmstorage/TmStorePackets.h index 0312a998..3abd0c1c 100644 --- a/tmstorage/TmStorePackets.h +++ b/tmstorage/TmStorePackets.h @@ -1,5 +1,5 @@ -#ifndef FRAMEWORK_TMSTORAGE_TMSTOREPACKETS_H_ -#define FRAMEWORK_TMSTORAGE_TMSTOREPACKETS_H_ +#ifndef FSFW_TMSTORAGE_TMSTOREPACKETS_H_ +#define FSFW_TMSTORAGE_TMSTOREPACKETS_H_ #include "../serialize/SerialFixedArrayListAdapter.h" #include "../serialize/SerializeElement.h" @@ -300,4 +300,4 @@ private: uint8_t rawTimestamp[TimeStamperIF::MISSION_TIMESTAMP_SIZE]; }; -#endif /* FRAMEWORK_TMSTORAGE_TMSTOREPACKETS_H_ */ +#endif /* FSFW_TMSTORAGE_TMSTOREPACKETS_H_ */