From 1748d18852ae937e462b9edb6015a7a6f0eab714 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 16 Aug 2023 10:57:02 +0200 Subject: [PATCH 01/15] missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5357e831..90a1b3b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ 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. ## Changed From e148e95471ee3b164153633df5225ba94241062f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 17 Aug 2023 10:27:33 +0200 Subject: [PATCH 02/15] event fix for file corruption --- bsp_q7s/em/emObjectFactory.cpp | 1 + mission/tmtc/PersistentTmStore.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp index 3c3ba290..976602d4 100644 --- a/bsp_q7s/em/emObjectFactory.cpp +++ b/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(stackHandler); // Initialize chip select to avoid SPI bus issues. createRadSensorChipSelect(gpioComIF); diff --git a/mission/tmtc/PersistentTmStore.cpp b/mission/tmtc/PersistentTmStore.cpp index 2f884dac..160348cd 100644 --- a/mission/tmtc/PersistentTmStore.cpp +++ b/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++; }; From df397f6dee611475fbf30f67a7b2968ca5ba1f1a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 17 Aug 2023 10:28:55 +0200 Subject: [PATCH 03/15] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a1b3b2..09c6db91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ 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 From 6febf6242a556dbe2b4b0500e9bfca3938b436b8 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 19 Aug 2023 06:33:31 +0200 Subject: [PATCH 04/15] pdec config corrupted event, readback config used as parameters --- linux/ipcore/PdecHandler.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index 189dfca8..35e7330f 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -590,15 +590,18 @@ void PdecHandler::checkConfig() { uint32_t secondWord = 0; result = pdecConfig.createSecondWord(&secondWord); if (result != returnvalue::OK) { - // This should normally never happen during runtime. So here is just - // output a warning - 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); + // This should normally never happen during runtime. So here is just + // output a warning + sif::warning << "PdecHandler::checkConfig: Failed to create second word" + << std::endl; + return; } + uint32_t readbackFirstWord = pdecConfig.readbackFirstWord(); + uint32_t readbackSecondWord = pdecConfig.readbackSecondWord(); + if (firstWord != readbackFirstWord or + secondWord != readbackSecondWord) { + triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord); + } } void PdecHandler::handleNewTc() { From ddbf4a5ff00247450b096f62621865e695fdb6d3 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 19 Aug 2023 06:37:39 +0200 Subject: [PATCH 05/15] run auto formatter --- linux/ipcore/PdecHandler.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index 35e7330f..c7266710 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -590,18 +590,16 @@ void PdecHandler::checkConfig() { uint32_t secondWord = 0; result = pdecConfig.createSecondWord(&secondWord); if (result != returnvalue::OK) { - // This should normally never happen during runtime. So here is just - // output a warning - sif::warning << "PdecHandler::checkConfig: Failed to create second word" - << std::endl; - return; + // This should normally never happen during runtime. So here is just + // output a warning + sif::warning << "PdecHandler::checkConfig: Failed to create second word" << std::endl; + return; } uint32_t readbackFirstWord = pdecConfig.readbackFirstWord(); uint32_t readbackSecondWord = pdecConfig.readbackSecondWord(); - if (firstWord != readbackFirstWord or - secondWord != readbackSecondWord) { - triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord); - } + if (firstWord != readbackFirstWord or secondWord != readbackSecondWord) { + triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord); + } } void PdecHandler::handleNewTc() { From a1d360502fbd2d8286e5c5a6f172037dcc34fc84 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 09:14:16 +0200 Subject: [PATCH 06/15] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09c6db91..5220985e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Fixed + +- `PDEC_CONFIG_CORRUPTED` event now actually contains the readback instead of the expected + config + # [v6.4.0] 2023-08-16 - `eive-tmtc`: v5.4.3 From b9167c7e22b94a23b4d0993a73a7a96b17aa87c3 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 14:33:55 +0200 Subject: [PATCH 07/15] valid check now includes allowed use of mgm4 --- mission/controller/acs/SensorProcessing.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mission/controller/acs/SensorProcessing.cpp b/mission/controller/acs/SensorProcessing.cpp index 686a2fcf..4405790c 100644 --- a/mission/controller/acs/SensorProcessing.cpp +++ b/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) { From 26bf178b2a62f678b726be8a67e5d502327f5366 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 14:41:16 +0200 Subject: [PATCH 08/15] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5220985e..db8ff779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ will consitute of a breaking change warranting a new major release: - `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 From 6048ffe65688c07e814372b6e2484384603c785f Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 16:01:56 +0200 Subject: [PATCH 09/15] prep --- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- bsp_hosted/fsfwconfig/events/translateEvents.cpp | 2 +- bsp_hosted/fsfwconfig/objects/translateObjects.cpp | 2 +- generators/bsp_hosted_returnvalues.csv | 8 ++++---- generators/bsp_q7s_returnvalues.csv | 8 ++++---- generators/events/translateEvents.cpp | 2 +- generators/objects/translateObjects.cpp | 2 +- linux/boardtest/UartTestClass.h | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- linux/payload/PlocSupervisorHandler.cpp | 4 ++-- linux/payload/PlocSupvUartMan.cpp | 8 ++++---- mission/power/gsLibDefs.h | 12 ++++++------ 14 files changed, 30 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db8ff779..a3098e4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 058c99fc..ff115a2c 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index 55158be2..a7aefe24 100644 --- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp +++ b/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" diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index c7eb075d..5ec24a70 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/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" diff --git a/generators/bsp_hosted_returnvalues.csv b/generators/bsp_hosted_returnvalues.csv index 50a86ae3..e3db4c9a 100644 --- a/generators/bsp_hosted_returnvalues.csv +++ b/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 diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv index 1bc91860..065e5392 100644 --- a/generators/bsp_q7s_returnvalues.csv +++ b/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 diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 55158be2..a7aefe24 100644 --- a/generators/events/translateEvents.cpp +++ b/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" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 53be3a34..4fe7e433 100644 --- a/generators/objects/translateObjects.cpp +++ b/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" diff --git a/linux/boardtest/UartTestClass.h b/linux/boardtest/UartTestClass.h index f959f877..d03706ed 100644 --- a/linux/boardtest/UartTestClass.h +++ b/linux/boardtest/UartTestClass.h @@ -11,7 +11,7 @@ #include -//#include "lwgps/lwgps.h" +// #include "lwgps/lwgps.h" #include "test/TestTask.h" class ScexUartReader; diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 55158be2..a7aefe24 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/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" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 53be3a34..4fe7e433 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/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" diff --git a/linux/payload/PlocSupervisorHandler.cpp b/linux/payload/PlocSupervisorHandler.cpp index 940785af..d4a3a1c0 100644 --- a/linux/payload/PlocSupervisorHandler.cpp +++ b/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; // } diff --git a/linux/payload/PlocSupvUartMan.cpp b/linux/payload/PlocSupvUartMan.cpp index e4371be5..1a129927 100644 --- a/linux/payload/PlocSupvUartMan.cpp +++ b/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); diff --git a/mission/power/gsLibDefs.h b/mission/power/gsLibDefs.h index cc9fc121..57525a39 100644 --- a/mission/power/gsLibDefs.h +++ b/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 From 90b4a4d8c00c828ac545c312b858a2c278e4d133 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 18:36:01 +0200 Subject: [PATCH 10/15] bump fsfw --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 796c7a9e..d246ce34 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 796c7a9e377fa197e7e79b9a757d1b8e97419b8f +Subproject commit d246ce34d05ecc5c722fd127e61556374961c899 From 4f335ea2700c7151ffc1142dbb9482ab9c85fc9e Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 18:49:49 +0200 Subject: [PATCH 11/15] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index b50c75c1..b1fbad39 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit b50c75c13cdbbc3d34d2f072d2bf1cb2fbe734b5 +Subproject commit b1fbad39e311634084ee3e6a44b6de6ba2ad6407 From a81eae7726b746eca3e48eccc81d8e2f9f1a5825 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Sep 2023 14:34:15 +0200 Subject: [PATCH 12/15] exchange nominal and 1st redundancy sensor for ploc mission board --- mission/controller/ThermalController.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 5f2277a9..2729cec0 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -1372,12 +1372,13 @@ void ThermalController::ctrlPlPcduBoard() { tooHotHandler(objects::PLPCDU_HANDLER, tooHotFlags.eBandTooHotFlag); } +// ToDo: remove one of the following 2 void ThermalController::ctrlPlocMissionBoard() { ctrlCtx.thermalComponent = tcsCtrl::PLOCMISSION_BOARD; - sensors[0].first = sensorTemperatures.plocHeatspreader.isValid(); - sensors[0].second = sensorTemperatures.plocHeatspreader.value; - sensors[1].first = sensorTemperatures.plocMissionboard.isValid(); - sensors[1].second = sensorTemperatures.plocMissionboard.value; + sensors[0].first = sensorTemperatures.plocMissionboard.isValid(); + sensors[0].second = sensorTemperatures.plocMissionboard.value; + sensors[1].first = sensorTemperatures.plocHeatspreader.isValid(); + sensors[1].second = sensorTemperatures.plocHeatspreader.value; sensors[2].first = sensorTemperatures.dacHeatspreader.isValid(); sensors[2].second = sensorTemperatures.dacHeatspreader.value; numSensors = 3; From c709bd08815419118271b8f948ad082b1cc04fe6 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Sep 2023 14:35:40 +0200 Subject: [PATCH 13/15] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3098e4d..6fb13142 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Changed +- The primary and the secondary temperature sensors for the PLOC mission boards are exchanged. + # [v6.4.1] 2023-08-21 ## Fixed From 63b6db258c0fcfed17db1f39b0de49747643bbff Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Sep 2023 14:37:04 +0200 Subject: [PATCH 14/15] params for new safe mode --- mission/controller/acs/AcsParameters.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mission/controller/acs/AcsParameters.h b/mission/controller/acs/AcsParameters.h index 0fb1daa9..a9c9ab5d 100644 --- a/mission/controller/acs/AcsParameters.h +++ b/mission/controller/acs/AcsParameters.h @@ -79,7 +79,7 @@ class AcsParameters : public HasParametersIF { float mgm13variance[3] = {pow(1.5e-8, 2), pow(1.5e-8, 2), pow(1.5e-8, 2)}; float mgm4variance[3] = {pow(1.7e-6, 2), pow(1.7e-6, 2), pow(1.7e-6, 2)}; float mgmVectorFilterWeight = 0.85; - float mgmDerivativeFilterWeight = 0.85; + float mgmDerivativeFilterWeight = 0.99; uint8_t useMgm4 = false; } mgmHandlingParameters; @@ -771,7 +771,7 @@ class AcsParameters : public HasParametersIF { -0.000889232196185857, -0.00168429567131815}}; float susBrightnessThreshold = 0.7; float susVectorFilterWeight = .85; - float susRateFilterWeight = .85; + float susRateFilterWeight = .99; } susHandlingParameters; struct GyrHandlingParameters { @@ -834,15 +834,15 @@ class AcsParameters : public HasParametersIF { double k_alignGyr = 4.0e-5; double k_parallelGyr = 3.75e-4; - double k_orthoSusMgm = 1.1e-2; - double k_alignSusMgm = 2.0e-5; - double k_parallelSusMgm = 4.4e-4; + double k_orthoSusMgm = 4.4e-3; + double k_alignSusMgm = 4.0e-5; + double k_parallelSusMgm = 3.75e-4; double sunTargetDirLeop[3] = {0, sqrt(.5), sqrt(.5)}; double sunTargetDir[3] = {0, 0, 1}; uint8_t useMekf = false; - uint8_t useGyr = true; + uint8_t useGyr = false; uint8_t dampingDuringEclipse = true; float sineLimitSunRotRate = 0.24; From cfbd6d3b1e715e8040b58544153a04621eddf827 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Sep 2023 14:38:19 +0200 Subject: [PATCH 15/15] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fb13142..d0738667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,10 @@ will consitute of a breaking change warranting a new major release: # [unreleased] ## Changed + - The primary and the secondary temperature sensors for the PLOC mission boards are exchanged. +- ACS parameters for the SUSMGM (FLP) safe mode have been adjusted. This safe mode is now the + default one. # [v6.4.1] 2023-08-21