diff --git a/.gitmodules b/.gitmodules index 8ca3f5e92..b7f685c86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,6 +18,6 @@ [submodule "lib/nrfx"] path = lib/nrfx url = https://github.com/NordicSemiconductor/nrfx.git -[submodule "lib/lvgl"] - path = lib/lvgl - url = https://github.com/amirgon/lvgl.git +[submodule "lib/lv_bindings"] + path = lib/lv_bindings + url = https://github.com/amirgon/lv_bindings.git diff --git a/lib/lv_bindings b/lib/lv_bindings new file mode 160000 index 000000000..57a64a07d --- /dev/null +++ b/lib/lv_bindings @@ -0,0 +1 @@ +Subproject commit 57a64a07db60b5cf2caadbec30592307d4c454c0 diff --git a/lib/lvgl b/lib/lvgl deleted file mode 160000 index 2244ca56a..000000000 --- a/lib/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2244ca56a1e0013f05a35a20de2923fa5dc06277 diff --git a/ports/unix/lv_drv_conf.h b/ports/unix/lv_drv_conf.h index f6e905389..e7fb71ec1 100644 --- a/ports/unix/lv_drv_conf.h +++ b/ports/unix/lv_drv_conf.h @@ -11,7 +11,7 @@ #if 1 /*Set it to "1" to enable the content*/ -#include "../../lib/lvgl/lvgl.h" +#include "../../lib/lv_bindings/lvgl/lvgl.h" /********************* * DELAY INTERFACE diff --git a/ports/unix/lv_mpy_hal.c b/ports/unix/lv_mpy_hal.c index b616e0388..9fd458e7b 100644 --- a/ports/unix/lv_mpy_hal.c +++ b/ports/unix/lv_mpy_hal.c @@ -1,5 +1,5 @@ #include -#include "../../lib/lvgl/lvgl.h" +#include "../../lib/lv_bindings/lvgl/lvgl.h" #include "monitor.h" #include "mouse.h" #include "py/runtime.h" diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h index c122ceba5..87289e3fe 100644 --- a/ports/unix/mpconfigport.h +++ b/ports/unix/mpconfigport.h @@ -296,7 +296,7 @@ void mp_unix_mark_exec(void); { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) }, #define MP_STATE_PORT MP_STATE_VM -#include "lib/lvgl/lv_misc/lv_gc.h" +#include "lib/lv_bindings/lvgl/lv_misc/lv_gc.h" #define MICROPY_PORT_ROOT_POINTERS \ LV_ROOTS \ const char *readline_hist[50]; \ diff --git a/py/py.mk b/py/py.mk index 51bdf4970..027cd9bf5 100644 --- a/py/py.mk +++ b/py/py.mk @@ -120,14 +120,15 @@ $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS) endif #LittlevGL -LVGL_DIR = lib/lvgl +LVGL_BINDING_DIR = lib/lv_bindings +LVGL_DIR = $(LVGL_BINDING_DIR)/lvgl INC += -I$(TOP)/$(LVGL_DIR) ALL_LVGL_SRC = $(shell find $(TOP)/$(LVGL_DIR) -type f) QSTR_GLOBAL_DEPENDENCIES += $(BUILD)/micropython/lv_mpy.c $(BUILD)/micropython/lv_mpy.c: $(ALL_LVGL_SRC) $(ECHO) "LVGL-GEN $@" $(Q)mkdir -p $(BUILD)/micropython - $(Q)$(PYTHON) $(TOP)/$(LVGL_DIR)/micropython/gen_mpy.py -X anim -X group -X task $(INC) -I $(TOP)/$(LVGL_DIR)/micropython/pycparser/utils/fake_libc_include $(TOP)/$(LVGL_DIR)/lvgl.h > $@ + $(Q)$(PYTHON) $(TOP)/$(LVGL_BINDING_DIR)/micropython/gen_mpy.py -X anim -X group -X task $(INC) -I $(TOP)/$(LVGL_BINDING_DIR)/micropython/pycparser/utils/fake_libc_include $(TOP)/$(LVGL_DIR)/lvgl.h > $@ CFLAGS_MOD += -Wno-unused-function @@ -184,7 +185,7 @@ SRC_MOD += $(BUILD)/micropython/lv_mpy.c \ lv_misc/lv_templ.c \ lv_misc/lv_txt.c \ lv_misc/lv_ufs.c \ - lv_misc/lv_gc.c \ + lv_misc/lv_gc.c \ lv_objx/lv_arc.c \ lv_objx/lv_bar.c \ lv_objx/lv_btn.c \