From 2c9e85706080f3536ee7ee4a01935912cf845096 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 16:56:34 +0100 Subject: [PATCH 1/4] 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; }; -- 2.43.0 From 6da0c8fe1a6ce1e5d22360996072b41c20135c16 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 16:57:18 +0100 Subject: [PATCH 2/4] 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 -- 2.43.0 From cc471148912b7b61b36ec28d7e271558b389c106 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 17:11:42 +0100 Subject: [PATCH 3/4] 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 -- 2.43.0 From 393d50a54f3239fc59e2d270ea46437224779744 Mon Sep 17 00:00:00 2001 From: meggert Date: Tue, 6 Feb 2024 15:09:15 +0100 Subject: [PATCH 4/4] 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 -- 2.43.0