4 years ago · 41c4ff641f
--- a/bsp/win32/CMakeLists.txt
+++ b/bsp/win32/CMakeLists.txt
@@ -31,7 +31,7 @@ ELSE ()
 
				 ENDIF ()
			
 
				 
			
 
				 include_directories(${TOPROOT}/luat/packages/lfs)
			
 
				-include_directories(${TOPROOT}/luat/packages/lcd)
			
 
				+include_directories(${TOPROOT}/components/lcd)
			
 
				 
			
 
				 aux_source_directory(./port PORT_SRCS)
			
 
				 aux_source_directory(${TOPROOT}/lua/src LUA_SRCS)
			
@@ -40,7 +40,7 @@ aux_source_directory(${TOPROOT}/components/freertos RTOS_SRCS)
 
				 aux_source_directory(${TOPROOT}/components/freertos/port RTOS_PORT_SRCS)
			
 
				 aux_source_directory(${TOPROOT}/luat/packages/lua-cjson CJSON_SRCS)
			
 
				 
			
 
				-aux_source_directory(${TOPROOT}/luat/packages/lcd LCD_SRCS)
			
 
				+aux_source_directory(${TOPROOT}/components/lcd LCD_SRCS)
			
 
				 
			
 
				 add_library(freertos10 ${PORT_SRCS} ${RTOS_SRCS} ${RTOS_PORT_SRCS} ${MM_SRCS} ${MM2_SRCS})
			
 
				 add_library(lua ${LUA_SRCS})
			
@@ -108,8 +108,8 @@ add_subdirectory(${TOPROOT}/components/mbedtls mbedtls.out)
 
				 
			
 
				 #-----------------------
			
 
				 # lvgl
			
 
				-include_directories(${TOPROOT}/luat/packages/lvgl)
			
 
				-add_subdirectory(${TOPROOT}/luat/packages/lvgl lvgl.out)
			
 
				+include_directories(${TOPROOT}/components/lvgl)
			
 
				+add_subdirectory(${TOPROOT}/components/lvgl lvgl.out)
			
 
				 #-----------------------
			
 
				 
			
 
				 IF (WIN32)
			
