diff options
| author | Ban Siesta <bansiesta@gmail.com> | 2015-01-04 10:43:28 +0000 |
|---|---|---|
| committer | Ban Siesta <bansiesta@gmail.com> | 2015-01-04 10:43:28 +0000 |
| commit | 25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b (patch) | |
| tree | 34f01351e24634e58391ecd82ce8727ec085fa40 /src/drivers/gps | |
| parent | 4cc7f599d1f29607fae625e26a586d0758f67283 (diff) | |
| download | px4-firmware-25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b.tar.gz px4-firmware-25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b.tar.bz2 px4-firmware-25fc9d791a1faf5d37a6b9a13bd16fafd6a5cf5b.zip | |
renaming of gps time to UTC time
Diffstat (limited to 'src/drivers/gps')
| -rw-r--r-- | src/drivers/gps/ashtech.cpp | 4 | ||||
| -rw-r--r-- | src/drivers/gps/mtk.cpp | 4 | ||||
| -rw-r--r-- | src/drivers/gps/ubx.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/drivers/gps/ashtech.cpp b/src/drivers/gps/ashtech.cpp index f1c5ca549..99dbe5984 100644 --- a/src/drivers/gps/ashtech.cpp +++ b/src/drivers/gps/ashtech.cpp @@ -112,8 +112,8 @@ int ASHTECH::handle_message(int len) warn("failed setting clock"); } - _gps_position->time_gps_usec = static_cast<uint64_t>(epoch) * 1000000ULL; - _gps_position->time_gps_usec += usecs; + _gps_position->time_utc_usec = static_cast<uint64_t>(epoch) * 1000000ULL; + _gps_position->time_utc_usec += usecs; _gps_position->timestamp_time = hrt_absolute_time(); } diff --git a/src/drivers/gps/mtk.cpp b/src/drivers/gps/mtk.cpp index c4f4f7bec..d808b59a9 100644 --- a/src/drivers/gps/mtk.cpp +++ b/src/drivers/gps/mtk.cpp @@ -282,8 +282,8 @@ MTK::handle_message(gps_mtk_packet_t &packet) timeinfo_conversion_temp -= timeinfo.tm_sec * 1e3; time_t epoch = mktime(&timeinfo); - _gps_position->time_gps_usec = epoch * 1e6; //TODO: test this - _gps_position->time_gps_usec += timeinfo_conversion_temp * 1e3; + _gps_position->time_utc_usec = epoch * 1e6; //TODO: test this + _gps_position->time_utc_usec += timeinfo_conversion_temp * 1e3; _gps_position->timestamp_position = _gps_position->timestamp_time = hrt_absolute_time(); // Position and velocity update always at the same time diff --git a/src/drivers/gps/ubx.cpp b/src/drivers/gps/ubx.cpp index c67965487..6b4e1630b 100644 --- a/src/drivers/gps/ubx.cpp +++ b/src/drivers/gps/ubx.cpp @@ -759,8 +759,8 @@ UBX::payload_rx_done(void) warn("failed setting clock"); } - _gps_position->time_gps_usec = static_cast<uint64_t>(epoch) * 1000000ULL; - _gps_position->time_gps_usec += _buf.payload_rx_nav_timeutc.nano / 1000; + _gps_position->time_utc_usec = static_cast<uint64_t>(epoch) * 1000000ULL; + _gps_position->time_utc_usec += _buf.payload_rx_nav_timeutc.nano / 1000; } _gps_position->timestamp_time = hrt_absolute_time(); @@ -831,8 +831,8 @@ UBX::payload_rx_done(void) warn("failed setting clock"); } - _gps_position->time_gps_usec = static_cast<uint64_t>(epoch) * 1000000ULL; - _gps_position->time_gps_usec += _buf.payload_rx_nav_timeutc.nano / 1000; + _gps_position->time_utc_usec = static_cast<uint64_t>(epoch) * 1000000ULL; + _gps_position->time_utc_usec += _buf.payload_rx_nav_timeutc.nano / 1000; } _gps_position->timestamp_time = hrt_absolute_time(); |