diff options
| author | CrossR <r.cross@lancaster.ac.uk> | 2020-08-21 22:03:52 +0100 |
|---|---|---|
| committer | CrossR <r.cross@lancaster.ac.uk> | 2020-08-21 22:03:52 +0100 |
| commit | 84761fc58931c8caa8cf1bf1b39946a9cb652822 (patch) | |
| tree | ab5effc50925021507f742ed8206fbd683f4ee99 /app/Kconfig | |
| parent | 5c29259fedc4a0265064afc0bc141e6bf33425f2 (diff) | |
| parent | c619fb9c58c8f2dbcc19d74e7502459b49633113 (diff) | |
Merge branch 'main' into CrossR/Sofle
Diffstat (limited to 'app/Kconfig')
| -rw-r--r-- | app/Kconfig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/Kconfig b/app/Kconfig index 416c985..877fce4 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -41,16 +41,10 @@ menuconfig ZMK_BLE select BT_GATT_DIS select BT_GATT_BAS select SETTINGS - select BT_SETTINGS + # select BT_SETTINGS if ZMK_BLE -config ZMK_BLE_UNPAIR_COMBO - bool "Enable BT unpair combo" - help - Adds a magic key combo that can be held on startup to remove all paired devices - default n - config ZMK_BLE_INIT_PRIORITY int "Init Priority" default 50 @@ -199,6 +193,10 @@ source "subsys/logging/Kconfig.template.log_config" rsource "boards/Kconfig" rsource "boards/shields/*/Kconfig.defconfig" +rsource "boards/shields/*/Kconfig.shield" + +osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig" +osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield" source "Kconfig.zephyr" |