summaryrefslogtreecommitdiff
path: root/app/dts
diff options
context:
space:
mode:
Diffstat (limited to 'app/dts')
-rw-r--r--app/dts/behaviors.dtsi3
-rw-r--r--app/dts/behaviors/layer_tap.dtsi12
-rw-r--r--app/dts/behaviors/mod_tap.dtsi5
-rw-r--r--app/dts/behaviors/none.dtsi15
-rw-r--r--app/dts/behaviors/reset.dtsi9
-rw-r--r--app/dts/behaviors/toggle_layer.dtsi15
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml23
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml8
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-none.yaml8
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-reset.yaml5
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml8
-rw-r--r--app/dts/bindings/zmk,bt-unpair-combo.yaml12
-rw-r--r--app/dts/bindings/zmk,keymap.yaml22
-rw-r--r--app/dts/bindings/zmk,kscan-mock.yaml2
-rw-r--r--app/dts/bindings/zmk,layers.yaml18
15 files changed, 126 insertions, 39 deletions
diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi
index 04e42b6..ab70bcc 100644
--- a/app/dts/behaviors.dtsi
+++ b/app/dts/behaviors.dtsi
@@ -1,7 +1,10 @@
#include <behaviors/key_press.dtsi>
#include <behaviors/transparent.dtsi>
+#include <behaviors/none.dtsi>
#include <behaviors/mod_tap.dtsi>
+#include <behaviors/layer_tap.dtsi>
#include <behaviors/momentary_layer.dtsi>
+#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
diff --git a/app/dts/behaviors/layer_tap.dtsi b/app/dts/behaviors/layer_tap.dtsi
new file mode 100644
index 0000000..af7319b
--- /dev/null
+++ b/app/dts/behaviors/layer_tap.dtsi
@@ -0,0 +1,12 @@
+/ {
+ behaviors {
+ lt: behavior_layer_tap {
+ compatible = "zmk,behavior-hold-tap";
+ label = "LAYER_TAP";
+ #binding-cells = <2>;
+ flavor = "tap-preferred";
+ tapping_term_ms = <200>;
+ bindings = <&mo>, <&kp>;
+ };
+ };
+};
diff --git a/app/dts/behaviors/mod_tap.dtsi b/app/dts/behaviors/mod_tap.dtsi
index 8e3b4e9..4ce732b 100644
--- a/app/dts/behaviors/mod_tap.dtsi
+++ b/app/dts/behaviors/mod_tap.dtsi
@@ -1,9 +1,12 @@
/ {
behaviors {
mt: behavior_mod_tap {
- compatible = "zmk,behavior-mod-tap";
+ compatible = "zmk,behavior-hold-tap";
label = "MOD_TAP";
#binding-cells = <2>;
+ flavor = "hold-preferred";
+ tapping_term_ms = <200>;
+ bindings = <&kp>, <&kp>;
};
};
};
diff --git a/app/dts/behaviors/none.dtsi b/app/dts/behaviors/none.dtsi
new file mode 100644
index 0000000..e84ed49
--- /dev/null
+++ b/app/dts/behaviors/none.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/ {
+ behaviors {
+ none: behavior_none {
+ compatible = "zmk,behavior-none";
+ label = "NONE";
+ #binding-cells = <0>;
+ };
+ };
+};
diff --git a/app/dts/behaviors/reset.dtsi b/app/dts/behaviors/reset.dtsi
index 4e3b444..fc4fa14 100644
--- a/app/dts/behaviors/reset.dtsi
+++ b/app/dts/behaviors/reset.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/zmk/reset.h>
+
/ {
behaviors {
reset: behavior_reset {
@@ -5,5 +7,12 @@
label = "RESET";
#binding-cells = <0>;
};
+
+ bootloader: behavior_reset_dfu {
+ compatible = "zmk,behavior-reset";
+ label = "BOOTLOADER_RESET";
+ type = <RST_UF2>;
+ #binding-cells = <0>;
+ };
};
};
diff --git a/app/dts/behaviors/toggle_layer.dtsi b/app/dts/behaviors/toggle_layer.dtsi
new file mode 100644
index 0000000..86a050d
--- /dev/null
+++ b/app/dts/behaviors/toggle_layer.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+ / {
+ behaviors {
+ tog: behavior_toggle_layer {
+ compatible = "zmk,behavior-toggle-layer";
+ label = "TOGGLE_LAYER";
+ #binding-cells = <1>;
+ };
+ };
+};
diff --git a/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml b/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
new file mode 100644
index 0000000..a20578f
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2020, Cody McGinnis; Okke Formsma
+# SPDX-License-Identifier: MIT
+
+description: Hold or Tap behavior
+
+compatible: "zmk,behavior-hold-tap"
+
+include: two_param.yaml
+
+properties:
+ bindings:
+ type: phandles
+ required: true
+ tapping_term_ms:
+ type: int
+ flavor:
+ type: string
+ required: false
+ default: "hold-preferred"
+ enum:
+ - "hold-preferred"
+ - "balanced"
+ - "tap-preferred" \ No newline at end of file
diff --git a/app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml b/app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml
deleted file mode 100644
index 7911082..0000000
--- a/app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2020, Pete Johanson
-# SPDX-License-Identifier: MIT
-
-description: Mod-Tap Beavhior
-
-compatible: "zmk,behavior-mod-tap"
-
-include: two_param.yaml
diff --git a/app/dts/bindings/behaviors/zmk,behavior-none.yaml b/app/dts/bindings/behaviors/zmk,behavior-none.yaml
new file mode 100644
index 0000000..9c66c94
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-none.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2020, Pete Johanson
+# SPDX-License-Identifier: MIT
+
+description: None Binding Behavior
+
+compatible: "zmk,behavior-none"
+
+include: zero_param.yaml
diff --git a/app/dts/bindings/behaviors/zmk,behavior-reset.yaml b/app/dts/bindings/behaviors/zmk,behavior-reset.yaml
index c8e5e6f..061b15e 100644
--- a/app/dts/bindings/behaviors/zmk,behavior-reset.yaml
+++ b/app/dts/bindings/behaviors/zmk,behavior-reset.yaml
@@ -6,3 +6,8 @@ description: Keyboard Reset Behavior
compatible: "zmk,behavior-reset"
include: zero_param.yaml
+
+properties:
+ type:
+ type: int
+ default: 0
diff --git a/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml b/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
new file mode 100644
index 0000000..065949f
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2020, Cody McGinnis <brainwart@gmail.com>
+# SPDX-License-Identifier: MIT
+
+description: Toggle Layer
+
+compatible: "zmk,behavior-toggle-layer"
+
+include: one_param.yaml
diff --git a/app/dts/bindings/zmk,bt-unpair-combo.yaml b/app/dts/bindings/zmk,bt-unpair-combo.yaml
new file mode 100644
index 0000000..d781347
--- /dev/null
+++ b/app/dts/bindings/zmk,bt-unpair-combo.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2020, Pete Johanson
+# SPDX-License-Identifier: MIT
+
+description: |
+ Defines a set of key positions that will unpair all BT devices if held on startup.
+
+compatible: "zmk,bt-unpair-combo"
+
+properties:
+ key-positions:
+ type: array
+ required: true
diff --git a/app/dts/bindings/zmk,keymap.yaml b/app/dts/bindings/zmk,keymap.yaml
index b9517a3..fb6d914 100644
--- a/app/dts/bindings/zmk,keymap.yaml
+++ b/app/dts/bindings/zmk,keymap.yaml
@@ -3,15 +3,13 @@ description: |
compatible: "zmk,keymap"
-properties:
- transform:
- type: phandle
- required: false
-
- label:
- type: string
- required: true
-
- layers:
- type: phandles
- required: true
+child-binding:
+ description: "A layer to be used in a keymap"
+
+ properties:
+ bindings:
+ type: phandle-array
+ required: true
+ sensor-bindings:
+ type: phandle-array
+ required: false
diff --git a/app/dts/bindings/zmk,kscan-mock.yaml b/app/dts/bindings/zmk,kscan-mock.yaml
index 41dd5b8..f9d83fa 100644
--- a/app/dts/bindings/zmk,kscan-mock.yaml
+++ b/app/dts/bindings/zmk,kscan-mock.yaml
@@ -15,3 +15,5 @@ properties:
type: int
columns:
type: int
+ exit-after:
+ type: boolean
diff --git a/app/dts/bindings/zmk,layers.yaml b/app/dts/bindings/zmk,layers.yaml
deleted file mode 100644
index 1a3592e..0000000
--- a/app/dts/bindings/zmk,layers.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-description: |
- Allows defining the various keymap layers for use.
-
-compatible: "zmk,layers"
-
-child-binding:
- description: "A layer to be used in a keymap"
-
- properties:
- label:
- type: string
- required: true
- bindings:
- type: phandle-array
- required: true
- sensor-bindings:
- type: phandle-array
- required: false