summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-06-21 21:56:49 -0400
committerPete Johanson <peter@peterjohanson.com>2020-06-21 21:56:49 -0400
commit93635077e600e269aa905a0558c07acf0efebffb (patch)
treeab06f053b039b77463c9244e0946a614567a3a4e
parent223edf05ad08938b066f9187668ebfae43c5e91a (diff)
Implement momentary layer + transparent behaviors
* Implement "momentary layer" behavior with `&mo` reference. * Implement basic "transparent" behavior with `&trans` reference.
-rw-r--r--app/CMakeLists.txt2
-rw-r--r--app/boards/native_posix.overlay8
-rw-r--r--app/dts/behaviors/momentary_layer.dtsi9
-rw-r--r--app/dts/behaviors/transparent.dtsi9
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml8
-rw-r--r--app/dts/bindings/behaviors/zmk,behavior-transparent.yaml8
-rw-r--r--app/src/behaviors/behavior_momentary_layer.c55
-rw-r--r--app/src/behaviors/behavior_transparent.c48
8 files changed, 144 insertions, 3 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e91bd58..38bd075 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -37,6 +37,8 @@ target_sources(app PRIVATE src/behaviors/behavior_hid.c)
target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
target_sources(app PRIVATE src/behaviors/behavior_reset.c)
target_sources(app PRIVATE src/behaviors/behavior_mod_tap.c)
+target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
+target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c)
target_sources_ifdef(CONFIG_ZMK_KSCAN_MOCK_DRIVER app PRIVATE src/kscan_mock.c)
target_sources_ifdef(CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER app PRIVATE src/kscan_composite.c)
diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay
index 8004705..1a4fb13 100644
--- a/app/boards/native_posix.overlay
+++ b/app/boards/native_posix.overlay
@@ -1,6 +1,8 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors/key_press.dtsi>
+#include <behaviors/transparent.dtsi>
#include <behaviors/mod_tap.dtsi>
+#include <behaviors/momentary_layer.dtsi>
#include <behaviors/reset.dtsi>
#include <behaviors/keymap.dtsi>
#include <behaviors/hid.dtsi>
@@ -65,7 +67,7 @@
>;
bindings = <
- &kp 5 &mt MOD_LSFT KC_B &kp 10 &kp 11
+ &kp 5 &mo 1 &kp 10 &kp 11
&kp 1 &kp 2 &kp 4 &kp 89>;
};
@@ -77,8 +79,8 @@
>;
bindings = <
- &kp 5 &kp 0 &kp 10 &kp 11
- &kp 1 &kp 2 &kp 4 &kp 89>;
+ &kp 20 &trans &kp 18 &kp 19
+ &kp 21 &kp 22 &kp 24 &kp 49>;
};
raise: layer_2 {
diff --git a/app/dts/behaviors/momentary_layer.dtsi b/app/dts/behaviors/momentary_layer.dtsi
new file mode 100644
index 0000000..e5b6c3c
--- /dev/null
+++ b/app/dts/behaviors/momentary_layer.dtsi
@@ -0,0 +1,9 @@
+/ {
+ behaviors {
+ mo: behavior_momentary_layer {
+ compatible = "zmk,behavior-momentary-layer";
+ label = "MO";
+ #binding-cells = <1>;
+ };
+ };
+};
diff --git a/app/dts/behaviors/transparent.dtsi b/app/dts/behaviors/transparent.dtsi
new file mode 100644
index 0000000..ddd0522
--- /dev/null
+++ b/app/dts/behaviors/transparent.dtsi
@@ -0,0 +1,9 @@
+/ {
+ behaviors {
+ trans: behavior_transparent {
+ compatible = "zmk,behavior-transparent";
+ label = "TRANS";
+ #binding-cells = <0>;
+ };
+ };
+};
diff --git a/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml b/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml
new file mode 100644
index 0000000..70c7c7f
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2020, Pete Johanson
+# SPDX-License-Identifier: MIT
+
+description: Momentary layer on press/release behavior
+
+compatible: "zmk,behavior-momentary-layer"
+
+include: one_param.yaml
diff --git a/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml b/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml
new file mode 100644
index 0000000..33f1aba
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2020, Pete Johanson
+# SPDX-License-Identifier: MIT
+
+description: Transparent Binding Behavior
+
+compatible: "zmk,behavior-transparent"
+
+include: zero_param.yaml
diff --git a/app/src/behaviors/behavior_momentary_layer.c b/app/src/behaviors/behavior_momentary_layer.c
new file mode 100644
index 0000000..f85d33d
--- /dev/null
+++ b/app/src/behaviors/behavior_momentary_layer.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_momentary_layer
+
+#include <device.h>
+#include <drivers/behavior.h>
+#include <logging/log.h>
+
+#include <zmk/events.h>
+#include <zmk/keymap.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+struct behavior_mo_config { };
+struct behavior_mo_data { };
+
+static int behavior_mo_init(struct device *dev)
+{
+ return 0;
+};
+
+
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
+{
+ LOG_DBG("position %d layer %d", position, layer);
+
+ return zmk_keymap_layer_activate(layer);
+}
+
+static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
+{
+ LOG_DBG("position %d layer %d", position, layer);
+
+ return zmk_keymap_layer_deactivate(layer);
+}
+
+static const struct behavior_driver_api behavior_mo_driver_api = {
+ .binding_pressed = on_keymap_binding_pressed,
+ .binding_released = on_keymap_binding_released
+};
+
+
+static const struct behavior_mo_config behavior_mo_config = {};
+
+static struct behavior_mo_data behavior_mo_data;
+
+DEVICE_AND_API_INIT(behavior_mo, DT_INST_LABEL(0), behavior_mo_init,
+ &behavior_mo_data,
+ &behavior_mo_config,
+ APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+ &behavior_mo_driver_api);
diff --git a/app/src/behaviors/behavior_transparent.c b/app/src/behaviors/behavior_transparent.c
new file mode 100644
index 0000000..5109264
--- /dev/null
+++ b/app/src/behaviors/behavior_transparent.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_transparent
+
+#include <device.h>
+#include <power/reboot.h>
+#include <drivers/behavior.h>
+#include <logging/log.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+struct behavior_transparent_config { };
+struct behavior_transparent_data { };
+
+static int behavior_transparent_init(struct device *dev)
+{
+ return 0;
+};
+
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
+{
+ return 1;
+}
+
+static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
+{
+ return 1;
+}
+
+static const struct behavior_driver_api behavior_transparent_driver_api = {
+ .binding_pressed = on_keymap_binding_pressed,
+ .binding_released = on_keymap_binding_released,
+};
+
+
+static const struct behavior_transparent_config behavior_transparent_config = {};
+
+static struct behavior_transparent_data behavior_transparent_data;
+
+DEVICE_AND_API_INIT(behavior_transparent, DT_INST_LABEL(0), behavior_transparent_init,
+ &behavior_transparent_data,
+ &behavior_transparent_config,
+ APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+ &behavior_transparent_driver_api); \ No newline at end of file