From a65b746a863bbd8e07cf404b4249526f75b069a3 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Wed, 19 Aug 2020 23:34:34 -0400
Subject: fix(bluetooth): Add unpair combo if DT node exists

---
 app/Kconfig | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'app/Kconfig')

diff --git a/app/Kconfig b/app/Kconfig
index 416c985..5f618b1 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -45,12 +45,6 @@ menuconfig ZMK_BLE
 
 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
-- 
cgit v1.3.1


From fb3dadba8721b4e63d1284b90c3380b7897b2f50 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Thu, 20 Aug 2020 07:39:14 -0400
Subject: fix(bluetooth): disable BT_SETTINGS for now.

---
 app/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Kconfig')

diff --git a/app/Kconfig b/app/Kconfig
index 5f618b1..00d4ae3 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
 
-- 
cgit v1.3.1


From 973087639329893e916d3d341ee4326d1c14a711 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Thu, 20 Aug 2020 10:51:35 -0400
Subject: fix(shields): Load Kconfig for out-of-tree shields

---
 app/Kconfig                | 4 ++++
 app/cmake/zmk_config.cmake | 1 +
 2 files changed, 5 insertions(+)

(limited to 'app/Kconfig')

diff --git a/app/Kconfig b/app/Kconfig
index 00d4ae3..877fce4 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -193,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"
 
diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake
index 518c3c3..017dd11 100644
--- a/app/cmake/zmk_config.cmake
+++ b/app/cmake/zmk_config.cmake
@@ -44,6 +44,7 @@ endif()
 set(CACHED_ZMK_CONFIG ${ZMK_CONFIG} CACHE STRING "Selected user ZMK config")
 
 if (ZMK_CONFIG)
+	set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}")
 	if(EXISTS ${ZMK_CONFIG}/boards)
 		message(STATUS "Adding ZMK config directory as board root: ${ZMK_CONFIG}")
 		list(APPEND BOARD_ROOT ${ZMK_CONFIG})
-- 
cgit v1.3.1