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

Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-03-08 09:49:16 +01:00
commit e2ad666d07
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 82a645debaa43231ecb3d7e2c40cffc22546c348
Subproject commit 84f95e8d7641be7a83faf1cbee718c6cc5de152d

2
linux/devices/startracker/StarTrackerHandler.cpp
View File

@ -672,7 +672,7 @@ ReturnValue_t StarTrackerHandler::isModeCombinationValid(Mode_t mode, Submode_t
return INVALID_SUBMODE;
}
default:
return HasModesIF::MOVE_IS_INVALID;
return HasModesIF::INVALID_MODE;
}
}

2
mission/controller/ThermalController.cpp
View File

@ -42,7 +42,7 @@ ReturnValue_t ThermalController::checkModeCommand(Mode_t mode, Submode_t submode
return INVALID_SUBMODE;
}
if ((mode != MODE_OFF) && (mode != MODE_ON) && (mode != MODE_NORMAL)) {
return MOVE_IS_INVALID;
return INVALID_MODE;
}
return RETURN_OK;
}