diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 00:50:38 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 00:50:38 +0200 |
commit | 154f14e7476780799108e16bc3c296f0ade85f7b (patch) | |
tree | d5820f728a7884f3d7da78f17547edd8688b3036 /src/modules/uORB/topics/vehicle_global_position.h | |
parent | 0fe8ed509ad2d45a16eba1fe2683f586e530ee02 (diff) | |
parent | 28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff) | |
download | px4-firmware-154f14e7476780799108e16bc3c296f0ade85f7b.tar.gz px4-firmware-154f14e7476780799108e16bc3c296f0ade85f7b.tar.bz2 px4-firmware-154f14e7476780799108e16bc3c296f0ade85f7b.zip |
Merged master into power_enforce
Diffstat (limited to 'src/modules/uORB/topics/vehicle_global_position.h')
-rw-r--r-- | src/modules/uORB/topics/vehicle_global_position.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/modules/uORB/topics/vehicle_global_position.h b/src/modules/uORB/topics/vehicle_global_position.h index 4897ca737..e32529cb4 100644 --- a/src/modules/uORB/topics/vehicle_global_position.h +++ b/src/modules/uORB/topics/vehicle_global_position.h @@ -36,7 +36,7 @@ * Definition of the global fused WGS84 position uORB topic. * * @author Thomas Gubler <thomasgubler@student.ethz.ch> - * @author Julian Oes <joes@student.ethz.ch> + * @author Julian Oes <julian@oes.ch> * @author Lorenz Meier <lm@inf.ethz.ch> */ @@ -61,15 +61,14 @@ * e.g. control inputs of the vehicle in a Kalman-filter implementation. */ struct vehicle_global_position_s { - uint64_t timestamp; /**< Time of this estimate, in microseconds since system start */ - - uint64_t time_gps_usec; /**< GPS timestamp in microseconds */ + uint64_t timestamp; /**< Time of this estimate, in microseconds since system start */ + uint64_t time_gps_usec; /**< GPS timestamp in microseconds */ double lat; /**< Latitude in degrees */ double lon; /**< Longitude in degrees */ float alt; /**< Altitude AMSL in meters */ - float vel_n; /**< Ground north velocity, m/s */ - float vel_e; /**< Ground east velocity, m/s */ - float vel_d; /**< Ground downside velocity, m/s */ + float vel_n; /**< Ground north velocity, m/s */ + float vel_e; /**< Ground east velocity, m/s */ + float vel_d; /**< Ground downside velocity, m/s */ float yaw; /**< Yaw in radians -PI..+PI. */ float eph; float epv; |