changes taken over from master

This commit is contained in:
Robin Müller 2020-09-10 15:05:26 +02:00
parent 18e6de7d6b
commit db3e32655d

View File

@ -5,9 +5,9 @@
#include "../storagemanager/StorageManagerIF.h"
#include "../tasks/ExecutableObjectIF.h"
#include "../ipc/MessageQueueIF.h"
#include "../tmtcservices/AcceptsTelecommandsIF.h"
#include "AcceptsTelecommandsIF.h"
#include "../tmtcservices/VerificationReporter.h"
#include "VerificationReporter.h"
#include "../ipc/CommandMessage.h"
#include "../container/FixedMap.h"
#include "../container/FIFO.h"
@ -211,8 +211,7 @@ protected:
virtual void doPeriodicOperation();
struct CommandInfo {
struct CommandInfo: public SerializeIF{
struct tcInfo {
uint8_t ackFlags;
uint16_t tcPacketId;
@ -225,6 +224,20 @@ protected:
Command_t command;
object_id_t objectId;
FIFO<store_address_t, 3> fifo;
virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size,
size_t maxSize, Endianness streamEndianness) const override{
return HasReturnvaluesIF::RETURN_FAILED;
};
virtual size_t getSerializedSize() const override {
return 0;
};
virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
Endianness streamEndianness) override{
return HasReturnvaluesIF::RETURN_FAILED;
};
};
using CommandMapIter = FixedMap<MessageQueueId_t,