From 0b125c028c65ff4a5e326760a7d0ac0f8941899c Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Fri, 9 Oct 2020 11:48:06 -0700
Subject: [PATCH] address pr comments

---
 app/boards/shields/microdox/Kconfig.defconfig    |  2 ++
 app/boards/shields/microdox/Kconfig.shield       |  3 +--
 .../shields/microdox/boards/nice_nano.overlay    |  5 +++++
 app/boards/shields/microdox/microdox.dtsi        |  7 +------
 app/boards/shields/microdox/microdox.keymap      | 16 +++++++++-------
 .../shields/microdox/microdox_left.overlay       |  4 ----
 .../shields/microdox/microdox_right.overlay      |  4 ----
 7 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
index 218443f9..4840eceb 100644
--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -1,3 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 if SHIELD_MICRODOX_LEFT
 
diff --git a/app/boards/shields/microdox/Kconfig.shield b/app/boards/shields/microdox/Kconfig.shield
index 7d7148de..ac79eab6 100644
--- a/app/boards/shields/microdox/Kconfig.shield
+++ b/app/boards/shields/microdox/Kconfig.shield
@@ -1,5 +1,4 @@
-# Copyright (c) 2020 Pete Johanson
-# Copyright (c) 2020 Kellen Carey
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 config SHIELD_MICRODOX_LEFT
diff --git a/app/boards/shields/microdox/boards/nice_nano.overlay b/app/boards/shields/microdox/boards/nice_nano.overlay
index c7c3eb8e..58cd8613 100644
--- a/app/boards/shields/microdox/boards/nice_nano.overlay
+++ b/app/boards/shields/microdox/boards/nice_nano.overlay
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
 &spi1 {
 	compatible = "nordic,nrf-spi";
 	/* Cannot be used together with i2c0. */
diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi
index bf7950df..55c67dd3 100644
--- a/app/boards/shields/microdox/microdox.dtsi
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson
- * Copyright (c) 2020 Kellen Carey
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
@@ -43,10 +42,6 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
 		
 	};
 
-	bt_unpair_combo: bt_unpair_combo {
-		compatible = "zmk,bt-unpair-combo";
-	};
-
 	// TODO: per-key RGB node(s)?
 };
 
diff --git a/app/boards/shields/microdox/microdox.keymap b/app/boards/shields/microdox/microdox.keymap
index 916141c7..5747771b 100644
--- a/app/boards/shields/microdox/microdox.keymap
+++ b/app/boards/shields/microdox/microdox.keymap
@@ -27,15 +27,15 @@
                 };
                 nav_layer {
 // -----------------------------------------------------------------------------------------
-// |     |     | ESC |  ~   |     |   | TAB | HOME |  UP  | END | DEL  |
-// |     | GUI | ALT | CTRL | NUM |   |  /  | LEFT | DOWN | RGT | BKSP |
-// |     |     |     |      |     |   |  \  | ENT  |      |     |      |
+// |BTCLR|     | ESC |  ~   |     |   | TAB | HOME |  UP  | END | DEL  |
+// | BT1 | GUI | ALT | CTRL | NUM |   |  /  | LEFT | DOWN | RGT | BKSP |
+// | BT2 |     |     |      |     |   |  \  | ENT  |      |     |      |
 //             |     |      |     |   |     |      |      |
                         bindings = <
-   &trans &trans  &kp ESC  &kp TILD &trans     &kp TAB  &kp HOME &kp UARW &kp END  &kp DEL
-   &trans &kp GUI &kp RALT &kp LCTL &mo 3      &kp FSLH &kp LARW &kp DARW &kp RARW &kp BKSP
-   &trans &trans  &trans   &trans   &trans     &kp BSLH &kp RET  &trans   &trans    &trans
-                  &trans   &trans   &trans     &trans   &trans   &trans
+   &bt BT_CLR   &trans  &kp ESC  &kp TILD &trans     &kp TAB  &kp HOME &kp UARW &kp END  &kp DEL
+   &bt BT_SEL 0 &kp GUI &kp RALT &kp LCTL &mo 3      &kp FSLH &kp LARW &kp DARW &kp RARW &kp BKSP
+   &bt BT_SEL 1 &trans  &trans   &trans   &trans     &kp BSLH &kp RET  &trans   &trans    &trans
+                        &trans   &trans   &trans     &trans   &trans   &trans
                         >;
                 };
 
@@ -53,6 +53,8 @@
                         >;
                 };
 
+// This layer is unreachable until "tri layer state" is sorted out.
+// Leaving it here for completeness.
                 num_layer {
 // -----------------------------------------------------------------------------------------
 // |     |     |     |     |     |   |  A  |  7  |  8  |  9  |  D  |
diff --git a/app/boards/shields/microdox/microdox_left.overlay b/app/boards/shields/microdox/microdox_left.overlay
index 0a3f823a..07dc0d26 100644
--- a/app/boards/shields/microdox/microdox_left.overlay
+++ b/app/boards/shields/microdox/microdox_left.overlay
@@ -16,7 +16,3 @@
 		, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
 		;
 };
-
-&bt_unpair_combo {
-	key-positions = <0 38>;
-};
diff --git a/app/boards/shields/microdox/microdox_right.overlay b/app/boards/shields/microdox/microdox_right.overlay
index 2638a398..a0d86013 100644
--- a/app/boards/shields/microdox/microdox_right.overlay
+++ b/app/boards/shields/microdox/microdox_right.overlay
@@ -20,7 +20,3 @@
 		, <&pro_micro_a  3 GPIO_ACTIVE_HIGH>
 		;
 };
-
-&bt_unpair_combo {
-	key-positions = <9 35>;
-};