From 584b6e30380b4927bbcf4a6247b7e44a15b948ad Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 8 Apr 2023 11:40:23 +0200 Subject: [PATCH] changelog and tmtc bump --- CHANGELOG.md | 7 +++++++ bsp_q7s/core/CoreController.cpp | 4 ++++ tmtc | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5743ee3d..f2c39d30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Changed + +- Allow specifying custom OBSW update filename. This allowed keeping a cleaner file structure + where each update has a name including the version +- The files extracted during an update process are deleted after the update was performed to keep + the update directory cleaner. + # [v1.44.0] 2023-04-07 - eive-tmtc: v2.22.0 diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index 6919af68..aaaa9274 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/bsp_q7s/core/CoreController.cpp @@ -2017,6 +2017,10 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u cmd.str(""); cmd.clear(); + // Remove the extracted files to keep directories clean. + std::filesystem::remove(strippedImagePath); + std::filesystem::remove(obswVersionFilePath); + // TODO: This takes a long time and will block the core controller.. Maybe use command executor? // For now dont care.. cmd << "writeprotect " << std::to_string(data[0]) << " " << std::to_string(data[1]) << " 1"; diff --git a/tmtc b/tmtc index 9edbdf1a..92ce64cd 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 9edbdf1a8dc62405e14e59fd4a4dced991963ca5 +Subproject commit 92ce64cd39fb5d74af1358a436113322d9711dfb