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

upstream fsfw bundled update #3

Closed
muellerr wants to merge 97 commits from mueller/bundled-update into eive/develop
pull from: mueller/bundled-update
merge into: eive:eive/develop
Conversation 1 Commits 97 Files Changed 193 +13 -10
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09161f22d0 - Show all commits

2
tmstorage/TmStoreMessage.cpp
View File

@ -1,5 +1,5 @@
#include "TmStoreMessage.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../tmstorage/TmStoreMessage.h"
TmStoreMessage::~TmStoreMessage() {

15
tmstorage/TmStoreMessage.h
View File

@ -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_ */

6
tmstorage/TmStorePackets.h
View File

@ -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_ */