From 2845512a5295f72fd525d70f7c98fa66f30a0c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=B3=E6=98=A5=E5=B9=B8?= Date: Tue, 21 Dec 2021 14:07:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=BC=B4=E7=94=9F=E5=AF=B9=E8=B1=A1=E6=97=B6logSetLevel?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/log/log.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/extensions/log/log.c b/extensions/log/log.c index 9ee7364..d702058 100644 --- a/extensions/log/log.c +++ b/extensions/log/log.c @@ -81,8 +81,15 @@ void logSetLevel(Log *log, LogLevel level) logAssert(log, return); log->level = level; } +#if SHELL_USING_COMPANION == 1 +SHELL_EXPORT_CMD_AGENCY( +SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_DISABLE_RETURN, +logSetLevel, logSetLevel, set log level\r\n logSetLevel [level], +(void *)shellCompanionGet(shellGetCurrent(), SHELL_COMPANION_ID_LOG), p1); +#else SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC), -logSetLevel, logSetLevel, set log level); +logSetLevel, logSetLevel, set log level\r\n logSetLevel [log] [level]); +#endif /** SHELL_USING_COMPANION == 1 */ /** From 5d3607af9175dbcfaa6df9c9caabe8281455a790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=B3=E6=98=A5=E5=B9=B8?= Date: Tue, 21 Dec 2021 15:13:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shell.c b/src/shell.c index a766751..07411fa 100644 --- a/src/shell.c +++ b/src/shell.c @@ -119,7 +119,7 @@ static const char *shellText[] = [SHELL_TEXT_HELP_HEADER] = "command help of ", [SHELL_TEXT_PASSWORD_HINT] = - "\r\nPlease input password:", + "Please input password:", [SHELL_TEXT_PASSWORD_ERROR] = "\r\npassword error\r\n", [SHELL_TEXT_CLEAR_CONSOLE] =