diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-05 10:02:07 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-05 10:02:07 +0100 |
| commit | 16b9f666e790a2b939f7890b39cc6e4cf2552165 (patch) | |
| tree | ee936b06d15e75e12b175f6786772781aff32cd8 /src/drivers/gps/gps_helper.h | |
| parent | e16c4ff76e7eff2da88bcbef5d05dd4ba11e7203 (diff) | |
| parent | c3ed35f5cc8e2617e61747e904dbaa652d1cc2c8 (diff) | |
| download | px4-firmware-16b9f666e790a2b939f7890b39cc6e4cf2552165.tar.gz px4-firmware-16b9f666e790a2b939f7890b39cc6e4cf2552165.tar.bz2 px4-firmware-16b9f666e790a2b939f7890b39cc6e4cf2552165.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
src/lib/mathlib/math/Matrix.hpp
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_status.h
src/platforms/px4_includes.h
Diffstat (limited to 'src/drivers/gps/gps_helper.h')
| -rw-r--r-- | src/drivers/gps/gps_helper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/drivers/gps/gps_helper.h b/src/drivers/gps/gps_helper.h index 3623397b2..0ce05fcb5 100644 --- a/src/drivers/gps/gps_helper.h +++ b/src/drivers/gps/gps_helper.h @@ -43,6 +43,8 @@ #include <uORB/uORB.h> #include <uORB/topics/vehicle_gps_position.h> +#define GPS_EPOCH_SECS 1234567890ULL + class GPS_Helper { public: |