Switch to zephyr 3.5

From this PR and branch: zmkfirmware#1995 https://github.com/petejohanson/zmk/commits/core/zephyr-3.5-update commit 37261fd Author: Peter Johanson <[email protected]> Date: Mon Dec 11 16:35:16 2023 -0800 fix(bluetooth): Remove LLCP impl override. commit 0473b80 Author: Peter Johanson <[email protected]> Date: Mon Dec 4 22:47:31 2023 +0000 fix(boards): Remove unused pin settings. * Remove unused pin settings that used deprecated devicetree properties. commit f623753 Author: Peter Johanson <[email protected]> Date: Mon Dec 4 14:39:41 2023 -0800 fix(boards): Make `&bootloader` work on nrf52 for now. * Use `NRF_STORE_REBOOT_TYPE_GPREGRET` to get bootloader behavior to work for now until retained bootmode is implemented. commit 33a597c Author: Peter Johanson <[email protected]> Date: Mon Dec 4 13:55:42 2023 -0800 feat(boards): Make `west flash` work with new UF2 runner. commit f86d3da Author: Peter Johanson <[email protected]> Date: Mon Dec 4 12:58:13 2023 -0800 fix(bt): Fixes for BLE test BSIM bits. commit 0d20fe9 Author: Peter Johanson <[email protected]> Date: Mon Dec 4 19:44:42 2023 +0000 fix(bt): Updated snapshots for BLE tests. * Core Zephyr changes tweaked the output from the BT stack for our unit tests. commit a6556b9 Author: Peter Johanson <[email protected]> Date: Wed Nov 15 16:06:21 2023 -0800 fix(shields): LVGL fixes for nice!view screen * Bump the LVGL mem pool size needed for custom screen. * Fixes for LVGL drawing/label usage. commit bbf4a6b Author: Peter Johanson <[email protected]> Date: Wed Nov 15 04:22:09 2023 +0000 fix(boards): Remove references to PINMUX Kconfig. commit 3a8d375 Author: Peter Johanson <[email protected]> Date: Wed Nov 15 00:40:36 2023 +0000 fix: Proper use of CONTAINER_OF with delayable work. commit 70d1fd2 Author: Peter Johanson <[email protected]> Date: Tue Nov 14 23:56:11 2023 +0000 FIXME: Bump to 3.5-branch Docker images. commit 6239071 Author: Peter Johanson <[email protected]> Date: Fri Nov 10 03:51:42 2023 +0000 fix(kscan): Adjust composite kscan priority * Composite kscan needs a dedicated priority to be sure it is initialized after the other kscan instances. commit d881b16 Author: Peter Johanson <[email protected]> Date: Fri Nov 10 00:03:57 2023 +0000 refactor: Remove explicit blocklist item. * `sof` is now not enabled by default as a west dep, so need to add it to the blocklist ourselves. commit 8107a98 Author: Peter Johanson <[email protected]> Date: Thu Nov 9 23:59:15 2023 +0000 refactor: Move to new sys_poweroff API. * Move to new `sys_poweroff` API for our deep sleep functionality. commit 74a8157 Author: Peter Johanson <[email protected]> Date: Thu Nov 9 23:58:28 2023 +0000 fix(ble): Ensure large enough string for setting name. * Fix warning related to potentially large number of profiles causing overflow of allocated string for the setting name. commit 2c632ff Author: Peter Johanson <[email protected]> Date: Thu Nov 9 00:20:27 2023 -0800 refactor(kscan): Clean up warning about shadowed local. commit d2b1b1a Author: Peter Johanson <[email protected]> Date: Thu Nov 9 00:17:44 2023 -0800 refactor: Move to POST_KERNEL phase for behavior inits. commit 56da764 Author: Peter Johanson <[email protected]> Date: Thu Nov 9 00:10:38 2023 -0800 refactor: Return int from main function. commit 8a800e5 Author: Peter Johanson <[email protected]> Date: Thu Nov 9 00:08:56 2023 -0800 fix(display): More LVGL API fixes. commit b89be75 Author: Peter Johanson <[email protected]> Date: Thu Nov 9 00:07:10 2023 -0800 fix: Fix syscalls generation setup. commit e3420bd Author: Peter Johanson <[email protected]> Date: Wed Nov 8 23:44:04 2023 -0800 CLEANUP: Switch to 3.5 Zephyr version. commit 5462d4e Author: Peter Johanson <[email protected]> Date: Mon Oct 16 06:11:21 2023 +0000 fix(sensors): Avoid duplicate Kconfig name. * Upstream added an equivalent fuel gauge driver, so namespace our Kconfig symbol for the MAX17048 driver. commit 3a09052 Author: Peter Johanson <[email protected]> Date: Wed Jun 28 13:34:25 2023 -0700 refacter(bluetooth): Proper HCI header include. commit 793dc0f Author: Peter Johanson <[email protected]> Date: Fri Jun 23 07:23:50 2023 +0000 REMOVEME: Move to PJJ 3.4 Zephyr. commit f0ca20e Author: Peter Johanson <[email protected]> Date: Fri Jun 23 07:20:30 2023 +0000 fix: Add missing include for k_work types. commit 66dd946 Author: Peter Johanson <[email protected]> Date: Fri Jun 23 07:19:57 2023 +0000 refactor: All SYS_INIT functions are void args. commit 634075a Author: Peter Johanson <[email protected]> Date: Fri Jun 23 07:17:00 2023 +0000 refactor: Move new LVGL DPI Kconfig setting.
infused-kim · Jan 7, 2024 · 7dc14b5 · 7dc14b5
1 parent 75e1c34
commit 7dc14b5
Show file tree

