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.3.1 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/CMakeLists.txt | 3 +- 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 ++++++++++++ app/src/behaviors/behavior_hid.c | 46 +++++++++++++----------- app/src/behaviors/behavior_mod_tap.c | 13 ++++--- app/src/events/modifiers_state_changed.c | 6 ++++ 8 files changed, 73 insertions(+), 41 deletions(-) create mode 100644 app/include/zmk/events/modifiers-state-changed.h create mode 100644 app/src/events/modifiers_state_changed.c (limited to 'app/include') diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index a3c20df..9bfc8d6 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -33,8 +33,9 @@ target_sources(app PRIVATE src/events.c) target_sources(app PRIVATE src/keymap.c) target_sources(app PRIVATE src/hid.c) target_sources(app PRIVATE src/event_manager.c) -target_sources(app PRIVATE src/events/keycode_state_changed.c) target_sources(app PRIVATE src/events/position_state_changed.c) +target_sources(app PRIVATE src/events/keycode_state_changed.c) +target_sources(app PRIVATE src/events/modifiers_state_changed.c) target_sources(app PRIVATE src/behaviors/behavior_hid.c) target_sources(app PRIVATE src/behaviors/behavior_key_press.c) target_sources(app PRIVATE src/behaviors/behavior_reset.c) 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 diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c index b901450..9e1fb6b 100644 --- a/app/src/behaviors/behavior_hid.c +++ b/app/src/behaviors/behavior_hid.c @@ -15,6 +15,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include #include +#include #include #include @@ -56,14 +57,14 @@ static int behaviour_hid_keycode_released(u8_t usage_page, u32_t keycode) case USAGE_KEYPAD: err = zmk_hid_keypad_release(keycode); if (err) { - LOG_ERR("Unable to press keycode"); + LOG_ERR("Unable to release keycode"); return err; } break; case USAGE_CONSUMER: err = zmk_hid_consumer_release(keycode); if (err) { - LOG_ERR("Unable to press keycode"); + LOG_ERR("Unable to release keycode"); return err; } break; @@ -71,6 +72,21 @@ static int behaviour_hid_keycode_released(u8_t usage_page, u32_t keycode) return zmk_endpoints_send_report(usage_page); } +static int behavior_hid_modifiers_pressed(zmk_mod_flags modifiers) +{ + LOG_DBG("modifiers %d", modifiers); + + zmk_hid_register_mods(modifiers); + return zmk_endpoints_send_report(USAGE_KEYPAD); +} + +static int behavior_hid_modifiers_released(zmk_mod_flags modifiers) +{ + LOG_DBG("modifiers %d", modifiers); + + zmk_hid_unregister_mods(modifiers); + return zmk_endpoints_send_report(USAGE_KEYPAD); +} int behavior_hid_listener(const struct zmk_event_header *eh) { @@ -81,37 +97,27 @@ int behavior_hid_listener(const struct zmk_event_header *eh) } else { behaviour_hid_keycode_released(ev->usage_page, ev->keycode); } + } else if (is_modifiers_state_changed(eh)) { + const struct modifiers_state_changed *ev = cast_modifiers_state_changed(eh); + if (ev->state) { + behavior_hid_modifiers_pressed(ev->modifiers); + } else { + behavior_hid_modifiers_released(ev->modifiers); + } } return 0; } ZMK_LISTENER(behavior_hid, behavior_hid_listener); ZMK_SUBSCRIPTION(behavior_hid, keycode_state_changed); +ZMK_SUBSCRIPTION(behavior_hid, modifiers_state_changed); static int behavior_hid_init(struct device *dev) { return 0; }; -static int on_modifiers_pressed(struct device *dev, zmk_mod_flags modifiers) -{ - LOG_DBG("modifiers %d", modifiers); - - zmk_hid_register_mods(modifiers); - return zmk_endpoints_send_report(USAGE_KEYPAD); -} - -static int on_modifiers_released(struct device *dev, zmk_mod_flags modifiers) -{ - LOG_DBG("modifiers %d", modifiers); - - zmk_hid_unregister_mods(modifiers); - return zmk_endpoints_send_report(USAGE_KEYPAD); -} - static const struct behavior_driver_api behavior_hid_driver_api = { - .modifiers_pressed = on_modifiers_pressed, - .modifiers_released = on_modifiers_released }; static const struct behavior_hid_config behavior_hid_config = {}; diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c index c9baff4..3746183 100644 --- a/app/src/behaviors/behavior_mod_tap.c +++ b/app/src/behaviors/behavior_mod_tap.c @@ -12,6 +12,7 @@ #include #include +#include #include LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); @@ -48,21 +49,20 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t m struct behavior_mod_tap_data *data = dev->driver_data; LOG_DBG("mods: %d, keycode: %d", mods, keycode); WRITE_BIT(data->pending_press_positions, position, true); - return zmk_events_modifiers_pressed(mods); + return ZMK_EVENT_RAISE(create_modifiers_state_changed(mods, true)); } - -// They keycode is passed by the "keymap" based on the parameter created as part of the assignment. static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t mods, u32_t keycode) { struct behavior_mod_tap_data *data = dev->driver_data; LOG_DBG("mods: %d, keycode: %d", mods, keycode); - zmk_events_modifiers_released(mods); + ZMK_EVENT_RAISE(create_modifiers_state_changed(mods, false)); + k_msleep(10); // TODO: Better approach than k_msleep to avoid USB send failures? Retries in the USB endpoint layer? if (data->pending_press_positions & BIT(position)) { - zmk_events_keycode_pressed(USAGE_KEYPAD, keycode); + ZMK_EVENT_RAISE(create_keycode_state_changed(USAGE_KEYPAD, keycode, true)); k_msleep(10); - zmk_events_keycode_released(USAGE_KEYPAD, keycode); + ZMK_EVENT_RAISE(create_keycode_state_changed(USAGE_KEYPAD, keycode, false)); } return 0; @@ -73,7 +73,6 @@ static const struct behavior_driver_api behavior_mod_tap_driver_api = { .binding_released = on_keymap_binding_released, }; - static const struct behavior_mod_tap_config behavior_mod_tap_config = {}; static struct behavior_mod_tap_data behavior_mod_tap_data; diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c new file mode 100644 index 0000000..b7ae02d --- /dev/null +++ b/app/src/events/modifiers_state_changed.c @@ -0,0 +1,6 @@ + + +#include +#include + +ZMK_EVENT_IMPL(modifiers_state_changed); \ No newline at end of file -- cgit v1.3.1 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/CMakeLists.txt | 3 +- app/dts/behaviors.dtsi | 3 +- app/dts/behaviors/hid.dtsi | 9 -- app/include/zmk/events.h | 9 -- app/src/behaviors/behavior_hid.c | 131 --------------------------- app/src/behaviors/behavior_mod_tap.c | 1 - app/src/behaviors/behavior_momentary_layer.c | 1 - app/src/events.c | 83 ----------------- app/src/hid_listener.c | 106 ++++++++++++++++++++++ 9 files changed, 108 insertions(+), 238 deletions(-) delete mode 100644 app/dts/behaviors/hid.dtsi delete mode 100644 app/include/zmk/events.h delete mode 100644 app/src/behaviors/behavior_hid.c delete mode 100644 app/src/events.c create mode 100644 app/src/hid_listener.c (limited to 'app/include') diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 9bfc8d6..5be628b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -29,14 +29,13 @@ zephyr_linker_sources(RODATA include/linker/zmk-events.ld) target_include_directories(app PRIVATE include) target_sources(app PRIVATE src/kscan.c) target_sources(app PRIVATE src/matrix_transform.c) -target_sources(app PRIVATE src/events.c) target_sources(app PRIVATE src/keymap.c) +target_sources(app PRIVATE src/hid_listener.c) target_sources(app PRIVATE src/hid.c) target_sources(app PRIVATE src/event_manager.c) target_sources(app PRIVATE src/events/position_state_changed.c) target_sources(app PRIVATE src/events/keycode_state_changed.c) target_sources(app PRIVATE src/events/modifiers_state_changed.c) -target_sources(app PRIVATE src/behaviors/behavior_hid.c) target_sources(app PRIVATE src/behaviors/behavior_key_press.c) target_sources(app PRIVATE src/behaviors/behavior_reset.c) target_sources(app PRIVATE src/behaviors/behavior_mod_tap.c) diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi index 7a4f8fb..86cd7b7 100644 --- a/app/dts/behaviors.dtsi +++ b/app/dts/behaviors.dtsi @@ -2,5 +2,4 @@ #include #include #include -#include -#include \ No newline at end of file +#include \ No newline at end of file diff --git a/app/dts/behaviors/hid.dtsi b/app/dts/behaviors/hid.dtsi deleted file mode 100644 index 30ebb09..0000000 --- a/app/dts/behaviors/hid.dtsi +++ /dev/null @@ -1,9 +0,0 @@ -/ { - behaviors { - hid_behavior: behavior_hid { - compatible = "zmk,behavior-hid", "zmk,behavior-global"; - label = "HID"; - #binding-cells = <0>; - }; - }; -}; 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 diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c deleted file mode 100644 index 9e1fb6b..0000000 --- a/app/src/behaviors/behavior_hid.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2020 Peter Johanson - * - * SPDX-License-Identifier: MIT - */ - -#define DT_DRV_COMPAT zmk_behavior_hid - -#include -#include -#include -#include - -LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); - -#include -#include -#include -#include -#include - -struct behavior_hid_config { }; -struct behavior_hid_data { }; - - -static int behaviour_hid_keycode_pressed(u8_t usage_page, u32_t keycode) -{ - int err; - LOG_DBG("keycode %d", keycode); - - switch (usage_page) { - case USAGE_KEYPAD: - err = zmk_hid_keypad_press(keycode); - if (err) { - LOG_ERR("Unable to press keycode"); - return err; - } - break; - case USAGE_CONSUMER: - err = zmk_hid_consumer_press(keycode); - if (err) { - LOG_ERR("Unable to press keycode"); - return err; - } - break; - } - - return zmk_endpoints_send_report(usage_page); -} - -static int behaviour_hid_keycode_released(u8_t usage_page, u32_t keycode) -{ - int err; - LOG_DBG("keycode %d", keycode); - - switch (usage_page) { - case USAGE_KEYPAD: - err = zmk_hid_keypad_release(keycode); - if (err) { - LOG_ERR("Unable to release keycode"); - return err; - } - break; - case USAGE_CONSUMER: - err = zmk_hid_consumer_release(keycode); - if (err) { - LOG_ERR("Unable to release keycode"); - return err; - } - break; - } - return zmk_endpoints_send_report(usage_page); -} - -static int behavior_hid_modifiers_pressed(zmk_mod_flags modifiers) -{ - LOG_DBG("modifiers %d", modifiers); - - zmk_hid_register_mods(modifiers); - return zmk_endpoints_send_report(USAGE_KEYPAD); -} - -static int behavior_hid_modifiers_released(zmk_mod_flags modifiers) -{ - LOG_DBG("modifiers %d", modifiers); - - zmk_hid_unregister_mods(modifiers); - return zmk_endpoints_send_report(USAGE_KEYPAD); -} - -int behavior_hid_listener(const struct zmk_event_header *eh) -{ - if (is_keycode_state_changed(eh)) { - const struct keycode_state_changed *ev = cast_keycode_state_changed(eh); - if (ev->state) { - behaviour_hid_keycode_pressed(ev->usage_page, ev->keycode); - } else { - behaviour_hid_keycode_released(ev->usage_page, ev->keycode); - } - } else if (is_modifiers_state_changed(eh)) { - const struct modifiers_state_changed *ev = cast_modifiers_state_changed(eh); - if (ev->state) { - behavior_hid_modifiers_pressed(ev->modifiers); - } else { - behavior_hid_modifiers_released(ev->modifiers); - } - } - return 0; -} - -ZMK_LISTENER(behavior_hid, behavior_hid_listener); -ZMK_SUBSCRIPTION(behavior_hid, keycode_state_changed); -ZMK_SUBSCRIPTION(behavior_hid, modifiers_state_changed); - -static int behavior_hid_init(struct device *dev) -{ - return 0; -}; - -static const struct behavior_driver_api behavior_hid_driver_api = { -}; - -static const struct behavior_hid_config behavior_hid_config = {}; - -static struct behavior_hid_data behavior_hid_data; - -DEVICE_AND_API_INIT(behavior_hid, DT_INST_LABEL(0), behavior_hid_init, - &behavior_hid_data, - &behavior_hid_config, - APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &behavior_hid_driver_api); \ No newline at end of file diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c index 3746183..62604eb 100644 --- a/app/src/behaviors/behavior_mod_tap.c +++ b/app/src/behaviors/behavior_mod_tap.c @@ -13,7 +13,6 @@ #include #include #include -#include LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/behaviors/behavior_momentary_layer.c b/app/src/behaviors/behavior_momentary_layer.c index 904051e..8a8584a 100644 --- a/app/src/behaviors/behavior_momentary_layer.c +++ b/app/src/behaviors/behavior_momentary_layer.c @@ -10,7 +10,6 @@ #include #include -#include #include LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/events.c b/app/src/events.c deleted file mode 100644 index fabb93e..0000000 --- a/app/src/events.c +++ /dev/null @@ -1,83 +0,0 @@ - -#include -#include -#include -#include -#include - -#define DT_DRV_COMPAT zmk_behavior_global -#define GLOBAL_BEHAVIOR_LEN DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) - -#define LABEL_ENTRY(i) DT_INST_LABEL(i), -static const char *global_behaviors[] = { - DT_INST_FOREACH_STATUS_OKAY(LABEL_ENTRY) -}; - -int zmk_events_position_pressed(u32_t position) -{ - for (int i = 0; i < GLOBAL_BEHAVIOR_LEN; i++) { - const char* label = global_behaviors[i]; - struct device *dev = device_get_binding(label); - behavior_position_pressed(dev, position); - } - return 0; -}; - -int zmk_events_position_released(u32_t position) -{ - for (int i = 0; i < GLOBAL_BEHAVIOR_LEN; i++) { - const char* label = global_behaviors[i]; - struct device *dev = device_get_binding(label); - behavior_position_released(dev, position); - } - return 0; -}; - -int zmk_events_keycode_pressed(u8_t usage_page, u32_t keycode) -{ - for (int i = 0; i < GLOBAL_BEHAVIOR_LEN; i++) { - const char* label = global_behaviors[i]; - struct device *dev = device_get_binding(label); - behavior_keycode_pressed(dev, usage_page, keycode); - } - return 0; -}; - -int zmk_events_keycode_released(u8_t usage_page, u32_t keycode) -{ - for (int i = 0; i < GLOBAL_BEHAVIOR_LEN; i++) { - const char* label = global_behaviors[i]; - struct device *dev = device_get_binding(label); - behavior_keycode_released(dev, usage_page, keycode); - } - return 0; -}; - -int zmk_events_modifiers_pressed(zmk_mod_flags modifiers) -{ - for (int i = 0; i < GLOBAL_BEHAVIOR_LEN; i++) { - const char* label = global_behaviors[i]; - struct device *dev = device_get_binding(label); - behavior_modifiers_pressed(dev, modifiers); - } - return 0; -}; - -int zmk_events_modifiers_released(zmk_mod_flags modifiers) -{ - for (int i = 0; i < GLOBAL_BEHAVIOR_LEN; i++) { - const char* label = global_behaviors[i]; - struct device *dev = device_get_binding(label); - behavior_modifiers_released(dev, modifiers); - } - return 0; -}; - -int zmk_events_consumer_key_pressed(u32_t usage) -{ - return 0; -}; -int zmk_events_consumer_key_released(u32_t usage) -{ - return 0; -}; diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c new file mode 100644 index 0000000..69aa23e --- /dev/null +++ b/app/src/hid_listener.c @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include +#include + +LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); + +#include +#include +#include +#include +#include + + +static int hid_listener_keycode_pressed(u8_t usage_page, u32_t keycode) +{ + int err; + LOG_DBG("usage_page 0x%02X keycode 0x%02X", usage_page, keycode); + + switch (usage_page) { + case USAGE_KEYPAD: + err = zmk_hid_keypad_press(keycode); + if (err) { + LOG_ERR("Unable to press keycode"); + return err; + } + break; + case USAGE_CONSUMER: + err = zmk_hid_consumer_press(keycode); + if (err) { + LOG_ERR("Unable to press keycode"); + return err; + } + break; + } + + return zmk_endpoints_send_report(usage_page); +} + +static int hid_listener_keycode_released(u8_t usage_page, u32_t keycode) +{ + int err; + LOG_DBG("usage_page 0x%02X keycode 0x%02X", usage_page, keycode); + + switch (usage_page) { + case USAGE_KEYPAD: + err = zmk_hid_keypad_release(keycode); + if (err) { + LOG_ERR("Unable to release keycode"); + return err; + } + break; + case USAGE_CONSUMER: + err = zmk_hid_consumer_release(keycode); + if (err) { + LOG_ERR("Unable to release keycode"); + return err; + } + break; + } + return zmk_endpoints_send_report(usage_page); +} + +static int hid_listener_modifiers_pressed(zmk_mod_flags modifiers) +{ + LOG_DBG("modifiers %d", modifiers); + + zmk_hid_register_mods(modifiers); + return zmk_endpoints_send_report(USAGE_KEYPAD); +} + +static int hid_listener_modifiers_released(zmk_mod_flags modifiers) +{ + LOG_DBG("modifiers %d", modifiers); + + zmk_hid_unregister_mods(modifiers); + return zmk_endpoints_send_report(USAGE_KEYPAD); +} + +int hid_listener(const struct zmk_event_header *eh) +{ + if (is_keycode_state_changed(eh)) { + const struct keycode_state_changed *ev = cast_keycode_state_changed(eh); + if (ev->state) { + hid_listener_keycode_pressed(ev->usage_page, ev->keycode); + } else { + hid_listener_keycode_released(ev->usage_page, ev->keycode); + } + } else if (is_modifiers_state_changed(eh)) { + const struct modifiers_state_changed *ev = cast_modifiers_state_changed(eh); + if (ev->state) { + hid_listener_modifiers_pressed(ev->modifiers); + } else { + hid_listener_modifiers_released(ev->modifiers); + } + } + return 0; +} + +ZMK_LISTENER(hid_listener, hid_listener); +ZMK_SUBSCRIPTION(hid_listener, keycode_state_changed); +ZMK_SUBSCRIPTION(hid_listener, modifiers_state_changed); \ No newline at end of file -- cgit v1.3.1 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 ++++++ app/src/event_manager.c | 7 ++++++- app/src/events/keycode_state_changed.c | 6 +++++- app/src/events/modifiers_state_changed.c | 6 +++++- app/src/events/position_state_changed.c | 6 +++++- 10 files changed, 51 insertions(+), 10 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 diff --git a/app/src/event_manager.c b/app/src/event_manager.c index 012d285..567cdf0 100644 --- a/app/src/event_manager.c +++ b/app/src/event_manager.c @@ -1,4 +1,9 @@ - +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ + #include #include diff --git a/app/src/events/keycode_state_changed.c b/app/src/events/keycode_state_changed.c index ae1b4c9..964b24a 100644 --- a/app/src/events/keycode_state_changed.c +++ b/app/src/events/keycode_state_changed.c @@ -1,4 +1,8 @@ - +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ #include #include diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c index b7ae02d..71ec015 100644 --- a/app/src/events/modifiers_state_changed.c +++ b/app/src/events/modifiers_state_changed.c @@ -1,4 +1,8 @@ - +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ #include #include diff --git a/app/src/events/position_state_changed.c b/app/src/events/position_state_changed.c index d67eedd..69cba03 100644 --- a/app/src/events/position_state_changed.c +++ b/app/src/events/position_state_changed.c @@ -1,4 +1,8 @@ - +/* + * Copyright (c) 2020 Peter Johanson + * + * SPDX-License-Identifier: MIT + */ #include #include -- cgit v1.3.1