diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-31 12:50:11 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-31 12:50:11 +0400 |
| commit | ba7cbe48f2128f73d75e669432fa6c4874422d69 (patch) | |
| tree | 7185e32b43e4db52c9a0b5cda19e97d5a58db1c0 /src/modules/uORB | |
| parent | 6c30eebeb873fec7b573ac14d36936bb6c355243 (diff) | |
| parent | d35a1699078b6cb8a41d58bdbbd09164e5c0adf2 (diff) | |
| download | px4-firmware-ba7cbe48f2128f73d75e669432fa6c4874422d69.tar.gz px4-firmware-ba7cbe48f2128f73d75e669432fa6c4874422d69.tar.bz2 px4-firmware-ba7cbe48f2128f73d75e669432fa6c4874422d69.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/home_position.h | 2 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/uORB/topics/home_position.h b/src/modules/uORB/topics/home_position.h index 1cf37e29c..3e2fee84e 100644 --- a/src/modules/uORB/topics/home_position.h +++ b/src/modules/uORB/topics/home_position.h @@ -59,7 +59,7 @@ struct home_position_s { uint64_t timestamp; /**< Timestamp (microseconds since system boot) */ - bool altitude_is_relative; + //bool altitude_is_relative; // TODO what means home relative altitude? we need clear definition of reference altitude then double lat; /**< Latitude in degrees */ double lon; /**< Longitude in degrees */ float altitude; /**< Altitude in meters */ diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index 5ce968f67..5efb3f5bc 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -62,8 +62,7 @@ */ typedef enum { - NAV_STATE_INIT = 0, - NAV_STATE_NONE, + NAV_STATE_NONE = 0, NAV_STATE_LOITER, NAV_STATE_MISSION, NAV_STATE_MISSION_LOITER, |