summaryrefslogtreecommitdiff
path: root/app/include/zmk/events
diff options
context:
space:
mode:
authorMubeen Khan <mubeen@mubeen.co>2020-10-11 23:17:04 -0500
committerGitHub <noreply@github.com>2020-10-11 23:17:04 -0500
commitd45e7b3c1190209953d5ffefff39f23341dbd88c (patch)
treed49b709299c9e29e41fadfa6f20d2e8ee9159cdc /app/include/zmk/events
parent7fc7a351170fb2017cb40e8de79b4535a936a6f6 (diff)
parentba73e5d4ac295cc67e03fca9f80030022b8f529c (diff)
Merge pull request #7 from zmkfirmware/main
Update to stay even with upstream main
Diffstat (limited to 'app/include/zmk/events')
-rw-r--r--app/include/zmk/events/keycode-state-changed.h1
-rw-r--r--app/include/zmk/events/position-state-changed.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h
index 4c00654..1e2c24e 100644
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode-state-changed.h
@@ -24,6 +24,5 @@ inline struct keycode_state_changed *create_keycode_state_changed(u8_t usage_pag
ev->usage_page = usage_page;
ev->keycode = keycode;
ev->state = state;
-
return ev;
} \ No newline at end of file
diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position-state-changed.h
index f88080d..e4cbbbe 100644
--- a/app/include/zmk/events/position-state-changed.h
+++ b/app/include/zmk/events/position-state-changed.h
@@ -13,6 +13,7 @@ struct position_state_changed {
struct zmk_event_header header;
u32_t position;
bool state;
+ s64_t timestamp;
};
ZMK_EVENT_DECLARE(position_state_changed); \ No newline at end of file