fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Replaced lvgl with lv_bindings submodule. lv_bindings contains the Micropython bindings and lvgl submodule (Micropython bindings was split from lvgl).

Browse Source
This commit is contained in:
Amir Gonnen 2019-01-24 00:59:39 +02:00
parent f34804d385
commit c34548a89d
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -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

1
lib/lv_bindings Submodule

@ -0,0 +1 @@
Subproject commit 57a64a07db60b5cf2caadbec30592307d4c454c0

1
lib/lvgl

@ -1 +0,0 @@
Subproject commit 2244ca56a1e0013f05a35a20de2923fa5dc06277

2
ports/unix/lv_drv_conf.h
View File

@ -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

2
ports/unix/lv_mpy_hal.c
View File

@ -1,5 +1,5 @@
#include <SDL2/SDL.h>
#include "../../lib/lvgl/lvgl.h"
#include "../../lib/lv_bindings/lvgl/lvgl.h"
#include "monitor.h"
#include "mouse.h"
#include "py/runtime.h"

2
ports/unix/mpconfigport.h
View File

@ -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]; \

7
py/py.mk
View File

@ -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 \