diff --git a/.gitignore b/.gitignore index a248e379a..73f952034 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ # VIM Swap Files ###################### *.swp +*.swo # VIM Session Files ###################### diff --git a/lib/lv_bindings b/lib/lv_bindings index fd1b05d62..95c345946 160000 --- a/lib/lv_bindings +++ b/lib/lv_bindings @@ -1 +1 @@ -Subproject commit fd1b05d621405335075c80f0a5fd9d0fa4acd10e +Subproject commit 95c345946625fe4b679bbc4f8765423ef7ee0270 diff --git a/lib/lv_conf.h b/lib/lv_conf.h index c44968918..a244ac1a5 100644 --- a/lib/lv_conf.h +++ b/lib/lv_conf.h @@ -7,98 +7,164 @@ #ifndef LV_CONF_H #define LV_CONF_H -/*=================== +/*==================== Graphical settings - *===================*/ + *====================*/ -/* Horizontal and vertical resolution of the library.*/ +/* Maximal horizontal and vertical resolution to support by the library.*/ #define LV_HOR_RES_MAX (480) #define LV_VER_RES_MAX (320) -/*Color settings*/ -#define LV_COLOR_DEPTH 32 /*Color depth: 1/8/16/32*/ -#define LV_COLOR_16_SWAP 0 /*Swap the 2 bytes of RGB565 color. Useful if the display has a 8 bit interface (e.g. SPI)*/ -#define LV_COLOR_SCREEN_TRANSP 0 /*1: Enable screen transparency. Useful for OSD or other overlapping GUIs. Requires ARGB8888 colors*/ -#define LV_COLOR_TRANSP LV_COLOR_LIME /*Images pixels with this color will not be drawn (with chroma keying)*/ +/* Color depth: + * - 1: 1 byte per pixel + * - 8: RGB233 + * - 16: RGB565 + * - 32: ARGB8888 + */ +#define LV_COLOR_DEPTH 16 + +/* Swap the 2 bytes of RGB565 color. + * Useful if the display has a 8 bit interface (e.g. SPI)*/ +#define LV_COLOR_16_SWAP 0 + +/* 1: Enable screen transparency. + * Useful for OSD or other overlapping GUIs. + * Requires `LV_COLOR_DEPTH = 32` colors and the screen's style should be modified: `style.body.opa = ...`*/ +#define LV_COLOR_SCREEN_TRANSP 0 + +/*Images pixels with this color will not be drawn (with chroma keying)*/ +#define LV_COLOR_TRANSP LV_COLOR_LIME /*LV_COLOR_LIME: pure green*/ /* Enable anti-aliasing (lines, and radiuses will be smoothed) */ -#define LV_ANTIALIAS 1 /*1: Enable anti-aliasing*/ +#define LV_ANTIALIAS 1 +/* Default display refresh period. + * Can be changed in the display driver (`lv_disp_drv_t`).*/ +#define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/ -/*Screen refresh period in milliseconds. LittlevGL will redraw the screen with this period*/ -#define LV_REFR_PERIOD 30 /*[ms]*/ - -/* Dot Per Inch: used to initialize default sizes. E.g. a button with width = LV_DPI / 2 -> half inch wide +/* Dot Per Inch: used to initialize default sizes. + * E.g. a button with width = LV_DPI / 2 -> half inch wide * (Not so important, you can adjust it to modify default sizes and spaces)*/ #define LV_DPI 100 /*[px]*/ -/*=================== - Dynamic memory - *===================*/ +/*========================= + Memory manager settings + *=========================*/ -/* Memory size which will be used by the library - * to store the graphical objects and other data */ -#define LV_MEM_CUSTOM 1 /*1: use custom malloc/free, 0: use the built-in lv_mem_alloc/lv_mem_free*/ +/* LittelvGL's internal memory manager's settings. + * The graphical objects and other related data are stored here. */ + +/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */ +#define LV_MEM_CUSTOM 1 #if LV_MEM_CUSTOM == 0 -# define LV_MEM_SIZE (64U * 1024U) /*Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ -# define LV_MEM_ATTR /*Complier prefix for big array declaration*/ -# define LV_MEM_ADR 0 /*Set an address for memory pool instead of allocation it as an array. Can be in external SRAM too.*/ -# define LV_MEM_AUTO_DEFRAG 1 /*Automatically defrag on free*/ +/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ +# define LV_MEM_SIZE (64U * 1024U) + +/* Complier prefix for a big array declaration */ +# define LV_MEM_ATTR + +/* Set an address for the memory pool instead of allocating it as an array. + * Can be in external SRAM too. */ +# define LV_MEM_ADR 0 + +/* Automatically defrag. on free. Defrag. means joining the adjacent free cells. */ +# define LV_MEM_AUTO_DEFRAG 1 #else /*LV_MEM_CUSTOM*/ -# define LV_MEM_CUSTOM_INCLUDE "lv_mp_mem_custom_include.h" /*Header for the dynamic memory function*/ +# define LV_MEM_CUSTOM_INCLUDE "include/lv_mp_mem_custom_include.h" /*Header for the dynamic memory function*/ # define LV_MEM_CUSTOM_ALLOC m_malloc /*Wrapper to malloc*/ # define LV_MEM_CUSTOM_FREE m_free /*Wrapper to free*/ #endif /*LV_MEM_CUSTOM*/ /* Garbage Collector settings - * Used if lvgl is binded to higher language and the memory is managed by that language */ + * Used if lvgl is binded to higher level language and the memory is managed by that language */ #define LV_ENABLE_GC 1 /* Enable GC for Micropython */ #if LV_ENABLE_GC != 0 +# define LV_GC_INCLUDE "py/mpstate.h" # define LV_MEM_CUSTOM_REALLOC m_realloc /*Wrapper to realloc*/ # define LV_MEM_CUSTOM_GET_SIZE gc_nbytes /*Wrapper to lv_mem_get_size*/ -# define LV_GC_INCLUDE "py/mpstate.h" # define LV_GC_ROOT(x) MP_STATE_PORT(x) #endif /* LV_ENABLE_GC */ -/*================= - Misc. setting - *=================*/ +/*======================= + Input device settings + *=======================*/ -/*Input device settings*/ -#define LV_INDEV_READ_PERIOD 30 /*Input device read period in milliseconds*/ -#define LV_INDEV_POINT_MARKER 0 /*Mark the pressed points (required: LV_USE_REAL_DRAW = 1)*/ -#define LV_INDEV_DRAG_LIMIT 10 /*Drag threshold in pixels */ -#define LV_INDEV_DRAG_THROW 20 /*Drag throw slow-down in [%]. Greater value means faster slow-down */ -#define LV_INDEV_LONG_PRESS_TIME 400 /*Long press time in milliseconds*/ -#define LV_INDEV_LONG_PRESS_REP_TIME 100 /*Repeated trigger period in long press [ms] */ +/* Input device default settings. + * Can be changed in the Input device driver (`lv_indev_drv_t`)*/ -/*Text settings*/ -#define LV_TXT_UTF8 1 /*Enable UTF-8 coded Unicode character usage */ -#define LV_TXT_BREAK_CHARS " ,.;:-_" /*Can break texts on these chars*/ -#define LV_TXT_LINE_BREAK_LONG_LEN 12 /* If a character is at least this long, will break wherever "prettiest" */ -#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 /* Minimum number of characters of a word to put on a line before a break */ -#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 1 /* Minimum number of characters of a word to put on a line after a break */ +/* Input device read period in milliseconds */ +#define LV_INDEV_DEF_READ_PERIOD 30 -/*Feature usage*/ -#define LV_USE_ANIMATION 1 /*1: Enable all animations*/ -#define LV_USE_SHADOW 1 /*1: Enable shadows*/ -#define LV_USE_GROUP 1 /*1: Enable object groups (for keyboards)*/ +/* Drag threshold in pixels */ +#define LV_INDEV_DEF_DRAG_LIMIT 10 + +/* Drag throw slow-down in [%]. Greater value -> faster slow-down */ +#define LV_INDEV_DEF_DRAG_THROW 20 + +/* Long press time in milliseconds. + * Time to send `LV_EVENT_LONG_PRESSSED`) */ +#define LV_INDEV_DEF_LONG_PRESS_TIME 400 + +/* Repeated trigger period in long press [ms] + * Time between `LV_EVENT_LONG_PRESSED_REPEAT */ +#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100 + +/*================== + * Feature usage + *==================*/ + +/*1: Enable the Animations */ +#define LV_USE_ANIMATION 1 + +/* 1: Enable shadow drawing*/ +#define LV_USE_SHADOW 1 + +/* 1: Enable object groups (for keyboard/encoder navigation) */ +#define LV_USE_GROUP 1 #if LV_USE_GROUP typedef void * lv_group_user_data_t; #endif /*LV_USE_GROUP*/ -#define LV_USE_GPU 1 /*1: Enable GPU interface*/ -#define LV_USE_FILESYSTEM 1 /*1: Enable file system (might be required for images*/ -#define LV_USE_USER_DATA_SINGLE 0 /*1: Add a `user_data` to drivers and objects*/ -#define LV_USE_USER_DATA_MULTI 1 /*1: Add separate `user_data` for every callback*/ -/*Compiler settings*/ -#define LV_ATTRIBUTE_TICK_INC /* Define a custom attribute to `lv_tick_inc` function */ -#define LV_ATTRIBUTE_TASK_HANDLER /* Define a custom attribute to `lv_task_handler` function */ -#define LV_COMPILER_VLA_SUPPORTED 1 /* 1: Variable length array is supported*/ -#define LV_COMPILER_NON_CONST_INIT_SUPPORTED 1 /* 1: Initialization with non constant values are supported */ +/* 1: Enable GPU interface*/ +#define LV_USE_GPU 1 -/*HAL settings*/ -#define LV_TICK_CUSTOM 0 /*1: use a custom tick source (removing the need to manually update the tick with `lv_tick_inc`) */ +/* 1: Enable file system (might be required for images */ +#define LV_USE_FILESYSTEM 1 + +/* 1: Enable indexed (palette) images */ +#define LV_IMG_CF_INDEXED 1 + +/* 1: Enable alpha indexed images */ +#define LV_IMG_CF_ALPHA 1 + +/*1: Add a `user_data` to drivers and objects*/ +#define LV_USE_USER_DATA_SINGLE 0 + +/*1: Add separate `user_data` for every callback*/ +#define LV_USE_USER_DATA_MULTI 1 + +/*===================== + * Compiler settings + *====================*/ +/* Define a custom attribute to `lv_tick_inc` function */ +#define LV_ATTRIBUTE_TICK_INC + +/* Define a custom attribute to `lv_task_handler` function */ +#define LV_ATTRIBUTE_TASK_HANDLER + +/* 1: Variable length array is supported*/ +#define LV_COMPILER_VLA_SUPPORTED 1 + +/* 1: Initialization with non constant values are supported */ +#define LV_COMPILER_NON_CONST_INIT_SUPPORTED 1 + +/*=================== + * HAL settings + *==================*/ + +/* 1: use a custom tick source. + * It removes the need to manually update the tick with `lv_tick_inc`) */ +#define LV_TICK_CUSTOM 0 #if LV_TICK_CUSTOM == 1 #define LV_TICK_CUSTOM_INCLUDE "something.h" /*Header for the sys time function*/ #define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current systime in ms*/ @@ -107,8 +173,12 @@ typedef void * lv_group_user_data_t; typedef void * lv_disp_drv_user_data_t; /*Type of user data in the display driver*/ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the display driver*/ -/*Log settings*/ -#define LV_USE_LOG 1 /*Enable/disable the log module*/ +/*================ + * Log settings + *===============*/ + +/*1: Enable the log module*/ +#define LV_USE_LOG 1 #if LV_USE_LOG /* How important log should be added: * LV_LOG_LEVEL_TRACE A lot of logs to give detailed information @@ -118,16 +188,17 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in t */ # define LV_LOG_LEVEL LV_LOG_LEVEL_WARN -/* 1: Print the log with 'printf'; 0: user need to register a callback*/ +/* 1: Print the log with 'printf'; + * 0: user need to register a callback with `lv_log_register_print`*/ # define LV_LOG_PRINTF 0 #endif /*LV_USE_LOG*/ /*================ * THEME USAGE *================*/ -#define LV_THEME_LIVE_UPDATE 1 /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/ +#define LV_THEME_LIVE_UPDATE 0 /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/ -#define LV_USE_THEME_TEMPL 0 /*Just for test*/ +#define LV_USE_THEME_TEMPL 1 /*Just for test*/ #define LV_USE_THEME_DEFAULT 1 /*Built mainly from the built-in styles. Consumes very few RAM*/ #define LV_USE_THEME_ALIEN 1 /*Dark futuristic theme*/ #define LV_USE_THEME_NIGHT 1 /*Dark elegant theme*/ @@ -173,14 +244,33 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in t */ #define LV_FONT_CUSTOM_DECLARE - #define LV_FONT_DEFAULT &lv_font_dejavu_20 /*Always set a default font from the built-in fonts*/ +/*================= + * Text settings + *=================*/ + + /*Can break (wrap) texts on these chars*/ +#define LV_TXT_BREAK_CHARS " ,.;:-_" + +/* If a character is at least this long, will break wherever "prettiest" */ +#define LV_TXT_LINE_BREAK_LONG_LEN 12 + +/* Minimum number of characters of a word to put on a line before a break */ +#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 + +/* Minimum number of characters of a word to put on a line after a break */ +#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 1 + /*=================== * LV_OBJ SETTINGS *==================*/ -typedef void * lv_obj_user_data_t; /*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/ -#define LV_OBJ_REALIGN 0 /*Enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/ + +/*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/ +typedef void * lv_obj_user_data_t; + +/*1: enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ +#define LV_OBJ_REALIGN 1 /*================== * LV OBJ X USAGE @@ -189,94 +279,91 @@ typedef void * lv_obj_user_data_t; /*Declare the type of the user data * Documentation of the object types: https://docs.littlevgl.com/#Object-types */ -/***************** - * Simple object - *****************/ - -/*Label (dependencies: -*/ -#define LV_USE_LABEL 1 -#if LV_USE_LABEL != 0 -# define LV_LABEL_SCROLL_SPEED 25 /*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_SCROLL/ROLL' mode*/ -#endif - -/*Image (dependencies: lv_label*/ -#define LV_USE_IMG 1 -#if LV_USE_IMG != 0 -# define LV_IMG_CF_INDEXED 1 /*Enable indexed (palette) images*/ -# define LV_IMG_CF_ALPHA 1 /*Enable alpha indexed images*/ -#endif - -/*Line (dependencies: -*/ -#define LV_USE_LINE 1 - /*Arc (dependencies: -)*/ #define LV_USE_ARC 1 -/******************* - * Container objects - *******************/ - -/*Container (dependencies: -*/ -#define LV_USE_CONT 1 - -/*Page (dependencies: lv_cont)*/ -#define LV_USE_PAGE 1 - -/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/ -#define LV_USE_WIN 1 - -/*Tab (dependencies: lv_page, lv_btnm)*/ -#define LV_USE_TABVIEW 1 -# if LV_USE_TABVIEW != 0 -# define LV_TABVIEW_ANIM_TIME 300 /*Time of slide animation [ms] (0: no animation)*/ -#endif - -/*Tileview (dependencies: lv_page) */ -#define LV_USE_TILEVIEW 1 -#if LV_USE_TILEVIEW -# define LV_TILEVIEW_ANIM_TIME 300 /*Time of slide animation [ms] (0: no animation)*/ -#endif - -/************************* - * Data visualizer objects - *************************/ - /*Bar (dependencies: -)*/ #define LV_USE_BAR 1 -/*Line meter (dependencies: *;)*/ -#define LV_USE_LMETER 1 +/*Button (dependencies: lv_cont*/ +#define LV_USE_BTN 1 +#if LV_USE_BTN != 0 +/*Enable button-state animations - draw a circle on click (dependencies: LV_USE_ANIMATION)*/ +# define LV_BTN_INK_EFFECT 1 +#endif + +/*Button matrix (dependencies: -)*/ +#define LV_USE_BTNM 1 + +/*Calendar (dependencies: -)*/ +#define LV_USE_CALENDAR 1 + +/*Canvas (dependencies: lv_img)*/ +#define LV_USE_CANVAS 1 + +/*Check box (dependencies: lv_btn, lv_label)*/ +#define LV_USE_CB 1 + +/*Chart (dependencies: -)*/ +#define LV_USE_CHART 1 +#if LV_USE_CHART +# define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 20 +#endif + +/*Container (dependencies: -*/ +#define LV_USE_CONT 1 + +/*Drop down list (dependencies: lv_page, lv_label, lv_symbol_def.h)*/ +#define LV_USE_DDLIST 1 +#if LV_USE_DDLIST != 0 +/*Open and close default animation time [ms] (0: no animation)*/ +# define LV_DDLIST_DEF_ANIM_TIME 200 +#endif /*Gauge (dependencies:lv_bar, lv_lmeter)*/ #define LV_USE_GAUGE 1 -/*Chart (dependencies: -)*/ -#define LV_USE_CHART 1 +/*Image (dependencies: lv_label*/ +#define LV_USE_IMG 1 -/*Table (dependencies: lv_label)*/ -#define LV_USE_TABLE 1 -#if LV_USE_TABLE -# define LV_TABLE_COL_MAX 12 +/*Image Button (dependencies: lv_btn*/ +#define LV_USE_IMGBTN 1 +#if LV_USE_IMGBTN +/*1: The imgbtn requires left, mid and right parts and the width can be set freely*/ +# define LV_IMGBTN_TILED 0 +#endif + +/*Keyboard (dependencies: lv_btnm)*/ +#define LV_USE_KB 1 + +/*Label (dependencies: -*/ +#define LV_USE_LABEL 1 +#if LV_USE_LABEL != 0 +/*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_ROLL/ROLL_CIRC' mode*/ +# define LV_LABEL_DEF_SCROLL_SPEED 25 #endif /*LED (dependencies: -)*/ #define LV_USE_LED 1 +/*Line (dependencies: -*/ +#define LV_USE_LINE 1 + +/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/ +#define LV_USE_LIST 1 +#if LV_USE_LIST != 0 +/*Default animation time of focusing to a list element [ms] (0: no animation) */ +# define LV_LIST_DEF_ANIM_TIME 100 +#endif + +/*Line meter (dependencies: *;)*/ +#define LV_USE_LMETER 1 + /*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/ #define LV_USE_MBOX 1 -/*Text area (dependencies: lv_label, lv_page)*/ -#define LV_USE_TA 1 -#if LV_USE_TA != 0 -# define LV_TA_CURSOR_BLINK_TIME 400 /*ms*/ -# define LV_TA_PWD_SHOW_TIME 1500 /*ms*/ -#endif - -/*Spinbox (dependencies: lv_ta)*/ -#define LV_USE_SPINBOX 1 - -/*Calendar (dependencies: -)*/ -#define LV_USE_CALENDAR 1 +/*Page (dependencies: lv_cont)*/ +#define LV_USE_PAGE 1 /*Preload (dependencies: lv_arc)*/ #define LV_USE_PRELOAD 1 @@ -286,60 +373,59 @@ typedef void * lv_obj_user_data_t; /*Declare the type of the user data # define LV_PRELOAD_DEF_ANIM LV_PRELOAD_TYPE_SPINNING_ARC #endif -/*Canvas (dependencies: lv_img)*/ -#define LV_USE_CANVAS 1 -/************************* - * User input objects - *************************/ - -/*Button (dependencies: lv_cont*/ -#define LV_USE_BTN 1 -#if LV_USE_BTN != 0 -# define LV_BTN_INK_EFFECT 1 /*Enable button-state animations - draw a circle on click (dependencies: LV_USE_ANIMATION)*/ -#endif - -/*Image Button (dependencies: lv_btn*/ -#define LV_USE_IMGBTN 1 -#if LV_USE_IMGBTN -# define LV_IMGBTN_TILED 0 /*1: The imgbtn requires left, mid and right parts and the width can be set freely*/ -#endif - -/*Button matrix (dependencies: -)*/ -#define LV_USE_BTNM 1 - -/*Keyboard (dependencies: lv_btnm)*/ -#define LV_USE_KB 1 - -/*Check box (dependencies: lv_btn, lv_label)*/ -#define LV_USE_CB 1 - -/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/ -#define LV_USE_LIST 1 -#if LV_USE_LIST != 0 -# define LV_LIST_FOCUS_TIME 100 /*Default animation time of focusing to a list element [ms] (0: no animation) */ -#endif - -/*Drop down list (dependencies: lv_page, lv_label, lv_symbol_def.h)*/ -#define LV_USE_DDLIST 1 -#if LV_USE_DDLIST != 0 -# define LV_DDLIST_ANIM_TIME 200 /*Open and close default animation time [ms] (0: no animation)*/ -#endif - /*Roller (dependencies: lv_ddlist)*/ #define LV_USE_ROLLER 1 #if LV_USE_ROLLER != 0 -# define LV_ROLLER_ANIM_TIME 200 /*Focus animation time [ms] (0: no animation)*/ +/*Focus animation time [ms] (0: no animation)*/ +# define LV_ROLLER_DEF_ANIM_TIME 200 + +/*Number of extra "pages" when the roller is infinite*/ +# define LV_ROLLER_INF_PAGES 7 #endif /*Slider (dependencies: lv_bar)*/ #define LV_USE_SLIDER 1 +/*Spinbox (dependencies: lv_ta)*/ +#define LV_USE_SPINBOX 1 + /*Switch (dependencies: lv_slider)*/ #define LV_USE_SW 1 -/************************* +/*Text area (dependencies: lv_label, lv_page)*/ +#define LV_USE_TA 1 +#if LV_USE_TA != 0 +# define LV_TA_CURSOR_BLINK_TIME 400 /*ms*/ +# define LV_TA_PWD_SHOW_TIME 1500 /*ms*/ +#endif + +/*Table (dependencies: lv_label)*/ +#define LV_USE_TABLE 1 +#if LV_USE_TABLE +# define LV_TABLE_COL_MAX 12 +#endif + +/*Tab (dependencies: lv_page, lv_btnm)*/ +#define LV_USE_TABVIEW 1 +# if LV_USE_TABVIEW != 0 +/*Time of slide animation [ms] (0: no animation)*/ +# define LV_TABVIEW_DEF_ANIM_TIME 300 +#endif + +/*Tileview (dependencies: lv_page) */ +#define LV_USE_TILEVIEW 1 +#if LV_USE_TILEVIEW +/*Time of slide animation [ms] (0: no animation)*/ +# define LV_TILEVIEW_DEF_ANIM_TIME 300 +#endif + +/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/ +#define LV_USE_WIN 1 + +/*================== * Non-user section - *************************/ + *==================*/ + #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /* Disable warnings for Visual Studio*/ # define _CRT_SECURE_NO_WARNINGS #endif @@ -347,7 +433,7 @@ typedef void * lv_obj_user_data_t; /*Declare the type of the user data /*--END OF LV_CONF_H--*/ /*Be sure every define has a default value*/ -#include "lv_conf_checker.h" +#include "lvgl/src/lv_conf_checker.h" #endif /*LV_CONF_H*/ diff --git a/py/py.mk b/py/py.mk index 5fc707d5f..1bd429783 100644 --- a/py/py.mk +++ b/py/py.mk @@ -123,7 +123,7 @@ endif LVGL_BINDING_DIR = $(TOP)/lib/lv_bindings LVGL_DIR = $(LVGL_BINDING_DIR)/lvgl LVGL_GENERIC_DRV_DIR = $(LVGL_BINDING_DIR)/driver/generic -INC += -I$(LVGL_DIR)/src -I$(LVGL_BINDING_DIR)/include +INC += -I$(LVGL_BINDING_DIR) ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f) $(TOP)/lib/lv_conf.h LVGL_PP = $(BUILD)/lvgl/lvgl.pp.c LVGL_MPY = $(BUILD)/lvgl/lv_mpy.c