Hide file tree

Showing 141 changed files with 227 additions and 371 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:3.2
+FROM docker.io/zmkfirmware/zmk-dev-arm:3.5-branch
 
 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc
diff --git a/.github/workflows/ble-test.yml b/.github/workflows/ble-test.yml
@@ -35,7 +35,7 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.2
+      image: docker.io/zmkfirmware/zmk-build-arm:3.5-branch
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
         run: make everything
       - name: Test ${{ matrix.test }}
         working-directory: app
-        run: BSIM_COMPONENTS_PATH="${GITHUB_WORKSPACE}/tools/bsim/components/" BSIM_OUT_PATH="${GITHUB_WORKSPACE}/tools/bsim/" ./run-ble-test.sh tests/ble/${{ matrix.test }}
+        run: BSIM_COMPONENTS_PATH="${GITHUB_WORKSPACE}/tools/bsim/components" BSIM_OUT_PATH="${GITHUB_WORKSPACE}/tools/bsim" ./run-ble-test.sh tests/ble/${{ matrix.test }}
       - name: Archive artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build-user-config.yml b/.github/workflows/build-user-config.yml
@@ -45,7 +45,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: zmkfirmware/zmk-build-arm:stable
+      image: zmkfirmware/zmk-build-arm:3.5-branch
     needs: matrix
     name: Build
     strategy:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.2
+      image: docker.io/zmkfirmware/zmk-build-arm:3.5-branch
     needs: compile-matrix
     strategy:
       matrix:

diff --git a/.github/workflows/hardware-metadata-validation.yml b/.github/workflows/hardware-metadata-validation.yml
@@ -18,7 +18,7 @@ jobs:
   validate-metadata:
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-dev-arm:3.2
+      image: docker.io/zmkfirmware/zmk-dev-arm:3.5-branch
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.2
+      image: docker.io/zmkfirmware/zmk-build-arm:3.5-branch
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -11,6 +11,9 @@ project(zmk)
 zephyr_linker_sources(SECTIONS include/linker/zmk-behaviors.ld)
 zephyr_linker_sources(RODATA include/linker/zmk-events.ld)
 
+zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/behavior.h)
+zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/ext_power.h)
+
 # Add your source file to the "app" target. This must come after
 # find_package(Zephyr) which defines the target.
 target_include_directories(app PRIVATE include)

diff --git a/app/Kconfig b/app/Kconfig
@@ -37,6 +37,17 @@ config BT_DIS_MODEL
 config BT_DIS_MANUF
     default "ZMK Project"
 
+# Hardware specific overrides
+
+if SOC_SERIES_NRF52X
+
+# Default on for our usage until boards implement retained bootmode.
+config NRF_STORE_REBOOT_TYPE_GPREGRET
+    bool
+    default y
+
+endif
+
 menu "HID"
 
 choice ZMK_HID_REPORT_TYPE
