Merge pull request 'Bump Submodules' (#788) from bump-submodules into main

Reviewed-on: #788

CHANGELOG.md

@@ -16,6 +16,16 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v6.4.1] 2023-08-21
+
+## Fixed
+
+- `PDEC_CONFIG_CORRUPTED` event now actually contains the readback instead of the expected
+  config
+- Magnetic field vector was not calculated if only MGM4 was available, but still written to
+  the dataset. This would result in a NaN vector. Allowance for usage of MGM4 is now checked
+  before entering calculation.
+
 # [v6.4.0] 2023-08-16
 
 - `eive-tmtc`: v5.4.3
@@ -24,6 +34,8 @@ will consitute of a breaking change warranting a new major release:
 
 - The handling function of the GPS data is only called once per GPS read. This should remove
   the fake fix-has-changed events.
+- Fix for PLOC SUPV HK set parsing.
+- The timestamp for the `POSSIBLE_FILE_CORRUPTION` event will be generated properly now.
 
 ## Changed
 

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 6)
 set(OBSW_VERSION_MINOR 4)
-set(OBSW_VERSION_REVISION 0)
+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 304 translations.
  * @details
- * Generated on: 2023-08-15 13:27:11
+ * Generated on: 2023-08-21 15:54:29
  */
 #include "translateEvents.h"
 

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 171 translations.
- * Generated on: 2023-08-15 13:27:11
+ * Generated on: 2023-08-21 15:54:29
  */
 #include "translateObjects.h"
 

bsp_q7s/em/emObjectFactory.cpp

@@ -111,6 +111,7 @@ void ObjectFactory::produce(void* args) {
   new CoreController(objects::CORE_CONTROLLER, enableHkSets);
 
   auto* stackHandler = new Stack5VHandler(*pwrSwitcher);
+  static_cast<void>(stackHandler);
 
   // Initialize chip select to avoid SPI bus issues.
   createRadSensorChipSelect(gpioComIF);

generators/bsp_hosted_returnvalues.csv

@@ -357,7 +357,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x3a02;MQI_Full;No space left for more messages;2;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
 0x3a03;MQI_NoReplyPartner;Returned if a reply method was called without partner;3;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
 0x3a04;MQI_DestinationInvalid;Returned if the target destination is invalid.;4;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3b00;SPH_ConnBroken;No description;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
 0x3b01;SPH_SemaphoreTimeout;No description;1;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
 0x3b02;SPH_SemaphoreNotOwned;No description;2;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
 0x3b03;SPH_SemaphoreInvalid;No description;3;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
@@ -373,6 +372,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x3e05;HKM_DatasetNotFound;No description;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
 0x3f01;DLEE_StreamTooShort;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
 0x3f02;DLEE_DecodingError;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x4100;PUS9_ConnBroken;No description;0;PUS_SERVICE_9;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
 0x4201;PUS11_InvalidTypeTimeWindow;No description;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4202;PUS11_InvalidTimeWindow;No description;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4203;PUS11_TimeshiftingNotPossible;No description;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
@@ -402,9 +402,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4406;UXOS_PcloseCallError;No description;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
-0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
-0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
+0x4500;HSPI_HalTimeoutRetval;No description;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4501;HSPI_HalBusyRetval;No description;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4502;HSPI_HalErrorRetval;No description;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
 0x4503;HSPI_Timeout;No description;3;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
 0x4504;HSPI_Busy;No description;4;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
 0x4505;HSPI_GenericError;No description;5;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h

generators/bsp_q7s_returnvalues.csv

@@ -357,7 +357,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x3a02;MQI_Full;No space left for more messages;2;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
 0x3a03;MQI_NoReplyPartner;Returned if a reply method was called without partner;3;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
 0x3a04;MQI_DestinationInvalid;Returned if the target destination is invalid.;4;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3b00;SPH_ConnBroken;No description;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
 0x3b01;SPH_SemaphoreTimeout;No description;1;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
 0x3b02;SPH_SemaphoreNotOwned;No description;2;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
 0x3b03;SPH_SemaphoreInvalid;No description;3;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
@@ -373,6 +372,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x3e05;HKM_DatasetNotFound;No description;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
 0x3f01;DLEE_StreamTooShort;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
 0x3f02;DLEE_DecodingError;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x4100;PUS9_ConnBroken;No description;0;PUS_SERVICE_9;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
 0x4201;PUS11_InvalidTypeTimeWindow;No description;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4202;PUS11_InvalidTimeWindow;No description;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4203;PUS11_TimeshiftingNotPossible;No description;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
@@ -402,9 +402,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4406;UXOS_PcloseCallError;No description;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
-0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
-0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
+0x4500;HSPI_HalTimeoutRetval;No description;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4501;HSPI_HalBusyRetval;No description;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4502;HSPI_HalErrorRetval;No description;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
 0x4503;HSPI_Timeout;No description;3;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
 0x4504;HSPI_Busy;No description;4;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h
 0x4505;HSPI_GenericError;No description;5;HAL_SPI;fsfw/src/fsfw_hal/common/spi/spiCommon.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 304 translations.
  * @details
- * Generated on: 2023-08-15 13:27:11
+ * Generated on: 2023-08-21 15:54:29
  */
 #include "translateEvents.h"
 

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 175 translations.
- * Generated on: 2023-08-15 13:27:11
+ * Generated on: 2023-08-21 15:54:29
  */
 #include "translateObjects.h"
 

linux/boardtest/UartTestClass.h

@@ -11,7 +11,7 @@
 
 #include <array>
 
-//#include "lwgps/lwgps.h"
+// #include "lwgps/lwgps.h"
 #include "test/TestTask.h"
 
 class ScexUartReader;

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 304 translations.
  * @details
- * Generated on: 2023-08-15 13:27:11
+ * Generated on: 2023-08-21 15:54:29
  */
 #include "translateEvents.h"
 

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 175 translations.
- * Generated on: 2023-08-15 13:27:11
+ * Generated on: 2023-08-21 15:54:29
  */
 #include "translateObjects.h"
 

linux/ipcore/PdecHandler.cpp

@@ -595,9 +595,10 @@ void PdecHandler::checkConfig() {
     sif::warning << "PdecHandler::checkConfig: Failed to create second word" << std::endl;
     return;
   }
-  if (firstWord != pdecConfig.readbackFirstWord() or
-      secondWord != pdecConfig.readbackSecondWord()) {
-    triggerEvent(PDEC_CONFIG_CORRUPTED, firstWord, secondWord);
+  uint32_t readbackFirstWord = pdecConfig.readbackFirstWord();
+  uint32_t readbackSecondWord = pdecConfig.readbackSecondWord();
+  if (firstWord != readbackFirstWord or secondWord != readbackSecondWord) {
+    triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord);
   }
 }
 

