From d5a5a97a3d79021898710fe527999c10671309f6 Mon Sep 17 00:00:00 2001 From: Michael du Breuil <wicked.shell.scripts@gmail.com> Date: Tue, 10 Jan 2017 02:59:02 -0700 Subject: [PATCH] SITL: Use the GPS_LEAPSECOND define --- libraries/AP_HAL_SITL/sitl_gps.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_HAL_SITL/sitl_gps.cpp b/libraries/AP_HAL_SITL/sitl_gps.cpp index afd8dd4346..d06842f912 100644 --- a/libraries/AP_HAL_SITL/sitl_gps.cpp +++ b/libraries/AP_HAL_SITL/sitl_gps.cpp @@ -177,7 +177,7 @@ static void gps_time(uint16_t *time_week, uint32_t *time_week_ms) { struct timeval tv; simulation_timeval(&tv); - const uint32_t epoch = 86400*(10*365 + (1980-1969)/4 + 1 + 6 - 2) - 15; + const uint32_t epoch = 86400*(10*365 + (1980-1969)/4 + 1 + 6 - 2) - (GPS_LEAPSECONDS_MILLIS / 1000ULL); uint32_t epoch_seconds = tv.tv_sec - epoch; *time_week = epoch_seconds / (86400*7UL); uint32_t t_ms = tv.tv_usec / 1000;