src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp

@@ -11,7 +11,6 @@ FreshDeviceHandlerBase::FreshDeviceHandlerBase(DhbConfig config)
       healthHelper(this, getObjectId()),
       paramHelper(this),
       poolManager(this, nullptr),
-      fdirInstance(config.fdirInstance),
       defaultFdirParent(config.defaultFdirParent) {
   auto mqArgs = MqArgs(config.objectId, static_cast<void*>(this));
   messageQueue = QueueFactory::instance()->createMessageQueue(
@@ -31,7 +30,6 @@ FreshDeviceHandlerBase::~FreshDeviceHandlerBase() {
 ReturnValue_t FreshDeviceHandlerBase::performOperation(uint8_t opCode) {
   performDeviceOperationPreQueueHandling(opCode);
   handleQueue();
-  fdirInstance->checkForFailures();
   performDeviceOperation(opCode);
   poolManager.performHkOperation();
   return returnvalue::OK;

src/fsfw/devicehandlers/FreshDeviceHandlerBase.h

@@ -129,7 +129,7 @@ class FreshDeviceHandlerBase : public SystemObject,
   ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
                               const uint8_t* data, size_t size) override = 0;
   // Executable overrides.
-  virtual ReturnValue_t performOperation(uint8_t opCode) override;
+  ReturnValue_t performOperation(uint8_t opCode) override;
   ReturnValue_t initializeAfterTaskCreation() override;
 
   /**

src/fsfw/tmtcpacket/ccsds/SpacePacketReader.cpp

@@ -1,6 +1,7 @@
 #include "SpacePacketReader.h"
 
 #include "fsfw/serialize/SerializeIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 SpacePacketReader::SpacePacketReader(const uint8_t* setAddress, size_t maxSize_) {
   setInternalFields(setAddress, maxSize_);

src/fsfw/tmtcservices/SourceSequenceCounter.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_TMTCSERVICES_SOURCESEQUENCECOUNTER_H_
 #define FSFW_TMTCSERVICES_SOURCESEQUENCECOUNTER_H_
 
-#include "fsfw/tmtcpacket/ccsds/defs.h"
+#include "fsfw/tmtcpacket/ccsds/SpacePacketReader.h"
 
 class SourceSequenceCounter {
  private:
@@ -9,7 +9,6 @@ class SourceSequenceCounter {
 
  public:
   SourceSequenceCounter(uint16_t initialSequenceCount = 0) : sequenceCount(initialSequenceCount) {}
-
   void increment() { sequenceCount = (sequenceCount + 1) % (ccsds::LIMIT_SEQUENCE_COUNT); }
   void decrement() { sequenceCount = (sequenceCount - 1) % (ccsds::LIMIT_SEQUENCE_COUNT); }
   uint16_t get() const { return this->sequenceCount; }
@@ -26,7 +25,6 @@ class SourceSequenceCounter {
     sequenceCount = newCount;
     return *this;
   }
-  void set(uint16_t sequenceCount) { this->sequenceCount = sequenceCount; }
 
   operator uint16_t() { return this->get(); }
 };