From 000e675d0e2b34165df7a730f7c7d4acd756ee2c Mon Sep 17 00:00:00 2001 From: armink Date: Tue, 11 Oct 2016 22:08:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91F?= =?UTF-8?q?lash=20=E6=8F=92=E4=BB=B6=E5=87=A0=E5=A4=84=E5=8D=95=E8=AF=8D?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: armink --- demo/os/rt-thread/stm32f10x/app/src/user_finsh_cmd.c | 4 ++-- easylogger/plugins/flash/elog_flash.c | 10 +++++----- easylogger/plugins/flash/elog_flash.h | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/demo/os/rt-thread/stm32f10x/app/src/user_finsh_cmd.c b/demo/os/rt-thread/stm32f10x/app/src/user_finsh_cmd.c index 41813b5..282bed0 100644 --- a/demo/os/rt-thread/stm32f10x/app/src/user_finsh_cmd.c +++ b/demo/os/rt-thread/stm32f10x/app/src/user_finsh_cmd.c @@ -124,9 +124,9 @@ static void elog_flash(uint8_t argc, char **argv) { if (argc >= 2) { if (!strcmp(argv[1], "read")) { if (argc >= 3) { - elog_flash_outout_recent(atol(argv[2])); + elog_flash_output_recent(atol(argv[2])); }else { - elog_flash_outout_all(); + elog_flash_output_all(); } } else if (!strcmp(argv[1], "clean")) { elog_flash_clean(); diff --git a/easylogger/plugins/flash/elog_flash.c b/easylogger/plugins/flash/elog_flash.c index 877cf67..caf61cf 100644 --- a/easylogger/plugins/flash/elog_flash.c +++ b/easylogger/plugins/flash/elog_flash.c @@ -89,7 +89,7 @@ ElogErrCode elog_flash_init(void) { * Maximum index is log used flash total size - 1. * @param size */ -void elog_flash_outout(size_t index, size_t size) { +void elog_flash_output(size_t index, size_t size) { /* 128 bytes buffer */ uint32_t buf[32] = { 0 }; size_t log_total_size = ef_log_get_used_size(); @@ -134,8 +134,8 @@ void elog_flash_outout(size_t index, size_t size) { /** * Read and output all log which saved in flash. */ -void elog_flash_outout_all(void) { - elog_flash_outout(0, ef_log_get_used_size()); +void elog_flash_output_all(void) { + elog_flash_output(0, ef_log_get_used_size()); } /** @@ -143,12 +143,12 @@ void elog_flash_outout_all(void) { * * @param size recent log size */ -void elog_flash_outout_recent(size_t size) { +void elog_flash_output_recent(size_t size) { size_t max_size = ef_log_get_used_size(); if (size > max_size) { log_i("The output size is out of bound. The max size is %d.", max_size); } else { - elog_flash_outout(max_size - size, size); + elog_flash_output(max_size - size, size); } } diff --git a/easylogger/plugins/flash/elog_flash.h b/easylogger/plugins/flash/elog_flash.h index 19fe645..60f2c46 100644 --- a/easylogger/plugins/flash/elog_flash.h +++ b/easylogger/plugins/flash/elog_flash.h @@ -41,13 +41,13 @@ extern "C" { #endif /* EasyLogger flash log plugin's software version number */ -#define ELOG_FLASH_SW_VERSION "0.07.30" +#define ELOG_FLASH_SW_VERSION "1.10.11" /* elog_flash.c */ ElogErrCode elog_flash_init(void); -void elog_flash_outout(size_t pos, size_t size); -void elog_flash_outout_all(void); -void elog_flash_outout_recent(size_t size); +void elog_flash_output(size_t pos, size_t size); +void elog_flash_output_all(void); +void elog_flash_output_recent(size_t size); void elog_flash_set_filter(uint8_t level,const char *tag,const char *keyword); void elog_flash_write(const char *log, size_t size); void elog_flash_clean(void);