Merge pull request #1955 from armink/fix_ulog

Fix ulog
This commit is contained in:
Bernard Xiong
2018-11-10 06:51:36 +08:00
committed by GitHub
4 changed files with 138 additions and 34 deletions
+1 -1
View File
@@ -225,7 +225,7 @@ config RT_USING_ULOG
config ULOG_SW_VERSION_NUM
hex
default 0x00100
default 0x00101
help
sfotware module version number
endif
File diff suppressed because it is too large Load Diff
+6 -2
View File
@@ -18,7 +18,7 @@
extern "C" {
#endif
#define ULOG_VERSION_STR "0.1.0"
#define ULOG_VERSION_STR "0.1.1"
/*
* ulog init and deint
@@ -58,9 +58,13 @@ rt_err_t ulog_backend_unregister(ulog_backend_t backend);
*/
int ulog_tag_lvl_filter_set(const char *tag, rt_uint32_t level);
rt_uint32_t ulog_tag_lvl_filter_get(const char *tag);
rt_slist_t *ulog_tag_lvl_list_get(void);
void ulog_global_filter_lvl_set(rt_uint32_t level);
rt_uint32_t ulog_global_filter_lvl_get(void);
void ulog_global_filter_tag_set(const char *tag);
const char *ulog_global_filter_tag_get(void);
void ulog_global_filter_kw_set(const char *keyword);
const char *ulog_global_filter_kw_get(void);
#endif /* ULOG_USING_FILTER */
/*
@@ -79,7 +83,7 @@ void ulog_async_waiting_log(rt_int32_t time);
/*
* dump the hex format data to log
*/
void ulog_hexdump(const char *name, rt_size_t width, rt_uint8_t *buf, rt_size_t size);
void ulog_hexdump(const char *tag, rt_size_t width, rt_uint8_t *buf, rt_size_t size);
/*
* Another log output API. This API is more difficult to use than LOG_X API.
+9
View File
@@ -165,6 +165,15 @@ extern "C" {
#define ULOG_FRAME_MAGIC 0x10
/* tag's level filter */
struct ulog_tag_lvl_filter
{
char tag[ULOG_FILTER_TAG_MAX_LEN + 1];
rt_uint32_t level;
rt_slist_t list;
};
typedef struct ulog_tag_lvl_filter *ulog_tag_lvl_filter_t;
struct ulog_frame
{
/* magic word is 0x10 ('lo') */