summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2020-01-28 18:24:05 -0800
committerFlorian Didron <fdidron@users.noreply.github.com>2020-02-26 10:15:12 +0900
commit66d48534b17e7d53a35bdbc2b28a5972910cfa78 (patch)
tree4ad4b25e97b200e059940c7b51ecf397f463c5b5
parent0c4e8700636122fe3a2965603b1069d1ef2f77c1 (diff)
Move webusb pairing key back into quantum
-rw-r--r--quantum/oryx.c9
-rw-r--r--quantum/quantum.c5
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
@@ -313,6 +313,11 @@ bool process_record_quantum(keyrecord_t *record) {
backlight_toggle_breathing();
return false;
#endif
+#ifdef WEBUSB_ENABLE
+ case WEBUSB_PAIR:
+ webusb_state.pairing ^= true;
+ return false;
+#endif
}
}