diff options
author | Julian Oes <julian@oes.ch> | 2014-06-19 10:26:56 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-06-19 10:26:56 +0200 |
commit | 62faa2ee5155253779d3b93c5a280e8918585f6e (patch) | |
tree | 1e9dfd8678df95098333ded38484fb509ecddeb4 /src/modules/commander/commander.cpp | |
parent | 94e004955df3f467b7e67b3fac0d968b9a68e091 (diff) | |
download | px4-firmware-62faa2ee5155253779d3b93c5a280e8918585f6e.tar.gz px4-firmware-62faa2ee5155253779d3b93c5a280e8918585f6e.tar.bz2 px4-firmware-62faa2ee5155253779d3b93c5a280e8918585f6e.zip |
commander/navigator: renamed FS modes to RTL and RTGS (return to ground station)
Diffstat (limited to 'src/modules/commander/commander.cpp')
-rw-r--r-- | src/modules/commander/commander.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 5954dcbb1..b957ad9b5 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -649,8 +649,7 @@ int commander_thread_main(int argc, char *argv[]) nav_states_str[NAVIGATION_STATE_AUTO_MISSION] = "AUTO_MISSION"; nav_states_str[NAVIGATION_STATE_AUTO_LOITER] = "AUTO_LOITER"; nav_states_str[NAVIGATION_STATE_AUTO_RTL] = "AUTO_RTL"; - nav_states_str[NAVIGATION_STATE_AUTO_FS_RC_LOSS] = "AUTO_FS_RC_LOSS"; - nav_states_str[NAVIGATION_STATE_AUTO_FS_DL_LOSS] = "AUTO_FS_DL_LOSS"; + nav_states_str[NAVIGATION_STATE_AUTO_RTGS] = "AUTO_RTGS"; nav_states_str[NAVIGATION_STATE_ACRO] = "ACRO"; nav_states_str[NAVIGATION_STATE_LAND] = "LAND"; nav_states_str[NAVIGATION_STATE_DESCEND] = "DESCEND"; @@ -1734,8 +1733,7 @@ set_control_mode() case NAVIGATION_STATE_AUTO_MISSION: case NAVIGATION_STATE_AUTO_LOITER: case NAVIGATION_STATE_AUTO_RTL: - case NAVIGATION_STATE_AUTO_FS_RC_LOSS: - case NAVIGATION_STATE_AUTO_FS_DL_LOSS: + case NAVIGATION_STATE_AUTO_RTGS: control_mode.flag_control_manual_enabled = false; control_mode.flag_control_auto_enabled = true; control_mode.flag_control_rates_enabled = true; |