From 66d48534b17e7d53a35bdbc2b28a5972910cfa78 Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 28 Jan 2020 18:24:05 -0800 Subject: Move webusb pairing key back into quantum --- quantum/oryx.c | 9 ++------- quantum/quantum.c | 5 +++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/quantum/oryx.c b/quantum/oryx.c index 853962ad83..e6bd2d7689 100644 --- a/quantum/oryx.c +++ b/quantum/oryx.c @@ -206,20 +206,15 @@ bool process_record_oryx(uint16_t keycode, keyrecord_t *record) { webusb_send(event, sizeof(event)); } - switch (keycode) { - case WEBUSB_PAIR: - if (record->event.pressed) { - webusb_state.pairing = true; - } - return false; #ifdef DYNAMIC_KEYMAP_ENABLE + switch (keycode) { case MACRO00 ... MACRO15: if (record->event.pressed) { dynamic_keymap_macro_send(keycode - MACRO00); } return false; -#endif } +#endif return true; } diff --git a/quantum/quantum.c b/quantum/quantum.c index a3c16f7f8f..9e213d065c 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -312,6 +312,11 @@ bool process_record_quantum(keyrecord_t *record) { case BL_BRTG: backlight_toggle_breathing(); return false; +#endif +#ifdef WEBUSB_ENABLE + case WEBUSB_PAIR: + webusb_state.pairing ^= true; + return false; #endif } } -- cgit v1.2.3