@@ -172,11 +183,6 @@ config ZMK_BLE_PASSKEY_ENTRY
 config BT_SMP_ALLOW_UNAUTH_OVERWRITE
     imply ZMK_BLE_PASSKEY_ENTRY
 
-choice BT_LL_SW_LLCP_IMPL
-    default BT_LL_SW_LLCP_LEGACY if !ZMK_BLE_EXPERIMENTAL_CONN
-
-endchoice
-
 config BT_CTLR_PHY_2M
     default n if ZMK_BLE_EXPERIMENTAL_CONN
 
@@ -387,13 +393,12 @@ config ZMK_IDLE_TIMEOUT
 
 config ZMK_SLEEP
     bool "Enable deep sleep support"
+    depends on HAS_POWEROFF
+    select POWEROFF
     imply USB
 
 if ZMK_SLEEP
 
-config PM_DEVICE
-    default y
-
 config ZMK_IDLE_SLEEP_TIMEOUT
     int "Milliseconds of inactivity before entering deep sleep"
     default 900000

diff --git a/app/boards/arm/adv360pro/board.cmake b/app/boards/arm/adv360pro/board.cmake
@@ -6,6 +6,7 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
 
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 ||||||| parent of a82932f0 (Adv360: official PR)
 =======

diff --git a/app/boards/arm/bluemicro840/board.cmake b/app/boards/arm/bluemicro840/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/bt60/board.cmake b/app/boards/arm/bt60/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/bt60/bt60.dtsi b/app/boards/arm/bt60/bt60.dtsi
@@ -70,18 +70,6 @@
     status = "okay";
 };
 
