diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-07 15:11:12 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-07 15:11:12 +0200 |
| commit | 407eafbdbb3a81a8d2e9b30ae0757a9f1862c467 (patch) | |
| tree | 0cc99180cbc19f95ac9ba9de0dfc5e6aac3a475d /src/modules/commander/state_machine_helper.cpp | |
| parent | 79cbf15d2621db38688939ab70eda7ac2fb88cbe (diff) | |
| parent | be73ad0bdb932e35cf891e8f5ffc1b89fdd683dc (diff) | |
| download | px4-firmware-407eafbdbb3a81a8d2e9b30ae0757a9f1862c467.tar.gz px4-firmware-407eafbdbb3a81a8d2e9b30ae0757a9f1862c467.tar.bz2 px4-firmware-407eafbdbb3a81a8d2e9b30ae0757a9f1862c467.zip | |
Merge branch 'master' into offboard2_merge
Conflicts:
src/modules/navigator/navigator.h
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/modules/commander/state_machine_helper.cpp')
| -rw-r--r-- | src/modules/commander/state_machine_helper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index 210a118f6..6b96e3a3f 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -271,7 +271,6 @@ main_state_transition(struct vehicle_status_s *status, main_state_t new_main_sta } break; - case MAIN_STATE_AUTO_MISSION: case MAIN_STATE_AUTO_LOITER: /* need global position estimate */ if (status->condition_global_position_valid) { @@ -279,6 +278,7 @@ main_state_transition(struct vehicle_status_s *status, main_state_t new_main_sta } break; + case MAIN_STATE_AUTO_MISSION: case MAIN_STATE_AUTO_RTL: /* need global position and home position */ if (status->condition_global_position_valid && status->condition_home_position_valid) { |