summaryrefslogtreecommitdiff
path: root/app/Kconfig
diff options
context:
space:
mode:
authorCrossR <r.cross@lancaster.ac.uk>2020-08-19 20:53:40 +0100
committerCrossR <r.cross@lancaster.ac.uk>2020-08-19 20:53:40 +0100
commitf8a635aaa0b379d499c0b4c4cd5d7831e1fda7fd (patch)
treeb2adb5a989b2a67360aea46abe0d13ffa02734a9 /app/Kconfig
parentdcd36f12e049ee2c423204ebaaa3c16062d9fd5e (diff)
parentebd6fbb2254cfcdd8af6309dd9a5c3251ac19935 (diff)
Merge remote-tracking branch 'upstream/main' into CrossR/Sofle
Diffstat (limited to 'app/Kconfig')
-rw-r--r--app/Kconfig13
1 files changed, 11 insertions, 2 deletions
diff --git a/app/Kconfig b/app/Kconfig
index be5a1e4..416c985 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -40,11 +40,17 @@ menuconfig ZMK_BLE
select BT_PERIPHERAL
select BT_GATT_DIS
select BT_GATT_BAS
- # select SETTINGS
- # select BT_SETTINGS
+ select 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
@@ -124,6 +130,9 @@ config ZMK_USB
config BT_MAX_CONN
default 5
+config BT_GAP_AUTO_UPDATE_CONN_PARAMS
+ default n
+
endif
endchoice