Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev-6.1' into feat-cpicker

Browse Source
This commit is contained in:
Themba Dube 2019-10-12 21:04:21 -04:00
commit de55986fc0
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lv_conf_template.h
View File

@ -199,8 +199,10 @@ typedef void * lv_img_decoder_user_data_t;
/* Export integer constant to binding. /* Export integer constant to binding.
* This macro is used with constants in the form of LV_<CONST> that * This macro is used with constants in the form of LV_<CONST> that
* should also appear on lvgl binding API such as Micropython * should also appear on lvgl binding API such as Micropython
*
* The default value just prevents a GCC warning.
*/ */
#define LV_EXPORT_CONST_INT(int_value) #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning
/*=================== /*===================
* HAL settings * HAL settings

15
src/lv_misc/lv_log.h
View File

@ -26,14 +26,13 @@ extern "C" {
/*Possible log level. For compatibility declare it independently from `LV_USE_LOG`*/ /*Possible log level. For compatibility declare it independently from `LV_USE_LOG`*/
enum { #define LV_LOG_LEVEL_TRACE 0 /**< A lot of logs to give detailed information*/
LV_LOG_LEVEL_TRACE = 0, /**< A lot of logs to give detailed information*/ #define LV_LOG_LEVEL_INFO 1 /**< Log important events*/
LV_LOG_LEVEL_INFO = 1, /**< Log important events*/ #define LV_LOG_LEVEL_WARN 2 /**< Log if something unwanted happened but didn't caused problem*/
LV_LOG_LEVEL_WARN = 2, /**< Log if something unwanted happened but didn't caused problem*/ #define LV_LOG_LEVEL_ERROR 3 /**< Only critical issue, when the system may fail*/
LV_LOG_LEVEL_ERROR = 3, /**< Only critical issue, when the system may fail*/ #define LV_LOG_LEVEL_NONE 4 /**< Do not log anything*/
LV_LOG_LEVEL_NONE = 4, /**< Do not log anything*/ #define _LV_LOG_LEVEL_NUM 5 /**< Number of log levels */
_LV_LOG_LEVEL_NUM = 5 /**< Number of log levels */
};
typedef int8_t lv_log_level_t; typedef int8_t lv_log_level_t;
#if LV_USE_LOG #if LV_USE_LOG