From 4db020575a3771d6113c32ba31402c826375d824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=5F666?= <13089258+pony-six-hundred-and-sixty-six@user.noreply.gitee.com> Date: Thu, 2 Jan 2025 09:19:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E7=99=BB=E5=BD=95=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E5=8A=A8=E6=80=81=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=E7=AD=89=E7=BA=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- applications/user_sys.h | 2 -- rt-thread/components/finsh/shell.h | 2 +- rt-thread/components/utilities/ulog/ulog.c | 2 ++ rt-thread/components/utilities/ulog/ulog.h | 1 + rt-thread/rtconfig.h | 3 +++ 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2cabbe5..f1bf12c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -58,6 +58,7 @@ "ctype.h": "c", "string.h": "c", "completion.h": "c", - "bsp_vin_detection.h": "c" + "bsp_vin_detection.h": "c", + "ulog_def.h": "c" } } diff --git a/applications/user_sys.h b/applications/user_sys.h index f801251..5a84b57 100644 --- a/applications/user_sys.h +++ b/applications/user_sys.h @@ -14,8 +14,6 @@ #include "rtdef.h" #include "bsp_flash.h" -#define SYS_PREHEAT_TIME_S (10U) -#define SYS_MUTE_TIME_S (uint8_t)(10 * 3) #define MAX_EXPIRATION_DAYS (uint16_t)(365 * 10 + 30 * 3) diff --git a/rt-thread/components/finsh/shell.h b/rt-thread/components/finsh/shell.h index a74f4da..9ef4ab4 100644 --- a/rt-thread/components/finsh/shell.h +++ b/rt-thread/components/finsh/shell.h @@ -44,7 +44,7 @@ int finsh_set_prompt(const char *prompt); #define FINSH_PASSWORD_MIN 6 #endif #ifndef FINSH_DEFAULT_PASSWORD - #define FINSH_DEFAULT_PASSWORD "rtthread" + #define FINSH_DEFAULT_PASSWORD "yd4n02a" #endif #endif /* FINSH_USING_AUTH */ diff --git a/rt-thread/components/utilities/ulog/ulog.c b/rt-thread/components/utilities/ulog/ulog.c index 4b0dbac..4f136cb 100644 --- a/rt-thread/components/utilities/ulog/ulog.c +++ b/rt-thread/components/utilities/ulog/ulog.c @@ -11,6 +11,7 @@ #include #include "ulog.h" #include "rthw.h" +#include "stdlib.h" #ifdef ULOG_USING_SYSLOG #include @@ -1519,6 +1520,7 @@ int ulog_init(void) #ifdef ULOG_USING_FILTER ulog_global_filter_lvl_set(LOG_FILTER_LVL_ALL); + // ulog_global_filter_lvl_set(LOG_FILTER_LVL_SILENT); #endif ulog.init_ok = RT_TRUE; diff --git a/rt-thread/components/utilities/ulog/ulog.h b/rt-thread/components/utilities/ulog/ulog.h index 598e307..fe6cbda 100644 --- a/rt-thread/components/utilities/ulog/ulog.h +++ b/rt-thread/components/utilities/ulog/ulog.h @@ -18,6 +18,7 @@ extern "C" { #endif + /* * ulog init and deint */ diff --git a/rt-thread/rtconfig.h b/rt-thread/rtconfig.h index 55fb148..015d98e 100644 --- a/rt-thread/rtconfig.h +++ b/rt-thread/rtconfig.h @@ -13,6 +13,9 @@ /* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ +#define FINSH_USING_AUTH //开启终端密码登录功能 +#define ULOG_USING_FILTER //开启动态修改日志等级 默认修改在ulog.c 1522行 + #define ENABLE_LOG_ALL #define TEST_ENABLE //打开所有的终端测试程序 #define ULOG_OUTPUT_LVL 7 // 生产时将其设为0