Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

feat(events): add timestamp to keycode_state_changed and sensor_event

Browse Source 
These timestamps are necessary to correctly deal with delayed events due to hold-tap shenanigans.
This commit is contained in:
Okke Formsma
2020-11-11 22:06:25 +01:00
committed by Pete Johanson
parent 27d036b9d5
commit bee45f9b3a
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/include/drivers/behavior.h
View File

@@ -23,7 +23,7 @@
typedef int (*behavior_keymap_binding_callback_t)(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event);
typedef int (*behavior_sensor_keymap_binding_callback_t)(struct zmk_behavior_binding *binding,
struct device *sensor);
struct device *sensor, s64_t timestamp);
__subsystem struct behavior_driver_api {
behavior_keymap_binding_callback_t binding_pressed;
@@ -92,11 +92,11 @@ static inline int z_impl_behavior_keymap_binding_released(struct zmk_behavior_bi
* @retval Negative errno code if failure.
*/
__syscall int behavior_sensor_keymap_binding_triggered(struct zmk_behavior_binding *binding,
struct device *sensor);
struct device *sensor, s64_t timestamp);
static inline int
z_impl_behavior_sensor_keymap_binding_triggered(struct zmk_behavior_binding *binding,
struct device *sensor) {
struct device *sensor, s64_t timestamp) {
struct device *dev = device_get_binding(binding->behavior_dev);
const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->driver_api;
@@ -104,7 +104,7 @@ z_impl_behavior_sensor_keymap_binding_triggered(struct zmk_behavior_binding *bin
return -ENOTSUP;
}
return api->sensor_binding_triggered(binding, sensor);
return api->sensor_binding_triggered(binding, sensor, timestamp);
}
/**

6
app/include/zmk/events/keycode-state-changed.h
View File

@@ -18,12 +18,13 @@ struct keycode_state_changed {
u32_t keycode;
u8_t implicit_modifiers;
bool state;
s64_t timestamp;
};
ZMK_EVENT_DECLARE(keycode_state_changed);
static inline struct keycode_state_changed *keycode_state_changed_from_encoded(u32_t encoded,
bool pressed) {
static inline struct keycode_state_changed *
keycode_state_changed_from_encoded(u32_t encoded, bool pressed, s64_t timestamp) {
u16_t page = HID_USAGE_PAGE(encoded) & 0xFF;
u16_t id = HID_USAGE_ID(encoded);
zmk_mod_flags implicit_mods = SELECT_MODS(encoded);
@@ -37,5 +38,6 @@ static inline struct keycode_state_changed *keycode_state_changed_from_encoded(u
ev->keycode = id;
ev->implicit_modifiers = implicit_mods;
ev->state = pressed;
ev->timestamp = timestamp;
return ev;
}

1
app/include/zmk/events/sensor-event.h
View File

@@ -14,6 +14,7 @@ struct sensor_event {
struct zmk_event_header header;
u8_t sensor_number;
struct device *sensor;
s64_t timestamp;
};
ZMK_EVENT_DECLARE(sensor_event);