Merge branch 'arch/drivers'

lvgl · Mar 10, 2023 · cd1a217 · cd1a217
2 parents f7dc04f + 23b04c3
commit cd1a217
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -120,34 +120,22 @@ import lvgl as lv
 lv.init()
 ```
 
-Then display driver and input driver needs to be registered.
+Then event loop, display driver and input driver needs to be registered.
 Refer to [Porting the library](https://docs.lvgl.io/8.0/porting/index.html) for more information.
 Here is an example of registering SDL drivers on Micropython unix port:
 
 ```python
-import SDL
-SDL.init()
-
-# Register SDL display driver.
-
-draw_buf = lv.disp_draw_buf_t()
-buf1_1 = bytearray(480*10)
-draw_buf.init(buf1_1, None, len(buf1_1)//4)
-disp_drv = lv.disp_drv_t()
-disp_drv.init()
-disp_drv.draw_buf = draw_buf
-disp_drv.flush_cb = SDL.monitor_flush
-disp_drv.hor_res = 480
-disp_drv.ver_res = 320
-disp_drv.register()
-
-# Regsiter SDL mouse driver
-
-indev_drv = lv.indev_drv_t()
-indev_drv.init()
-indev_drv.type = lv.INDEV_TYPE.POINTER
-indev_drv.read_cb = SDL.mouse_read
-indev_drv.register()
+# Create an event loop and Register SDL display/mouse/keyboard drivers.
+from lv_utils import event_loop
+
+WIDTH = 480
+HEIGHT = 320
+
+event_loop = event_loop()
+disp_drv = lv.sdl_window_create(WIDTH, HEIGHT)
+mouse = lv.sdl_mouse_create()
+keyboard = lv.sdl_keyboard_create()
+keyboard.set_group(self.group)
 ```
 
 Here is an alternative example, for registering ILI9341 drivers on Micropython ESP32 port:

diff --git a/lib/lv_bindings b/lib/lv_bindings
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
@@ -99,7 +99,7 @@ else
 # Use gcc syntax for map file
 LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
 endif
-LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA) -lSDL2
+LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 
 # Flags to link with pthread library
 LIBPTHREAD = -lpthread
@@ -219,6 +219,17 @@ endif
 
 # Additional optional libraries
 
+ifneq ($(UNAME_S),Darwin)
+CFLAGS_MOD += -DMICROPY_FB=1
+endif
+
+SDL_CFLAGS_MOD :=  $(shell pkg-config --silence-errors --cflags sdl2)
+SDL_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs   sdl2)
+ifneq ($(SDL_LDFLAGS_MOD),)
+CFLAGS_MOD += $(SDL_CFLAGS_MOD) -DMICROPY_SDL=1
+LDFLAGS_MOD += $(SDL_LDFLAGS_MOD)
+endif
+
 RLOTTIE_CFLAGS_MOD :=  $(shell pkg-config --silence-errors --cflags rlottie)
 RLOTTIE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs   rlottie)
 ifneq ($(RLOTTIE_LDFLAGS_MOD),)
@@ -262,9 +273,6 @@ SRC_C += \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
 LIB_SRC_C += $(addprefix lib/,\
-    lv_bindings/driver/SDL/sdl_common.c \
-    lv_bindings/driver/SDL/sdl.c \
-	lv_bindings/driver/SDL/modSDL.c \
 	$(LIB_SRC_C_EXTRA) \
 	)
 
@@ -274,12 +282,6 @@ SHARED_SRC_C += $(addprefix shared/,\
 	$(SHARED_SRC_C_EXTRA) \
 	)
 
-ifneq ($(UNAME_S),Darwin)
-LIB_SRC_C += $(addprefix lib/,\
-	lv_bindings/driver/linux/modfb.c \
-	)
-endif
-
 SRC_CXX += \
 	$(SRC_MOD_CXX)
+1 −1		.github/workflows/unix_port.yml
+32 −53		README.md
+0 −173		driver/SDL/modSDL.c
+0 −373		driver/SDL/sdl.c
+0 −84		driver/SDL/sdl.h
+0 −268		driver/SDL/sdl_common.c
+0 −106		driver/SDL/sdl_common.h
+12 −10		driver/esp32/espidf.c
+14 −23		driver/esp32/ili9XXX.py
+0 −353		driver/esp32/modILI9341.c
+2 −3		driver/esp32/modrtch.c
+2 −4		driver/esp32/modxpt2046.c
+3 −5		driver/esp32/xpt2046.py
+6 −8		driver/generic/ft6x36.py
+0 −33		driver/generic/indev_example.py
+4 −11		driver/generic/st77xx.py
+3 −6		driver/generic/xpt2046.py
+4 −6		driver/linux/evdev.py
+0 −304		driver/linux/modfb.c
+3 −5		driver/stm32/STM32F7DISC/modrk043fn48h.c
+5 −5		driver/zephyr/lvgl.c
+0 −1		examples/Dynamic_loading_font_example.py
+25 −76		examples/advanced_demo.py
+3 −3		examples/custom_widget_example.py
+19 −63		examples/example1.py
+13 −21		examples/example3.py
+10 −24		examples/fb_test.py
+1 −1		examples/generic-st77xx-with-xpt2046.py
+3 −2		examples/png_example.py
+15 −37		examples/uasyncio_example1.py
+89 −32		gen/gen_mpy.py
+221 −221		gen/lv_mpy_example.c
+8 −39		lib/display_driver_utils.py
+11 −9		lib/lv_utils.py
+1 −1		lib/tpcal.py
+48 −2		lv_conf.h
+1 −1		lvgl
+1 −1		tests/run_test.py