diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/behaviors/behavior_key_press.c | 8 | ||||
| -rw-r--r-- | app/src/behaviors/behavior_sensor_rotate_key_press.c | 8 | ||||
| -rw-r--r-- | app/src/keymap.c | 6 | ||||
| -rw-r--r-- | app/src/sensors.c | 1 |
4 files changed, 12 insertions, 11 deletions
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c index bfcdbfc..8559a51 100644 --- a/app/src/behaviors/behavior_key_press.c +++ b/app/src/behaviors/behavior_key_press.c @@ -21,15 +21,15 @@ static int behavior_key_press_init(struct device *dev) { return 0; }; static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event) { LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1); - - return ZMK_EVENT_RAISE(keycode_state_changed_from_encoded(binding->param1, true)); + return ZMK_EVENT_RAISE( + keycode_state_changed_from_encoded(binding->param1, true, event.timestamp)); } static int on_keymap_binding_released(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event) { LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1); - - return ZMK_EVENT_RAISE(keycode_state_changed_from_encoded(binding->param1, false)); + return ZMK_EVENT_RAISE( + keycode_state_changed_from_encoded(binding->param1, false, event.timestamp)); } static const struct behavior_driver_api behavior_key_press_driver_api = { diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c index d0a2296..199ece2 100644 --- a/app/src/behaviors/behavior_sensor_rotate_key_press.c +++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c @@ -18,8 +18,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); static int behavior_sensor_rotate_key_press_init(struct device *dev) { return 0; }; -static int on_sensor_binding_triggered(struct zmk_behavior_binding *binding, - struct device *sensor) { +static int on_sensor_binding_triggered(struct zmk_behavior_binding *binding, struct device *sensor, + s64_t timestamp) { struct sensor_value value; int err; u32_t keycode; @@ -45,12 +45,12 @@ static int on_sensor_binding_triggered(struct zmk_behavior_binding *binding, LOG_DBG("SEND %d", keycode); - ZMK_EVENT_RAISE(keycode_state_changed_from_encoded(keycode, true)); + ZMK_EVENT_RAISE(keycode_state_changed_from_encoded(keycode, true, timestamp)); // TODO: Better way to do this? k_msleep(5); - return ZMK_EVENT_RAISE(keycode_state_changed_from_encoded(keycode, false)); + return ZMK_EVENT_RAISE(keycode_state_changed_from_encoded(keycode, false, timestamp)); } static const struct behavior_driver_api behavior_sensor_rotate_key_press_driver_api = { diff --git a/app/src/keymap.c b/app/src/keymap.c index 70db2fa..4174ac1 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -152,7 +152,7 @@ int zmk_keymap_position_state_changed(u32_t position, bool pressed, s64_t timest } #if ZMK_KEYMAP_HAS_SENSORS -int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor) { +int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor, s64_t timestamp) { for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--) { if (((zmk_keymap_layer_state & BIT(layer)) == BIT(layer) || layer == zmk_keymap_layer_default) && @@ -171,7 +171,7 @@ int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor) { continue; } - ret = behavior_sensor_keymap_binding_triggered(binding, sensor); + ret = behavior_sensor_keymap_binding_triggered(binding, sensor, timestamp); if (ret > 0) { LOG_DBG("behavior processing to continue to next layer"); @@ -197,7 +197,7 @@ int keymap_listener(const struct zmk_event_header *eh) { #if ZMK_KEYMAP_HAS_SENSORS } else if (is_sensor_event(eh)) { const struct sensor_event *ev = cast_sensor_event(eh); - return zmk_keymap_sensor_triggered(ev->sensor_number, ev->sensor); + return zmk_keymap_sensor_triggered(ev->sensor_number, ev->sensor, ev->timestamp); #endif /* ZMK_KEYMAP_HAS_SENSORS */ } diff --git a/app/src/sensors.c b/app/src/sensors.c index 15f374b..f1cfdd1 100644 --- a/app/src/sensors.c +++ b/app/src/sensors.c @@ -48,6 +48,7 @@ static void zmk_sensors_trigger_handler(struct device *dev, struct sensor_trigge event = new_sensor_event(); event->sensor_number = item->sensor_number; event->sensor = dev; + event->timestamp = k_uptime_get(); ZMK_EVENT_RAISE(event); } |