Merge branch 'develop' into meier/pdec-config-persistent

CHANGELOG.md

@@ -16,12 +16,30 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
-eive-tmtc: v2.15.1
+## Fixed
+
+- ADIS1650X: Added missing MDL_RANG pool entry for configuration set
+
+# [v1.31.1]
+
+## Fixed
+
+- ADIS1650X configuration set was empty because the local pool variables were not registered.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/402
+- ACS Controller: Correction for size of MEKF dataset and some optimization and fixes
+  for actuator control which lead to a crash.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/403
+
+# [v1.31.0]
+
+eive-tmtc: v2.16.0
 
 ## Fixed
 
 - Usage of floats as iterators and using them to calculate a uint8_t index in `SusConverter`
 - Removed unused variables in the `AcsController`
+- Remove shadowing variables inside ACS assembly classes.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/385
 
 ## Changed
 
@@ -36,6 +54,8 @@ COM PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/364
 * Solves [#386](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/386)
 - All `targetQuat` functions in `Guidance` now return the target quaternion (target
   in ECI frame), which is passed on to `CtrlValData`.
+- Moved polling sequence table definitions and source code to `mission/core` folder.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/395
 
 ## Added
 

CMakeLists.txt

@@ -10,8 +10,8 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 1)
-set(OBSW_VERSION_MINOR 30)
-set(OBSW_VERSION_REVISION 0)
+set(OBSW_VERSION_MINOR 31)
+set(OBSW_VERSION_REVISION 1)
 
 # set(CMAKE_VERBOSE TRUE)
 

bsp_hosted/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 260 translations.
  * @details
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
  */
 #include "translateEvents.h"
 

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 148 translations.
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
  */
 #include "translateObjects.h"
 

bsp_q7s/core/scheduling.cpp

@@ -17,10 +17,10 @@
 #include "fsfw/tasks/FixedTimeslotTaskIF.h"
 #include "fsfw/tasks/PeriodicTaskIF.h"
 #include "fsfw/tasks/TaskFactory.h"
+#include "mission/core/pollingSeqTables.h"
 #include "mission/core/scheduling.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/utility/InitMission.h"
-#include "pollingsequence/pollingSequenceFactory.h"
 
 /* This is configured for linux without CR */
 #ifdef PLATFORM_UNIX
@@ -404,7 +404,7 @@ void scheduling::createPstTasks(TaskFactory& factory, TaskDeadlineMissedFunction
 #ifdef RELEASE_BUILD
   static constexpr float acsPstPeriod = 0.4;
 #else
-  static constexpr float acsPstPeriod = 0.8;
+  static constexpr float acsPstPeriod = 0.4;
 #endif
   FixedTimeslotTaskIF* acsTcsPst = factory.createFixedTimeslotTask(
       "ACS_TCS_PST", 80, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, acsPstPeriod, missedDeadlineFunc);

bsp_q7s/core/scheduling.h

@@ -1,11 +1,10 @@
 #ifndef BSP_Q7S_INITMISSION_H_
 #define BSP_Q7S_INITMISSION_H_
 
-#include <pollingsequence/pollingSequenceFactory.h>
-
 #include <vector>
 
 #include "fsfw/tasks/definitions.h"
+#include "mission/core/pollingSeqTables.h"
 
 using pst::AcsPstCfg;
 

common/config/eive/definitions.h

@@ -62,7 +62,8 @@ static constexpr uint32_t SCHED_BLOCK_2_SENSOR_READ_MS = 30;
 static constexpr uint32_t SCHED_BLOCK_3_READ_IMTQ_MGM_MS = 42;
 static constexpr uint32_t SCHED_BLOCK_4_ACS_CTRL_MS = 45;
 static constexpr uint32_t SCHED_BLOCK_5_ACTUATOR_MS = 50;
-static constexpr uint32_t SCHED_BLOCK_6_IMTQ_BLOCK_2_MS = 75;
+static constexpr uint32_t SCHED_BLOCK_6_IMTQ_BLOCK_2_MS = 90;
+static constexpr uint32_t SCHED_BLOCK_RTD = 150;
 static constexpr uint32_t SCHED_BLOCK_7_RW_READ_MS = 300;
 
 // 15 ms for FM
@@ -76,6 +77,7 @@ static constexpr float SCHED_BLOCK_5_PERIOD = static_cast<float>(SCHED_BLOCK_5_A
 static constexpr float SCHED_BLOCK_6_PERIOD =
     static_cast<float>(SCHED_BLOCK_6_IMTQ_BLOCK_2_MS) / 400.0;
 static constexpr float SCHED_BLOCK_7_PERIOD = static_cast<float>(SCHED_BLOCK_7_RW_READ_MS) / 400.0;
+static constexpr float SCHED_BLOCK_RTD_PERIOD = static_cast<float>(SCHED_BLOCK_RTD) / 400.0;
 
 }  // namespace acs
 

generators/bsp_hosted_returnvalues.csv

@@ -2,7 +2,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
-0x6300;NVMB_Busy;No description;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.h
 0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h

generators/bsp_q7s_returnvalues.csv

@@ -2,7 +2,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
-0x6300;NVMB_Busy;No description;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.h
 0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 260 translations.
  * @details
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
  */
 #include "translateEvents.h"
 

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 153 translations.
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/CMakeLists.txt

@@ -1,5 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp
-                                    pollingsequence/pollingSequenceFactory.cpp)
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp)
 
 target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 260 translations.
  * @details
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
  */
 #include "translateEvents.h"
 

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 153 translations.
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
  */
 #include "translateObjects.h"
 

