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/linker/zmk-events.ld | 16 ++++++ app/include/linker/zmk-linker-defs.h | 6 +++ app/include/zmk/event-manager.h | 65 +++++++++++++++++++++++++ app/include/zmk/events/keycode-state-changed.h | 13 +++++ app/include/zmk/events/position-state-changed.h | 12 +++++ 5 files changed, 112 insertions(+) create mode 100644 app/include/linker/zmk-events.ld create mode 100644 app/include/linker/zmk-linker-defs.h create mode 100644 app/include/zmk/event-manager.h 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') diff --git a/app/include/linker/zmk-events.ld b/app/include/linker/zmk-events.ld new file mode 100644 index 0000000..f1ee9f7 --- /dev/null +++ b/app/include/linker/zmk-events.ld @@ -0,0 +1,16 @@ +#include + + SECTION_PROLOGUE(event_types,,) + { + __event_type_start = .; \ + KEEP(*(".event_type")); \ + __event_type_end = .; \ + } GROUP_LINK_IN(ROMABLE_REGION) + + SECTION_PROLOGUE(event_subscriptions,,) + { + __event_subscriptions_start = .; \ + KEEP(*(".event_subscription")); \ + __event_subscriptions_end = .; \ + } GROUP_LINK_IN(ROMABLE_REGION) + diff --git a/app/include/linker/zmk-linker-defs.h b/app/include/linker/zmk-linker-defs.h new file mode 100644 index 0000000..61b6741 --- /dev/null +++ b/app/include/linker/zmk-linker-defs.h @@ -0,0 +1,6 @@ + + +#define→EVENT_TYPE_SECTIONS()→ → → → \ +→ → __event_type_start = .;→ → \ +→ → KEEP(*(".event_type_*"));→ → \ +→ → __event_type_end = .;→→ → \ diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event-manager.h new file mode 100644 index 0000000..8c05a1b --- /dev/null +++ b/app/include/zmk/event-manager.h @@ -0,0 +1,65 @@ +#pragma once + +#include +#include +#include + +struct zmk_event_type +{ + const char *name; +}; + +struct zmk_event_header { + const struct zmk_event_type* event; +}; + +typedef int (*zmk_listener_callback_t)(const struct zmk_event_header *eh); +struct zmk_listener +{ + zmk_listener_callback_t callback; +}; + +struct zmk_event_subscription { + const struct zmk_event_type *event_type; + const struct zmk_listener *listener; +}; + +#define ZMK_EVENT_DECLARE(event_type) \ + struct event_type* new_##event_type(); \ + bool is_##event_type(const struct zmk_event_header *eh); \ + const struct event_type* cast_##event_type(const struct zmk_event_header *eh); \ + extern const struct zmk_event_type zmk_event_##event_type; + +#define ZMK_EVENT_IMPL(event_type) \ + const struct zmk_event_type zmk_event_##event_type = { \ + .name = STRINGIFY(event_type) \ + }; \ + const struct zmk_event_type* zmk_event_ref_##event_type __used __attribute__((__section__(".event_type"))) = &zmk_event_##event_type; \ + struct event_type* new_##event_type() { \ + struct event_type* ev = (struct event_type *) k_malloc(sizeof(struct event_type)); \ + ev->header.event = &zmk_event_##event_type; \ + return ev; \ + }; \ + bool is_##event_type(const struct zmk_event_header *eh) { \ + return eh->event == &zmk_event_##event_type; \ + }; \ + const struct event_type* cast_##event_type(const struct zmk_event_header *eh) {\ + return (const struct event_type*)eh; \ + }; + + +#define ZMK_LISTENER(mod, cb) \ + const struct zmk_listener zmk_listener_##mod = { \ + .callback = cb \ + }; + +#define ZMK_SUBSCRIPTION(mod, ev_type) \ + const Z_DECL_ALIGN(struct zmk_event_subscription) _CONCAT(_CONCAT(zmk_event_sub_,mod),ev_type) __used __attribute__((__section__(".event_subscription"))) = { \ + .event_type = &zmk_event_##ev_type, \ + .listener = &zmk_listener_##mod, \ + }; + +#define ZMK_EVENT_RAISE(ev) \ + zmk_event_manager_raise((struct zmk_event_header *)ev); + +int zmk_event_manager_raise(struct zmk_event_header *event); 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/linker/zmk-events.ld | 6 ------ app/include/zmk/events.h | 6 ------ app/include/zmk/events/keycode-state-changed.h | 12 +++++++++++- app/include/zmk/events/modifiers-state-changed.h | 22 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 app/include/zmk/events/modifiers-state-changed.h (limited to 'app/include') diff --git a/app/include/linker/zmk-events.ld b/app/include/linker/zmk-events.ld index f1ee9f7..f2bf833 100644 --- a/app/include/linker/zmk-events.ld +++ b/app/include/linker/zmk-events.ld @@ -1,16 +1,10 @@ #include - SECTION_PROLOGUE(event_types,,) - { __event_type_start = .; \ KEEP(*(".event_type")); \ __event_type_end = .; \ - } GROUP_LINK_IN(ROMABLE_REGION) - SECTION_PROLOGUE(event_subscriptions,,) - { __event_subscriptions_start = .; \ KEEP(*(".event_subscription")); \ __event_subscriptions_end = .; \ - } GROUP_LINK_IN(ROMABLE_REGION) diff --git a/app/include/zmk/events.h b/app/include/zmk/events.h index 5be2beb..178686c 100644 --- a/app/include/zmk/events.h +++ b/app/include/zmk/events.h @@ -2,14 +2,8 @@ #include -int zmk_events_position_pressed(u32_t position); -int zmk_events_position_released(u32_t position); -int zmk_events_keycode_pressed(u8_t usage_page, u32_t keycode); -int zmk_events_keycode_released(u8_t usage_page, u32_t keycode); int zmk_events_modifiers_pressed(zmk_mod_flags modifiers); int zmk_events_modifiers_released(zmk_mod_flags modifiers); -int zmk_events_consumer_key_pressed(u32_t usage); -int zmk_events_consumer_key_released(u32_t usage); // TODO: Encoders? // TODO: Sensors? \ No newline at end of file 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 57e061ac91ba95fb333139cbb3b0df97d1b22c98 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 30 Jun 2020 15:21:42 -0400 Subject: Lots of cleanup of old events/behavior mash. --- app/include/zmk/events.h | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/include/zmk/events.h (limited to 'app/include') diff --git a/app/include/zmk/events.h b/app/include/zmk/events.h deleted file mode 100644 index 178686c..0000000 --- a/app/include/zmk/events.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include - -int zmk_events_modifiers_pressed(zmk_mod_flags modifiers); -int zmk_events_modifiers_released(zmk_mod_flags modifiers); - -// TODO: Encoders? -// TODO: Sensors? \ 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/linker/zmk-events.ld | 6 ++++++ app/include/linker/zmk-linker-defs.h | 6 ------ app/include/zmk/event-manager.h | 6 ++++++ 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 ++++++ 6 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 app/include/linker/zmk-linker-defs.h (limited to 'app/include') diff --git a/app/include/linker/zmk-events.ld b/app/include/linker/zmk-events.ld index f2bf833..44063be 100644 --- a/app/include/linker/zmk-events.ld +++ b/app/include/linker/zmk-events.ld @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + #include __event_type_start = .; \ diff --git a/app/include/linker/zmk-linker-defs.h b/app/include/linker/zmk-linker-defs.h deleted file mode 100644 index 61b6741..0000000 --- a/app/include/linker/zmk-linker-defs.h +++ /dev/null @@ -1,6 +0,0 @@ - - -#define→EVENT_TYPE_SECTIONS()→ → → → \ -→ → __event_type_start = .;→ → \ -→ → KEEP(*(".event_type_*"));→ → \ -→ → __event_type_end = .;→→ → \ diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event-manager.h index 8c05a1b..2ef55e9 100644 --- a/app/include/zmk/event-manager.h +++ b/app/include/zmk/event-manager.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + #pragma once #include 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