From 38a418a1d16707d721d85900c0c7c637cd1795a3 Mon Sep 17 00:00:00 2001
From: David Barr <dpbarr@gmail.com>
Date: Fri, 2 Oct 2020 14:16:59 +0100
Subject: [PATCH] updates as per PR changes (i hope)

---
 app/boards/shields/cradio/Kconfig.defconfig   |  7 +++---
 app/boards/shields/cradio/Kconfig.shield      |  2 +-
 app/boards/shields/cradio/cradio.dtsi         | 23 ++++++++-----------
 app/boards/shields/cradio/cradio_left.conf    |  3 +++
 app/boards/shields/cradio/cradio_left.overlay |  7 +-----
 app/boards/shields/cradio/cradio_right.conf   |  3 +++
 .../shields/cradio/cradio_right.overlay       |  3 ++-
 7 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
index ab38e258..46799b9e 100644
--- a/app/boards/shields/cradio/Kconfig.defconfig
+++ b/app/boards/shields/cradio/Kconfig.defconfig
@@ -1,10 +1,9 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
 config ZMK_KEYBOARD_NAME
 	default "cradio"
 
-# Unable to use interrupts as the same pin number is used
-# across A & B controllers, and STM32F303CCT6 can't enable
-# interrutps for multiple controllers for the same "line"
-# for the external interrupts.
 config ZMK_KSCAN_GPIO_POLLING
 	default y
 
diff --git a/app/boards/shields/cradio/Kconfig.shield b/app/boards/shields/cradio/Kconfig.shield
index 0385d23e..71a439e0 100644
--- a/app/boards/shields/cradio/Kconfig.shield
+++ b/app/boards/shields/cradio/Kconfig.shield
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Pete Johanson
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 config SHIELD_CRADIO
diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi
index 19225f90..582f58a4 100644
--- a/app/boards/shields/cradio/cradio.dtsi
+++ b/app/boards/shields/cradio/cradio.dtsi
@@ -1,8 +1,9 @@
 /*
  * Copyright (c) 2020 Pete Johanson
  *
- * SPDX-License-Identifier: MIT
+ * Copyright (c) 2020 The ZMK Contributors
  */
+ 
  #include <dt-bindings/zmk/matrix-transform.h>
  
 / {
@@ -16,31 +17,27 @@
         columns = <34>;
         rows = <1>;
 		map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) 		RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) 
-RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) 		RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)   
-RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) 		RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) 
-RC(0,15)  RC(0,16) 					RC(0,33) RC(0,32)  
->;
+	RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) 		RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) 
+	RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) 		RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)   
+	RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) 		RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) 
+	RC(0,15)  RC(0,16) 					RC(0,33) RC(0,32)  
+	>;
 
-	};	
-	
 	kscan0: kscan {
 		compatible = "zmk,kscan-gpio-direct";
 		label = "KSCAN";
 	};
 	
-	
-	
-	
 	bt_unpair_combo: bt_unpair_combo {
 		compatible = "zmk,bt-unpair-combo";
 	};
 	
-		};
+	};	
+	};
 		
 		&kscan0 {
 		input-gpios
-		= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
 			, <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
 			, <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
 			, <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
diff --git a/app/boards/shields/cradio/cradio_left.conf b/app/boards/shields/cradio/cradio_left.conf
index 1e028a78..405f04db 100644
--- a/app/boards/shields/cradio/cradio_left.conf
+++ b/app/boards/shields/cradio/cradio_left.conf
@@ -1,2 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
 CONFIG_ZMK_SPLIT=y
 CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/app/boards/shields/cradio/cradio_left.overlay b/app/boards/shields/cradio/cradio_left.overlay
index c6600724..6caf8e3d 100644
--- a/app/boards/shields/cradio/cradio_left.overlay
+++ b/app/boards/shields/cradio/cradio_left.overlay
@@ -1,11 +1,6 @@
 /*
  * Copyright (c) 2020 Pete Johanson
  *
- * SPDX-License-Identifier: MIT
+ * Copyright (c) 2020 The ZMK Contributors
  */
-#include "cradio.dtsi"
 
-&bt_unpair_combo {
-
-	key-positions = <0 16>;
-};
diff --git a/app/boards/shields/cradio/cradio_right.conf b/app/boards/shields/cradio/cradio_right.conf
index 990cf7c0..bd2c93bf 100644
--- a/app/boards/shields/cradio/cradio_right.conf
+++ b/app/boards/shields/cradio/cradio_right.conf
@@ -1,2 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
 CONFIG_ZMK_SPLIT=y
 CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay
index 3469199b..09efc53b 100644
--- a/app/boards/shields/cradio/cradio_right.overlay
+++ b/app/boards/shields/cradio/cradio_right.overlay
@@ -1,8 +1,9 @@
 /*
  * Copyright (c) 2020 Pete Johanson
  *
- * SPDX-License-Identifier: MIT
+ * Copyright (c) 2020 The ZMK Contributors
  */
+ 
 #include "cradio.dtsi"
 
 &default_transform {