Merge d38b4d383f into 7bd74a6b0f

app/CMakeLists.txt

@@ -47,6 +47,7 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse.c)
   target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_KEY_TOGGLE app PRIVATE src/behaviors/behavior_key_toggle.c)
+  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_TURBO_KEY app PRIVATE src/behaviors/behavior_turbo_key.c)
   target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c)
   target_sources(app PRIVATE src/behaviors/behavior_sticky_key.c)
   target_sources(app PRIVATE src/behaviors/behavior_caps_word.c)

app/Kconfig

@@ -486,6 +486,12 @@ config ZMK_MACRO_DEFAULT_TAP_MS
     int "Default time to wait (in milliseconds) between the press and release events of a tapped behavior in macros"
     default 30
 
+DT_COMPAT_ZMK_BEHAVIOR_TURBO_KEY := zmk,behavior-turbo-key
+
+config ZMK_BEHAVIOR_TURBO_KEY
+        bool
+        default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BEHAVIOR_TURBO_KEY))
+
 endmenu
 
 menu "Advanced"

app/dts/bindings/behaviors/zmk,behavior-turbo-key.yaml

@@ -0,0 +1,22 @@
+# Copyright (c) 2022 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+description: Turbo key behavior
+
+compatible: "zmk,behavior-turbo-key"
+
+include: zero_param.yaml
+
+properties:
+  bindings:
+    type: phandle-array
+    required: true
+  wait-ms:
+    type: int
+    default: 200
+  tap-ms:
+    type: int
+    default: 5
+  toggle-term-ms:
+    type: int
+    default: -1

app/src/behaviors/behavior_turbo_key.c

@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_turbo_key
+
+#include <zephyr/device.h>
+#include <drivers/behavior.h>
+#include <zephyr/logging/log.h>
+
+#include <zmk/hid.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/behavior.h>
+#include <zmk/behavior_queue.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+struct behavior_turbo_config {
+    int tap_ms;
+    int wait_ms;
+    int toggle_term_ms;
+    const struct zmk_behavior_binding binding;
+};
+
+struct behavior_turbo_data {
+    uint32_t position;
+    bool is_active;
+    bool is_pressed;
+
+    int32_t press_time;
+
+    int tap_ms;
+    int wait_ms;
+    struct zmk_behavior_binding binding;
+
+    // Timer Data
+    bool timer_started;
+    bool timer_cancelled;
+    bool turbo_decided;
+    int64_t release_at;
+    struct k_work_delayable release_timer;
+};
+
+static int behavior_turbo_key_init(const struct device *dev) { return 0; };
+
+static int stop_timer(struct behavior_turbo_data *data) {
+    int timer_cancel_result = k_work_cancel_delayable(&data->release_timer);
+    if (timer_cancel_result == -EINPROGRESS) {
+        // too late to cancel, we'll let the timer handler clear up.
+        data->timer_cancelled = true;
+    }
+    return timer_cancel_result;
+}
+
+static void clear_turbo(struct behavior_turbo_data *data) {
+    LOG_DBG("Turbo deactivated");
+    data->is_active = false;
+    stop_timer(data);
+}
+
+static void reset_timer(struct behavior_turbo_data *data, struct zmk_behavior_binding_event event) {
+    data->release_at = event.timestamp + data->wait_ms;
+    int32_t ms_left = data->release_at - k_uptime_get();
+    if (ms_left > 0) {
+        k_work_schedule(&data->release_timer, K_MSEC(ms_left));
+        LOG_DBG("Successfully reset turbo timer at position %d", data->position);
+    }
+}
+
+static void behavior_turbo_timer_handler(struct k_work *item) {
+    struct behavior_turbo_data *data =
+        CONTAINER_OF(item, struct behavior_turbo_data, release_timer);
+    if (!data->is_active) {
+        return;
+    }
+    if (data->timer_cancelled) {
+        return;
+    }
+    LOG_DBG("Turbo timer reached.");
+    struct zmk_behavior_binding_event event = {.position = data->position,
+                                               .timestamp = k_uptime_get()};
+    zmk_behavior_queue_add(event.position, data->binding, true, data->tap_ms);
+    zmk_behavior_queue_add(event.position, data->binding, false, 0);
+    reset_timer(data, event);
+}
+
+static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
+                                     struct zmk_behavior_binding_event event) {
+    const struct device *dev = device_get_binding(binding->behavior_dev);
+    const struct behavior_turbo_config *cfg = dev->config;
+    struct behavior_turbo_data *data = dev->data;
+
+    if (!data->is_active) {
+        data->is_active = true;
+
+        LOG_DBG("%d started new turbo", event.position);
+        data->press_time = k_uptime_get();
+        k_work_init_delayable(&data->release_timer, behavior_turbo_timer_handler);
+        zmk_behavior_queue_add(event.position, cfg->binding, true, cfg->tap_ms);
+        zmk_behavior_queue_add(event.position, cfg->binding, false, 0);
+        reset_timer(data, event);
+    } else {
+        clear_turbo(data);
+    }
+    return ZMK_BEHAVIOR_OPAQUE;
+}
+
+static int on_keymap_binding_released(struct zmk_behavior_binding *binding,
+                                      struct zmk_behavior_binding_event event) {
+    const struct device *dev = device_get_binding(binding->behavior_dev);
+    const struct behavior_turbo_config *cfg = dev->config;
+    struct behavior_turbo_data *data = dev->data;
+
+    if (data->is_active) {
+        data->is_pressed = false;
+        int32_t elapsedTime = k_uptime_get() - data->press_time;
+        LOG_DBG("turbo elapsed time: %d", elapsedTime);
+        if (elapsedTime > cfg->toggle_term_ms) {
+            clear_turbo(data);
+        }
+    }
+    return 0;
+}
+
+static const struct behavior_driver_api behavior_turbo_key_driver_api = {
+    .binding_pressed = on_keymap_binding_pressed,
+    .binding_released = on_keymap_binding_released,
+};
+
+#define _TRANSFORM_ENTRY(idx, node)                                                                \
+    {                                                                                              \
+        .behavior_dev = DT_LABEL(DT_INST_PHANDLE_BY_IDX(node, bindings, idx)),                     \
+        .param1 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param1), (0),       \
+                              (DT_INST_PHA_BY_IDX(node, bindings, idx, param1))),                  \
+        .param2 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param2), (0),       \
+                              (DT_INST_PHA_BY_IDX(node, bindings, idx, param2))),                  \
+    }
+
+#define TURBO_INST(n)                                                                              \
+    static struct behavior_turbo_config behavior_turbo_config_##n = {                              \
+        .tap_ms = DT_INST_PROP(n, tap_ms),                                                         \
+        .wait_ms = DT_INST_PROP(n, wait_ms),                                                       \
+        .toggle_term_ms = DT_INST_PROP(n, toggle_term_ms),                                         \
+        .binding = _TRANSFORM_ENTRY(0, n)};                                                        \
+    static struct behavior_turbo_data behavior_turbo_data_##n = {                                  \
+        .tap_ms = DT_INST_PROP(n, tap_ms),                                                         \
+        .wait_ms = DT_INST_PROP(n, wait_ms),                                                       \
+        .binding = _TRANSFORM_ENTRY(0, n)};                                                        \
+    DEVICE_DT_INST_DEFINE(n, behavior_turbo_key_init, NULL, &behavior_turbo_data_##n,              \
+                          &behavior_turbo_config_##n, APPLICATION,                                 \
+                          CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_turbo_key_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(TURBO_INST)

app/tests/turbo/basic/events.patterns

@@ -0,0 +1 @@
+s/.*hid_listener_keycode_//p

app/tests/turbo/basic/keycode_events.snapshot

@@ -0,0 +1,8 @@
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00

app/tests/turbo/basic/native_posix_64.keymap

@@ -0,0 +1,8 @@
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+    events = <
+        ZMK_MOCK_PRESS(0,0,1000)
+        ZMK_MOCK_RELEASE(0,0,10)
+    >;
+};

