From ca51abf318e501f9fde746b46c041a20d6c6aa7e Mon Sep 17 00:00:00 2001
From: Cem Aksoylar <caksoylar@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:20:54 -0800
Subject: [PATCH] Update for Zephyr 3.5 branch with mouse keys

---
 .github/workflows/build.yml           | 2 +-
 boards/shields/ffkb/Kconfig.defconfig | 5 +----
 boards/shields/ffkb/ffkb.overlay      | 1 +
 config/corneish_zen.conf              | 6 +++---
 config/west.yml                       | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de802cad..72285c03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,4 +11,4 @@ on:
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
+    uses: caksoylar/zmk/.github/workflows/build-user-config.yml@caksoylar/experimental-3.5
diff --git a/boards/shields/ffkb/Kconfig.defconfig b/boards/shields/ffkb/Kconfig.defconfig
index dea26d0d..18edbf83 100644
--- a/boards/shields/ffkb/Kconfig.defconfig
+++ b/boards/shields/ffkb/Kconfig.defconfig
@@ -14,9 +14,6 @@ config I2C
 config SSD1306
     default y
 
-config SSD1306_REVERSE_MODE
-    default y
-
 endif # ZMK_DISPLAY
 
 if LVGL
@@ -24,7 +21,7 @@ if LVGL
 config LV_Z_VDB_SIZE
     default 64
 
-config LV_Z_DPI
+config LV_DPI_DEF
     default 148
 
 config LV_Z_BITS_PER_PIXEL
diff --git a/boards/shields/ffkb/ffkb.overlay b/boards/shields/ffkb/ffkb.overlay
index 464bc4f0..933b576e 100644
--- a/boards/shields/ffkb/ffkb.overlay
+++ b/boards/shields/ffkb/ffkb.overlay
@@ -100,6 +100,7 @@
         page-offset = <0>;
         display-offset = <0>;
         multiplex-ratio = <63>;
+        inversion-on;
         prechargep = <0x22>;
     };
 };
diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf
index 7d35ca67..24b68266 100644
--- a/config/corneish_zen.conf
+++ b/config/corneish_zen.conf
@@ -5,14 +5,14 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
 
 # Zen display tweaks
-CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
+#CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
 # Stock status screen
 #CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
 #CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
 #CONFIG_CUSTOM_WIDGET_LOGO_IMAGE_ZMK=y
 # 8-bit status screen
-CONFIG_ZEN_STATUS_SCREEN_8BIT=y
-CONFIG_ZEN_STATUS_SCREEN_8BIT_HALF=y
+#CONFIG_ZEN_STATUS_SCREEN_8BIT=y
+#CONFIG_ZEN_STATUS_SCREEN_8BIT_HALF=y
 
 # Sleep timeout to 30 min
 CONFIG_ZMK_SLEEP=y
diff --git a/config/west.yml b/config/west.yml
index 27660ac9..3f92f048 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -7,7 +7,7 @@ manifest:
   projects:
     - name: zmk
       remote: caksoylar
-      revision: caksoylar/zen-8bit
+      revision: caksoylar/experimental-3.5
       import: app/west.yml
     - name: zmk-rgbled-widget
       remote: caksoylar