eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Custom OBSW update path #582

Merged
muellerr merged 6 commits from feature_custom_obsw_update_path into develop 2023-04-11 16:12:43 +02:00
Conversation 1 Commits 6 Files Changed 2 +114 -185
8 changed files with 114 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 584b6e3038 - Show all commits

7
CHANGELOG.md
View File

@@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [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 # [v1.44.0] 2023-04-07
- eive-tmtc: v2.22.0 - eive-tmtc: v2.22.0

4
bsp_q7s/core/CoreController.cpp
View File

@@ -2017,6 +2017,10 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
cmd.str(""); cmd.str("");
cmd.clear(); cmd.clear();
// Remove the extracted files to keep directories clean.
std::filesystem::remove(strippedImagePath);
std::filesystem::remove(obswVersionFilePath);
meggert commented 2023-04-11 09:16:47 +02:00
Outdated
Review
Copy Link

use bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept; instead

use `bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept;` instead
// TODO: This takes a long time and will block the core controller.. Maybe use command executor? // TODO: This takes a long time and will block the core controller.. Maybe use command executor?
meggert commented 2023-04-11 09:17:12 +02:00
Outdated
Review
Copy Link

use bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept; instead

use `bool remove( const std::filesystem::path& p, std::error_code& ec ) noexcept;` instead
// For now dont care.. // For now dont care..
cmd << "writeprotect " << std::to_string(data[0]) << " " << std::to_string(data[1]) << " 1"; cmd << "writeprotect " << std::to_string(data[0]) << " " << std::to_string(data[1]) << " 1";

2
tmtc

Submodule tmtc updated: 9edbdf1a8d...92ce64cd39