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 'master' into dev

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2021-01-19 14:36:38 +01:00
commit 7740085a08
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lv_conf_internal.h
View File

@ -748,6 +748,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif
#endif /*LV_TICK_CUSTOM*/
/*================
* Log settings
*===============*/
@ -1987,6 +1988,8 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif
#endif
/*If running without lv_conf.h add typdesf with default value*/
#if defined(LV_CONF_SKIP)