From f28ba61b02fdc15d12c2dd9515f4f3857d028905 Mon Sep 17 00:00:00 2001
From: Mikael <mikael.senger@ksat-stuttgart.de>
Date: Mon, 18 Sep 2023 16:01:03 +0200
Subject: [PATCH] Added opCode to performControlOperation

---
 src/fsfw/controller/ControllerBase.cpp                   | 2 +-
 src/fsfw/controller/ControllerBase.h                     | 2 +-
 src/fsfw/controller/ExtendedControllerBase.cpp           | 2 +-
 src/fsfw/controller/ExtendedControllerBase.h             | 2 +-
 src/fsfw_tests/integration/controller/TestController.cpp | 2 +-
 src/fsfw_tests/integration/controller/TestController.h   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fsfw/controller/ControllerBase.cpp b/src/fsfw/controller/ControllerBase.cpp
index 2c151f5a..b51f86a3 100644
--- a/src/fsfw/controller/ControllerBase.cpp
+++ b/src/fsfw/controller/ControllerBase.cpp
@@ -78,7 +78,7 @@ void ControllerBase::announceMode(bool recursive) { triggerEvent(MODE_INFO, mode
 
 ReturnValue_t ControllerBase::performOperation(uint8_t opCode) {
   handleQueue();
-  performControlOperation();
+  performControlOperation(opCode);
   return returnvalue::OK;
 }
 
diff --git a/src/fsfw/controller/ControllerBase.h b/src/fsfw/controller/ControllerBase.h
index da140e49..4a6aafc3 100644
--- a/src/fsfw/controller/ControllerBase.h
+++ b/src/fsfw/controller/ControllerBase.h
@@ -61,7 +61,7 @@ class ControllerBase : public HasModesIF,
   /**
    * Periodic helper, implemented by child class.
    */
-  virtual void performControlOperation() = 0;
+  virtual void performControlOperation(uint8_t opCode) = 0;
 
   ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
                                  uint32_t *msToReachTheMode) override = 0;
diff --git a/src/fsfw/controller/ExtendedControllerBase.cpp b/src/fsfw/controller/ExtendedControllerBase.cpp
index 58db3563..63b21ba1 100644
--- a/src/fsfw/controller/ExtendedControllerBase.cpp
+++ b/src/fsfw/controller/ExtendedControllerBase.cpp
@@ -81,7 +81,7 @@ ReturnValue_t ExtendedControllerBase::initializeAfterTaskCreation() {
 
 ReturnValue_t ExtendedControllerBase::performOperation(uint8_t opCode) {
   handleQueue();
-  performControlOperation();
+  performControlOperation(opCode);
   /* We do this after performing control operation because variables will be set changed
   in this function. */
   poolManager.performHkOperation();
diff --git a/src/fsfw/controller/ExtendedControllerBase.h b/src/fsfw/controller/ExtendedControllerBase.h
index 64af3bd9..409f8e71 100644
--- a/src/fsfw/controller/ExtendedControllerBase.h
+++ b/src/fsfw/controller/ExtendedControllerBase.h
@@ -44,7 +44,7 @@ class ExtendedControllerBase : public ControllerBase,
   /**
    * Periodic helper from ControllerBase, implemented by child class.
    */
-  void performControlOperation() override = 0;
+  void performControlOperation(uint8_t opCode) override = 0;
 
   // Handle the four messages mentioned above
   void handleQueue() override;
diff --git a/src/fsfw_tests/integration/controller/TestController.cpp b/src/fsfw_tests/integration/controller/TestController.cpp
index c489f336..5e860d16 100644
--- a/src/fsfw_tests/integration/controller/TestController.cpp
+++ b/src/fsfw_tests/integration/controller/TestController.cpp
@@ -13,7 +13,7 @@ ReturnValue_t TestController::handleCommandMessage(CommandMessage *message) {
   return returnvalue::OK;
 }
 
-void TestController::performControlOperation() {}
+void TestController::performControlOperation(uint8_t opCode) {}
 
 void TestController::handleChangedDataset(sid_t sid, store_address_t storeId, bool *clearMessage) {}
 
diff --git a/src/fsfw_tests/integration/controller/TestController.h b/src/fsfw_tests/integration/controller/TestController.h
index 9577bedf..8fb9530d 100644
--- a/src/fsfw_tests/integration/controller/TestController.h
+++ b/src/fsfw_tests/integration/controller/TestController.h
@@ -13,7 +13,7 @@ class TestController : public ExtendedControllerBase {
  protected:
   // Extended Controller Base overrides
   ReturnValue_t handleCommandMessage(CommandMessage* message) override;
-  void performControlOperation() override;
+  void performControlOperation(uint8_t opCode) override;
 
   // HasLocalDatapoolIF callbacks
   virtual void handleChangedDataset(sid_t sid, store_address_t storeId,