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

AP_Logger: allow for compilation without AP_RTC_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2023-10-05 18:40:34 +11:00 committed by Andrew Tridgell
parent f90093b628
commit 7f90de0973
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -583,11 +583,15 @@ uint32_t AP_Logger_File::_get_log_time(const uint16_t log_num)
// it is the file we are currently writing
free(fname);
write_fd_semaphore.give();
#if AP_RTC_ENABLED
uint64_t utc_usec;
if (!AP::rtc().get_utc_usec(utc_usec)) {
return 0;
}
return utc_usec / 1000000U;
#else
return 0;
#endif
}
write_fd_semaphore.give();
}
@ -840,8 +844,10 @@ void AP_Logger_File::start_new_log(void)
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
// remember if we had utc time when we opened the file
#if AP_RTC_ENABLED
uint64_t utc_usec;
_need_rtc_update = !AP::rtc().get_utc_usec(utc_usec);
#endif
#endif
// create the log directory if need be
@ -1034,7 +1040,7 @@ void AP_Logger_File::io_timer(void)
last_io_operation = "";
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#if AP_RTC_ENABLED && CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
// ChibiOS does not update mtime on writes, so if we opened
// without knowing the time we should update it later
if (_need_rtc_update) {

2
libraries/AP_Logger/AP_Logger_File.h
View File

@ -72,7 +72,7 @@ private:
char *_write_filename;
bool last_log_is_marked_discard;
uint32_t _last_write_ms;
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#if AP_RTC_ENABLED
bool _need_rtc_update;
#endif