Merge pull request 'the hottest fix' (#614) from hottest_fix_acs into main

Reviewed-on: #614

CHANGELOG.md

@@ -16,6 +16,40 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v2.0.4] 2023-04-19
+
+## Fixed
+
+- The dual lane assembly device handlers did not properly set their datasets
+  to invalid on off transitions
+
+# [v2.0.3] 2023-04-17
+
+- eive-tmtc: v3.1.1
+
+## Fixed
+
+- Fixed shadowing within the `SafeCtrl`, which prevented actuator commands to be calculated during
+  eclipse phase.
+- EM build idle mode fixes for RW dummy.
+
+## Added
+
+- Add `MGT_OVERHEATING` event and fallback to system SAFE mode if the MGT is overheating for
+  whatever reason.
+
+## Changed
+
+- Low-pass filters can no longer be executed if no actual data is available.
+
+# [v2.0.2] 2023-04-16
+
+- Bump patch version to 2.
+
+# [v2.0.1] 2023-04-16
+
+- eive-tmtc: v3.1.0
+
 # [v2.0.0] 2023-04-16
 
 This is the version which will fly on the satellite for the initial launch phase.

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 2)
 set(OBSW_VERSION_MINOR 0)
-set(OBSW_VERSION_REVISION 0)
+set(OBSW_VERSION_REVISION 4)
 
 # set(CMAKE_VERBOSE TRUE)
 

automation/Jenkinsfile

@@ -22,7 +22,7 @@ pipeline {
             steps {
                 dir(BUILDDIR_Q7S) {
                     sh 'cmake -DTGT_BSP="arm/q7s" -DCMAKE_BUILD_TYPE=Debug ..'
-                    sh 'cmake --build . -j6'
+                    sh 'cmake --build . -j8'
                 }
             }
         }
@@ -30,7 +30,7 @@ pipeline {
             steps {
                 dir(BUILDDIR_Q7S_EM) {
                     sh 'cmake -DTGT_BSP="arm/q7s" -DEIVE_Q7S_EM=ON -DCMAKE_BUILD_TYPE=Debug ..'
-                    sh 'cmake --build . -j6'
+                    sh 'cmake --build . -j8'
                 }
             }
         }
@@ -38,7 +38,7 @@ pipeline {
             steps {
                 dir(BUILDDIR_LINUX) {
                     sh 'cmake ..'
-                    sh 'cmake --build . -j6'
+                    sh 'cmake --build . -j8'
                     sh './eive-unittest'
                 }
             }

bsp_hosted/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 290 translations.
+ * @brief    Auto-generated event translation file. Contains 291 translations.
  * @details
- * Generated on: 2023-04-14 20:23:17
+ * Generated on: 2023-04-17 11:34:19
  */
 #include "translateEvents.h"
 
@@ -280,6 +280,7 @@ const char *OBC_OVERHEATING_STRING = "OBC_OVERHEATING";
 const char *CAMERA_OVERHEATING_STRING = "CAMERA_OVERHEATING";
 const char *PCDU_SYSTEM_OVERHEATING_STRING = "PCDU_SYSTEM_OVERHEATING";
 const char *HEATER_NOT_OFF_FOR_OFF_MODE_STRING = "HEATER_NOT_OFF_FOR_OFF_MODE";
+const char *MGT_OVERHEATING_STRING = "MGT_OVERHEATING";
 const char *TX_TIMER_EXPIRED_STRING = "TX_TIMER_EXPIRED";
 const char *BIT_LOCK_TX_ON_STRING = "BIT_LOCK_TX_ON";
 const char *POSSIBLE_FILE_CORRUPTION_STRING = "POSSIBLE_FILE_CORRUPTION";
@@ -848,6 +849,8 @@ const char *translateEvents(Event event) {
       return PCDU_SYSTEM_OVERHEATING_STRING;
     case (14107):
       return HEATER_NOT_OFF_FOR_OFF_MODE_STRING;
+    case (14108):
+      return MGT_OVERHEATING_STRING;
     case (14201):
       return TX_TIMER_EXPIRED_STRING;
     case (14202):

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 171 translations.
- * Generated on: 2023-04-14 20:23:17
+ * Generated on: 2023-04-17 11:34:19
  */
 #include "translateObjects.h"
 

dummies/RwDummy.cpp

@@ -37,6 +37,9 @@ uint32_t RwDummy::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return
 
 ReturnValue_t RwDummy::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                LocalDataPoolManager &poolManager) {
+  localDataPoolMap.emplace(rws::RW_SPEED, &rwSpeed);
+  localDataPoolMap.emplace(rws::RAMP_TIME, &rampTime);
+
   localDataPoolMap.emplace(rws::TEMPERATURE_C, new PoolEntry<int32_t>({0}));
 
   localDataPoolMap.emplace(rws::CURR_SPEED, new PoolEntry<int32_t>({0}));

dummies/RwDummy.h

@@ -15,6 +15,9 @@ class RwDummy : public DeviceHandlerBase {
   virtual ~RwDummy();
 
  protected:
+  PoolEntry<int32_t> rwSpeed = PoolEntry<int32_t>({0});
+  PoolEntry<uint16_t> rampTime = PoolEntry<uint16_t>({10});
+
   void doStartUp() override;
   void doShutDown() override;
   ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t *id) override;

dummies/TemperatureSensorInserter.cpp

@@ -96,6 +96,16 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) {
       }
       break;
     }
