Merge branch 'master' into offboard2

This commit is contained in:
Anton Babushkin
2014-05-21 10:40:58 +02:00
38 changed files with 360 additions and 138 deletions

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 */