fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-30 16:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into offboard2

Browse Source
This commit is contained in:
Anton Babushkin
2014-05-21 10:40:58 +02:00
parent 8c4b35cc23 fb801b6fae
commit 950571eaf6
38 changed files with 360 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/state_machine_helper.cpp
+4
View File
@@ -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 */