refactor(display): Updates for LVGL v8.x changes.

* LV_ prefix from new LVGL official Kconfig now used. * API changes for themes, container object removal, etc. * Add our own Kconfig and code for theme default small font. * Remove some hardcoded sizes.
2023-01-17 23:33:42 -05:00
parent 168b32b828
commit 69a4c3200d
44 changed files with 463 additions and 246 deletions
--- a/app/boards/shields/corne/Kconfig.defconfig
+++ b/app/boards/shields/corne/Kconfig.defconfig
@@ -28,17 +28,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/elephant42/Kconfig.defconfig
+++ b/app/boards/shields/elephant42/Kconfig.defconfig
@@ -31,17 +31,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/jorne/Kconfig.defconfig
+++ b/app/boards/shields/jorne/Kconfig.defconfig
@@ -29,17 +29,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/knob_goblin/Kconfig.defconfig
+++ b/app/boards/shields/knob_goblin/Kconfig.defconfig
@@ -21,17 +21,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
  default 64

-config LVGL_DPI
+config LV_Z_DPI
  default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
  default 1

-choice LVGL_COLOR_DEPTH
-  default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+  default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/kyria/Kconfig.defconfig
+++ b/app/boards/shields/kyria/Kconfig.defconfig
@@ -29,17 +29,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/leeloo/Kconfig.defconfig
+++ b/app/boards/shields/leeloo/Kconfig.defconfig
@@ -32,17 +32,17 @@ endif # ZMK_DISPLAY
 if LVGL


-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/lily58/Kconfig.defconfig
+++ b/app/boards/shields/lily58/Kconfig.defconfig
@@ -29,17 +29,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/lotus58/Kconfig.defconfig
+++ b/app/boards/shields/lotus58/Kconfig.defconfig
@@ -31,17 +31,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -31,17 +31,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/murphpad/Kconfig.defconfig
+++ b/app/boards/shields/murphpad/Kconfig.defconfig
@@ -21,17 +21,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/nibble/Kconfig.defconfig
+++ b/app/boards/shields/nibble/Kconfig.defconfig
@@ -25,17 +25,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/nice_view/Kconfig.defconfig
+++ b/app/boards/shields/nice_view/Kconfig.defconfig
@@ -4,7 +4,7 @@
 if SHIELD_NICE_VIEW

 config ZMK_DISPLAY
-	select LVGL_FONT_MONTSERRAT_26
+	select LV_FONT_MONTSERRAT_26

 if ZMK_DISPLAY

@@ -17,11 +17,11 @@ config LS0XX
 config ZMK_WIDGET_WPM_STATUS
 	default y if !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # ZMK_DISPLAY
--- a/app/boards/shields/nice_view/nice_view.conf
+++ b/app/boards/shields/nice_view/nice_view.conf
@@ -1,5 +1,5 @@
 # Enable nice!view
 CONFIG_ZMK_DISPLAY=y
-CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_26=y
-CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_26=y
+CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26=y
+CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y
 CONFIG_ZMK_DISPLAY_BLANK_ON_IDLE=n
--- a/app/boards/shields/snap/Kconfig.defconfig
+++ b/app/boards/shields/snap/Kconfig.defconfig
@@ -31,17 +31,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/sofle/Kconfig.defconfig
+++ b/app/boards/shields/sofle/Kconfig.defconfig
@@ -31,17 +31,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
@@ -37,17 +37,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
@@ -37,17 +37,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
@@ -37,17 +37,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/tidbit/Kconfig.defconfig
+++ b/app/boards/shields/tidbit/Kconfig.defconfig
@@ -22,17 +22,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/waterfowl/Kconfig.defconfig
+++ b/app/boards/shields/waterfowl/Kconfig.defconfig
@@ -29,17 +29,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL
--- a/app/boards/shields/zodiark/Kconfig.defconfig
+++ b/app/boards/shields/zodiark/Kconfig.defconfig
@@ -31,17 +31,17 @@ endif # ZMK_DISPLAY

 if LVGL

-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64

-config LVGL_DPI
+config LV_Z_DPI
 	default 148

-config LVGL_BITS_PER_PIXEL
+config LV_Z_BITS_PER_PIXEL
 	default 1

-choice LVGL_COLOR_DEPTH
-	default LVGL_COLOR_DEPTH_1
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice

 endif # LVGL