aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_HAL_SITL: rename macros to avoid conflicts

Browse Source 
these macros were also defined in NuttX in clock.h
This commit is contained in:
Andrew Tridgell 2017-05-05 20:09:29 +10:00
parent b72532164b
commit e51bbcebec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_SITL/sitl_gps.cpp
View File

@ -179,10 +179,10 @@ static void gps_time(uint16_t *time_week, uint32_t *time_week_ms)
simulation_timeval(&tv); simulation_timeval(&tv);
const uint32_t epoch = 86400*(10*365 + (1980-1969)/4 + 1 + 6 - 2) - (GPS_LEAPSECONDS_MILLIS / 1000ULL); 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; uint32_t epoch_seconds = tv.tv_sec - epoch;
*time_week = epoch_seconds / SEC_PER_WEEK; *time_week = epoch_seconds / AP_SEC_PER_WEEK;
uint32_t t_ms = tv.tv_usec / 1000; uint32_t t_ms = tv.tv_usec / 1000;
// round time to nearest 200ms // round time to nearest 200ms
*time_week_ms = (epoch_seconds % SEC_PER_WEEK) * MSEC_PER_SEC + ((t_ms/200) * 200); *time_week_ms = (epoch_seconds % AP_SEC_PER_WEEK) * AP_MSEC_PER_SEC + ((t_ms/200) * 200);
} }
/* /*