From 2c9e85706080f3536ee7ee4a01935912cf845096 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 16:56:34 +0100 Subject: [PATCH 01/10] PLOC SUPV latchup report bugfixes --- linux/payload/FreshSupvHandler.cpp | 12 ++++++++++-- linux/payload/plocSupvDefs.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/linux/payload/FreshSupvHandler.cpp b/linux/payload/FreshSupvHandler.cpp index 88a68635..09b56d14 100644 --- a/linux/payload/FreshSupvHandler.cpp +++ b/linux/payload/FreshSupvHandler.cpp @@ -900,6 +900,14 @@ ReturnValue_t FreshSupvHandler::parseTmPackets() { } break; } + case(Apid::LATCHUP_MON): { + if (tmReader.getServiceId() == + static_cast(supv::tm::LatchupMonId::LATCHUP_STATUS_REPORT)) { + handleLatchupStatusReport(receivedData); + continue; + } + break; + } case (Apid::ADC_MON): { if (tmReader.getServiceId() == static_cast(supv::tm::AdcMonId::ADC_REPORT)) { genericHandleTm("ADC", receivedData, adcReport, supv::Apid::ADC_MON, @@ -1485,10 +1493,10 @@ ReturnValue_t FreshSupvHandler::handleLatchupStatusReport(const uint8_t* data) { offset += 2; latchupStatusReport.cnt5 = *(payloadData + offset) << 8 | *(payloadData + offset + 1); offset += 2; - latchupStatusReport.cnt6 = *(payloadData + offset) << 8 | *(data + offset + 1); + latchupStatusReport.cnt6 = *(payloadData + offset) << 8 | *(payloadData + offset + 1); offset += 2; uint16_t msec = *(payloadData + offset) << 8 | *(payloadData + offset + 1); - latchupStatusReport.isSet = msec >> supv::LatchupStatusReport::IS_SET_BIT_POS; + latchupStatusReport.isSynced = msec >> supv::LatchupStatusReport::IS_SET_BIT_POS; latchupStatusReport.timeMsec = msec & (~(1 << latchupStatusReport.IS_SET_BIT_POS)); offset += 2; latchupStatusReport.timeSec = *(payloadData + offset); diff --git a/linux/payload/plocSupvDefs.h b/linux/payload/plocSupvDefs.h index c3c042e3..349c29ad 100644 --- a/linux/payload/plocSupvDefs.h +++ b/linux/payload/plocSupvDefs.h @@ -1805,7 +1805,7 @@ class LatchupStatusReport : public StaticLocalDataSet { lp_var_t timeMon = lp_var_t(sid.objectId, PoolIds::LATCHUP_RPT_TIME_MON, this); lp_var_t timeYear = lp_var_t(sid.objectId, PoolIds::LATCHUP_RPT_TIME_YEAR, this); - lp_var_t isSet = lp_var_t(sid.objectId, PoolIds::LATCHUP_RPT_IS_SET, this); + lp_var_t isSynced = lp_var_t(sid.objectId, PoolIds::LATCHUP_RPT_IS_SET, this); static const uint8_t IS_SET_BIT_POS = 15; }; From 6da0c8fe1a6ce1e5d22360996072b41c20135c16 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 16:57:18 +0100 Subject: [PATCH 02/10] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 008631ab..fea76a29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ will consitute of a breaking change warranting a new major release: ## Fixed - All action commands sent by the PLOC SUPV to itself will have no sender now. +- PLOC SUPV latchup report could not be handled previously. +- Bugfix in PLOC SUPV latchup report parsing. # [v7.5.5] 2024-01-22 From cc471148912b7b61b36ec28d7e271558b389c106 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 17:11:42 +0100 Subject: [PATCH 03/10] ups --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c24a5b96..fdee8266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,7 +57,6 @@ will consitute of a breaking change warranting a new major release: calculation of rotation rate from two quaternions. - Fixed alignment matrix and pseudo inverses of RWs, to match the wrong definition of positive rotation. ->>>>>>> origin/main # [v7.5.5] 2024-01-22 From 484dba7eb6ec4526b89697c75771e0539ce9e6b0 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 5 Feb 2024 10:10:41 +0100 Subject: [PATCH 04/10] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ec0f64f..41b80a3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v7.6.1] 2024-02-05 + ## Changed - Guidance now uses the coordinate functions from the FSFW. From 681aebe011fa2c8d56edc99b5840573e9601fdbe Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 5 Feb 2024 10:11:01 +0100 Subject: [PATCH 05/10] bump version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8957c6bf..a25fb8bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 7) set(OBSW_VERSION_MINOR 6) -set(OBSW_VERSION_REVISION 0) +set(OBSW_VERSION_REVISION 1) # set(CMAKE_VERBOSE TRUE) From 393d50a54f3239fc59e2d270ea46437224779744 Mon Sep 17 00:00:00 2001 From: meggert Date: Tue, 6 Feb 2024 15:09:15 +0100 Subject: [PATCH 06/10] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index e5fe0ab9..a5ebac62 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e5fe0ab95ac2f695eb9a533ad825314f359f513a +Subproject commit a5ebac626682e86b45f991c919a3ce9a9b7fcfcc From 36658d07f040cc14280354d25a3c3d046075420e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 8 Feb 2024 14:26:16 +0100 Subject: [PATCH 07/10] small MPSoC bugfix --- linux/payload/PlocMpsocHandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/payload/PlocMpsocHandler.cpp b/linux/payload/PlocMpsocHandler.cpp index 9aa110e1..6df5a59b 100644 --- a/linux/payload/PlocMpsocHandler.cpp +++ b/linux/payload/PlocMpsocHandler.cpp @@ -998,6 +998,7 @@ ReturnValue_t PlocMpsocHandler::handleGetHkReport(const uint8_t* data) { if (result != returnvalue::OK) { return result; } + hkReport.setValidity(true, true); return returnvalue::OK; } From b3785628a7bbfdef5d8709529282d86f95c25579 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 9 Feb 2024 11:25:36 +0100 Subject: [PATCH 08/10] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c2d0b21..061478a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ will consitute of a breaking change warranting a new major release: - PLOC SUPV latchup report could not be handled previously. - Bugfix in PLOC SUPV latchup report parsing. +- Bugfix in PLOC MPSoC HK set: Set and variables were not set valid. # [v7.6.1] 2024-02-05 From b5a7db4e66bda7a448360fe8fb9f0f815ca41a04 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 12 Feb 2024 10:41:58 +0100 Subject: [PATCH 09/10] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 061478a5..28c9d245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ will consitute of a breaking change warranting a new major release: - PLOC SUPV latchup report could not be handled previously. - Bugfix in PLOC SUPV latchup report parsing. - Bugfix in PLOC MPSoC HK set: Set and variables were not set valid. +- MPSoC HK set was not set to valid. # [v7.6.1] 2024-02-05 From a562a4544580770a4804f76d469723cdd79d62d4 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 12 Feb 2024 10:42:45 +0100 Subject: [PATCH 10/10] oops --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28c9d245..061478a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,6 @@ will consitute of a breaking change warranting a new major release: - PLOC SUPV latchup report could not be handled previously. - Bugfix in PLOC SUPV latchup report parsing. - Bugfix in PLOC MPSoC HK set: Set and variables were not set valid. -- MPSoC HK set was not set to valid. # [v7.6.1] 2024-02-05