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.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/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.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_defconfig b/boards/arm/eyelash_sofle/eyelash_sofle_left_defconfig deleted file mode 100644 index 548418d326..0000000000 --- a/boards/arm/eyelash_sofle/eyelash_sofle_left_defconfig +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (c) 2022 Darryl deHaan -# 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 - -# enable pinctrl -CONFIG_PINCTRL=y - -# enable GPIO -CONFIG_GPIO=y - -# Enable SPI -CONFIG_SPI=y - -# Enable writing to flash -CONFIG_USE_DT_CODE_PARTITION=y -CONFIG_BUILD_OUTPUT_UF2=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y - -# Enable 32kHz crystal -CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y -CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y - -CONFIG_ZMK_USB=y -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 - -#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 -#CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y - -#EC11 enable -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y -CONFIG_ZMK_POINTING=y diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_left.dts b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts similarity index 99% rename from boards/arm/eyelash_sofle/eyelash_sofle_left.dts rename to boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts index c20cb41a7e..5e994a0dca 100644 --- a/boards/arm/eyelash_sofle/eyelash_sofle_left.dts +++ b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840.dts @@ -21,4 +21,3 @@ &left_encoder { status = "okay"; }; - diff --git a/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig new file mode 100644 index 0000000000..63435aa4bb --- /dev/null +++ b/boards/arm/eyelash_sofle/eyelash_sofle_left_nrf52840_defconfig @@ -0,0 +1,38 @@ +# +# Copyright (c) 2022 Darryl deHaan +# SPDX-License-Identifier: MIT +# + +CONFIG_ZMK_SLEEP=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# enable pinctrl +CONFIG_PINCTRL=y + +# enable GPIO +CONFIG_GPIO=y + +# Enable SPI +CONFIG_SPI=y + +# Enable writing to flash +CONFIG_USE_DT_CODE_PARTITION=y +CONFIG_BUILD_OUTPUT_UF2=y +CONFIG_MPU_ALLOW_FLASH_WRITE=y +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y + +# Enable 32kHz crystal +CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y +CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y + +CONFIG_ZMK_USB=y +CONFIG_ZMK_BLE=y + +# enable display drivers +CONFIG_ZMK_DISPLAY=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 diff --git a/config/eyelash_sofle.conf b/config/eyelash_sofle.conf index 562fe7593e..16114980c7 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 - -#EXT POWER -CONFIG_ZMK_EXT_POWER=y - # MOUSE CONFIG_ZMK_POINTING=y -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +# EXT POWER +CONFIG_ZMK_EXT_POWER=y + CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n CONFIG_ZMK_BACKLIGHT=y 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