Merge pull request #4 from dreipunkteinsvier/letsfetz

Update to Zephyr 3.2
MangoIV · Apr 22, 2023 · 4fa9dbc · 4fa9dbc
2 parents 2bb7d89 + 467f916
commit 4fa9dbc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: zmkfirmware/zmk-build-arm:stable
+      image: zmkfirmware/zmk-build-arm:3.2-branch-20230422022718-3.2.0-0.15.2-76376c9148ed-4770437526
     strategy:
       fail-fast: false
       matrix:

diff --git a/zmk-config/boards/arm/le_chiff_ble/Kconfig.defconfig b/zmk-config/boards/arm/le_chiff_ble/Kconfig.defconfig
@@ -50,23 +50,17 @@ endif # ZMK_DISPLAY
 
 if LVGL
 
-config LVGL_HOR_RES_MAX
-	default 128
-
-config LVGL_VER_RES_MAX
-	default 32
-
-config LVGL_VDB_SIZE
+config LV_Z_VDB_SIZE
 	default 64
 
-config LVGL_DPI
+config LV_DPI_DEF
 	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

diff --git a/zmk-config/boards/arm/le_chiff_ble/le_chiff_ble.keymap b/zmk-config/boards/arm/le_chiff_ble/le_chiff_ble.keymap
@@ -65,7 +65,7 @@
 			bindings = <
             &kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &out OUT_USB &out OUT_BLE &none  &kp EQUAL &kp MINUS
             &none &kp F5 &kp F6 &kp F7 &kp F8 &kp LBKT &kp RBKT &none &kp GRAVE &kp BSLH
-            &kp LSHFT &kp F9 &kp F10 &kp F11 &kp F12 &none &none &none &reset &bootloader &kp RSHFT
+            &kp LSHFT &kp F9 &kp F10 &kp F11 &kp F12 &none &none &none &sys_reset &bootloader &kp RSHFT
             &kp LGUI &kp LCTRL &kp LALT &trans
 			>;
 			sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;