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

Merge remote-tracking branch 'origin/develop' into eggert/acs
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
2023-02-08 13:27:09 +01:00
parent 098fcc4f12 c1d8693d3c
commit 80f48acb07
17 changed files with 568 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mission/controller/AcsController.cpp
View File

@@ -170,7 +170,7 @@ void AcsController::performSafe() {
}
if (detumbleCounter > acsParameters.detumbleParameter.detumblecounter) {
detumbleCounter = 0;
// Triggers detubmle mode transition in subsystem
// Triggers detumble mode transition in subsystem
triggerEvent(acs::SAFE_RATE_VIOLATION);
}
@@ -563,7 +563,7 @@ ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,
return INVALID_SUBMODE;
}
} else if ((mode == MODE_ON) || (mode == MODE_NORMAL)) {
if ((submode > acs::PTG_TARGET_INERTIAL) || (submode < acs::SAFE)) {
if ((submode < acs::AcsMode::SAFE) or (submode > acs::AcsMode::PTG_TARGET_INERTIAL)) {
return INVALID_SUBMODE;
} else {
return returnvalue::OK;