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

Final Version of the ACS Controller #367

Merged
muellerr merged 78 commits from eggert/acs into develop 2023-02-08 13:50:11 +01:00
Conversation 0 Commits 78 Files Changed 27 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 341966e709 - Show all commits

2
mission/controller/AcsController.cpp
View File

@ -451,7 +451,7 @@ ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,
return INVALID_SUBMODE; return INVALID_SUBMODE;
} }
} else if ((mode == MODE_ON) || (mode == MODE_NORMAL)) { } else if ((mode == MODE_ON) || (mode == MODE_NORMAL)) {
if ((submode > 7) || (submode < 2)) { if ((submode > 8) || (submode < 2)) {
return INVALID_SUBMODE; return INVALID_SUBMODE;
} else { } else {
return returnvalue::OK; return returnvalue::OK;

3
mission/controller/AcsController.h
View File

@ -29,7 +29,8 @@ class AcsController : public ExtendedControllerBase {
static const Submode_t SUBMODE_IDLE = 4; static const Submode_t SUBMODE_IDLE = 4;
static const Submode_t SUBMODE_PTG_NADIR = 5; static const Submode_t SUBMODE_PTG_NADIR = 5;
static const Submode_t SUBMODE_PTG_TARGET = 6; static const Submode_t SUBMODE_PTG_TARGET = 6;
static const Submode_t SUBMODE_PTG_INERTIAL = 7; static const Submode_t SUBMODE_PTG_TARGET_GS = 7;
static const Submode_t SUBMODE_PTG_INERTIAL = 8;
static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM; static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM;
static const Event SAFE_RATE_VIOLATION = static const Event SAFE_RATE_VIOLATION =