diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-02 17:09:36 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-02 17:09:36 +0400 |
| commit | 5c53797c1710d49d1df87515509ad81ea5367a21 (patch) | |
| tree | e04a7ed4e712354eed8c2567176a72409310ff80 /src/modules/uORB/topics/vehicle_global_position.h | |
| parent | 93617c4073d560ec2a804d728a2830534a74a50a (diff) | |
| parent | 0205eebaa63016b3cf4bb03a5af230554d4a581b (diff) | |
| download | px4-firmware-5c53797c1710d49d1df87515509ad81ea5367a21.tar.gz px4-firmware-5c53797c1710d49d1df87515509ad81ea5367a21.tar.bz2 px4-firmware-5c53797c1710d49d1df87515509ad81ea5367a21.zip | |
Merge branch 'master' into mpc_local_pos
Diffstat (limited to 'src/modules/uORB/topics/vehicle_global_position.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_global_position.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/uORB/topics/vehicle_global_position.h b/src/modules/uORB/topics/vehicle_global_position.h index 5c54630e2..4897ca737 100644 --- a/src/modules/uORB/topics/vehicle_global_position.h +++ b/src/modules/uORB/topics/vehicle_global_position.h @@ -1,9 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * Author: @author Thomas Gubler <thomasgubler@student.ethz.ch> - * @author Julian Oes <joes@student.ethz.ch> - * @author Lorenz Meier <lm@inf.ethz.ch> + * Copyright (c) 2012-2014 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,6 +34,10 @@ /** * @file vehicle_global_position.h * Definition of the global fused WGS84 position uORB topic. + * + * @author Thomas Gubler <thomasgubler@student.ethz.ch> + * @author Julian Oes <joes@student.ethz.ch> + * @author Lorenz Meier <lm@inf.ethz.ch> */ #ifndef VEHICLE_GLOBAL_POSITION_T_H_ @@ -59,8 +60,7 @@ * estimator, which will take more sources of information into account than just GPS, * e.g. control inputs of the vehicle in a Kalman-filter implementation. */ -struct vehicle_global_position_s -{ +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 */ |