fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 06:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

renaming of gps time to UTC time

Browse Source
This commit is contained in:
Ban Siesta
2015-01-04 10:43:28 +00:00
parent 4cc7f599d1
commit 25fc9d791a
11 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/frsky_telemetry/frsky_data.c
+2 -2
View File
@@ -223,7 +223,7 @@ void frsky_send_frame2(int uart)
char lat_ns = 0, lon_ew = 0;
int sec = 0;
if (global_pos.timestamp != 0 && hrt_absolute_time() < global_pos.timestamp + 20000) {
time_t time_gps = global_pos.time_gps_usec / 1000000;
time_t time_gps = global_pos.time_utc_usec / 1000000ULL;
struct tm *tm_gps = gmtime(&time_gps);
course = (global_pos.yaw + M_PI_F) / M_PI_F * 180.0f;
@@ -274,7 +274,7 @@ void frsky_send_frame3(int uart)
orb_copy(ORB_ID(vehicle_global_position), global_position_sub, &global_pos);
/* send formatted frame */
time_t time_gps = global_pos.time_gps_usec / 1000000;
time_t time_gps = global_pos.time_utc_usec / 1000000ULL;
struct tm *tm_gps = gmtime(&time_gps);
uint16_t hour_min = (tm_gps->tm_min << 8) | (tm_gps->tm_hour & 0xff);
frsky_send_data(uart, FRSKY_ID_GPS_DAY_MONTH, tm_gps->tm_mday);
src/drivers/gps/ashtech.cpp
+2 -2
View File
@@ -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();
}
src/drivers/gps/mtk.cpp
+2 -2
View File
@@ -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
src/drivers/gps/ubx.cpp
+4 -4
View File
@@ -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();