--- a/luat/packages/lcd/luat_lcd.c
+++ b/luat/packages/lcd/luat_lcd.c
--- a/luat/packages/lcd/luat_lcd.h
+++ b/luat/packages/lcd/luat_lcd.h
--- a/luat/packages/lcd/luat_lcd_gc9106l.c
+++ b/luat/packages/lcd/luat_lcd_gc9106l.c
--- a/luat/packages/lcd/luat_lcd_gc9306.c
+++ b/luat/packages/lcd/luat_lcd_gc9306.c
--- a/luat/packages/lcd/luat_lcd_gc9a01.c
+++ b/luat/packages/lcd/luat_lcd_gc9a01.c
--- a/luat/packages/lcd/luat_lcd_ili9341.c
+++ b/luat/packages/lcd/luat_lcd_ili9341.c
--- a/luat/packages/lcd/luat_lcd_st7735.c
+++ b/luat/packages/lcd/luat_lcd_st7735.c
--- a/luat/packages/lcd/luat_lcd_st7789.c
+++ b/luat/packages/lcd/luat_lcd_st7789.c
--- a/luat/packages/lcd/luat_lib_lcd.c
+++ b/luat/packages/lcd/luat_lib_lcd.c
--- a/luat/packages/lvgl/CMakeLists.txt
+++ b/luat/packages/lvgl/CMakeLists.txt
--- a/luat/packages/lvgl/README.md
+++ b/luat/packages/lvgl/README.md
--- a/luat/packages/lvgl/binding/luat_lib_lvgl.c
+++ b/luat/packages/lvgl/binding/luat_lib_lvgl.c
--- a/luat/packages/lvgl/binding/luat_lib_lvgl7.c
+++ b/luat/packages/lvgl/binding/luat_lib_lvgl7.c
--- a/luat/packages/lvgl/binding/luat_lib_lvgl_cb.c
+++ b/luat/packages/lvgl/binding/luat_lib_lvgl_cb.c
--- a/luat/packages/lvgl/binding/luat_lib_lvgl_gif.c
+++ b/luat/packages/lvgl/binding/luat_lib_lvgl_gif.c
--- a/luat/packages/lvgl/binding/luat_lib_lvgl_qrcode.c
+++ b/luat/packages/lvgl/binding/luat_lib_lvgl_qrcode.c
--- a/luat/packages/lvgl/binding/luat_lib_lvgl_style.c
+++ b/luat/packages/lvgl/binding/luat_lib_lvgl_style.c
--- a/luat/packages/lvgl/binding/luat_lv_fs.c
+++ b/luat/packages/lvgl/binding/luat_lv_fs.c
--- a/luat/packages/lvgl/binding/luat_lvgl.h
+++ b/luat/packages/lvgl/binding/luat_lvgl.h
--- a/luat/packages/lvgl/binding/luat_lvgl_cb.h
+++ b/luat/packages/lvgl/binding/luat_lvgl_cb.h
--- a/luat/packages/lvgl/binding/luat_lvgl_gif.h
+++ b/luat/packages/lvgl/binding/luat_lvgl_gif.h
--- a/luat/packages/lvgl/binding/luat_lvgl_qrcode.h
+++ b/luat/packages/lvgl/binding/luat_lvgl_qrcode.h
--- a/luat/packages/lvgl/binding/luat_lvgl_style.h
+++ b/luat/packages/lvgl/binding/luat_lvgl_style.h
--- a/luat/packages/lvgl/binding/luat_lvgl_userdata.h
+++ b/luat/packages/lvgl/binding/luat_lvgl_userdata.h
--- a/luat/packages/lvgl/gen/luat_lv_enum.h
+++ b/luat/packages/lvgl/gen/luat_lv_enum.h
--- a/luat/packages/lvgl/gen/luat_lv_gen.h
+++ b/luat/packages/lvgl/gen/luat_lv_gen.h
--- a/luat/packages/lvgl/gen/lv_core/luat_lv_disp.c
+++ b/luat/packages/lvgl/gen/lv_core/luat_lv_disp.c
--- a/luat/packages/lvgl/gen/lv_core/luat_lv_group.c
+++ b/luat/packages/lvgl/gen/lv_core/luat_lv_group.c
--- a/luat/packages/lvgl/gen/lv_core/luat_lv_obj.c
+++ b/luat/packages/lvgl/gen/lv_core/luat_lv_obj.c
--- a/luat/packages/lvgl/gen/lv_core/luat_lv_refr.c
+++ b/luat/packages/lvgl/gen/lv_core/luat_lv_refr.c
--- a/luat/packages/lvgl/gen/lv_core/luat_lv_style.c
+++ b/luat/packages/lvgl/gen/lv_core/luat_lv_style.c
--- a/luat/packages/lvgl/gen/lv_draw/luat_lv_draw.c
+++ b/luat/packages/lvgl/gen/lv_draw/luat_lv_draw.c
--- a/luat/packages/lvgl/gen/lv_font/luat_lv_font.c
+++ b/luat/packages/lvgl/gen/lv_font/luat_lv_font.c
--- a/luat/packages/lvgl/gen/lv_misc/luat_lv_anim.c
+++ b/luat/packages/lvgl/gen/lv_misc/luat_lv_anim.c
--- a/luat/packages/lvgl/gen/lv_misc/luat_lv_area.c
+++ b/luat/packages/lvgl/gen/lv_misc/luat_lv_area.c
--- a/luat/packages/lvgl/gen/lv_misc/luat_lv_color.c
+++ b/luat/packages/lvgl/gen/lv_misc/luat_lv_color.c
--- a/luat/packages/lvgl/gen/lv_misc/luat_lv_debug.c
+++ b/luat/packages/lvgl/gen/lv_misc/luat_lv_debug.c
--- a/luat/packages/lvgl/gen/lv_misc/luat_lv_task.c
+++ b/luat/packages/lvgl/gen/lv_misc/luat_lv_task.c
--- a/luat/packages/lvgl/gen/lv_themes/luat_lv_theme.c
+++ b/luat/packages/lvgl/gen/lv_themes/luat_lv_theme.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_arc.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_arc.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_bar.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_bar.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_btn.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_btn.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_btnmatrix.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_btnmatrix.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_calendar.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_calendar.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_canvas.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_canvas.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_chart.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_chart.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_checkbox.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_checkbox.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_cont.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_cont.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_cpicker.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_cpicker.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_dropdown.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_dropdown.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_gauge.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_gauge.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_img.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_img.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_imgbtn.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_imgbtn.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_keyboard.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_keyboard.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_label.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_label.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_led.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_led.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_line.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_line.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_linemeter.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_linemeter.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_list.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_list.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_msgbox.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_msgbox.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_objmask.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_objmask.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_page.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_page.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_roller.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_roller.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_slider.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_slider.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_spinbox.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_spinbox.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_spinner.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_spinner.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_switch.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_switch.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_table.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_table.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_tabview.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_tabview.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_textarea.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_textarea.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_tileview.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_tileview.c
--- a/luat/packages/lvgl/gen/lv_widgets/luat_lv_win.c
+++ b/luat/packages/lvgl/gen/lv_widgets/luat_lv_win.c
--- a/luat/packages/lvgl/genapi.py
+++ b/luat/packages/lvgl/genapi.py
--- a/luat/packages/lvgl/lv_conf.h
+++ b/luat/packages/lvgl/lv_conf.h
--- a/luat/packages/lvgl/lvgl.h
+++ b/luat/packages/lvgl/lvgl.h
--- a/luat/packages/lvgl/src/lv_api_map.h
+++ b/luat/packages/lvgl/src/lv_api_map.h
--- a/luat/packages/lvgl/src/lv_bmp/lv_bmp.c
+++ b/luat/packages/lvgl/src/lv_bmp/lv_bmp.c
--- a/luat/packages/lvgl/src/lv_bmp/lv_bmp.h
+++ b/luat/packages/lvgl/src/lv_bmp/lv_bmp.h
--- a/luat/packages/lvgl/src/lv_conf_internal.h
+++ b/luat/packages/lvgl/src/lv_conf_internal.h
--- a/luat/packages/lvgl/src/lv_conf_kconfig.h
+++ b/luat/packages/lvgl/src/lv_conf_kconfig.h
--- a/luat/packages/lvgl/src/lv_core/lv_core.mk
+++ b/luat/packages/lvgl/src/lv_core/lv_core.mk
--- a/luat/packages/lvgl/src/lv_core/lv_disp.c
+++ b/luat/packages/lvgl/src/lv_core/lv_disp.c
--- a/luat/packages/lvgl/src/lv_core/lv_disp.h
+++ b/luat/packages/lvgl/src/lv_core/lv_disp.h
--- a/luat/packages/lvgl/src/lv_core/lv_group.c
+++ b/luat/packages/lvgl/src/lv_core/lv_group.c
--- a/luat/packages/lvgl/src/lv_core/lv_group.h
+++ b/luat/packages/lvgl/src/lv_core/lv_group.h
--- a/luat/packages/lvgl/src/lv_core/lv_indev.c
+++ b/luat/packages/lvgl/src/lv_core/lv_indev.c
--- a/luat/packages/lvgl/src/lv_core/lv_indev.h
+++ b/luat/packages/lvgl/src/lv_core/lv_indev.h
--- a/luat/packages/lvgl/src/lv_core/lv_obj.c
+++ b/luat/packages/lvgl/src/lv_core/lv_obj.c
--- a/luat/packages/lvgl/src/lv_core/lv_obj.h
+++ b/luat/packages/lvgl/src/lv_core/lv_obj.h
--- a/luat/packages/lvgl/src/lv_core/lv_obj_style_dec.h
+++ b/luat/packages/lvgl/src/lv_core/lv_obj_style_dec.h
--- a/luat/packages/lvgl/src/lv_core/lv_refr.c
+++ b/luat/packages/lvgl/src/lv_core/lv_refr.c
--- a/luat/packages/lvgl/src/lv_core/lv_refr.h
+++ b/luat/packages/lvgl/src/lv_core/lv_refr.h
--- a/luat/packages/lvgl/src/lv_core/lv_style.c
+++ b/luat/packages/lvgl/src/lv_core/lv_style.c
--- a/luat/packages/lvgl/src/lv_core/lv_style.h
+++ b/luat/packages/lvgl/src/lv_core/lv_style.h
--- a/luat/packages/lvgl/src/lv_draw/lv_draw.h
+++ b/luat/packages/lvgl/src/lv_draw/lv_draw.h
--- a/luat/packages/lvgl/src/lv_draw/lv_draw.mk
+++ b/luat/packages/lvgl/src/lv_draw/lv_draw.mk
--- a/luat/packages/lvgl/src/lv_draw/lv_draw_arc.c
+++ b/luat/packages/lvgl/src/lv_draw/lv_draw_arc.c
--- a/luat/packages/lvgl/src/lv_draw/lv_draw_arc.h
+++ b/luat/packages/lvgl/src/lv_draw/lv_draw_arc.h
--- a/luat/packages/lvgl/src/lv_draw/lv_draw_blend.c
+++ b/luat/packages/lvgl/src/lv_draw/lv_draw_blend.c