kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update hid_listener.c

Browse source
This commit is contained in:
Merlinov 2023-02-08 23:07:18 +03:00 • committed by GitHub
parent 4424c71308
commit d09f7c7dcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/src/hid_listener.c
View file

@ -12,13 +12,30 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/event_manager.h> #include <zmk/event_manager.h>
#include <zmk/events/keycode_state_changed.h> #include <zmk/events/keycode_state_changed.h>
#include <zmk/hid.h> #include <zmk/hid.h>
#include <zmk/events/modifiers_state_changed.h>
#include <dt-bindings/zmk/hid_usage_pages.h> #include <dt-bindings/zmk/hid_usage_pages.h>
#include <zmk/endpoints.h> #include <zmk/endpoints.h>
static int hid_listener_keycode_pressed(const struct zmk_keycode_state_changed *ev) { static int hid_listener_keycode_pressed(const struct zmk_keycode_state_changed *ev) {
int err; int err, explicit_mods_changed, implicit_mods_changed;
LOG_DBG("usage_page 0x%02X keycode 0x%02X implicit_mods 0x%02X explicit_mods 0x%02X", LOG_DBG("usage_page 0x%02X keycode 0x%02X implicit_mods 0x%02X explicit_mods 0x%02X",
ev->usage_page, ev->keycode, ev->implicit_modifiers, ev->explicit_modifiers); ev->usage_page, ev->keycode, ev->implicit_modifiers, ev->explicit_modifiers);
err = zmk_hid_press(ZMK_HID_USAGE(ev->usage_page, ev->keycode));
if (err < 0) {
LOG_DBG("Unable to press keycode");
return err;
}
explicit_mods_changed = zmk_hid_register_mods(ev->explicit_modifiers);
implicit_mods_changed = zmk_hid_implicit_modifiers_press(ev->implicit_modifiers);
if (ev->usage_page != HID_USAGE_KEY &&
(explicit_mods_changed > 0 || implicit_mods_changed > 0)) {
err = zmk_endpoints_send_report(HID_USAGE_KEY);
if (err < 0) {
LOG_ERR("Failed to send key report for changed mofifiers for consumer page event (%d)",
err);
int err, explicit_mods_changed, implicit_mods_changed;
switch (ev->usage_page) { switch (ev->usage_page) {
case HID_USAGE_KEY: case HID_USAGE_KEY:
err = zmk_hid_keyboard_press(ev->keycode); err = zmk_hid_keyboard_press(ev->keycode);
@ -44,6 +61,10 @@ static int hid_listener_keycode_released(const struct zmk_keycode_state_changed
int err; int err;
LOG_DBG("usage_page 0x%02X keycode 0x%02X implicit_mods 0x%02X explicit_mods 0x%02X", LOG_DBG("usage_page 0x%02X keycode 0x%02X implicit_mods 0x%02X explicit_mods 0x%02X",
ev->usage_page, ev->keycode, ev->implicit_modifiers, ev->explicit_modifiers); ev->usage_page, ev->keycode, ev->implicit_modifiers, ev->explicit_modifiers);
err = zmk_hid_release(ZMK_HID_USAGE(ev->usage_page, ev->keycode));
if (err < 0) {
LOG_DBG("Unable to release keycode");
return err;
switch (ev->usage_page) { switch (ev->usage_page) {
case HID_USAGE_KEY: case HID_USAGE_KEY:
err = zmk_hid_keyboard_release(ev->keycode); err = zmk_hid_keyboard_release(ev->keycode);
@ -59,7 +80,19 @@ static int hid_listener_keycode_released(const struct zmk_keycode_state_changed
return err; return err;
} }
} }
explicit_mods_changed = zmk_hid_unregister_mods(ev->explicit_modifiers);
zmk_hid_unregister_mods(ev->explicit_modifiers); zmk_hid_unregister_mods(ev->explicit_modifiers);
implicit_mods_changed = zmk_hid_implicit_modifiers_release();
;
if (ev->usage_page != HID_USAGE_KEY &&
(explicit_mods_changed > 0 || implicit_mods_changed > 0)) {
err = zmk_endpoints_send_report(HID_USAGE_KEY);
if (err < 0) {
LOG_ERR("Failed to send key report for changed mofifiers for consumer page event (%d)",
err);
}
}
// There is a minor issue with this code. // There is a minor issue with this code.
// If LC(A) is pressed, then LS(B), then LC(A) is released, the shift for B will be released // If LC(A) is pressed, then LS(B), then LC(A) is released, the shift for B will be released
// prematurely. This causes if LS(B) to repeat like Bbbbbbbb when pressed for a long time. // prematurely. This causes if LS(B) to repeat like Bbbbbbbb when pressed for a long time.
@ -75,12 +108,15 @@ int hid_listener(const zmk_event_t *eh) {
if (kc_ev->state) { if (kc_ev->state) {
hid_listener_keycode_pressed(kc_ev); hid_listener_keycode_pressed(kc_ev);
} else { } else {
hid_listener_keycode_released(kc_ev); hid_listener_keycode_released(ev);
} }
return 0; return 0;
} }
return 0; return 0;
} }
const struct zmk_keycode_state_changed *ev = as_zmk_keycode_state_changed(eh);
if (ev) {
if (ev->state) {
hid_listener_keycode_pressed(ev);
ZMK_LISTENER(hid_listener, hid_listener); ZMK_LISTENER(hid_listener, hid_listener);
ZMK_SUBSCRIPTION(hid_listener, zmk_keycode_state_changed); ZMK_SUBSCRIPTION(hid_listener, zmk_keycode_state_changed);