Merge remote-tracking branch 'origin/develop' into add_heater_info_set

mission/controller/AcsController.cpp

@@ -566,9 +566,24 @@ ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,
   return INVALID_MODE;
 }
 
-void AcsController::modeChanged(Mode_t mode, Submode_t submode) {}
+void AcsController::modeChanged(Mode_t mode, Submode_t submode) {
+  return ExtendedControllerBase::modeChanged(mode, submode);
+}
 
-void AcsController::announceMode(bool recursive) {}
+void AcsController::announceMode(bool recursive) {
+  const char *modeStr = "UNKNOWN";
+  if (mode == HasModesIF::MODE_OFF) {
+    modeStr = "OFF";
+  } else if (mode == HasModesIF::MODE_ON) {
+    modeStr = "ON";
+  } else if (mode == DeviceHandlerIF::MODE_NORMAL) {
+    modeStr = "NORMAL";
+  }
+  const char *submodeStr = acs::getModeStr(static_cast<acs::AcsMode>(submode));
+  sif::info << "ACS controller is now in " << modeStr << " mode with " << submodeStr << " submode"
+            << std::endl;
+  return ExtendedControllerBase::announceMode(recursive);
+}
 
 void AcsController::copyMgmData() {
   ACS::SensorValues sensorValues;

mission/controller/ThermalController.cpp

@@ -122,30 +122,7 @@ void ThermalController::performControlOperation() {
     }
   }
 
-  ctrlCameraBody();
-  ctrlAcsBoard();
-  ctrlMgt();
-  ctrlRw();
-  ctrlStr();
-  ctrlIfBoard();
-  ctrlAcsBoard();
-  ctrlObc();
-  ctrlObcIfBoard();
-  ctrlSBandTransceiver();
-  ctrlPcduP60Board();
-  ctrlPcduAcu();
-  ctrlPcduPdu();
-  ctrlPlPcduBoard();
-  ctrlPlocMissionBoard();
-  ctrlPlocProcessingBoard();
-  ctrlDac();
-
-  ctrlDro();
-  ctrlX8();
-  ctrlHpa();
-  ctrlTx();
-  ctrlMpa();
-  ctrlScexBoard();
+  // performThermalModuleCtrl();
 }
 
 ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
@@ -1355,6 +1332,33 @@ void ThermalController::ctrlHpa() {
   }
 }
 
+void ThermalController::performThermalModuleCtrl() {
+  ctrlCameraBody();
+  ctrlAcsBoard();
+  ctrlMgt();
+  ctrlRw();
+  ctrlStr();
+  ctrlIfBoard();
+  ctrlAcsBoard();
+  ctrlObc();
+  ctrlObcIfBoard();
+  ctrlSBandTransceiver();
+  ctrlPcduP60Board();
+  ctrlPcduAcu();
+  ctrlPcduPdu();
+  ctrlPlPcduBoard();
+  ctrlPlocMissionBoard();
+  ctrlPlocProcessingBoard();
+  ctrlDac();
+
+  ctrlDro();
+  ctrlX8();
+  ctrlHpa();
+  ctrlTx();
+  ctrlMpa();
+  ctrlScexBoard();
+}
+
 void ThermalController::ctrlScexBoard() {
   sensors[0].first = sensorTemperatures.sensor_scex.isValid();
   sensors[0].second = sensorTemperatures.sensor_scex.value;
@@ -1440,7 +1444,7 @@ void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
 }
 
 void ThermalController::resetSensorsArray() {
-  //TODO: müssen auch andere Variablen resettet werden? senstemp?
+  // TODO: müssen auch andere Variablen resettet werden? senstemp?
   for (auto& validValuePair : sensors) {
     validValuePair.first = false;
     validValuePair.second = INVALID_TEMPERATURE;

mission/controller/ThermalController.h

@@ -44,6 +44,7 @@ class ThermalController : public ExtendedControllerBase {
   ReturnValue_t initialize() override;
 
  protected:
+  void performThermalModuleCtrl();
   ReturnValue_t handleCommandMessage(CommandMessage* message) override;
   void performControlOperation() override;
   ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,