Compare commits
9 Commits
improve-se
...
develop
Author | SHA1 | Date | |
---|---|---|---|
42867ad0cb | |||
6381d9a83c | |||
73bf1cc229 | |||
222f02aefd | |||
e9b4fc9825 | |||
0660457c92 | |||
7c9b9e4cd8 | |||
fb2e480705 | |||
b8ae646060 |
|
@ -11,6 +11,7 @@ FreshDeviceHandlerBase::FreshDeviceHandlerBase(DhbConfig config)
|
||||||
healthHelper(this, getObjectId()),
|
healthHelper(this, getObjectId()),
|
||||||
paramHelper(this),
|
paramHelper(this),
|
||||||
poolManager(this, nullptr),
|
poolManager(this, nullptr),
|
||||||
|
fdirInstance(config.fdirInstance),
|
||||||
defaultFdirParent(config.defaultFdirParent) {
|
defaultFdirParent(config.defaultFdirParent) {
|
||||||
auto mqArgs = MqArgs(config.objectId, static_cast<void*>(this));
|
auto mqArgs = MqArgs(config.objectId, static_cast<void*>(this));
|
||||||
messageQueue = QueueFactory::instance()->createMessageQueue(
|
messageQueue = QueueFactory::instance()->createMessageQueue(
|
||||||
|
@ -30,6 +31,7 @@ FreshDeviceHandlerBase::~FreshDeviceHandlerBase() {
|
||||||
ReturnValue_t FreshDeviceHandlerBase::performOperation(uint8_t opCode) {
|
ReturnValue_t FreshDeviceHandlerBase::performOperation(uint8_t opCode) {
|
||||||
performDeviceOperationPreQueueHandling(opCode);
|
performDeviceOperationPreQueueHandling(opCode);
|
||||||
handleQueue();
|
handleQueue();
|
||||||
|
fdirInstance->checkForFailures();
|
||||||
performDeviceOperation(opCode);
|
performDeviceOperation(opCode);
|
||||||
poolManager.performHkOperation();
|
poolManager.performHkOperation();
|
||||||
return returnvalue::OK;
|
return returnvalue::OK;
|
||||||
|
|
|
@ -129,7 +129,7 @@ class FreshDeviceHandlerBase : public SystemObject,
|
||||||
ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
|
ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
|
||||||
const uint8_t* data, size_t size) override = 0;
|
const uint8_t* data, size_t size) override = 0;
|
||||||
// Executable overrides.
|
// Executable overrides.
|
||||||
ReturnValue_t performOperation(uint8_t opCode) override;
|
virtual ReturnValue_t performOperation(uint8_t opCode) override;
|
||||||
ReturnValue_t initializeAfterTaskCreation() override;
|
ReturnValue_t initializeAfterTaskCreation() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "SpacePacketReader.h"
|
#include "SpacePacketReader.h"
|
||||||
|
|
||||||
#include "fsfw/serialize/SerializeIF.h"
|
#include "fsfw/serialize/SerializeIF.h"
|
||||||
#include "fsfw/serviceinterface/ServiceInterface.h"
|
|
||||||
|
|
||||||
SpacePacketReader::SpacePacketReader(const uint8_t* setAddress, size_t maxSize_) {
|
SpacePacketReader::SpacePacketReader(const uint8_t* setAddress, size_t maxSize_) {
|
||||||
setInternalFields(setAddress, maxSize_);
|
setInternalFields(setAddress, maxSize_);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef FSFW_TMTCSERVICES_SOURCESEQUENCECOUNTER_H_
|
#ifndef FSFW_TMTCSERVICES_SOURCESEQUENCECOUNTER_H_
|
||||||
#define FSFW_TMTCSERVICES_SOURCESEQUENCECOUNTER_H_
|
#define FSFW_TMTCSERVICES_SOURCESEQUENCECOUNTER_H_
|
||||||
|
|
||||||
#include "fsfw/tmtcpacket/ccsds/SpacePacketReader.h"
|
#include "fsfw/tmtcpacket/ccsds/defs.h"
|
||||||
|
|
||||||
class SourceSequenceCounter {
|
class SourceSequenceCounter {
|
||||||
private:
|
private:
|
||||||
|
@ -9,6 +9,7 @@ class SourceSequenceCounter {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SourceSequenceCounter(uint16_t initialSequenceCount = 0) : sequenceCount(initialSequenceCount) {}
|
SourceSequenceCounter(uint16_t initialSequenceCount = 0) : sequenceCount(initialSequenceCount) {}
|
||||||
|
|
||||||
void increment() { sequenceCount = (sequenceCount + 1) % (ccsds::LIMIT_SEQUENCE_COUNT); }
|
void increment() { sequenceCount = (sequenceCount + 1) % (ccsds::LIMIT_SEQUENCE_COUNT); }
|
||||||
void decrement() { sequenceCount = (sequenceCount - 1) % (ccsds::LIMIT_SEQUENCE_COUNT); }
|
void decrement() { sequenceCount = (sequenceCount - 1) % (ccsds::LIMIT_SEQUENCE_COUNT); }
|
||||||
uint16_t get() const { return this->sequenceCount; }
|
uint16_t get() const { return this->sequenceCount; }
|
||||||
|
@ -25,6 +26,7 @@ class SourceSequenceCounter {
|
||||||
sequenceCount = newCount;
|
sequenceCount = newCount;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
void set(uint16_t sequenceCount) { this->sequenceCount = sequenceCount; }
|
||||||
|
|
||||||
operator uint16_t() { return this->get(); }
|
operator uint16_t() { return this->get(); }
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user