mission/controller/AcsController.cpp

@@ -432,15 +432,13 @@ ReturnValue_t AcsController::commandActuators(int16_t xDipole, int16_t yDipole,
   return returnvalue::OK;
 }
 
-void AcsController::updateActuatorCmdData(int16_t mtqTargetDipole[3]) {
-  double rwTargetTorque[4] = {0.0, 0.0, 0.0, 0.0};
-  int32_t rwTargetSpeed[4] = {0, 0, 0, 0};
-  updateActuatorCmdData(rwTargetTorque, rwTargetSpeed, mtqTargetDipole);
+void AcsController::updateActuatorCmdData(const int16_t *mtqTargetDipole) {
+  updateActuatorCmdData(RW_OFF_TORQUE, RW_OFF_SPEED, mtqTargetDipole);
 }
 
-void AcsController::updateActuatorCmdData(double rwTargetTorque[4], int32_t rwTargetSpeed[4],
-                                          int16_t mtqTargetDipole[3]) {
-  {
+void AcsController::updateActuatorCmdData(const double *rwTargetTorque,
+                                          const int32_t *rwTargetSpeed,
+                                          const int16_t *mtqTargetDipole) {
   PoolReadGuard pg(&actuatorCmdData);
   if (pg.getReadResult() == returnvalue::OK) {
     std::memcpy(actuatorCmdData.rwTargetTorque.value, rwTargetTorque, 4 * sizeof(double));
@@ -449,26 +447,21 @@ void AcsController::updateActuatorCmdData(double rwTargetTorque[4], int32_t rwTa
     actuatorCmdData.setValidity(true, true);
   }
 }
-}
 
 void AcsController::updateCtrlValData(double errAng) {
-  double unitQuat[4] = {0, 0, 0, 1};
-  {
   PoolReadGuard pg(&ctrlValData);
   if (pg.getReadResult() == returnvalue::OK) {
-      std::memcpy(ctrlValData.tgtQuat.value, unitQuat, 4 * sizeof(double));
+    std::memcpy(ctrlValData.tgtQuat.value, UNIT_QUAT, 4 * sizeof(double));
     ctrlValData.tgtQuat.setValid(false);
-      std::memcpy(ctrlValData.errQuat.value, unitQuat, 4 * sizeof(double));
+    std::memcpy(ctrlValData.errQuat.value, UNIT_QUAT, 4 * sizeof(double));
     ctrlValData.errQuat.setValid(false);
     ctrlValData.errAng.value = errAng;
     ctrlValData.errAng.setValid(true);
     ctrlValData.setValidity(true, false);
   }
 }
-}
 
-void AcsController::updateCtrlValData(double tgtQuat[4], double errQuat[4], double errAng) {
-  {
+void AcsController::updateCtrlValData(const double *tgtQuat, const double *errQuat, double errAng) {
   PoolReadGuard pg(&ctrlValData);
   if (pg.getReadResult() == returnvalue::OK) {
     std::memcpy(ctrlValData.tgtQuat.value, tgtQuat, 4 * sizeof(double));
@@ -477,21 +470,16 @@ void AcsController::updateCtrlValData(double tgtQuat[4], double errQuat[4], doub
     ctrlValData.setValidity(true, true);
   }
 }
-}
 
 void AcsController::disableCtrlValData() {
-  double unitQuat[4] = {0, 0, 0, 1};
-  double errAng = 0;
-  {
   PoolReadGuard pg(&ctrlValData);
   if (pg.getReadResult() == returnvalue::OK) {
-      std::memcpy(ctrlValData.tgtQuat.value, unitQuat, 4 * sizeof(double));
-      std::memcpy(ctrlValData.errQuat.value, unitQuat, 4 * sizeof(double));
-      ctrlValData.errAng.value = errAng;
+    std::memcpy(ctrlValData.tgtQuat.value, UNIT_QUAT, 4 * sizeof(double));
+    std::memcpy(ctrlValData.errQuat.value, UNIT_QUAT, 4 * sizeof(double));
+    ctrlValData.errAng.value = 0;
     ctrlValData.setValidity(false, true);
   }
 }
-}
 
 ReturnValue_t AcsController::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                      LocalDataPoolManager &poolManager) {

mission/controller/AcsController.h

@@ -40,6 +40,10 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes
   void performPointingCtrl();
 
  private:
+  static constexpr double UNIT_QUAT[4] = {0, 0, 0, 1};
+  static constexpr double RW_OFF_TORQUE[4] = {0.0, 0.0, 0.0, 0.0};
+  static constexpr int32_t RW_OFF_SPEED[4] = {0, 0, 0, 0};
+
   AcsParameters acsParameters;
   SensorProcessing sensorProcessing;
   Navigation navigation;
@@ -84,11 +88,11 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes
   ReturnValue_t commandActuators(int16_t xDipole, int16_t yDipole, int16_t zDipole,
                                  uint16_t dipoleTorqueDuration, int32_t rw1Speed, int32_t rw2Speed,
                                  int32_t rw3Speed, int32_t rw4Speed, uint16_t rampTime);
-  void updateActuatorCmdData(int16_t mtqTargetDipole[3]);
-  void updateActuatorCmdData(double rwTargetTorque[4], int32_t rwTargetSpeed[4],
-                             int16_t mtqTargetDipole[3]);
+  void updateActuatorCmdData(const int16_t* mtqTargetDipole);
+  void updateActuatorCmdData(const double* rwTargetTorque, const int32_t* rwTargetSpeed,
+                             const int16_t* mtqTargetDipole);
   void updateCtrlValData(double errAng);
-  void updateCtrlValData(double tgtQuat[4], double errQuat[4], double errAng);
+  void updateCtrlValData(const double* tgtQuat, const double* errQuat, double errAng);
   void disableCtrlValData();
 
   /* ACS Sensor Values */
@@ -187,7 +191,7 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes
   PoolEntry<double> tgtQuat = PoolEntry<double>(4);
   PoolEntry<double> errQuat = PoolEntry<double>(4);
   PoolEntry<double> errAng = PoolEntry<double>();
-  PoolEntry<double> tgtRotRate = PoolEntry<double>(4);
+  PoolEntry<double> tgtRotRate = PoolEntry<double>(3);
 
   // Actuator CMD
   acsctrl::ActuatorCmdData actuatorCmdData;

mission/controller/controllerdefinitions/AcsCtrlDefinitions.h

@@ -110,7 +110,7 @@ static constexpr uint8_t SUS_SET_PROCESSED_ENTRIES = 15;
 static constexpr uint8_t GYR_SET_RAW_ENTRIES = 4;
 static constexpr uint8_t GYR_SET_PROCESSED_ENTRIES = 5;
 static constexpr uint8_t GPS_SET_PROCESSED_ENTRIES = 4;
-static constexpr uint8_t MEKF_SET_ENTRIES = 2;
+static constexpr uint8_t MEKF_SET_ENTRIES = 3;
 static constexpr uint8_t CTRL_VAL_SET_ENTRIES = 4;
 static constexpr uint8_t ACT_CMD_SET_ENTRIES = 3;
 

mission/core/CMakeLists.txt

@@ -1 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp scheduling.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp scheduling.cpp
+                                           pollingSeqTables.cpp)

mission/core/pollingSeqTables.cpp

@@ -1,4 +1,4 @@
-#include "pollingSequenceFactory.h"
+#include "pollingSeqTables.h"
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
@@ -659,7 +659,7 @@ ReturnValue_t pst::pstTcsAndAcs(FixedTimeslotTaskIF *thisSequence, AcsPstCfg cfg
                           DeviceHandlerIF::GET_READ);
   }
 
-  thisSequence->addSlot(objects::SPI_RTD_COM_IF, length * 0.5, 0);
+  thisSequence->addSlot(objects::SPI_RTD_COM_IF, length * config::acs::SCHED_BLOCK_RTD_PERIOD, 0);
 
   return returnvalue::OK;
 }

mission/devices/GyroADIS1650XHandler.cpp

@@ -385,6 +385,7 @@ ReturnValue_t GyroADIS1650XHandler::initializeLocalDataPool(localpool::DataPool
 
   localDataPoolMap.emplace(ADIS1650X::DIAG_STAT_REGISTER, new PoolEntry<uint16_t>());
   localDataPoolMap.emplace(ADIS1650X::FILTER_SETTINGS, new PoolEntry<uint8_t>());
+  localDataPoolMap.emplace(ADIS1650X::RANG_MDL, &rangMdl);
   localDataPoolMap.emplace(ADIS1650X::MSC_CTRL_REGISTER, new PoolEntry<uint16_t>());
   localDataPoolMap.emplace(ADIS1650X::DEC_RATE_REGISTER, new PoolEntry<uint16_t>());
   poolManager.subscribeForRegularPeriodicPacket(

mission/devices/GyroADIS1650XHandler.h

@@ -63,6 +63,8 @@ class GyroADIS1650XHandler : public DeviceHandlerBase {
   InternalState internalState = InternalState::STARTUP;
   bool commandExecuted = false;
 
+  PoolEntry<uint16_t> rangMdl = PoolEntry<uint16_t>();
+
   void prepareReadCommand(uint8_t *regList, size_t len);
 
   BurstModes getBurstMode();

mission/devices/devicedefinitions/GyroADIS1650XDefinitions.h

@@ -147,11 +147,15 @@ class AdisGyroConfigDataset : public StaticLocalDataSet<5> {
     setAllVariablesReadOnly();
   }
 
-  lp_var_t<uint16_t> diagStatReg = lp_var_t<uint16_t>(sid.objectId, ADIS1650X::DIAG_STAT_REGISTER);
-  lp_var_t<uint8_t> filterSetting = lp_var_t<uint8_t>(sid.objectId, ADIS1650X::FILTER_SETTINGS);
-  lp_var_t<uint16_t> rangMdl = lp_var_t<uint16_t>(sid.objectId, ADIS1650X::RANG_MDL);
-  lp_var_t<uint16_t> mscCtrlReg = lp_var_t<uint16_t>(sid.objectId, ADIS1650X::MSC_CTRL_REGISTER);
-  lp_var_t<uint16_t> decRateReg = lp_var_t<uint16_t>(sid.objectId, ADIS1650X::DEC_RATE_REGISTER);
+  lp_var_t<uint16_t> diagStatReg =
+      lp_var_t<uint16_t>(sid.objectId, ADIS1650X::DIAG_STAT_REGISTER, this);
+  lp_var_t<uint8_t> filterSetting =
+      lp_var_t<uint8_t>(sid.objectId, ADIS1650X::FILTER_SETTINGS, this);
+  lp_var_t<uint16_t> rangMdl = lp_var_t<uint16_t>(sid.objectId, ADIS1650X::RANG_MDL, this);
+  lp_var_t<uint16_t> mscCtrlReg =
+      lp_var_t<uint16_t>(sid.objectId, ADIS1650X::MSC_CTRL_REGISTER, this);
+  lp_var_t<uint16_t> decRateReg =
+      lp_var_t<uint16_t>(sid.objectId, ADIS1650X::DEC_RATE_REGISTER, this);
 
  private:
   friend class GyroADIS1650XHandler;

mission/system/objects/AcsBoardAssembly.h

@@ -108,8 +108,6 @@ class AcsBoardAssembly : public DualLaneAssemblyBase {
   static constexpr pcdu::Switches SWITCH_A = pcdu::Switches::PDU1_CH7_ACS_A_SIDE_3V3;
   static constexpr pcdu::Switches SWITCH_B = pcdu::Switches::PDU2_CH7_ACS_BOARD_SIDE_B_3V3;
 
-  bool tryingOtherSide = false;
-  bool dualModeErrorSwitch = true;
   AcsBoardHelper helper;
   GpioIF* gpioIF = nullptr;
 

mission/system/objects/Stack5VHandler.h

@@ -10,6 +10,7 @@ enum class HandlerState { SWITCH_PENDING, IDLE };
 
 class Stack5VHandler {
  public:
+  //! [EXPORT] : [SKIP]
   static constexpr ReturnValue_t BUSY = returnvalue::makeCode(1, 0);
   Stack5VHandler(PowerSwitchIF& switcher);
 

mission/system/objects/SusAssembly.h

@@ -50,8 +50,6 @@ class SusAssembly : public DualLaneAssemblyBase {
 
   SusAssHelper helper;
   PowerSwitchIF* pwrSwitcher = nullptr;
-  bool tryingOtherSide = false;
-  bool dualModeErrorSwitch = true;
   ReturnValue_t initialize() override;
 
   // AssemblyBase overrides

tmtc

@@ -1 +1 @@
-Subproject commit 446e38ed57718aabc91defbe811a9c0fe378f9cd
+Subproject commit 24f0d8e1a6a8ea1323623932e699326214c78159