patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

lvgl: change the prefix of Zephyr-specific LVGL config options

Browse source 
We're now using the Kconfig copied from the upstream lvgl repository. It
uses the LV_ prefix for all options while we're using LVGL_ for
Zephyr-specific ones. Make the latter consistent with upstream but also
make sure they're distinct from lvgl's by using LV_Z_ as the prefix.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@huawei.com>
This commit is contained in:
Bartosz Golaszewski 2022-01-06 10:20:04 +01:00 committed by Carles Cufí
parent 6c190292c0
commit 0f09360456
17 changed files with 67 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boards/arm/mimxrt1050_evk/Kconfig.defconfig
View file

@ -53,22 +53,22 @@ endif # NETWORKING
if LVGL if LVGL
config LVGL_POINTER_KSCAN config LV_Z_POINTER_KSCAN
default y default y
config LVGL_POINTER_KSCAN_DEV_NAME config LV_Z_POINTER_KSCAN_DEV_NAME
default "FT5336" default "FT5336"
config LVGL_HOR_RES_MAX config LV_Z_HOR_RES_MAX
default 480 default 480
config LVGL_VER_RES_MAX config LV_Z_VER_RES_MAX
default 272 default 272
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 16 default 16
config LVGL_DPI config LV_Z_DPI
default 128 default 128
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS

12
boards/arm/mimxrt1060_evk/Kconfig.defconfig
View file

@ -53,22 +53,22 @@ endif # NETWORKING
if LVGL if LVGL
config LVGL_POINTER_KSCAN config LV_Z_POINTER_KSCAN
default y default y
config LVGL_POINTER_KSCAN_DEV_NAME config LV_Z_POINTER_KSCAN_DEV_NAME
default "FT5336" default "FT5336"
config LVGL_HOR_RES_MAX config LV_Z_HOR_RES_MAX
default 480 default 480
config LVGL_VER_RES_MAX config LV_Z_VER_RES_MAX
default 272 default 272
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 16 default 16
config LVGL_DPI config LV_Z_DPI
default 128 default 128
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS

12
boards/arm/mimxrt1064_evk/Kconfig.defconfig
View file

@ -47,22 +47,22 @@ endif # NETWORKING
if LVGL if LVGL
config LVGL_POINTER_KSCAN config LV_Z_POINTER_KSCAN
default y default y
config LVGL_POINTER_KSCAN_DEV_NAME config LV_Z_POINTER_KSCAN_DEV_NAME
default "FT5336" default "FT5336"
config LVGL_HOR_RES_MAX config LV_Z_HOR_RES_MAX
default 480 default 480
config LVGL_VER_RES_MAX config LV_Z_VER_RES_MAX
default 272 default 272
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 16 default 16
config LVGL_DPI config LV_Z_DPI
default 128 default 128
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS

6
boards/arm/reel_board/Kconfig.defconfig
View file

@ -32,13 +32,13 @@ choice LV_COLOR_DEPTH_BITS
default LV_COLOR_DEPTH_1 default LV_COLOR_DEPTH_1
endchoice endchoice
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 1 default 1
config LVGL_DPI config LV_Z_DPI
default 130 default 130
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 16 default 16
endif # LVGL endif # LVGL

14
boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig
View file

@ -30,10 +30,10 @@ endif # KSCAN
if LVGL if LVGL
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 64 default 64
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 24 default 24
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS
@ -43,19 +43,19 @@ endchoice
config KSCAN config KSCAN
default y default y
config LVGL_POINTER_KSCAN config LV_Z_POINTER_KSCAN
default y default y
config LVGL_POINTER_KSCAN_DEV_NAME config LV_Z_POINTER_KSCAN_DEV_NAME
default "FT5336" default "FT5336"
config LVGL_POINTER_KSCAN_SWAP_XY config LV_Z_POINTER_KSCAN_SWAP_XY
default y default y
config LVGL_POINTER_KSCAN_INVERT_X config LV_Z_POINTER_KSCAN_INVERT_X
default y default y
config LVGL_POINTER_KSCAN_INVERT_Y config LV_Z_POINTER_KSCAN_INVERT_Y
default y default y
endif # LVGL endif # LVGL

14
boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig
View file

