summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-15 01:19:36 +0000
committerQMK Bot <hello@qmk.fm>2021-03-15 01:19:36 +0000
commit998c58e89be0a0bd86e564185967b7ad0fde0f26 (patch)
tree4da8542406e0b3ff913207f62c1a2a5fe7911a73 /tmk_core
parent35db567c9cee9f065b1c50ecdb66e616d25f0a1b (diff)
parent0779c34db8ba0bf7141712377b1db467394f940f (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/keycode.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h
index efad92b235..a39a33be21 100644
--- a/tmk_core/common/keycode.h
+++ b/tmk_core/common/keycode.h
@@ -524,7 +524,11 @@ enum internal_special_keycodes {
enum mouse_keys {
/* Mouse Buttons */
+#ifdef VIA_ENABLE
+ KC_MS_UP = 0xF0,
+#else
KC_MS_UP = 0xED,
+#endif
KC_MS_DOWN,
KC_MS_LEFT,
KC_MS_RIGHT, // 0xF0
@@ -533,9 +537,15 @@ enum mouse_keys {
KC_MS_BTN3,
KC_MS_BTN4,
KC_MS_BTN5,
+#ifdef VIA_ENABLE
+ KC_MS_BTN6 = KC_MS_BTN5,
+ KC_MS_BTN7 = KC_MS_BTN5,
+ KC_MS_BTN8 = KC_MS_BTN5,
+#else
KC_MS_BTN6,
KC_MS_BTN7,
KC_MS_BTN8,
+#endif
/* Mouse Wheel */
KC_MS_WH_UP,