diff options
| author | Nick <nick.win999@gmail.com> | 2020-09-15 14:41:59 -0500 |
|---|---|---|
| committer | Nick <nick.win999@gmail.com> | 2020-09-15 14:41:59 -0500 |
| commit | 18d21b0362c5c09902836ed4791bd13e1efd9a9a (patch) | |
| tree | 3f78a0ef43fc23e93195e1205a31f77154af7e76 /app/Kconfig | |
| parent | 81bc157f539235ad032fde78b6f6cec7a16d2c39 (diff) | |
| parent | c0806d27f1d048db335ecc854eab61b59e23ea7a (diff) | |
Merge remote-tracking branch 'upstream/main' into underglow/state-persistence
Diffstat (limited to 'app/Kconfig')
| -rw-r--r-- | app/Kconfig | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/app/Kconfig b/app/Kconfig index cda5c58..a9d4f34 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -37,27 +37,26 @@ menuconfig ZMK_BLE select BT select BT_SMP select BT_SMP_SC_PAIR_ONLY + select BT_SMP_APP_PAIRING_ACCEPT select BT_PERIPHERAL select BT_GATT_DIS select BT_GATT_BAS - select SETTINGS select BT_SETTINGS + select 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 - + config SYSTEM_WORKQUEUE_STACK_SIZE default 2048 +config ZMK_BLE_CLEAR_BONDS_ON_START + bool "Configuration that clears all bond information from the keyboard on startup." + default n + # HID GATT notifications sent this way are *not* picked up by Linux, and possibly others. config BT_GATT_NOTIFY_MULTIPLE default n @@ -107,28 +106,20 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL select BT_CENTRAL select BT_GATT_CLIENT -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 bool "Peripheral" + select BT_KEYS_OVERWRITE_OLDEST if ZMK_SPLIT_BLE_ROLE_PERIPHERAL config ZMK_USB default n +config BT_MAX_PAIRED + default 1 config BT_MAX_CONN - default 5 + default 1 config BT_GAP_AUTO_UPDATE_CONN_PARAMS default n @@ -141,8 +132,17 @@ endif endif -endmenu +if ZMK_BLE && (!ZMK_SPLIT_BLE || ZMK_SPLIT_BLE_ROLE_CENTRAL) + +config BT_MAX_CONN + default 6 +config BT_MAX_PAIRED + default 5 + +endif + +endmenu config ZMK_KSCAN_MOCK_DRIVER bool "Enable mock kscan driver to simulate key presses" @@ -227,6 +227,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" |