@ -27,10 +27,10 @@ endif # KSCAN
if LVGL if LVGL
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 64 default 64
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 16 default 16
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS
@ -43,19 +43,19 @@ config LV_COLOR_16_SWAP
config KSCAN config KSCAN
default y default y
config LVGL_POINTER_KSCAN config LV_Z_POINTER_KSCAN
default y default y
config LVGL_POINTER_KSCAN_DEV_NAME config LV_Z_POINTER_KSCAN_DEV_NAME
default "TOUCH" default "TOUCH"
config LVGL_POINTER_KSCAN_SWAP_XY config LV_Z_POINTER_KSCAN_SWAP_XY
default y default y
config LVGL_POINTER_KSCAN_INVERT_X config LV_Z_POINTER_KSCAN_INVERT_X
default y default y
config LVGL_POINTER_KSCAN_INVERT_Y config LV_Z_POINTER_KSCAN_INVERT_Y
default y default y
endif # LVGL endif # LVGL

14
boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig
View file

@ -27,10 +27,10 @@ endif # KSCAN
if LVGL if LVGL
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 32 default 32
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 24 default 24
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS
@ -40,19 +40,19 @@ endchoice
config KSCAN config KSCAN
default y default y
config LVGL_POINTER_KSCAN config LV_Z_POINTER_KSCAN
default y default y
config LVGL_POINTER_KSCAN_DEV_NAME config LV_Z_POINTER_KSCAN_DEV_NAME
default "TOUCH" default "TOUCH"
config LVGL_POINTER_KSCAN_SWAP_XY config LV_Z_POINTER_KSCAN_SWAP_XY
default y default y
config LVGL_POINTER_KSCAN_INVERT_X config LV_Z_POINTER_KSCAN_INVERT_X
default y default y
config LVGL_POINTER_KSCAN_INVERT_Y config LV_Z_POINTER_KSCAN_INVERT_Y
default y default y
endif # LVGL endif # LVGL

9
boards/shields/ls0xx_generic/Kconfig.defconfig
View file

@ -13,13 +13,16 @@ config LS0XX
if LVGL if LVGL
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
int
default 16 default 16
config LVGL_DPI config LV_Z_DPI
int
default 150 default 150
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
int
default 1 default 1
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS

6
boards/shields/ssd1306/Kconfig.defconfig
View file

@ -28,14 +28,14 @@ endchoice
if LVGL if LVGL
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 64 default 64
config LVGL_DPI config LV_Z_DPI
default 116 if SHIELD_SH1106_128X64 default 116 if SHIELD_SH1106_128X64
default 148 default 148
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 1 default 1
choice LV_COLOR_DEPTH_BITS choice LV_COLOR_DEPTH_BITS

2
boards/shields/st7735r/Kconfig.defconfig
View file

@ -14,7 +14,7 @@ config ST7735R
if LVGL if LVGL
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 16 default 16
endif # LVGL endif # LVGL

2
boards/shields/st7789v_generic/Kconfig.defconfig
View file

@ -18,7 +18,7 @@ endchoice
if LVGL if LVGL
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 24 if SHIELD_ST7789V_TL019FQV01 default 24 if SHIELD_ST7789V_TL019FQV01
default 16 if SHIELD_ST7789V_WAVESHARE_240X240 default 16 if SHIELD_ST7789V_WAVESHARE_240X240

6
boards/shields/waveshare_epaper/Kconfig.defconfig
View file

@ -25,11 +25,11 @@ config GD7965
if LVGL if LVGL
config LVGL_VDB_SIZE config LV_Z_VDB_SIZE
default 16 if SHIELD_WAVESHARE_EPAPER_GDEW075T7 default 16 if SHIELD_WAVESHARE_EPAPER_GDEW075T7
default 16 default 16
config LVGL_DPI config LV_Z_DPI
default 188 if SHIELD_WAVESHARE_EPAPER_GDEH0154A07 default 188 if SHIELD_WAVESHARE_EPAPER_GDEH0154A07
default 120 if SHIELD_WAVESHARE_EPAPER_GDEW042T2 default 120 if SHIELD_WAVESHARE_EPAPER_GDEW042T2
default 130 default 130
@ -38,7 +38,7 @@ choice LV_COLOR_DEPTH_BITS
default LV_COLOR_DEPTH_1 default LV_COLOR_DEPTH_1
endchoice endchoice
config LVGL_BITS_PER_PIXEL config LV_Z_BITS_PER_PIXEL
default 1 default 1
endif # LVGL endif # LVGL

