diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-20 08:36:49 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-20 08:36:49 -0700 |
| commit | 639d86eab22abe8850120fa07dfa58b0b4bec377 (patch) | |
| tree | ac117f24f82817adce5d7407b9ab99bcd3038de0 /src/modules/commander/state_machine_helper.cpp | |
| parent | 4fdc01630832f5c7d2d571c1494d4b65f1a510fc (diff) | |
| parent | 559bfbb11cdac499cda8070c32e2b7e79b3b883e (diff) | |
| download | px4-firmware-639d86eab22abe8850120fa07dfa58b0b4bec377.tar.gz px4-firmware-639d86eab22abe8850120fa07dfa58b0b4bec377.tar.bz2 px4-firmware-639d86eab22abe8850120fa07dfa58b0b4bec377.zip | |
Merge pull request #979 from PX4/acro2
ACRO mode
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 abcf72717..f1a353d5b 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 */ |