github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 18ae2fe7fb into dev

Browse Source
This commit is contained in:
github-actions[bot]
2020-10-26 11:40:55 +00:00
committed by GitHub
parent 54a8a4ba33 18ae2fe7fb
commit ae0d498cf6
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lv_conf_checker.py
View File

@@ -32,6 +32,14 @@ fout.write(
#include <stdint.h>
#if defined __has_include
# if __has_include("lv_conf.h")
# ifndef LV_CONF_INCLUDE_SIMPLE
# define LV_CONF_INCLUDE_SIMPLE
# endif
# endif
#endif
/*If lv_conf.h is not skipped include it*/
#if !defined(LV_CONF_SKIP) && !defined(CONFIG_LV_CONF_SKIP)
# if defined(LV_CONF_PATH) /*If there is a path defined for lv_conf.h use it*/

15
src/lv_conf_internal.h
View File

@@ -8,8 +8,19 @@
#define LV_CONF_INTERNAL_H
/* clang-format off */
/*Handle special Kconfig options*/
#include "lv_conf_kconfig.h"
#include <stdint.h>
#if defined __has_include
# if __has_include("lv_conf.h")
# ifndef LV_CONF_INCLUDE_SIMPLE
# define LV_CONF_INCLUDE_SIMPLE
# endif
# endif
#endif
/*If lv_conf.h is not skipped include it*/
#if !defined(LV_CONF_SKIP) && !defined(CONFIG_LV_CONF_SKIP)
# if defined(LV_CONF_PATH) /*If there is a path defined for lv_conf.h use it*/
@@ -25,12 +36,8 @@
# endif
#endif
/* clang-format off */
/*Handle special Kconfig options*/
#include "lv_conf_kconfig.h"
#include <stdint.h>
/*====================