From a29805cb6840e71c67b4e5053dc3592ef801276b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Oct 2023 16:18:35 +0200 Subject: [PATCH 1/4] SCEX bugfix --- mission/payload/ScexDeviceHandler.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mission/payload/ScexDeviceHandler.cpp b/mission/payload/ScexDeviceHandler.cpp index 12c62f7a..0db10561 100644 --- a/mission/payload/ScexDeviceHandler.cpp +++ b/mission/payload/ScexDeviceHandler.cpp @@ -38,9 +38,13 @@ void ScexDeviceHandler::doShutDown() { setMode(_MODE_POWER_DOWN); } -ReturnValue_t ScexDeviceHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) { return OK; } +ReturnValue_t ScexDeviceHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) { + return NOTHING_TO_SEND; +} -ReturnValue_t ScexDeviceHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) { return OK; } +ReturnValue_t ScexDeviceHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) { + return NOTHING_TO_SEND; +} ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand, const uint8_t* commandData, From 7f82dd91e28dd1362d5ff9c7e36238d6d82a69ff Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Oct 2023 16:20:51 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae7901e..ed736ae4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ will consitute of a breaking change warranting a new major release: ## Fixed - Missing `nullptr` checks for PLOC Supervisor handler, which could lead to crashes. +- SCEX bugfix for normal and transition command. # [v6.6.0] 2023-09-18 From d1e0d7407241b745d7ad38e5ce5f45786e5a1b85 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Oct 2023 18:44:13 +0200 Subject: [PATCH 3/4] robustness fix --- mission/payload/ScexDeviceHandler.cpp | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mission/payload/ScexDeviceHandler.cpp b/mission/payload/ScexDeviceHandler.cpp index 0db10561..ac668cdf 100644 --- a/mission/payload/ScexDeviceHandler.cpp +++ b/mission/payload/ScexDeviceHandler.cpp @@ -273,7 +273,7 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons // Unknown DeviceCommand return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED; } - if (helper.getPacketCounter() == helper.getTotalPacketCounter()) { + if (helper.getPacketCounter() >= helper.getTotalPacketCounter()) { reader.finish(); commandActive = false; if (id != PING) { diff --git a/tmtc b/tmtc index 22a42108..9711dd92 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 22a42108b431bafa707de2b3a24cad9de95b70d0 +Subproject commit 9711dd9242340720e28d41eefda90666ec9af4bb From 528360744144a00b8dea423f980278dbfe37bf7a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 11 Oct 2023 13:59:11 +0200 Subject: [PATCH 4/4] changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a119bca..700a9a49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ will consitute of a breaking change warranting a new major release: ## Fixed - Missing `nullptr` checks for PLOC Supervisor handler, which could lead to crashes. -- SCEX bugfix for normal and transition command. +- SCEX bugfix for normal and transition commanding. # [v6.6.0] 2023-09-18