Skip to content

Commit ddd7343

Browse files
authored
Merge pull request #1951 from armink/fix_kconfig
[component] fix Kconfig warning in at and ulog.
2 parents 1b351ff + 4e6f13e commit ddd7343

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

components/net/at/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if RT_USING_AT
7878
endif
7979

8080
config AT_SW_VERSION_NUM
81-
int
81+
hex
8282
default 0x10200
8383
help
8484
sfotware module version number

components/utilities/Kconfig

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ config RT_USING_ULOG
5454
if !ULOG_USING_SYSLOG
5555
choice
5656
prompt "The static output log level."
57-
default ULOG_OUTPUT_LVL_DEBUG
57+
default ULOG_OUTPUT_LVL_D
5858
help
5959
When the log level is less than this option and it will stop output.
6060
These log will not compile into ROM when using LOG_X api.
6161
NOTE: It's not available on syslog mode.
62-
config ULOG_OUTPUT_LVL_ASSERT
62+
config ULOG_OUTPUT_LVL_A
6363
bool "Assert"
64-
config ULOG_OUTPUT_LVL_ERROR
64+
config ULOG_OUTPUT_LVL_E
6565
bool "Error"
66-
config ULOG_OUTPUT_LVL_WARNING
66+
config ULOG_OUTPUT_LVL_W
6767
bool "Warning"
68-
config ULOG_OUTPUT_LVL_INFO
68+
config ULOG_OUTPUT_LVL_I
6969
bool "Information"
70-
config ULOG_OUTPUT_LVL_DEBUG
70+
config ULOG_OUTPUT_LVL_D
7171
bool "Debug"
7272
endchoice
7373
endif
@@ -101,14 +101,18 @@ config RT_USING_ULOG
101101

102102
config ULOG_OUTPUT_LVL
103103
int
104-
default 0 if ULOG_OUTPUT_LVL_ASSERT
104+
default 0 if ULOG_OUTPUT_LVL_A
105105
default 0 if ULOG_OUTPUT_LVL_EMERG
106106
default 1 if ULOG_OUTPUT_LVL_ALERT
107107
default 2 if ULOG_OUTPUT_LVL_CRIT
108+
default 3 if ULOG_OUTPUT_LVL_E
108109
default 3 if ULOG_OUTPUT_LVL_ERROR
110+
default 4 if ULOG_OUTPUT_LVL_W
109111
default 4 if ULOG_OUTPUT_LVL_WARNING
110112
default 5 if ULOG_OUTPUT_LVL_NOTICE
113+
default 6 if ULOG_OUTPUT_LVL_I
111114
default 6 if ULOG_OUTPUT_LVL_INFO
115+
default 7 if ULOG_OUTPUT_LVL_D
112116
default 7 if ULOG_OUTPUT_LVL_DEBUG
113117
default 7
114118

@@ -220,7 +224,7 @@ config RT_USING_ULOG
220224
default n
221225

222226
config ULOG_SW_VERSION_NUM
223-
int
227+
hex
224228
default 0x00100
225229
help
226230
sfotware module version number

0 commit comments

Comments
 (0)