From ff6d3f121da440eaf45d56d3fdbfcdd7a52c189b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 01:55:04 +0000 Subject: [PATCH 1/5] fix: migrate eyelash_sofle board to Zephyr 4.x new board format with board.yml Agent-Logs-Url: https://github.com/DarinRowe/zmk-sofle/sessions/d6c6f475-e7cc-4f82-a464-389bb5f94a68 Co-authored-by: DarinRowe <5706314+DarinRowe@users.noreply.github.com> --- boards/arm/eyelash_sofle/Kconfig.board | 12 ---------- .../eyelash_sofle/Kconfig.eyelash_sofle_left | 8 +++++++ .../eyelash_sofle/Kconfig.eyelash_sofle_right | 8 +++++++ boards/arm/eyelash_sofle/board.yml | 9 ++++++++ ...ft.dts => eyelash_sofle_left_nrf52840.dts} | 5 ----- ... => eyelash_sofle_left_nrf52840_defconfig} | 22 ------------------- ...t.dts => eyelash_sofle_right_nrf52840.dts} | 1 - ...=> eyelash_sofle_right_nrf52840_defconfig} | 4 ---- 8 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 boards/arm/eyelash_sofle/Kconfig.board create mode 100644 boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_left create mode 100644 boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_right create mode 100644 boards/arm/eyelash_sofle/board.yml rename boards/arm/eyelash_sofle/{eyelash_sofle_left.dts => eyelash_sofle_left_nrf52840.dts} (90%) rename boards/arm/eyelash_sofle/{eyelash_sofle_left_defconfig => eyelash_sofle_left_nrf52840_defconfig} (63%) rename boards/arm/eyelash_sofle/{eyelash_sofle_right.dts => eyelash_sofle_right_nrf52840.dts} (99%) rename boards/arm/eyelash_sofle/{eyelash_sofle_right_defconfig => eyelash_sofle_right_nrf52840_defconfig} (86%) diff --git a/boards/arm/eyelash_sofle/Kconfig.board b/boards/arm/eyelash_sofle/Kconfig.board deleted file mode 100644 index b0d53f256e..0000000000 --- a/boards/arm/eyelash_sofle/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (c) 2024 The ZMK Contributors -# SPDX-License-Identifier: MIT -# - -config BOARD_EYELASH_SOFLE_LEFT - bool "eyelash_sofle left" - depends on SOC_NRF52840_QIAA - -config BOARD_EYELASH_SOFLE_RIGHT - bool "eyelash_sofle right" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_left b/boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_left new file mode 100644 index 0000000000..4123b47198 --- /dev/null +++ b/boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_left @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 The ZMK Contributors +# SPDX-License-Identifier: MIT +# + +config BOARD_EYELASH_SOFLE_LEFT + select SOC_NRF52840_QIAA + select ZMK_BOARD_COMPAT diff --git a/boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_right b/boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_right new file mode 100644 index 0000000000..41ec08de05 --- /dev/null +++ b/boards/arm/eyelash_sofle/Kconfig.eyelash_sofle_right @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 The ZMK Contributors +# SPDX-License-Identifier: MIT +# + +config BOARD_EYELASH_SOFLE_RIGHT + select SOC_NRF52840_QIAA + select ZMK_BOARD_COMPAT diff --git a/boards/arm/eyelash_sofle/board.yml b/boards/arm/eyelash_sofle/board.yml new file mode 100644 index 0000000000..53d54a6457 --- /dev/null +++ b/boards/arm/eyelash_sofle/board.yml @@ -0,0 +1,9 @@ +boards: + - name: eyelash_sofle_left + vendor: eyelash + socs: + - name: nrf52840 + - name: eyelash_sofle_right + vendor: eyelash + socs: + - name: nrf52840 diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_left.dts b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts similarity index 90% rename from boards/arm/eyelash_sofle/eyelash_sofle_left.dts rename to boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts index c20cb41a7e..5798675334 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_left.dts +++ b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts @@ -17,8 +17,3 @@ , <&gpio0 22 GPIO_ACTIVE_HIGH> ; }; - -&left_encoder { - status = "okay"; -}; - diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_left_defconfig b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig similarity index 63% rename from boards/arm/eyelash_sofle/eyelash_sofle_left_defconfig rename to boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig index 548418d326..5a59cbc8be 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_left_defconfig +++ b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig @@ -3,14 +3,8 @@ # SPDX-License-Identifier: MIT # -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_EYELASH_SOFLE_LEFT=y CONFIG_ZMK_SLEEP=y - - - # Enable MPU CONFIG_ARM_MPU=y @@ -43,21 +37,6 @@ CONFIG_ZMK_BLE=y # enable display drivers CONFIG_ZMK_DISPLAY=y - - -#CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y -#CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048 -#CONFIG_LV_Z_BITS_PER_PIXEL=1 -#CONFIG_LV_COLOR_DEPTH_1=y -#CONFIG_LV_DPI_DEF=145 -#CONFIG_LV_Z_VDB_SIZE=100 -#CONFIG_LV_USE_THEME_MONO=y -#CONFIG_LV_COLOR_CHROMA_KEY_HEX=0x00FF00 -#CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_16=y -#CONFIG_LV_FONT_MONTSERRAT_26=y -#CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y - - #EXT POWER CONFIG_ZMK_EXT_POWER=y @@ -73,7 +52,6 @@ CONFIG_USB_DEVICE_MANUFACTURER="sofle" CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n -#CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y #EC11 enable CONFIG_EC11=y diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_right.dts b/boards/arm/eyelash_sofle/eyelash_sofle_right_nrf52840.dts similarity index 99% rename from boards/arm/eyelash_sofle/eyelash_sofle_right.dts rename to boards/arm/eyelash_sofle/eyelash_sofle_right_nrf52840.dts index b6484bd742..4d684cdb64 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_right.dts +++ b/boards/arm/eyelash_sofle/eyelash_sofle_right_nrf52840.dts @@ -21,4 +21,3 @@ &default_transform { col-offset = <7>; }; - diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_right_defconfig b/boards/arm/eyelash_sofle/eyelash_sofle_right_nrf52840_defconfig similarity index 86% rename from boards/arm/eyelash_sofle/eyelash_sofle_right_defconfig rename to boards/arm/eyelash_sofle/eyelash_sofle_right_nrf52840_defconfig index fd7be4da2c..529f06b9ed 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_right_defconfig +++ b/boards/arm/eyelash_sofle/eyelash_sofle_right_nrf52840_defconfig @@ -3,10 +3,6 @@ # SPDX-License-Identifier: MIT # -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_EYELASH_SOFLE_RIGHT=y - # Enable 32kHz crystal CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y From 02583c64fe56847212a35633691ffabdcdc01520 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 02:25:25 +0000 Subject: [PATCH 2/5] fix: remove conflicting eyelash_sofle external module from west.yml Agent-Logs-Url: https://github.com/DarinRowe/zmk-sofle/sessions/4baf6f63-64ac-45cf-a730-89c6f816808c Co-authored-by: DarinRowe <5706314+DarinRowe@users.noreply.github.com> --- config/west.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/west.yml b/config/west.yml index 0e67706466..a09dff6b6d 100644 --- a/config/west.yml +++ b/config/west.yml @@ -12,9 +12,6 @@ manifest: # - name: mario-peripheral-animation # remote: gpeye # revision: main - - name: eyelash_sofle - url: https://github.com/a741725193/zmk-sofle - revision: main - name: zmk remote: zmkfirmware revision: main From 1770be91c163661b2b93ae7c27abe4f7634b8c0e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 02:47:05 +0000 Subject: [PATCH 3/5] fix: resolve Kconfig warnings for Zephyr 4.x compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove CONFIG_WS2812_STRIP=y (undefined symbol in Zephyr 4.x; WS2812 SPI driver is auto-selected from DTS compatible node) - Remove deprecated SOC_DCDC_NRF52X/SOC_DCDC_NRF52X_HV Kconfig selects from Kconfig.defconfig; replace with DTS-based DCDC via ®0 - Remove deprecated BT_CTLR default from Kconfig.defconfig - Remove CONFIG_EC11=y/EC11_TRIGGER_GLOBAL_THREAD=y from left defconfig and user conf (auto-selected from DT; right board has no encoder) - Remove CONFIG_BT_CTLR_TX_PWR_PLUS_8=y from left defconfig (causes warning in settings_reset build where BLE is disabled) - Remove user-preference configs from board defconfig (passkey, bonds, USB manufacturer name) — kept in eyelash_sofle.conf where appropriate Agent-Logs-Url: https://github.com/DarinRowe/zmk-sofle/sessions/5c31c00a-c57d-4d5c-bc6f-41a90bda7a0d Co-authored-by: DarinRowe <5706314+DarinRowe@users.noreply.github.com> --- boards/arm/eyelash_sofle/Kconfig.defconfig | 15 ------------- boards/arm/eyelash_sofle/eyelash_sofle.dtsi | 4 ++++ .../eyelash_sofle_left_nrf52840_defconfig | 21 ------------------- config/eyelash_sofle.conf | 10 ++------- 4 files changed, 6 insertions(+), 44 deletions(-) diff --git a/boards/arm/eyelash_sofle/Kconfig.defconfig b/boards/arm/eyelash_sofle/Kconfig.defconfig index 92794fc67d..a2332f932c 100644 --- a/boards/arm/eyelash_sofle/Kconfig.defconfig +++ b/boards/arm/eyelash_sofle/Kconfig.defconfig @@ -19,24 +19,9 @@ if BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT config BOARD default "eyelash_sofle" -config BOARD_ENABLE_DCDC - bool "Enable DCDC mode" - select SOC_DCDC_NRF52X - default y - depends on (BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT) - -config BOARD_ENABLE_DCDC_HV - bool "Enable High Voltage DCDC converter" - default y - select SOC_DCDC_NRF52X_HV - depends on (BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT) - config ZMK_SPLIT default y -config BT_CTLR - default BT - if USB config USB_NRFX diff --git a/boards/arm/eyelash_sofle/eyelash_sofle.dtsi b/boards/arm/eyelash_sofle/eyelash_sofle.dtsi index 2580d5fc5b..7888573751 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle.dtsi +++ b/boards/arm/eyelash_sofle/eyelash_sofle.dtsi @@ -233,4 +233,8 @@ nice_view_spi: &spi0 { pinctrl-1 = <&spi0_sleep>; pinctrl-names = "default", "sleep"; cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; +}; + +®0 { + status = "okay"; }; \ No newline at end of file diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig index 5a59cbc8be..63435aa4bb 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig +++ b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig @@ -36,24 +36,3 @@ CONFIG_ZMK_BLE=y # enable display drivers CONFIG_ZMK_DISPLAY=y - -#EXT POWER -CONFIG_ZMK_EXT_POWER=y - -#BLE-passkey -CONFIG_ZMK_BLE_PASSKEY_ENTRY=n - -#BLE-clean -CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=n - -#usb-name -CONFIG_USB_DEVICE_MANUFACTURER="sofle" - -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y - -CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n - -#EC11 enable -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y -CONFIG_ZMK_POINTING=y diff --git a/config/eyelash_sofle.conf b/config/eyelash_sofle.conf index 562fe7593e..63db3eddf5 100644 --- a/config/eyelash_sofle.conf +++ b/config/eyelash_sofle.conf @@ -14,7 +14,6 @@ CONFIG_ZMK_SLEEP=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y -CONFIG_WS2812_STRIP=y CONFIG_ZMK_RGB_UNDERGLOW=y CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y CONFIG_ZMK_RGB_UNDERGLOW_ON_START=n @@ -28,17 +27,12 @@ CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3 #CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y -#EC11 enable -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y +# MOUSE +CONFIG_ZMK_POINTING=y #EXT POWER CONFIG_ZMK_EXT_POWER=y -# MOUSE -CONFIG_ZMK_POINTING=y - -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n CONFIG_ZMK_BACKLIGHT=y From 9062f31256f6f67b71eebcb1aa317d7747d1f47e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 02:48:01 +0000 Subject: [PATCH 4/5] style: fix comment spacing in eyelash_sofle.conf Agent-Logs-Url: https://github.com/DarinRowe/zmk-sofle/sessions/5c31c00a-c57d-4d5c-bc6f-41a90bda7a0d Co-authored-by: DarinRowe <5706314+DarinRowe@users.noreply.github.com> --- config/eyelash_sofle.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/eyelash_sofle.conf b/config/eyelash_sofle.conf index 63db3eddf5..16114980c7 100644 --- a/config/eyelash_sofle.conf +++ b/config/eyelash_sofle.conf @@ -30,7 +30,7 @@ CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3 # MOUSE CONFIG_ZMK_POINTING=y -#EXT POWER +# EXT POWER CONFIG_ZMK_EXT_POWER=y CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n From 0509b57e9427fe598ea98f351c1f79e9007d4443 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 05:54:46 +0000 Subject: [PATCH 5/5] fix: restore left encoder compatibility Agent-Logs-Url: https://github.com/DarinRowe/zmk-sofle/sessions/0cdeacf7-f861-480b-af36-85ec924cc539 Co-authored-by: DarinRowe <5706314+DarinRowe@users.noreply.github.com> --- boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts index 5798675334..5e994a0dca 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts +++ b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts @@ -17,3 +17,7 @@ , <&gpio0 22 GPIO_ACTIVE_HIGH> ; }; + +&left_encoder { + status = "okay"; +};