app/tests/turbo/behavior_keymap.dtsi

@@ -0,0 +1,36 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan_mock.h>
+
+/ {
+    behaviors {
+        turbo: turbo {
+            compatible = "zmk,behavior-turbo-key";
+            label = "turbo";
+            #binding-cells = <0>;
+            tap-ms = <5>;
+            wait-ms = <300>;
+            bindings = <&kp C>;
+        };
+        t2: turbo2 {
+            compatible = "zmk,behavior-turbo-key";
+            label = "turbo2";
+            #binding-cells = <0>;
+            tap-ms = <5>;
+            wait-ms = <300>;
+            toggle-term-ms = <50>;
+            bindings = <&kp C>;
+        };
+    };
+
+    keymap {
+        compatible = "zmk,keymap";
+        label ="Default keymap";
+
+        default_layer {
+            bindings = <
+                &turbo &t2
+                &kp D &kp Q>;
+        };
+    };
+};

app/tests/turbo/toggle/events.patterns

@@ -0,0 +1 @@
+s/.*hid_listener_keycode_//p

app/tests/turbo/toggle/keycode_events.snapshot

@@ -0,0 +1,8 @@
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00

app/tests/turbo/toggle/native_posix_64.keymap

@@ -0,0 +1,10 @@
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+    events = <
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,1000)
+        ZMK_MOCK_PRESS(0,1,10)
+        ZMK_MOCK_RELEASE(0,1,10)
+    >;
+};

docs/docs/behaviors/turbo.md

@@ -0,0 +1,51 @@
+---
+title: Turbo Behavior
+sidebar_label: Turbo Key
+---
+
+## Summary
+
+The turbo behavior will repeatedly trigger a behavior after a specified amount of time.
+
+### Configuration
+
+An example of how to implement a turbo key to output `A` every 5 seconds:
+
+```
+/ {
+    behaviors {
+        turbo_A: turbo_A {
+            compatible = "zmk,behavior-turbo-key";
+            label = "TURBO_A";
+            #binding-cells = <0>;
+            bindings = <&kp A>;
+            wait-ms = <5000>;
+        };
+    };
+};
+```
+
+### Behavior Binding
+
+- Reference: `&turbo_A`
+- Parameter: None
+
+Example:
+
+```
+&turbo_A
+```
+
+### Advanced Configuration
+
+#### `wait-ms`
+
+Defines how often the behavior will trigger. Defaults to 200ms.
+
+#### `tap-ms`
+
+Defines how long the behavior will be held for each press. Defaults to 5ms.
+
+#### `toggle-term-ms`
+
+Releasing the turbo key within `toggle-term-ms` will toggle the repeating, removing the need to hold down the key.

docs/sidebars.js

@@ -45,6 +45,7 @@ module.exports = {
       "behaviors/mod-morph",
       "behaviors/macros",
       "behaviors/key-toggle",
+      "behaviors/turbo",
       "behaviors/sticky-key",
       "behaviors/sticky-layer",
       "behaviors/tap-dance",