Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Logger: Console output can be disabled

Browse Source
This commit is contained in:
murata 2022-03-21 18:26:16 +09:00 committed by Andrew Tridgell
parent 9d2ffdc028
commit 6102e094be
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_Logger/AP_Logger_Block.cpp
View File

@ -45,16 +45,16 @@ void AP_Logger_Block::Init(void)
// If we can't allocate the full size, try to reduce it until we can allocate it
while (!writebuf.set_size(bufsize) && bufsize >= df_PageSize * df_PagePerBlock) {
hal.console->printf("AP_Logger_Block: Couldn't set buffer size to=%u\n", (unsigned)bufsize);
DEV_PRINTF("AP_Logger_Block: Couldn't set buffer size to=%u\n", (unsigned)bufsize);
bufsize >>= 1;
}
if (!writebuf.get_size()) {
hal.console->printf("Out of memory for logging\n");
DEV_PRINTF("Out of memory for logging\n");
return;
}
hal.console->printf("AP_Logger_Block: buffer size=%u\n", (unsigned)bufsize);
DEV_PRINTF("AP_Logger_Block: buffer size=%u\n", (unsigned)bufsize);
_initialised = true;
}
@ -408,15 +408,15 @@ void AP_Logger_Block::validate_log_structure()
last_file = file;
}
if (file == next_file) {
hal.console->printf("Found complete log %d at %X-%X\n", int(file), unsigned(page), unsigned(find_last_page_of_log(file)));
DEV_PRINTF("Found complete log %d at %X-%X\n", int(file), unsigned(page), unsigned(find_last_page_of_log(file)));
}
}
if (file != 0xFFFF && file != next_file && page <= df_NumPages && page > 0) {
hal.console->printf("Found corrupt log %d at 0x%04X, erasing", int(file), unsigned(page));
DEV_PRINTF("Found corrupt log %d at 0x%04X, erasing", int(file), unsigned(page));
df_EraseFrom = page;
} else if (next_file != 0xFFFF && page > 0 && next_file > 1) { // chip is empty
hal.console->printf("Found %d complete logs at 0x%04X-0x%04X", int(next_file - first_file), unsigned(page_start), unsigned(page - 1));
DEV_PRINTF("Found %d complete logs at 0x%04X-0x%04X", int(next_file - first_file), unsigned(page_start), unsigned(page - 1));
}
}

18
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -76,15 +76,15 @@ void AP_Logger_File::Init()
bufsize *= 0.9;
}
if (bufsize >= _writebuf_chunk && bufsize != desired_bufsize) {
hal.console->printf("AP_Logger: reduced buffer %u/%u\n", (unsigned)bufsize, (unsigned)desired_bufsize);
DEV_PRINTF("AP_Logger: reduced buffer %u/%u\n", (unsigned)bufsize, (unsigned)desired_bufsize);
}
if (!_writebuf.get_size()) {
hal.console->printf("Out of memory for logging\n");
DEV_PRINTF("Out of memory for logging\n");
return;
}
hal.console->printf("AP_Logger_File: buffer size=%u\n", (unsigned)bufsize);
DEV_PRINTF("AP_Logger_File: buffer size=%u\n", (unsigned)bufsize);
_initialised = true;
@ -323,12 +323,12 @@ void AP_Logger_File::Prep_MinSpace()
break;
}
if (file_exists(filename_to_remove)) {
hal.console->printf("Removing (%s) for minimum-space requirements (%.0fMB < %.0fMB)\n",
DEV_PRINTF("Removing (%s) for minimum-space requirements (%.0fMB < %.0fMB)\n",
filename_to_remove, (double)avail*B_to_MB, (double)target_free*B_to_MB);
EXPECT_DELAY_MS(2000);
if (AP::FS().unlink(filename_to_remove) == -1) {
_cached_oldest_log = 0;
hal.console->printf("Failed to remove %s: %s\n", filename_to_remove, strerror(errno));
DEV_PRINTF("Failed to remove %s: %s\n", filename_to_remove, strerror(errno));
free(filename_to_remove);
if (errno == ENOENT) {
// corruption - should always have a continuous
@ -627,7 +627,7 @@ int16_t AP_Logger_File::get_log_data(const uint16_t list_entry, const uint16_t p
int saved_errno = errno;
::printf("Log read open fail for %s - %s\n",
fname, strerror(saved_errno));
hal.console->printf("Log read open fail for %s - %s\n",
DEV_PRINTF("Log read open fail for %s - %s\n",
fname, strerror(saved_errno));
free(fname);
return -1;
@ -790,7 +790,7 @@ void AP_Logger_File::start_new_log(void)
}
if (disk_space_avail() < _free_space_min_avail && disk_space() > 0) {
hal.console->printf("Out of space for logging\n");
DEV_PRINTF("Out of space for logging\n");
return;
}
@ -834,7 +834,7 @@ void AP_Logger_File::start_new_log(void)
if (open_error_ms_was_zero) {
::printf("Log open fail for %s - %s\n",
_write_filename, strerror(saved_errno));
hal.console->printf("Log open fail for %s - %s\n",
DEV_PRINTF("Log open fail for %s - %s\n",
_write_filename, strerror(saved_errno));
}
return;
@ -934,7 +934,7 @@ void AP_Logger_File::io_timer(void)
_free_space_last_check_time = tnow;
last_io_operation = "disk_space_avail";
if (disk_space_avail() < _free_space_min_avail && disk_space() > 0) {
hal.console->printf("Out of space for logging\n");
DEV_PRINTF("Out of space for logging\n");
stop_logging();
_open_error_ms = AP_HAL::millis(); // prevent logging starting again for 5s
last_io_operation = "";