From c11867323c2d4d51416a76349668c9a8a1228b6d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 30 Oct 2023 16:11:36 +0100 Subject: [PATCH 1/7] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3a8ed70..eae983a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v7.3.0] 2023-10-30 + ## Changed - Changed PDEC addresses depending on which firmware version is used. It is suspected that From 3158f2341c1cc77a20cad346adf153d224e31456 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 30 Oct 2023 16:11:51 +0100 Subject: [PATCH 2/7] update version number --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfd7815..78be7ec5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 7) -set(OBSW_VERSION_MINOR 2) +set(OBSW_VERSION_MINOR 3) set(OBSW_VERSION_REVISION 0) # set(CMAKE_VERBOSE TRUE) From b081766829bef550f79dac075aa693decc774ea9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 6 Nov 2023 14:37:13 +0100 Subject: [PATCH 3/7] always add PLOC code --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfd7815..ec343707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,13 +126,13 @@ set(OBSW_ADD_HEATERS 1 CACHE STRING "Add TCS heaters") set(OBSW_ADD_PLOC_SUPERVISOR - ${INIT_VAL} + 1 CACHE STRING "Add PLOC supervisor handler") set(OBSW_ADD_SA_DEPL ${INIT_VAL} CACHE STRING "Add SA deployment handler") set(OBSW_ADD_PLOC_MPSOC - ${INIT_VAL} + 1 CACHE STRING "Add MPSoC handler") set(OBSW_ADD_ACS_CTRL ${INIT_VAL} From 4986955a0f14b63791da0062cdea94dab7791de5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 6 Nov 2023 14:43:31 +0100 Subject: [PATCH 4/7] bump changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3a8ed70..1575e29a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,10 @@ will consitute of a breaking change warranting a new major release: the previous addresses were invalid and not properly covered by the Linux memory protection. The OBSW will use the old addresses for older FW versions. +## Added + +- Always add PLOC MPSoC and PLOC SUPV components for the EM as well. + # [v7.2.0] 2023-10-27 - `eive-tmtc` v5.10.1 From 93c5e542bdc0846beaa11c4e589b2de06642ff57 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 6 Nov 2023 14:44:01 +0100 Subject: [PATCH 5/7] bump release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eae983a9..868d01fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ will consitute of a breaking change warranting a new major release: # [unreleased] -# [v7.3.0] 2023-10-30 +# [v7.3.0] 2023-11-06 ## Changed From 5862c1bb40b4d8fd853e29e7bf16054c0f92f7d1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 7 Nov 2023 09:12:44 +0100 Subject: [PATCH 6/7] auto-formatter --- bsp_q7s/objectFactory.cpp | 8 ++++---- linux/ipcore/PdecHandler.cpp | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bsp_q7s/objectFactory.cpp b/bsp_q7s/objectFactory.cpp index d0c0f924..eadf70c6 100644 --- a/bsp_q7s/objectFactory.cpp +++ b/bsp_q7s/objectFactory.cpp @@ -643,12 +643,12 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwit supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv); gpioComIF->addGpios(supvGpioCookie); const char* plocSupvDev = q7s::UART_PLOC_SUPERVISOR_DEV; - if(not std::filesystem::exists(plocSupvDev)) { + if (not std::filesystem::exists(plocSupvDev)) { plocSupvDev = q7s::UART_PLOC_SUPERVISOR_DEV_FALLBACK; } - auto supervisorCookie = new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER, - plocSupvDev, serial::PLOC_SUPV_BAUD, - supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL); + auto supervisorCookie = + new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER, plocSupvDev, serial::PLOC_SUPV_BAUD, + supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL); supervisorCookie->setNoFixedSizeReply(); auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER); auto* supvHandler = new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie, diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index 28598aa8..fd952855 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -468,9 +468,7 @@ bool PdecHandler::newTcReceived() { return true; } -void PdecHandler::doPeriodicWork() { - checkLocks(); -} +void PdecHandler::doPeriodicWork() { checkLocks(); } bool PdecHandler::checkFrameAna(uint32_t pdecFar) { bool frameValid = false; From 49a87224e75f8d182a008ab1e2297bcd14f37a6f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 7 Nov 2023 09:13:21 +0100 Subject: [PATCH 7/7] changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 738ec6a6..74bd77e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ will consitute of a breaking change warranting a new major release: # [unreleased] -# [v7.3.0] 2023-11-06 +# [v7.3.0] 2023-11-07 ## Changed