From 9a991bf019d6f723bc4230822852efa78a05be49 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 30 Jun 2020 00:31:09 -0400 Subject: Initial event manager work, and two first events. * Add initial event manager implementation, roughly mimicking Nordic's API. * Add `position_state_changed` and `keycode_state_changed` events. * Hook up HID and keymap to new events instead of using behaviour global event crazy. --- app/include/zmk/events/keycode-state-changed.h | 13 +++++++++++++ app/include/zmk/events/position-state-changed.h | 12 ++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 app/include/zmk/events/keycode-state-changed.h create mode 100644 app/include/zmk/events/position-state-changed.h (limited to 'app/include/zmk/events') diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h new file mode 100644 index 0000000..48cdddc --- /dev/null +++ b/app/include/zmk/events/keycode-state-changed.h @@ -0,0 +1,13 @@ +#pragma once + +#include +#include + +struct keycode_state_changed { + struct zmk_event_header header; + u8_t usage_page; + u32_t keycode; + bool state; +}; + +ZMK_EVENT_DECLARE(keycode_state_changed); \ 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 new file mode 100644 index 0000000..190b59d --- /dev/null +++ b/app/include/zmk/events/position-state-changed.h @@ -0,0 +1,12 @@ +#pragma once + +#include +#include + +struct position_state_changed { + struct zmk_event_header header; + u32_t position; + bool state; +}; + +ZMK_EVENT_DECLARE(position_state_changed); \ No newline at end of file -- cgit v1.2.3 From 96ec16da9246c3c7c07986a0c6a2900d3bbfddaa Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 30 Jun 2020 10:43:09 -0400 Subject: Modifier event, tweaks for linker script. --- app/include/zmk/events/keycode-state-changed.h | 12 +++++++++++- app/include/zmk/events/modifiers-state-changed.h | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 app/include/zmk/events/modifiers-state-changed.h (limited to 'app/include/zmk/events') diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h index 48cdddc..dc6e37e 100644 --- a/app/include/zmk/events/keycode-state-changed.h +++ b/app/include/zmk/events/keycode-state-changed.h @@ -10,4 +10,14 @@ struct keycode_state_changed { bool state; }; -ZMK_EVENT_DECLARE(keycode_state_changed); \ No newline at end of file +ZMK_EVENT_DECLARE(keycode_state_changed); + +inline struct keycode_state_changed* create_keycode_state_changed(u8_t usage_page, u32_t keycode, bool state) +{ + struct keycode_state_changed* ev = new_keycode_state_changed(); + 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/modifiers-state-changed.h b/app/include/zmk/events/modifiers-state-changed.h new file mode 100644 index 0000000..57596b2 --- /dev/null +++ b/app/include/zmk/events/modifiers-state-changed.h @@ -0,0 +1,22 @@ +#pragma once + +#include +#include +#include + +struct modifiers_state_changed { + struct zmk_event_header header; + zmk_mod_flags modifiers; + bool state; +}; + +ZMK_EVENT_DECLARE(modifiers_state_changed); + +inline struct modifiers_state_changed* create_modifiers_state_changed(zmk_mod_flags modifiers, bool state) +{ + struct modifiers_state_changed* ev = new_modifiers_state_changed(); + ev->modifiers = modifiers; + ev->state = state; + + return ev; +} \ No newline at end of file -- cgit v1.2.3 From a62a2f8c5c9f505865a4f9cde8d0479b3e2219e5 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 30 Jun 2020 16:13:03 -0400 Subject: Cleanup, license headers. --- app/include/zmk/events/keycode-state-changed.h | 6 ++++++ app/include/zmk/events/modifiers-state-changed.h | 6 ++++++ app/include/zmk/events/position-state-changed.h | 6 ++++++ 3 files changed, 18 insertions(+) (limited to 'app/include/zmk/events') diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h index dc6e37e..1663f9b 100644 --- a/app/include/zmk/events/keycode-state-changed.h +++ b/app/include/zmk/events/keycode-state-changed.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + #pragma once #include diff --git a/app/include/zmk/events/modifiers-state-changed.h b/app/include/zmk/events/modifiers-state-changed.h index 57596b2..a17a093 100644 --- a/app/include/zmk/events/modifiers-state-changed.h +++ b/app/include/zmk/events/modifiers-state-changed.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + #pragma once #include diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position-state-changed.h index 190b59d..c91688e 100644 --- a/app/include/zmk/events/position-state-changed.h +++ b/app/include/zmk/events/position-state-changed.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + #pragma once #include -- cgit v1.2.3