linux/payload/PlocSupervisorHandler.cpp

@@ -2105,9 +2105,9 @@ uint32_t PlocSupervisorHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t mod
 //   if (result != returnvalue::OK) {
 //     return result;
 //   }
-//#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
+// #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
 //   loggingReport.printSet();
-//#endif
+// #endif
 //   nextReplyId = supv::EXE_REPORT;
 //   return result;
 // }

linux/payload/PlocSupvUartMan.cpp

@@ -274,12 +274,12 @@ ReturnValue_t PlocSupvUartManager::initiateUpdateContinuation() {
 }
 
 // ReturnValue_t PlocSupvHelper::startEventBufferRequest(std::string path) {
-//#ifdef XIPHOS_Q7S
+// #ifdef XIPHOS_Q7S
 //   ReturnValue_t result = FilesystemHelper::checkPath(path);
 //   if (result != returnvalue::OK) {
 //     return result;
 //   }
-//#endif
+// #endif
 //   if (not std::filesystem::exists(path)) {
 //     return PATH_NOT_EXISTS;
 //   }
@@ -836,11 +836,11 @@ uint32_t PlocSupvUartManager::getFileSize(std::string filename) {
 ReturnValue_t PlocSupvUartManager::handleEventBufferReception(ploc::SpTmReader& reader) {
   ReturnValue_t result = returnvalue::OK;
   // TODO: Fix
-  //#ifdef XIPHOS_Q7S
+  // #ifdef XIPHOS_Q7S
   //  if (not sdcMan->getActiveSdCard()) {
   //    return HasFileSystemIF::FILESYSTEM_INACTIVE;
   //  }
-  //#endif
+  // #endif
   //  std::string filename = Filenaming::generateAbsoluteFilename(
   //      eventBufferReq.path, eventBufferReq.filename, timestamping);
   //  std::ofstream file(filename, std::ios_base::app | std::ios_base::out);

mission/controller/acs/SensorProcessing.cpp

@@ -25,7 +25,8 @@ void SensorProcessing::processMgm(const float *mgm0Value, bool mgm0valid, const
                         gpsDataProcessed->altitude.value, timeOfMgmMeasurement, magIgrfModel);
     gpsValid = true;
   }
-  if (!mgm0valid && !mgm1valid && !mgm2valid && !mgm3valid && !mgm4valid) {
+  if (not mgm0valid and not mgm1valid and not mgm2valid and not mgm3valid and
+      (not mgm4valid or not mgmParameters->useMgm4)) {
     {
       PoolReadGuard pg(mgmDataProcessed);
       if (pg.getReadResult() == returnvalue::OK) {

mission/power/gsLibDefs.h

@@ -8,12 +8,12 @@
 // I really don't want to pull in all of those GomSpace headers just for 6 constants..
 // Those are the headers which contain the defines which were just hardcoded below.
 
-//#include "p60acu_hk.h"
-//#include "p60acu_param.h"
-//#include "p60dock_hk.h"
-//#include "p60dock_param.h"
-//#include "p60pdu_hk.h"
-//#include "p60pdu_param.h"
+// #include "p60acu_hk.h"
+// #include "p60acu_param.h"
+// #include "p60dock_hk.h"
+// #include "p60dock_param.h"
+// #include "p60pdu_hk.h"
+// #include "p60pdu_param.h"
 
 #endif
 

mission/tmtc/PersistentTmStore.cpp

@@ -320,6 +320,7 @@ ReturnValue_t PersistentTmStore::loadNextDumpFile() {
     }
     // File will change, reset this field for correct state-keeping.
     dumpParams.currentSameFileIdx = std::nullopt;
+    dumpParams.currentFileUnixStamp = dumpParams.dumpIter->epoch;
     // Increment iterator for next cycle.
     dumpParams.dumpIter++;
   };