Merge remote-tracking branch 'upstream/main' into bluetooth/battery-reporting

7 files changed, 30 insertions, 12 deletions

diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi
index ab70bcc..202202b 100644
--- a/app/dts/behaviors.dtsi
+++ b/app/dts/behaviors.dtsi
@@ -7,4 +7,5 @@
 #include <behaviors/toggle_layer.dtsi>
 #include <behaviors/reset.dtsi>
 #include <behaviors/sensor_rotate_key_press.dtsi>
-#include <behaviors/rgb_underglow.dtsi>
\ No newline at end of file
+#include <behaviors/rgb_underglow.dtsi>
+#include <behaviors/bluetooth.dtsi>
\ No newline at end of file
diff --git a/app/dts/behaviors/bluetooth.dtsi b/app/dts/behaviors/bluetooth.dtsi
new file mode 100644
index 0000000..ea09f4a
--- /dev/null
+++ b/app/dts/behaviors/bluetooth.dtsi
@@ -0,0 +1,9 @@
+/ {
+	behaviors {
+		bt: behavior_bluetooth {
+			compatible = "zmk,behavior-bluetooth";
+			label = "BLUETOOTH";
+			#binding-cells = <2>;
+		};
+	};
+};
diff --git a/app/dts/behaviors/toggle_layer.dtsi b/app/dts/behaviors/toggle_layer.dtsi
index 86a050d..4045396 100644
--- a/app/dts/behaviors/toggle_layer.dtsi
+++ b/app/dts/behaviors/toggle_layer.dtsi
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
- 
- / {
+
+/ {
 	behaviors {
 		tog: behavior_toggle_layer {
 			compatible = "zmk,behavior-toggle-layer";
diff --git a/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml b/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml
new file mode 100644
index 0000000..127ebe0
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2020, Peter Johanson
+# SPDX-License-Identifier: MIT
+
+description: Bluetooth Behavior
+
+compatible: "zmk,behavior-bluetooth"
+
+include: two_param.yaml
diff --git a/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml b/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
index a20578f..5f74e9a 100644
--- a/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
+++ b/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Cody McGinnis; Okke Formsma
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 description: Hold or Tap behavior
@@ -12,12 +12,12 @@ properties:
     type: phandles
     required: true
   tapping_term_ms:
-    type: int 
+    type: int
   flavor:
     type: string
     required: false
     default: "hold-preferred"
     enum:
-    - "hold-preferred"
-    - "balanced"
-    - "tap-preferred"
\ No newline at end of file
+      - "hold-preferred"
+      - "balanced"
+      - "tap-preferred"
diff --git a/app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml b/app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml
index 6b6d5b0..2cb74b9 100644
--- a/app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml
+++ b/app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml
@@ -1,8 +1,8 @@
-# Copyright (c) 2020, Nick Winans
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 description: RGB Underglow Action
 
 compatible: "zmk,behavior-rgb-underglow"
 
-include: one_param.yaml
\ No newline at end of file
+include: one_param.yaml
diff --git a/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml b/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
index 065949f..0a9723f 100644
--- a/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
+++ b/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Cody McGinnis <brainwart@gmail.com>
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 description: Toggle Layer