diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-31 19:31:16 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-31 19:31:16 +0400 |
| commit | 549fd4f0e8012550bb7dc6794d386a3a3afdeb74 (patch) | |
| tree | 1318104f956a3ea1bf11acbd3faed081b00ba889 /src/modules/uORB | |
| parent | 5c84479ce93792d7fa7b777387be3bf8d50cebae (diff) | |
| parent | 7f9a7ffe82372d311a7947284871d794a8934493 (diff) | |
| download | px4-firmware-549fd4f0e8012550bb7dc6794d386a3a3afdeb74.tar.gz px4-firmware-549fd4f0e8012550bb7dc6794d386a3a3afdeb74.tar.bz2 px4-firmware-549fd4f0e8012550bb7dc6794d386a3a3afdeb74.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index 5efb3f5bc..9d5dad9f9 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -65,9 +65,7 @@ typedef enum { NAV_STATE_NONE = 0, NAV_STATE_LOITER, NAV_STATE_MISSION, - NAV_STATE_MISSION_LOITER, NAV_STATE_RTL, - NAV_STATE_RTL_LOITER, NAV_STATE_MAX } nav_state_t; |