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/src/behaviors/behavior_hid.c | 35 +++++++++++++++++------ app/src/behaviors/behavior_key_press.c | 19 +++++++++++-- app/src/behaviors/behavior_keymap.c | 50 --------------------------------- app/src/behaviors/behavior_mod_tap.c | 43 +++++++++++++--------------- app/src/event_manager.c | 32 +++++++++++++++++++++ app/src/events/keycode_state_changed.c | 6 ++++ app/src/events/position_state_changed.c | 6 ++++ app/src/keymap.c | 16 +++++++++++ app/src/kscan.c | 13 +++++---- 9 files changed, 129 insertions(+), 91 deletions(-) delete mode 100644 app/src/behaviors/behavior_keymap.c create mode 100644 app/src/event_manager.c create mode 100644 app/src/events/keycode_state_changed.c create mode 100644 app/src/events/position_state_changed.c (limited to 'app/src') diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c index 1ac7404..b901450 100644 --- a/app/src/behaviors/behavior_hid.c +++ b/app/src/behaviors/behavior_hid.c @@ -13,18 +13,16 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); +#include +#include #include #include struct behavior_hid_config { }; struct behavior_hid_data { }; -static int behavior_hid_init(struct device *dev) -{ - return 0; -}; -static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode) +static int behaviour_hid_keycode_pressed(u8_t usage_page, u32_t keycode) { int err; LOG_DBG("keycode %d", keycode); @@ -49,7 +47,7 @@ static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode return zmk_endpoints_send_report(usage_page); } -static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycode) +static int behaviour_hid_keycode_released(u8_t usage_page, u32_t keycode) { int err; LOG_DBG("keycode %d", keycode); @@ -73,6 +71,28 @@ static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycod return zmk_endpoints_send_report(usage_page); } + +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); + } + } + return 0; +} + +ZMK_LISTENER(behavior_hid, behavior_hid_listener); +ZMK_SUBSCRIPTION(behavior_hid, keycode_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); @@ -90,13 +110,10 @@ static int on_modifiers_released(struct device *dev, zmk_mod_flags modifiers) } static const struct behavior_driver_api behavior_hid_driver_api = { - .keycode_pressed = on_keycode_pressed, - .keycode_released = on_keycode_released, .modifiers_pressed = on_modifiers_pressed, .modifiers_released = on_modifiers_released }; - static const struct behavior_hid_config behavior_hid_config = {}; static struct behavior_hid_data behavior_hid_data; diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c index 7213b3c..34df1c0 100644 --- a/app/src/behaviors/behavior_key_press.c +++ b/app/src/behaviors/behavior_key_press.c @@ -10,7 +10,8 @@ #include #include -#include +#include +#include LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); @@ -27,15 +28,27 @@ static int behavior_key_press_init(struct device *dev) static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t keycode, u32_t _) { const struct behavior_key_press_config *cfg = dev->config_info; + struct keycode_state_changed *ev; LOG_DBG("position %d usage_page 0x%02X keycode 0x%02X", position, cfg->usage_page, keycode); - return zmk_events_keycode_pressed(cfg->usage_page, keycode); + + ev = new_keycode_state_changed(); + ev->usage_page = cfg->usage_page; + ev->keycode = keycode; + ev->state = true; + return ZMK_EVENT_RAISE(ev); } static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t keycode, u32_t _) { const struct behavior_key_press_config *cfg = dev->config_info; + struct keycode_state_changed *ev; LOG_DBG("position %d usage_page 0x%02X keycode 0x%02X", position, cfg->usage_page, keycode); - return zmk_events_keycode_released(cfg->usage_page, keycode); + + ev = new_keycode_state_changed(); + ev->usage_page = cfg->usage_page; + ev->keycode = keycode; + ev->state = false; + return ZMK_EVENT_RAISE(ev); } static const struct behavior_driver_api behavior_key_press_driver_api = { diff --git a/app/src/behaviors/behavior_keymap.c b/app/src/behaviors/behavior_keymap.c deleted file mode 100644 index 7a06b2f..0000000 --- a/app/src/behaviors/behavior_keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2020 Peter Johanson - * - * SPDX-License-Identifier: MIT - */ - -#define DT_DRV_COMPAT zmk_behavior_keymap - -#include -#include -#include -#include - -LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); - -#include - -struct behavior_keymap_config { }; -struct behavior_keymap_data { }; - -static int behavior_keymap_init(struct device *dev) -{ - return 0; -}; - -static int on_position_pressed(struct device *dev, u32_t position) -{ - return zmk_keymap_position_state_changed(position, true); -} - -static int on_position_released(struct device *dev, u32_t position) -{ - return zmk_keymap_position_state_changed(position, false); -} - -static const struct behavior_driver_api behavior_keymap_driver_api = { - .position_pressed = on_position_pressed, - .position_released = on_position_released, -}; - - -static const struct behavior_keymap_config behavior_keymap_config = {}; - -static struct behavior_keymap_data behavior_keymap_data; - -DEVICE_AND_API_INIT(behavior_keymap, DT_INST_LABEL(0), behavior_keymap_init, - &behavior_keymap_data, - &behavior_keymap_config, - APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &behavior_keymap_driver_api); diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c index 2e6e339..c9baff4 100644 --- a/app/src/behaviors/behavior_mod_tap.c +++ b/app/src/behaviors/behavior_mod_tap.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); @@ -19,6 +21,22 @@ struct behavior_mod_tap_data { u16_t pending_press_positions; }; +int behavior_mod_tap_listener(const struct zmk_event_header *eh) +{ + if (is_keycode_state_changed(eh)) { + struct device *dev = device_get_binding(DT_INST_LABEL(0)); + const struct keycode_state_changed *ev = cast_keycode_state_changed(eh); + if (ev->state) { + struct behavior_mod_tap_data *data = dev->driver_data; + data->pending_press_positions = 0; + } + } + return 0; +} + +ZMK_LISTENER(behavior_mod_tap, behavior_mod_tap_listener); +ZMK_SUBSCRIPTION(behavior_mod_tap, keycode_state_changed); + static int behavior_mod_tap_init(struct device *dev) { return 0; @@ -40,7 +58,7 @@ static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t struct behavior_mod_tap_data *data = dev->driver_data; LOG_DBG("mods: %d, keycode: %d", mods, keycode); -zmk_events_modifiers_released(mods); + zmk_events_modifiers_released(mods); if (data->pending_press_positions & BIT(position)) { zmk_events_keycode_pressed(USAGE_KEYPAD, keycode); k_msleep(10); @@ -50,30 +68,9 @@ zmk_events_modifiers_released(mods); return 0; } -static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode) -{ - struct behavior_mod_tap_data *data = dev->driver_data; - data->pending_press_positions = 0; - LOG_DBG("pressing: %d", keycode); - return 0; -} - -static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycode) -{ - LOG_DBG("releasing: %d", keycode); - return 0; -} - static const struct behavior_driver_api behavior_mod_tap_driver_api = { - // These callbacks are all optional, and define which kinds of events the behavior can handle. - // They can reference local functions defined here, or shared event handlers. .binding_pressed = on_keymap_binding_pressed, .binding_released = on_keymap_binding_released, - .keycode_pressed = on_keycode_pressed, - .keycode_released = on_keycode_released - // Other optional callbacks a behavior can implement - // .on_mouse_moved - // .on_sensor_data - Any behaviour that wants to be linked to a censor can implement this behavior }; @@ -81,7 +78,7 @@ static const struct behavior_mod_tap_config behavior_mod_tap_config = {}; static struct behavior_mod_tap_data behavior_mod_tap_data; -DEVICE_AND_API_INIT(behavior_key_press, DT_INST_LABEL(0), behavior_mod_tap_init, +DEVICE_AND_API_INIT(behavior_mod_tap, DT_INST_LABEL(0), behavior_mod_tap_init, &behavior_mod_tap_data, &behavior_mod_tap_config, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, diff --git a/app/src/event_manager.c b/app/src/event_manager.c new file mode 100644 index 0000000..012d285 --- /dev/null +++ b/app/src/event_manager.c @@ -0,0 +1,32 @@ + +#include +#include + +LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); + +#include + +extern struct zmk_event_type* __event_type_start[]; +extern struct zmk_event_type* __event_type_end[]; + +extern struct zmk_event_subscription __event_subscriptions_start[]; +extern struct zmk_event_subscription __event_subscriptions_end[]; + +int zmk_event_manager_raise(struct zmk_event_header *event) +{ + int ret; + struct zmk_event_subscription *ev_sub; + for (ev_sub = __event_subscriptions_start; ev_sub != __event_subscriptions_end; ev_sub++) { + if (ev_sub->event_type == event->event) { + ret = ev_sub->listener->callback(event); + if (ret) { + LOG_DBG("Listener returned an error: %d", ret); + goto release; + } + } + } + +release: + k_free(event); + return ret; +} \ No newline at end of file diff --git a/app/src/events/keycode_state_changed.c b/app/src/events/keycode_state_changed.c new file mode 100644 index 0000000..ae1b4c9 --- /dev/null +++ b/app/src/events/keycode_state_changed.c @@ -0,0 +1,6 @@ + + +#include +#include + +ZMK_EVENT_IMPL(keycode_state_changed); \ No newline at end of file diff --git a/app/src/events/position_state_changed.c b/app/src/events/position_state_changed.c new file mode 100644 index 0000000..d67eedd --- /dev/null +++ b/app/src/events/position_state_changed.c @@ -0,0 +1,6 @@ + + +#include +#include + +ZMK_EVENT_IMPL(position_state_changed); \ No newline at end of file diff --git a/app/src/keymap.c b/app/src/keymap.c index f951dd7..25bcf80 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -9,6 +9,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include #include +#include +#include + static u32_t zmk_keymap_layer_state = 0; static u8_t zmk_keymap_layer_default = 0; @@ -116,3 +119,16 @@ int zmk_keymap_position_state_changed(u32_t position, bool pressed) return -ENOTSUP; } + +int keymap_listener(const struct zmk_event_header *eh) +{ + if (is_position_state_changed(eh)) { + const struct position_state_changed *ev = cast_position_state_changed(eh); + zmk_keymap_position_state_changed(ev->position, ev->state); + } + return 0; +} + +ZMK_LISTENER(keymap, keymap_listener); +ZMK_SUBSCRIPTION(keymap, position_state_changed); + diff --git a/app/src/kscan.c b/app/src/kscan.c index 29a6019..63713f1 100644 --- a/app/src/kscan.c +++ b/app/src/kscan.c @@ -12,7 +12,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include -#include +#include +#include #define ZMK_KSCAN_EVENT_STATE_PRESSED 0 #define ZMK_KSCAN_EVENT_STATE_RELEASED 1 @@ -50,12 +51,12 @@ void zmk_kscan_process_msgq(struct k_work *item) { bool pressed = (ev.state == ZMK_KSCAN_EVENT_STATE_PRESSED); u32_t position = zmk_matrix_transform_row_column_to_position(ev.row, ev.column); + struct position_state_changed *pos_ev; LOG_DBG("Row: %d, col: %d, position: %d, pressed: %s\n", ev.row, ev.column, position, (pressed ? "true" : "false")); - if (pressed) { - zmk_events_position_pressed(position); - } else { - zmk_events_position_released(position); - } + pos_ev = new_position_state_changed(); + pos_ev->state = pressed; + pos_ev->position = position; + ZMK_EVENT_RAISE(pos_ev); } } -- 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/src/behaviors/behavior_hid.c | 46 ++++++++++++++++++-------------- app/src/behaviors/behavior_mod_tap.c | 13 +++++---- app/src/events/modifiers_state_changed.c | 6 +++++ 3 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 app/src/events/modifiers_state_changed.c (limited to 'app/src') 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.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/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 ++++++++++++++++++++++ 5 files changed, 106 insertions(+), 216 deletions(-) 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/src') 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.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/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 +++++- 4 files changed, 21 insertions(+), 4 deletions(-) (limited to 'app/src') 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.2.3 From 7bf8621d5bea45c57dbbf0fac927d3332177b81b Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 30 Jun 2020 16:39:29 -0400 Subject: Whitespace fix. --- app/src/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/src') diff --git a/app/src/keymap.c b/app/src/keymap.c index 25bcf80..dcfd0f1 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -122,11 +122,11 @@ int zmk_keymap_position_state_changed(u32_t position, bool pressed) int keymap_listener(const struct zmk_event_header *eh) { - if (is_position_state_changed(eh)) { - const struct position_state_changed *ev = cast_position_state_changed(eh); + if (is_position_state_changed(eh)) { + const struct position_state_changed *ev = cast_position_state_changed(eh); zmk_keymap_position_state_changed(ev->position, ev->state); - } - return 0; + } + return 0; } ZMK_LISTENER(keymap, keymap_listener); -- cgit v1.2.3