+    case (TestCase::COLD_CAMERA): {
+      if (cycles == 15) {
+        sif::debug << "Setting cold CAM temperature" << std::endl;
+        max31865DummyMap[objects::RTD_2_IC5_4K_CAMERA]->setTemperature(-40, true);
+      }
+      if (cycles == 30) {
+        sif::debug << "Setting CAM temperature back to normal" << std::endl;
+        max31865DummyMap[objects::RTD_2_IC5_4K_CAMERA]->setTemperature(0, true);
+      }
+    }
   }
   cycles++;
   return returnvalue::OK;

dummies/TemperatureSensorInserter.h

@@ -31,6 +31,7 @@ class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject
     COLD_MGT = 3,
     COLD_STR = 4,
     COLD_STR_CONSECUTIVE = 5,
+    COLD_CAMERA = 6,
   };
   int iteration = 0;
   uint32_t cycles = 0;

generators/bsp_hosted_events.csv

@@ -274,6 +274,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14105;0x3719;CAMERA_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14106;0x371a;PCDU_SYSTEM_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14107;0x371b;HEATER_NOT_OFF_FOR_OFF_MODE;MEDIUM;No description;mission/controller/tcsDefs.h
+14108;0x371c;MGT_OVERHEATING;MEDIUM;No description;mission/controller/tcsDefs.h
 14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h
 14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h

generators/bsp_q7s_events.csv

@@ -274,6 +274,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14105;0x3719;CAMERA_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14106;0x371a;PCDU_SYSTEM_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14107;0x371b;HEATER_NOT_OFF_FOR_OFF_MODE;MEDIUM;No description;mission/controller/tcsDefs.h
+14108;0x371c;MGT_OVERHEATING;MEDIUM;No description;mission/controller/tcsDefs.h
 14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h
 14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 290 translations.
+ * @brief    Auto-generated event translation file. Contains 291 translations.
  * @details
- * Generated on: 2023-04-14 20:23:17
+ * Generated on: 2023-04-17 11:34:19
  */
 #include "translateEvents.h"
 
@@ -280,6 +280,7 @@ const char *OBC_OVERHEATING_STRING = "OBC_OVERHEATING";
 const char *CAMERA_OVERHEATING_STRING = "CAMERA_OVERHEATING";
 const char *PCDU_SYSTEM_OVERHEATING_STRING = "PCDU_SYSTEM_OVERHEATING";
 const char *HEATER_NOT_OFF_FOR_OFF_MODE_STRING = "HEATER_NOT_OFF_FOR_OFF_MODE";
