From b57283101b9501c88ae1d87f5de0e37e7f5163f3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 28 Jun 2023 17:20:10 +0200 Subject: [PATCH 1/4] important bugfix for live channel --- mission/com/LiveTmTask.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mission/com/LiveTmTask.cpp b/mission/com/LiveTmTask.cpp index d09c6ced..39648c15 100644 --- a/mission/com/LiveTmTask.cpp +++ b/mission/com/LiveTmTask.cpp @@ -19,13 +19,8 @@ LiveTmTask::LiveTmTask(object_id_t objectId, PusTmFunnel& pusFunnel, CfdpTmFunne ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) { readCommandQueue(); while (true) { - bool performWriteOp = true; - if (mode == MODE_OFF or ptmeLocked) { - performWriteOp = false; - } - // The funnel tasks are scheduled here directly as well. - ReturnValue_t result = channel.handleNextTm(performWriteOp); + ReturnValue_t result = channel.handleNextTm(!ptmeLocked); if (result == DirectTmSinkIF::IS_BUSY) { sif::error << "Lost live TM, PAPB busy" << std::endl; } From 2173d890475d3e685ebc2d5e0454268c6228b1e8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Jun 2023 08:54:34 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fda0e54..95a4d7d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,12 @@ will consitute of a breaking change warranting a new major release: - Important bugfixes for PTME. See `q7s-package` CHANGELOG. -# [v5.1.0] to be released +## Fixed + +- For the live channel (VC0), telemetry was still only dumped if the transmitter is active. + Please note that this fix will lead to crashes for FW version v4. + +# [v5.1.0] 2023-06-28 - `eive-tmtc` version v5.1.0 From 4f5903227e92ce01b0654e7291966b9848a835c6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Jun 2023 08:54:58 +0200 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95a4d7d0..9e74bdd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ will consitute of a breaking change warranting a new major release: ## Fixed - For the live channel (VC0), telemetry was still only dumped if the transmitter is active. - Please note that this fix will lead to crashes for FW version v4. + Please note that this fix will lead to crashes for FW versions below v3.2. # [v5.1.0] 2023-06-28 From 04d24e74b1b1e00277f71e2c788f00ac657ee4b5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Jun 2023 15:01:54 +0200 Subject: [PATCH 4/4] q7s-package version specification --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77281df0..2b3ef9f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ will consitute of a breaking change warranting a new major release: # [v6.0.0] to be released +- `q7s-package` version v3.2.0 - Important bugfixes for PTME. See `q7s-package` CHANGELOG. ## Fixed