Browse Source

日志时间不对,增加一些打印

apm_2208-rover-debug
Brown.Z 3 years ago
parent
commit
e81e63a26f
  1. 11
      libraries/AP_GPS/GPS_Backend.cpp
  2. 10
      libraries/AP_Logger/AP_Logger_Block.cpp
  3. 11
      libraries/AP_Logger/AP_Logger_File.cpp

11
libraries/AP_GPS/GPS_Backend.cpp

@ -107,6 +107,17 @@ void AP_GPS_Backend::make_gps_time(uint32_t bcd_date, uint32_t bcd_milliseconds) @@ -107,6 +107,17 @@ void AP_GPS_Backend::make_gps_time(uint32_t bcd_date, uint32_t bcd_milliseconds)
state.time_week = ret / AP_SEC_PER_WEEK;
state.time_week_ms = (ret % AP_SEC_PER_WEEK) * AP_MSEC_PER_SEC;
state.time_week_ms += msec;
static uint32_t last_1s = AP_HAL::millis();
if (AP_HAL::millis() - last_1s > 5000)
{
// gcs().send_text(MAV_SEVERITY_INFO, "week:%d,ms:%ld",state.time_week,state.time_week_ms);
// gcs().send_text(MAV_SEVERITY_INFO, "year:%d,m:%d,d:%d \n\r",tm.tm_year,tm.tm_mon,tm.tm_mday);
// gcs().send_text(MAV_SEVERITY_INFO, "hour:%d,m:%d,s:%d \n\r",tm.tm_hour,tm.tm_min,tm.tm_sec);
gcs().send_text(MAV_SEVERITY_INFO, "unix_time:%ld\n\r",unix_time);
last_1s = AP_HAL::millis();
}
}
/*

10
libraries/AP_Logger/AP_Logger_Block.cpp

@ -592,7 +592,13 @@ void AP_Logger_Block::start_new_log(void) @@ -592,7 +592,13 @@ void AP_Logger_Block::start_new_log(void)
FileHeader hdr {};
if (AP::rtc().get_utc_usec(utc_usec)) {
hdr.utc_secs = utc_usec / 1000000U;
gcs().send_text(MAV_SEVERITY_INFO, "start_new_log utc:%lld\n",utc_usec);
}else
{
gcs().send_text(MAV_SEVERITY_INFO, "start_new_log err\n");
}
writebuf.write((uint8_t*)&hdr, sizeof(FileHeader));
start_new_log_reset_variables();
@ -794,6 +800,10 @@ void AP_Logger_Block::get_log_info(uint16_t list_entry, uint32_t &size, uint32_t @@ -794,6 +800,10 @@ void AP_Logger_Block::get_log_info(uint16_t list_entry, uint32_t &size, uint32_t
uint64_t utc_usec;
if (AP::rtc().get_utc_usec(utc_usec)) {
df_FileTime = utc_usec / 1000000U;
gcs().send_text(MAV_SEVERITY_INFO, "get_log_info utc:%lld\n",utc_usec);
}else
{
gcs().send_text(MAV_SEVERITY_INFO, "get_log_info err\n");
}
}
time_utc = df_FileTime;

11
libraries/AP_Logger/AP_Logger_File.cpp

@ -562,9 +562,13 @@ uint32_t AP_Logger_File::_get_log_time(const uint16_t log_num) @@ -562,9 +562,13 @@ uint32_t AP_Logger_File::_get_log_time(const uint16_t log_num)
write_fd_semaphore.give();
uint64_t utc_usec;
if (!AP::rtc().get_utc_usec(utc_usec)) {
gcs().send_text(MAV_SEVERITY_INFO, "_get_log_time err\n");
return 0;
}else
{
gcs().send_text(MAV_SEVERITY_INFO, "_get_log_time utc:%lld\n",utc_usec);
}
return utc_usec / 1000000U;
return utc_usec / 1000000U;
}
write_fd_semaphore.give();
}
@ -819,6 +823,7 @@ void AP_Logger_File::start_new_log(void) @@ -819,6 +823,7 @@ void AP_Logger_File::start_new_log(void)
// remember if we had utc time when we opened the file
uint64_t utc_usec;
_need_rtc_update = !AP::rtc().get_utc_usec(utc_usec);
gcs().send_text(MAV_SEVERITY_INFO, "log utc {%d}:%lld\n",_need_rtc_update,utc_usec);
#endif
// create the log directory if need be
@ -1008,6 +1013,10 @@ void AP_Logger_File::io_timer(void) @@ -1008,6 +1013,10 @@ void AP_Logger_File::io_timer(void)
if (AP::rtc().get_utc_usec(utc_usec)) {
AP::FS().set_mtime(_write_filename, utc_usec/(1000U*1000U));
_need_rtc_update = false;
gcs().send_text(MAV_SEVERITY_INFO, "io_timer utc:%lld\n",utc_usec);
}else
{
gcs().send_text(MAV_SEVERITY_INFO, "io_timer err\n");
}
}
#endif

Loading…
Cancel
Save