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

re-run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-09-29 14:10:21 +02:00
parent e161eeb537
commit 541b44cea7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bsp_q7s/core/CoreController.cpp
View File

@ -1872,11 +1872,11 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
sourceStr = "tmp directory";
}
bool sameChipAndCopy = false;
if(chip == CURRENT_CHIP and copy == CURRENT_COPY) {
if (chip == CURRENT_CHIP and copy == CURRENT_COPY) {
// This is problematic if the OBSW is running as a systemd service.
// Do not allow for now.
return HasActionsIF::INVALID_PARAMETERS;
//sameChipAndCopy = true;
// sameChipAndCopy = true;
}
sif::info << "Executing SW update for Chip " << static_cast<int>(data[0]) << " Copy "
<< static_cast<int>(data[1]) << " from " << sourceStr << std::endl;
@ -1912,7 +1912,7 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
cmd.clear();
path obswDestPath;
path obswVersionDestPath;
if(not sameChipAndCopy) {
if (not sameChipAndCopy) {
cmd << "xsc_mount_copy " << std::to_string(data[0]) << " " << std::to_string(data[1]);
result = system(cmd.str().c_str());
if (result != 0) {