diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-05-21 10:40:58 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-05-21 10:40:58 +0200 |
| commit | 950571eaf6b67344b0c46287c45f06e8f85e8ece (patch) | |
| tree | 8995f76f65a60851727c073d12b8dd2f3bcf0fc7 /src/modules/commander/state_machine_helper.cpp | |
| parent | 8c4b35cc23ddf1eaef0dfc90f8fbb066b5b845af (diff) | |
| parent | fb801b6faecd77fe2aac54d3389cacf73993ccc4 (diff) | |
| download | px4-firmware-950571eaf6b67344b0c46287c45f06e8f85e8ece.tar.gz px4-firmware-950571eaf6b67344b0c46287c45f06e8f85e8ece.tar.bz2 px4-firmware-950571eaf6b67344b0c46287c45f06e8f85e8ece.zip | |
Merge branch 'master' into offboard2
Diffstat (limited to 'src/modules/commander/state_machine_helper.cpp')
| -rw-r--r-- | src/modules/commander/state_machine_helper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index aaabde66b..55f73e043 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -222,6 +222,10 @@ main_state_transition(struct vehicle_status_s *status, main_state_t new_main_sta ret = TRANSITION_CHANGED; break; + case MAIN_STATE_ACRO: + ret = TRANSITION_CHANGED; + break; + case MAIN_STATE_ALTCTL: /* need at minimum altitude estimate */ |