From 419fa456579ad52bdb18a95702aad8cb0b24f380 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 10 Feb 2016 08:29:17 +0100 Subject: [PATCH] Change SDLOG2 to blackbox in user-facing output --- src/modules/sdlog2/sdlog2.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index e5f1b7480f..720771878f 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -446,7 +446,8 @@ int create_log_dir() } /* print logging path, important to find log file later */ - mavlink_and_console_log_info(mavlink_fd, "[log] log dir: %s", log_dir); + mavlink_and_console_log_info(mavlink_fd, "[blackbox] %s", log_dir); + return 0; } @@ -482,7 +483,7 @@ int open_log_file() if (file_number > MAX_NO_LOGFILE) { /* we should not end up here, either we have more than MAX_NO_LOGFILE on the SD card, or another problem */ - mavlink_and_console_log_critical(mavlink_fd, "[log] ERR: max files %d", MAX_NO_LOGFILE); + mavlink_and_console_log_critical(mavlink_fd, "[blackbox] ERR: max files %d", MAX_NO_LOGFILE); return -1; } } @@ -494,10 +495,10 @@ int open_log_file() #endif if (fd < 0) { - mavlink_and_console_log_critical(mavlink_fd, "[log] failed: %s", log_file_name); + mavlink_and_console_log_critical(mavlink_fd, "[blackbox] failed: %s", log_file_name); } else { - mavlink_and_console_log_info(mavlink_fd, "[log] start: %s", log_file_name); + mavlink_and_console_log_info(mavlink_fd, "[blackbox] recording: %s", log_file_name); } return fd; @@ -534,7 +535,7 @@ int open_perf_file(const char* str) if (file_number > MAX_NO_LOGFILE) { /* we should not end up here, either we have more than MAX_NO_LOGFILE on the SD card, or another problem */ - mavlink_and_console_log_critical(mavlink_fd, "[log] ERR: max files %d", MAX_NO_LOGFILE); + mavlink_and_console_log_critical(mavlink_fd, "[blackbox] ERR: max files %d", MAX_NO_LOGFILE); return -1; } } @@ -546,7 +547,7 @@ int open_perf_file(const char* str) #endif if (fd < 0) { - mavlink_and_console_log_critical(mavlink_fd, "[log] failed: %s", log_file_name); + mavlink_and_console_log_critical(mavlink_fd, "[blackbox] failed: %s", log_file_name); } @@ -673,7 +674,7 @@ void sdlog2_start_log() /* create log dir if needed */ if (create_log_dir() != 0) { - mavlink_and_console_log_critical(mavlink_fd, "[log] error creating log dir"); + mavlink_and_console_log_critical(mavlink_fd, "[blackbox] error creating log dir"); return; } @@ -766,7 +767,7 @@ void sdlog2_stop_log() /* free log writer performance counter */ perf_free(perf_write); - mavlink_and_console_log_info(mavlink_fd, "[log] logging stopped"); + mavlink_and_console_log_info(mavlink_fd, "[blackbox] recording stopped"); sdlog2_status(); } @@ -1954,7 +1955,7 @@ void sdlog2_status() float seconds = ((float)(hrt_absolute_time() - start_time)) / 1000000.0f; warnx("wrote %lu msgs, %4.2f MiB (average %5.3f KiB/s), skipped %lu msgs", log_msgs_written, (double)mebibytes, (double)(kibibytes / seconds), log_msgs_skipped); - mavlink_log_info(mavlink_fd, "[log] wrote %lu msgs, skipped %lu msgs", log_msgs_written, log_msgs_skipped); + mavlink_log_info(mavlink_fd, "[blackbox] wrote %lu msgs, skipped %lu msgs", log_msgs_written, log_msgs_skipped); } } @@ -1979,7 +1980,7 @@ int check_free_space() /* use a threshold of 50 MiB */ if (statfs_buf.f_bavail < (px4_statfs_buf_f_bavail_t)(50 * 1024 * 1024 / statfs_buf.f_bsize)) { mavlink_and_console_log_critical(mavlink_fd, - "[log] no space on MicroSD: %u MiB", + "[blackbox] no space on MicroSD: %u MiB", (unsigned int)(statfs_buf.f_bavail * statfs_buf.f_bsize) / (1024U * 1024U)); /* we do not need a flag to remember that we sent this warning because we will exit anyway */ return PX4_ERROR; @@ -1987,7 +1988,7 @@ int check_free_space() /* use a threshold of 100 MiB to send a warning */ } else if (!space_warning_sent && statfs_buf.f_bavail < (px4_statfs_buf_f_bavail_t)(100 * 1024 * 1024 / statfs_buf.f_bsize)) { mavlink_and_console_log_critical(mavlink_fd, - "[log] space on MicroSD low: %u MiB", + "[blackbox] space on MicroSD low: %u MiB", (unsigned int)(statfs_buf.f_bavail * statfs_buf.f_bsize) / (1024U * 1024U)); /* we don't want to flood the user with warnings */ space_warning_sent = true;