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
+1
View File
@@ -66,6 +66,7 @@ typedef enum {
MAIN_STATE_ALTCTL,
MAIN_STATE_POSCTL,
MAIN_STATE_AUTO,
MAIN_STATE_ACRO,
MAIN_STATE_OFFBOARD,
MAIN_STATE_MAX
} main_state_t;