diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-07 15:09:16 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-07 15:09:16 +0200 |
| commit | 9a69c7ba0e688b3d020c2bd740dfd24187d95865 (patch) | |
| tree | a31d4fed1c15e2c2a0ee97d81cd12ea6aad96f1c /src/modules/commander/state_machine_helper.cpp | |
| parent | 3f307fa0d7d6e8901eefca28dac039af69a0a92b (diff) | |
| parent | be73ad0bdb932e35cf891e8f5ffc1b89fdd683dc (diff) | |
| download | px4-firmware-9a69c7ba0e688b3d020c2bd740dfd24187d95865.tar.gz px4-firmware-9a69c7ba0e688b3d020c2bd740dfd24187d95865.tar.bz2 px4-firmware-9a69c7ba0e688b3d020c2bd740dfd24187d95865.zip | |
Merge branch 'master' into dataman_nav_drton
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 423ce2f23..7fb2e08db 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) { |