Merge branch 'navigator_new' into navigator_new_vector

This commit is contained in:
Anton Babushkin
2013-12-30 14:42:00 +04:00
7 changed files with 166 additions and 64 deletions
+2
View File
@@ -99,11 +99,13 @@ typedef enum {
typedef enum {
RETURN_SWITCH_NONE = 0,
RETURN_SWITCH_NORMAL,
RETURN_SWITCH_RETURN
} return_switch_pos_t;
typedef enum {
MISSION_SWITCH_NONE = 0,
MISSION_SWITCH_LOITER,
MISSION_SWITCH_MISSION
} mission_switch_pos_t;