pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(endpoints): clear HID report on endpoint change

Browse source 
This prevents stuck keys when switching endpoints by clearing
everything in the HID report and sending one last report before
switching to the new endpoint.
This commit is contained in:
Joel Spadin 2020-10-11 18:38:39 -05:00
parent 1d369ffa73
commit 8f666cecc9
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/include/zmk/hid.h
View file

@ -165,9 +165,11 @@ int zmk_hid_register_mods(zmk_mod_flags modifiers);
int zmk_hid_unregister_mods(zmk_mod_flags modifiers); int zmk_hid_unregister_mods(zmk_mod_flags modifiers);
int zmk_hid_keypad_press(zmk_key key); int zmk_hid_keypad_press(zmk_key key);
int zmk_hid_keypad_release(zmk_key key); int zmk_hid_keypad_release(zmk_key key);
void zmk_hid_keypad_clear();
int zmk_hid_consumer_press(zmk_key key); int zmk_hid_consumer_press(zmk_key key);
int zmk_hid_consumer_release(zmk_key key); int zmk_hid_consumer_release(zmk_key key);
void zmk_hid_consumer_clear();
struct zmk_hid_keypad_report *zmk_hid_get_keypad_report(); struct zmk_hid_keypad_report *zmk_hid_get_keypad_report();
struct zmk_hid_consumer_report *zmk_hid_get_consumer_report(); struct zmk_hid_consumer_report *zmk_hid_get_consumer_report();

12
app/src/endpoints.c
View file

@ -126,11 +126,21 @@ static enum endpoint get_selected_endpoint() {
return ENDPOINT_USB; return ENDPOINT_USB;
} }
static void disconnect_current_endpoint() {
zmk_hid_keypad_clear();
zmk_hid_consumer_clear();
zmk_endpoints_send_report(USAGE_KEYPAD);
zmk_endpoints_send_report(USAGE_CONSUMER);
}
static int endpoint_listener(const struct zmk_event_header *eh) { static int endpoint_listener(const struct zmk_event_header *eh) {
enum endpoint new_endpoint = get_selected_endpoint(); enum endpoint new_endpoint = get_selected_endpoint();
if (new_endpoint != current_endpoint) { if (new_endpoint != current_endpoint) {
// TODO: send null report on previous endpoint /* Cancel all current keypresses so keys don't stay held on the old endpoint. */
disconnect_current_endpoint();
current_endpoint = new_endpoint; current_endpoint = new_endpoint;
LOG_INF("Endpoint changed: %d", current_endpoint); LOG_INF("Endpoint changed: %d", current_endpoint);
} }

4
app/src/hid.c
View file

@ -94,6 +94,8 @@ int zmk_hid_keypad_release(zmk_key code) {
return 0; return 0;
}; };
void zmk_hid_keypad_clear() { memset(&kp_report.body, 0, sizeof(kp_report.body)); }
int zmk_hid_consumer_press(zmk_key code) { int zmk_hid_consumer_press(zmk_key code) {
TOGGLE_CONSUMER(0U, code); TOGGLE_CONSUMER(0U, code);
return 0; return 0;
@ -104,6 +106,8 @@ int zmk_hid_consumer_release(zmk_key code) {
return 0; return 0;
}; };
void zmk_hid_consumer_clear() { memset(&consumer_report.body, 0, sizeof(consumer_report.body)); }
struct zmk_hid_keypad_report *zmk_hid_get_keypad_report() { struct zmk_hid_keypad_report *zmk_hid_get_keypad_report() {
return &kp_report; return &kp_report;
} }