mission/system/EiveSystem.cpp

@@ -296,14 +296,9 @@ ReturnValue_t EiveSystem::sendFullRebootCommand() {
 }
 
 void EiveSystem::pdecRecoveryLogic() {
-  if (pdecResetWasAttempted and pdecResetWasAttemptedCd.hasTimedOut()) {
-    pdecResetWasAttempted = false;
-  }
-  if (frameDirtyCheckCd.hasTimedOut()) {
-    if (frameDirtyErrorCounter >= FRAME_DIRTY_COM_REBOOT_LIMIT) {
+  if (pdecResetCounter >= PDEC_RESET_MAX_COUNT_BEFORE_REBOOT) {
     // If a PTME reset was already attempted and there is still an issue receiving TC frames,
     // reboot the system.
-      if (pdecResetWasAttempted) {
     if (waitingForPdecReboot) {
       return;
     }
@@ -315,20 +310,24 @@ void EiveSystem::pdecRecoveryLogic() {
     if (result != returnvalue::OK) {
       sif::error << "Sending a reboot command has failed" << std::endl;
       // If the previous operation failed, it should be re-attempted the next task cycle.
-          pdecResetWasAttemptedCd.resetTimer();
+      pdecResetCounterResetCd.resetTimer();
       return;
     }
     waitingForPdecReboot = true;
     return;
-      } else {
+  }
+  if (pdecResetCounterResetCd.hasTimedOut()) {
+    pdecResetCounter = 0;
+  }
+  if (frameDirtyCheckCd.hasTimedOut()) {
+    if (frameDirtyErrorCounter >= FRAME_DIRTY_COM_REBOOT_LIMIT) {
       // Try one full PDEC reset.
       CommandMessage msg;
       store_address_t dummy{};
       ActionMessage::setCommand(&msg, pdec::RESET_PDEC_WITH_REINIITALIZATION, dummy);
       commandQueue->sendMessage(pdecHandlerQueueId, &msg);
-        pdecResetWasAttemptedCd.resetTimer();
-        pdecResetWasAttempted = true;
-      }
+      pdecResetCounterResetCd.resetTimer();
+      pdecResetCounter++;
     }
     frameDirtyErrorCounter = 0;
     frameDirtyCheckCd.resetTimer();

mission/system/EiveSystem.h

@@ -10,6 +10,7 @@
 class EiveSystem : public Subsystem, public HasActionsIF {
  public:
   static constexpr uint8_t FRAME_DIRTY_COM_REBOOT_LIMIT = 4;
+  static constexpr uint32_t PDEC_RESET_MAX_COUNT_BEFORE_REBOOT = 10;
 
   static constexpr ActionId_t EXECUTE_I2C_REBOOT = 10;
 
@@ -39,11 +40,11 @@ class EiveSystem : public Subsystem, public HasActionsIF {
   Countdown frameDirtyCheckCd = Countdown(10000);
   // If the PDEC reset was already attempted in the last 2 minutes, there is a high chance that
   // only a full reboot will fix the issue.
-  Countdown pdecResetWasAttemptedCd = Countdown(120000);
-  bool pdecResetWasAttempted = false;
+  Countdown pdecResetCounterResetCd = Countdown(120000);
   bool waitingForI2cReboot = false;
   bool waitingForPdecReboot = false;
 
+  uint32_t pdecResetCounter = 0;
   ActionHelper actionHelper;
   PowerSwitchIF* powerSwitcher = nullptr;
   std::atomic_uint16_t& i2cErrors;