diff options
| author | Nick <nick.win999@gmail.com> | 2020-09-07 12:22:18 -0500 |
|---|---|---|
| committer | Nick <nick.win999@gmail.com> | 2020-09-07 12:22:18 -0500 |
| commit | fa40558f73ae0b7f693d93ec931aecf9d52167a1 (patch) | |
| tree | 3ab362de33ea29d2489d8a4414f88044b4e7137c /app/Kconfig | |
| parent | bc282a0a4f1af4f6f78a0dd63e5b022eb76a603c (diff) | |
| parent | 61b249666b13f7f356c0e77ee5eb500d672d7dce (diff) | |
Merge commit '61b249666b13f7f356c0e77ee5eb500d672d7dce' into boards/dz60rgb
Diffstat (limited to 'app/Kconfig')
| -rw-r--r-- | app/Kconfig | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/Kconfig b/app/Kconfig index 01384a0..877fce4 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -41,7 +41,7 @@ menuconfig ZMK_BLE select BT_GATT_DIS select BT_GATT_BAS select SETTINGS - select BT_SETTINGS + # select BT_SETTINGS if ZMK_BLE @@ -88,6 +88,7 @@ config ZMK_SPLIT_BLE bool "Split keyboard support via BLE transport" depends on ZMK_BLE default y + select BT_USER_PHY_UPDATE if ZMK_SPLIT_BLE @@ -105,6 +106,10 @@ if ZMK_SPLIT_BLE_ROLE_CENTRAL config BT_MAX_CONN default 5 +config BT_MAX_PAIRED + # Bump this everywhere once we support switching active connections! + default 2 + endif config ZMK_SPLIT_BLE_ROLE_PERIPHERAL @@ -119,6 +124,9 @@ config ZMK_USB config BT_MAX_CONN default 5 +config BT_GAP_AUTO_UPDATE_CONN_PARAMS + default n + endif endchoice @@ -185,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" |