From 5f9e0bf80a580ef7a1d2370e57144d60c33e6d03 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 10 Mar 2023 18:17:04 +0100
Subject: [PATCH] tweaks and CHANGELOG

---
 CHANGELOG.md                    | 16 ++++++++--------
 bsp_q7s/core/CoreController.cpp | 22 ++++++++++++----------
 mission/core/GenericFactory.cpp |  2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0244af92..03560147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,14 +16,6 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
-## Changed
-
-- Refactored TM pipeline to optimize usage of the PTME and communication downlink bandwidth.
-  This was done by moving the dumping of TMs to the VCs into separate threads with permanent loops.
-  These threads are then able to process high TM loads on demand. The PUS TM funnel will route
-  PUS packets to the approrpiate persisten TM stores and then demultiplex the TM to all registered
-  TM destinations as before.
-
 ## Fixed
 
 - `PAPB_EMPTY_SIGNAL_VC1` GPIO was not set up properly.
@@ -31,6 +23,14 @@ will consitute of a breaking change warranting a new major release:
 
 ## Changed
 
+- Refactored TM pipeline to optimize usage of the PTME and communication downlink bandwidth.
+  This was done by moving the dumping of TMs to the VCs into separate threads with permanent loops.
+  These threads are then able to process high TM loads on demand. The PUS TM funnel will route
+  PUS packets to the approrpiate persisten TM stores and then demultiplex the TM to all registered
+  TM destinations as before.
+- Service 5 now handles 40 events per cycle instead of 15
+- Remove periodic SD card check. The file system is not mounted read-only anymore when using an
+  ext4 filesystem
 - More fixes and improvements for SD card handling. Extend SD card setup in core controller to
   create full initial state for SD card manager are core controller as early as possible, turn
   execution of setup file update blocking. This might solve the issue with the SD card manager
diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 7eb0fe5f..b9e000d7 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -99,16 +99,18 @@ void CoreController::performControlOperation() {
   }
   sdStateMachine();
   performMountedSdCardOperations();
-  if (sdCardCheckCd.hasTimedOut()) {
-    if (shortSdCardCdCounter < 2) {
-      shortSdCardCdCounter++;
-    }
-    if (shortSdCardCdCounter == 2) {
-      sdCardCheckCd.setTimeout(DEFAULT_SD_CARD_CHECK_TIMEOUT);
-    }
-    performSdCardCheck();
-    sdCardCheckCd.resetTimer();
-  }
+  // TODO: Remove if not required. The filesystem is not re-mounted read-only
+  // when using ext4
+//  if (sdCardCheckCd.hasTimedOut()) {
+//    if (shortSdCardCdCounter < 2) {
+//      shortSdCardCdCounter++;
+//    }
+//    if (shortSdCardCdCounter == 2) {
+//      sdCardCheckCd.setTimeout(DEFAULT_SD_CARD_CHECK_TIMEOUT);
+//    }
+//    performSdCardCheck();
+//    sdCardCheckCd.resetTimer();
+//  }
   readHkData();
   opDivider5.checkAndIncrement();
   opDivider10.checkAndIncrement();
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 39eeb582..35554f5d 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -235,7 +235,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
                            pus::PUS_SERVICE_3);
   new Service5EventReporting(
       PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
-      15, 120);
+      40, 120);
   new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,
                                  pus::PUS_SERVICE_8, 16, 60);
   new Service9TimeManagement(