-&i2c0 {
-    compatible = "nordic,nrf-twi";
-    sda-pin = <17>;
-    scl-pin = <20>;
-};
-
-&uart0 {
-    compatible = "nordic,nrf-uarte";
-    tx-pin = <6>;
-    rx-pin = <8>;
-};
-
 &usbd {
     status = "okay";
     cdc_acm_uart: cdc_acm_uart {

diff --git a/app/boards/arm/ckp/board.cmake b/app/boards/arm/ckp/board.cmake
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/corneish_zen/board.cmake b/app/boards/arm/corneish_zen/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig b/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
@@ -5,9 +5,6 @@ CONFIG_SOC_STM32F303XC=y
 # 72MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
-# enable pinmux
-CONFIG_PINMUX=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/app/boards/arm/ferris/ferris_rev02_defconfig b/app/boards/arm/ferris/ferris_rev02_defconfig
@@ -6,7 +6,7 @@ CONFIG_SOC_STM32F072XB=y
 # 48MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
 
-# enable PINMUX
+# enable PINCTRL
 CONFIG_PINCTRL=y
 
 # enable GPIO

diff --git a/app/boards/arm/glove80/board.cmake b/app/boards/arm/glove80/board.cmake
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/mikoto/CMakeLists.txt b/app/boards/arm/mikoto/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
 zephyr_library()
 zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif()
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
diff --git a/app/boards/arm/mikoto/Kconfig.defconfig b/app/boards/arm/mikoto/Kconfig.defconfig
@@ -21,9 +21,6 @@ endif # USB
 config BT_CTLR
     default BT
 
-config PINMUX
-    default y
-
 choice BOARD_MIKOTO_CHARGER_CURRENT
     default BOARD_MIKOTO_CHARGER_CURRENT_100MA
 endchoice

diff --git a/app/boards/arm/mikoto/board.cmake b/app/boards/arm/mikoto/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/mikoto/pinmux.c b/app/boards/arm/mikoto/pinmux.c
@@ -11,8 +11,7 @@
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/devicetree.h>
 
-static int pinmux_mikoto_init(const struct device *port) {
-    ARG_UNUSED(port);
+static int pinmux_mikoto_init(void) {
 
 #if CONFIG_BOARD_MIKOTO_520
     const struct device *p0 = DEVICE_DT_GET(DT_NODELABEL(gpio0));

diff --git a/app/boards/arm/nice60/board.cmake b/app/boards/arm/nice60/board.cmake
@@ -3,5 +3,6 @@
 
 set(OPENOCD_NRF5_SUBFAMILY nrf52)
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/app/boards/arm/nice_nano/board.cmake b/app/boards/arm/nice_nano/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/nrfmicro/CMakeLists.txt b/app/boards/arm/nrfmicro/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
 zephyr_library()
 zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif()
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
diff --git a/app/boards/arm/nrfmicro/Kconfig.defconfig b/app/boards/arm/nrfmicro/Kconfig.defconfig
@@ -18,9 +18,6 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
     default BT
 
-config PINMUX
-    default y
-
 if BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833
 
 config BOARD_NRFMICRO_CHARGER

diff --git a/app/boards/arm/nrfmicro/board.cmake b/app/boards/arm/nrfmicro/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/nrfmicro/pinmux.c b/app/boards/arm/nrfmicro/pinmux.c
@@ -11,9 +11,7 @@
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/devicetree.h>
 
-static int pinmux_nrfmicro_init(const struct device *port) {
-    ARG_UNUSED(port);
-
+static int pinmux_nrfmicro_init(void) {
 #if (CONFIG_BOARD_NRFMICRO_13 || CONFIG_BOARD_NRFMICRO_13_52833)
     const struct device *p0 = DEVICE_DT_GET(DT_NODELABEL(gpio0));
 #if CONFIG_BOARD_NRFMICRO_CHARGER

diff --git a/app/boards/arm/pillbug/board.cmake b/app/boards/arm/pillbug/board.cmake
@@ -2,5 +2,6 @@
 
 set(OPENOCD_NRF5_SUBFAMILY nrf52)
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/app/boards/arm/planck/planck_rev6_defconfig b/app/boards/arm/planck/planck_rev6_defconfig
@@ -5,9 +5,6 @@ CONFIG_SOC_STM32F303XC=y
 # 72MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
-
-# enable pinmux
-CONFIG_PINMUX=y
 CONFIG_PINCTRL=y
 
 # enable GPIO

diff --git a/app/boards/arm/puchi_ble/CMakeLists.txt b/app/boards/arm/puchi_ble/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
 zephyr_library()
 zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif()
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
diff --git a/app/boards/arm/puchi_ble/Kconfig.defconfig b/app/boards/arm/puchi_ble/Kconfig.defconfig
@@ -16,7 +16,4 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
     default BT
 
-config PINMUX
-    default y
-
 endif # BOARD_PUCHI_BLE_v1
diff --git a/app/boards/arm/puchi_ble/board.cmake b/app/boards/arm/puchi_ble/board.cmake
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/puchi_ble/pinmux.c b/app/boards/arm/puchi_ble/pinmux.c
@@ -11,9 +11,7 @@
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/devicetree.h>
 
-static int pinmux_puchi_ble_init(const struct device *port) {
-    ARG_UNUSED(port);
-
+static int pinmux_puchi_ble_init() {
 #if CONFIG_BOARD_PUCHI_BLE_v1
     const struct device *p0 = DEVICE_DT_GET(DT_NODELABEL(gpio0));
 #if CONFIG_BOARD_PUCHI_BLE_CHARGER

diff --git a/app/boards/arm/s40nc/board.cmake b/app/boards/arm/s40nc/board.cmake
@@ -3,5 +3,6 @@
 
 set(OPENOCD_NRF5_SUBFAMILY nrf52)
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/app/boards/shields/corne/Kconfig.defconfig b/app/boards/shields/corne/Kconfig.defconfig
@@ -21,17 +21,14 @@ config I2C
 config SSD1306
     default y
 
-config SSD1306_REVERSE_MODE
-    default y
-
 endif # ZMK_DISPLAY
 
 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/app/boards/shields/corne/corne.dtsi b/app/boards/shields/corne/corne.dtsi
@@ -76,6 +76,7 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10
         segment-remap;
         com-invdir;
         com-sequential;
+        inversion-on;
         prechargep = <0x22>;
     };
 };
diff --git a/app/boards/shields/elephant42/Kconfig.defconfig b/app/boards/shields/elephant42/Kconfig.defconfig
@@ -24,17 +24,14 @@ config I2C
 config SSD1306
     default y
 
-config SSD1306_REVERSE_MODE
-    default y
-
 endif # ZMK_DISPLAY
 
 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/app/boards/shields/elephant42/elephant42.dtsi b/app/boards/shields/elephant42/elephant42.dtsi
@@ -53,6 +53,7 @@ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7)
         segment-remap;
         com-invdir;
         com-sequential;
+        inversion-on;
         prechargep = <0x22>;
     };
 };