+const char *MGT_OVERHEATING_STRING = "MGT_OVERHEATING";
 const char *TX_TIMER_EXPIRED_STRING = "TX_TIMER_EXPIRED";
 const char *BIT_LOCK_TX_ON_STRING = "BIT_LOCK_TX_ON";
 const char *POSSIBLE_FILE_CORRUPTION_STRING = "POSSIBLE_FILE_CORRUPTION";
@@ -848,6 +849,8 @@ const char *translateEvents(Event event) {
       return PCDU_SYSTEM_OVERHEATING_STRING;
     case (14107):
       return HEATER_NOT_OFF_FOR_OFF_MODE_STRING;
+    case (14108):
+      return MGT_OVERHEATING_STRING;
     case (14201):
       return TX_TIMER_EXPIRED_STRING;
     case (14202):

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 175 translations.
- * Generated on: 2023-04-14 20:23:17
+ * Generated on: 2023-04-17 11:34:19
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 290 translations.
+ * @brief    Auto-generated event translation file. Contains 291 translations.
  * @details
- * Generated on: 2023-04-14 20:23:17
+ * Generated on: 2023-04-17 11:34:19
  */
 #include "translateEvents.h"
 
@@ -280,6 +280,7 @@ const char *OBC_OVERHEATING_STRING = "OBC_OVERHEATING";
 const char *CAMERA_OVERHEATING_STRING = "CAMERA_OVERHEATING";
 const char *PCDU_SYSTEM_OVERHEATING_STRING = "PCDU_SYSTEM_OVERHEATING";
 const char *HEATER_NOT_OFF_FOR_OFF_MODE_STRING = "HEATER_NOT_OFF_FOR_OFF_MODE";
+const char *MGT_OVERHEATING_STRING = "MGT_OVERHEATING";
 const char *TX_TIMER_EXPIRED_STRING = "TX_TIMER_EXPIRED";
 const char *BIT_LOCK_TX_ON_STRING = "BIT_LOCK_TX_ON";
 const char *POSSIBLE_FILE_CORRUPTION_STRING = "POSSIBLE_FILE_CORRUPTION";
@@ -848,6 +849,8 @@ const char *translateEvents(Event event) {
       return PCDU_SYSTEM_OVERHEATING_STRING;
     case (14107):
       return HEATER_NOT_OFF_FOR_OFF_MODE_STRING;
+    case (14108):
+      return MGT_OVERHEATING_STRING;
     case (14201):
       return TX_TIMER_EXPIRED_STRING;
     case (14202):

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 175 translations.
- * Generated on: 2023-04-14 20:23:17
+ * Generated on: 2023-04-17 11:34:19
  */
 #include "translateObjects.h"
 

linux/ipcore/PdecHandler.cpp

@@ -435,8 +435,7 @@ ReturnValue_t PdecHandler::releasePdec() {
 }
 
 ReturnValue_t PdecHandler::pdecToReset() {
-  ReturnValue_t result = returnvalue::OK;
+  ReturnValue_t result = gpioComIF->pullLow(pdecReset);
-  result = gpioComIF->pullLow(pdecReset);
   if (result != returnvalue::OK) {
     sif::error << "PdecHandler::pdecToReset: Failed to pull PDEC reset line"
                   " to low"

mission/acs/GyrAdis1650XHandler.cpp

@@ -37,6 +37,7 @@ void GyrAdis1650XHandler::doStartUp() {
 void GyrAdis1650XHandler::doShutDown() {
   if (internalState != InternalState::SHUTDOWN) {
     commandExecuted = false;
+    PoolReadGuard pg(&primaryDataset);
     primaryDataset.setValidity(false, true);
     internalState = InternalState::SHUTDOWN;
   }

mission/acs/GyrL3gCustomHandler.cpp

@@ -33,6 +33,7 @@ void GyrL3gCustomHandler::doStartUp() {
 void GyrL3gCustomHandler::doShutDown() {
   if (internalState != InternalState::SHUTDOWN) {
     internalState = InternalState::SHUTDOWN;
+    PoolReadGuard pg(&dataset);
     dataset.setValidity(false, true);
     commandExecuted = false;
   }

mission/acs/MgmLis3CustomHandler.cpp

@@ -29,6 +29,7 @@ void MgmLis3CustomHandler::doStartUp() {
 
 void MgmLis3CustomHandler::doShutDown() {
   if (internalState != InternalState::SHUTDOWN) {
+    PoolReadGuard pg(&dataset);
     dataset.setValidity(false, true);
     internalState = InternalState::SHUTDOWN;
     commandExecuted = false;

mission/acs/MgmRm3100CustomHandler.cpp

@@ -33,6 +33,7 @@ void MgmRm3100CustomHandler::doStartUp() {
 void MgmRm3100CustomHandler::doShutDown() {
   if (internalState != InternalState::SHUTDOWN) {
     commandExecuted = false;
+    PoolReadGuard pg(&primaryDataset);
     primaryDataset.setValidity(false, true);
     internalState = InternalState::SHUTDOWN;
   }

mission/acs/SusHandler.cpp

@@ -29,6 +29,7 @@ void SusHandler::doStartUp() {
 
 void SusHandler::doShutDown() {
   if (internalState != InternalState::SHUTDOWN) {
+    PoolReadGuard pg(&dataset);
     dataset.setValidity(false, true);
     internalState = InternalState::SHUTDOWN;
     commandExecuted = false;

mission/controller/ThermalController.cpp

@@ -20,6 +20,8 @@
 #define LOWER_SYRLINKS_UPPER_LIMITS 0
 #define LOWER_EBAND_UPPER_LIMITS 0
 #define LOWER_PLOC_UPPER_LIMITS 0
+#define LOWER_MGT_UPPER_LIMITS 0
+#define LOWER_RW_UPPER_LIMITS 0
 
 ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater,
                                      const std::atomic_bool& tcsBoardShortUnavailable)
@@ -111,7 +113,7 @@ void ThermalController::performControlOperation() {
       break;
   }
 
-  if (cycles == 50) {
+  if (cycles == 40) {
     bool changedLimits = false;
 #if LOWER_SYRLINKS_UPPER_LIMITS == 1
     changedLimits = true;
@@ -130,9 +132,21 @@ void ThermalController::performControlOperation() {
     hpaLimits.cutOffLimit = 0;
     hpaLimits.opUpperLimit = 0;
     hpaLimits.nopUpperLimit = 0;
+#endif
+#if LOWER_MGT_UPPER_LIMITS == 1
+    changedLimits = true;
+    mgtLimits.cutOffLimit = 0;
+    mgtLimits.opUpperLimit = 0;
+    mgtLimits.nopUpperLimit = 0;
+#endif
+#if LOWER_RW_UPPER_LIMITS == 1
+    changedLimits = true;
+    rwLimits.cutOffLimit = 0;
+    rwLimits.opUpperLimit = 0;
+    rwLimits.nopUpperLimit = 0;
 #endif
     if (changedLimits) {
-      sif::debug << "ThermalController: changing limits" << std::endl;  // TODO: rausschmeissen
+      sif::debug << "ThermalController: changing limits" << std::endl;
     }
   }
 
@@ -1055,7 +1069,12 @@ void ThermalController::ctrlMgt() {
   numSensors = 3;
   HeaterContext htrCtx(heater::HEATER_2_ACS_BRD, heater::HEATER_3_PCDU_PDU, mgtLimits);
   ctrlComponentTemperature(htrCtx);
-  // TODO: trigger special event
+  if (componentAboveUpperLimit and not mgtTooHotFlag) {
+    triggerEvent(tcsCtrl::MGT_OVERHEATING, tempFloatToU32());
+    mgtTooHotFlag = true;
+  } else if (not componentAboveUpperLimit) {
+    mgtTooHotFlag = false;
+  }
 }
 
 void ThermalController::ctrlRw() {
@@ -1240,7 +1259,7 @@ void ThermalController::ctrlObcIfBoard() {
     triggerEvent(tcsCtrl::OBC_OVERHEATING, tempFloatToU32());
     obcTooHotFlag = true;
   } else if (not componentAboveUpperLimit) {
-    obcTooHotFlag = false;  // TODO: !!
+    obcTooHotFlag = false;
   }
 }
 

mission/controller/ThermalController.h

@@ -267,6 +267,7 @@ class ThermalController : public ExtendedControllerBase {
   bool pcduSystemTooHotFlag = false;
   bool syrlinksTooHotFlag = false;
   bool obcTooHotFlag = false;
+  bool mgtTooHotFlag = false;
   bool strTooHotFlag = false;
   bool rwTooHotFlag = false;
 

mission/controller/acs/SensorProcessing.cpp

@@ -150,7 +150,8 @@ void SensorProcessing::processMgm(const float *mgm0Value, bool mgm0valid, const
   }
   timeOfSavedMagFieldEst = timeOfMgmMeasurement;
 
-  if (mgmDataProcessed->mgmVecTotDerivative.isValid()) {
+  if (VectorOperations<double>::norm(mgmVecTotDerivative, 3) != 0 and
+      mgmDataProcessed->mgmVecTotDerivative.isValid()) {
     lowPassFilter(mgmVecTotDerivative, mgmDataProcessed->mgmVecTotDerivative.value,
                   mgmParameters->mgmDerivativeFilterWeight);
   }
@@ -533,7 +534,7 @@ void SensorProcessing::processGyr(
     }
   }
 
-  if (gyrDataProcessed->gyrVecTot.isValid()) {
+  if (VectorOperations<double>::norm(gyrVecTot, 3) != 0 and gyrDataProcessed->gyrVecTot.isValid()) {
     lowPassFilter(gyrVecTot, gyrDataProcessed->gyrVecTot.value, gyrParameters->gyrFilterWeight);
   }
 

mission/controller/acs/control/SafeCtrl.cpp

@@ -95,7 +95,6 @@ void SafeCtrl::safeRateDamping(const double *magFieldB, const double *satRotRate
                                 acsParameters->safeModeControllerParameters.k_orthoNonMekf);
 
   // sum of all torques
-  double cmdTorque[3] = {0, 0, 0};
   VectorOperations<double>::add(cmdParallel, cmdOrtho, cmdTorque, 3);
 
   // calculate magnetic moment to command

mission/controller/tcsDefs.h

@@ -17,6 +17,7 @@ static constexpr Event OBC_OVERHEATING = MAKE_EVENT(4, severity::HIGH);
 static constexpr Event CAMERA_OVERHEATING = MAKE_EVENT(5, severity::HIGH);
 static constexpr Event PCDU_SYSTEM_OVERHEATING = MAKE_EVENT(6, severity::HIGH);
 static constexpr Event HEATER_NOT_OFF_FOR_OFF_MODE = MAKE_EVENT(7, severity::MEDIUM);
+static constexpr Event MGT_OVERHEATING = MAKE_EVENT(8, severity::HIGH);
 
 enum SetId : uint32_t {
   SENSOR_TEMPERATURES = 0,

mission/system/EiveSystem.cpp

@@ -114,6 +114,7 @@ ReturnValue_t EiveSystem::initialize() {
   manager->subscribeToEvent(eventQueue->getId(),
                             event::getEventId(tcsCtrl::PCDU_SYSTEM_OVERHEATING));
   manager->subscribeToEvent(eventQueue->getId(), event::getEventId(tcsCtrl::OBC_OVERHEATING));
+  manager->subscribeToEvent(eventQueue->getId(), event::getEventId(tcsCtrl::MGT_OVERHEATING));
   manager->subscribeToEvent(eventQueue->getId(), event::getEventId(pdec::INVALID_TC_FRAME));
   return Subsystem::initialize();
 }
@@ -132,6 +133,7 @@ void EiveSystem::handleEventMessages() {
             break;
           }
           case tcsCtrl::OBC_OVERHEATING:
+          case tcsCtrl::MGT_OVERHEATING:
           case tcsCtrl::PCDU_SYSTEM_OVERHEATING: {
             if (isInTransition) {
               performSafeRecovery = true;