2
drivers/kscan/Kconfig.sdl
View file

@ -10,5 +10,5 @@ config KSCAN_SDL
config SDL_POINTER_KSCAN_DEV_NAME config SDL_POINTER_KSCAN_DEV_NAME
string "SDL kscan device name" string "SDL kscan device name"
depends on KSCAN_SDL depends on KSCAN_SDL
default LVGL_POINTER_KSCAN_DEV_NAME if LVGL default LV_Z_POINTER_KSCAN_DEV_NAME if LVGL
default "SDL_KSCAN" default "SDL_KSCAN"

2
samples/subsys/display/lvgl/prj.conf
View file

@ -1,4 +1,4 @@
CONFIG_LVGL_MEM_POOL_NUMBER_BLOCKS=8 CONFIG_LV_Z_MEM_POOL_NUMBER_BLOCKS=8
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048
CONFIG_DISPLAY=y CONFIG_DISPLAY=y

2
samples/subsys/display/lvgl/src/main.c
View file

@ -29,7 +29,7 @@ void main(void)
return; return;
} }
if (IS_ENABLED(CONFIG_LVGL_POINTER_KSCAN)) { if (IS_ENABLED(CONFIG_LV_Z_POINTER_KSCAN)) {
lv_obj_t *hello_world_button; lv_obj_t *hello_world_button;
hello_world_button = lv_btn_create(lv_scr_act()); hello_world_button = lv_btn_create(lv_scr_act());

4
tests/lib/gui/lvgl/prj.conf
View file

@ -12,8 +12,8 @@ CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_LVGL=y CONFIG_LVGL=y
CONFIG_LVGL_MEM_POOL_NUMBER_BLOCKS=8 CONFIG_LV_Z_MEM_POOL_NUMBER_BLOCKS=8
CONFIG_LVGL_USE_FILESYSTEM=y CONFIG_LV_Z_USE_FILESYSTEM=y
CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEM_CUSTOM=y
CONFIG_LV_USE_LOG=y CONFIG_LV_USE_LOG=y
CONFIG_LV_COLOR_DEPTH_32=y CONFIG_LV_COLOR_DEPTH_32=y

12
tests/lib/gui/lvgl/testcase.yaml
View file

@ -8,16 +8,16 @@ tests:
platform_allow: native_posix_64 platform_allow: native_posix_64
extra_configs: extra_configs:
- CONFIG_NEWLIB_LIBC=y - CONFIG_NEWLIB_LIBC=y
- CONFIG_LVGL_BUFFER_ALLOC_DYNAMIC=y - CONFIG_LV_Z_BUFFER_ALLOC_DYNAMIC=y
- CONFIG_LVGL_MEM_POOL_HEAP_LIB_C=y - CONFIG_LV_Z_MEM_POOL_HEAP_LIB_C=y
libraries.gui.lvgl.dynamic.pool.sys_heap: libraries.gui.lvgl.dynamic.pool.sys_heap:
tags: display gui tags: display gui
platform_allow: native_posix_64 platform_allow: native_posix_64
extra_configs: extra_configs:
- CONFIG_LVGL_BUFFER_ALLOC_DYNAMIC=y - CONFIG_LV_Z_BUFFER_ALLOC_DYNAMIC=y
- CONFIG_LVGL_MEM_POOL_SYS_HEAP=y - CONFIG_LV_Z_MEM_POOL_SYS_HEAP=y
- CONFIG_LVGL_MEM_POOL_NUMBER_BLOCKS=3 - CONFIG_LV_Z_MEM_POOL_NUMBER_BLOCKS=3
- CONFIG_LVGL_MEM_POOL_MAX_SIZE=32768 - CONFIG_LV_Z_MEM_POOL_MAX_SIZE=32768
libraries.gui.lvgl.16bit: libraries.gui.lvgl.16bit:
tags: display gui tags: display gui
platform_allow: native_posix_64 platform_allow: native_posix_64