From 0c135ccce4520435e2125f18c2419974f183a07c Mon Sep 17 00:00:00 2001 From: Chris Andreae Date: Tue, 14 Nov 2023 12:35:06 +0900 Subject: [PATCH] fixup! move ZMK_USB/BLE from Kconfig.defconfig to board defconfig --- app/boards/arm/glove80/Kconfig.defconfig | 6 ------ app/boards/arm/glove80/glove80_lh_defconfig | 4 ++++ app/boards/arm/glove80/glove80_rh_defconfig | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/boards/arm/glove80/Kconfig.defconfig b/app/boards/arm/glove80/Kconfig.defconfig index 58cf8954..e1c452a5 100644 --- a/app/boards/arm/glove80/Kconfig.defconfig +++ b/app/boards/arm/glove80/Kconfig.defconfig @@ -26,12 +26,6 @@ config ZMK_SPLIT config BT_CTLR default BT -config ZMK_BLE - default y - -config ZMK_USB - default y - config ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS default 5 diff --git a/app/boards/arm/glove80/glove80_lh_defconfig b/app/boards/arm/glove80/glove80_lh_defconfig index 4b96a7c2..a93f27cd 100644 --- a/app/boards/arm/glove80/glove80_lh_defconfig +++ b/app/boards/arm/glove80/glove80_lh_defconfig @@ -5,6 +5,10 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y CONFIG_BOARD_GLOVE80_LH=y +# Enable both USB and BLE +CONFIG_ZMK_USB=y +CONFIG_ZMK_BLE=y + # Keyboard IDs CONFIG_ZMK_KEYBOARD_NAME="Glove80 Left" CONFIG_USB_DEVICE_PID=0x27db diff --git a/app/boards/arm/glove80/glove80_rh_defconfig b/app/boards/arm/glove80/glove80_rh_defconfig index 19519a1a..ef29d682 100644 --- a/app/boards/arm/glove80/glove80_rh_defconfig +++ b/app/boards/arm/glove80/glove80_rh_defconfig @@ -5,6 +5,10 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y CONFIG_BOARD_GLOVE80_RH=y +# Enable both USB and BLE +CONFIG_ZMK_USB=y +CONFIG_ZMK_BLE=y + # Keyboard IDs CONFIG_ZMK_KEYBOARD_NAME="Glove80 Right" CONFIG_USB_DEVICE_PID=0x27d9