update zmk.

Eloy98 · Apr 6, 2023 · 1297795 · 1297795
1 parent 0bbfabe
commit 1297795
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/config/boards/shields/swoop/Kconfig.defconfig b/config/boards/shields/swoop/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_Z_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
 endchoice
 
 endif # LVGL

diff --git a/config/west.yml b/config/west.yml
@@ -9,12 +9,12 @@ manifest:
       url-base: https://github.com/petejohanson
   projects:
     - name: zmk
-      # remote: zmkfirmware
-      # revision: main
+      remote: zmkfirmware
+      revision: main
       # remote: zephyr-3
       # revision: zephyr/3.1-upgrade
-      remote: kuolemax
-      revision: encoder-fix
+      # remote: kuolemax
+      # revision: encoder-fix
       import: app/west.yml
   self:
     path: config