diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-15 01:19:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-15 01:19:36 +0000 |
| commit | 998c58e89be0a0bd86e564185967b7ad0fde0f26 (patch) | |
| tree | 4da8542406e0b3ff913207f62c1a2a5fe7911a73 /tmk_core | |
| parent | 35db567c9cee9f065b1c50ecdb66e616d25f0a1b (diff) | |
| parent | 0779c34db8ba0bf7141712377b1db467394f940f (diff) | |
| download | qmk_firmware-998c58e89be0a0bd86e564185967b7ad0fde0f26.tar.gz qmk_firmware-998c58e89be0a0bd86e564185967b7ad0fde0f26.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/keycode.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index efad92b23..a39a33be2 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h | |||
| @@ -524,7 +524,11 @@ enum internal_special_keycodes { | |||
| 524 | 524 | ||
| 525 | enum mouse_keys { | 525 | enum mouse_keys { |
| 526 | /* Mouse Buttons */ | 526 | /* Mouse Buttons */ |
| 527 | #ifdef VIA_ENABLE | ||
| 528 | KC_MS_UP = 0xF0, | ||
| 529 | #else | ||
| 527 | KC_MS_UP = 0xED, | 530 | KC_MS_UP = 0xED, |
| 531 | #endif | ||
| 528 | KC_MS_DOWN, | 532 | KC_MS_DOWN, |
| 529 | KC_MS_LEFT, | 533 | KC_MS_LEFT, |
| 530 | KC_MS_RIGHT, // 0xF0 | 534 | KC_MS_RIGHT, // 0xF0 |
| @@ -533,9 +537,15 @@ enum mouse_keys { | |||
| 533 | KC_MS_BTN3, | 537 | KC_MS_BTN3, |
| 534 | KC_MS_BTN4, | 538 | KC_MS_BTN4, |
| 535 | KC_MS_BTN5, | 539 | KC_MS_BTN5, |
| 540 | #ifdef VIA_ENABLE | ||
| 541 | KC_MS_BTN6 = KC_MS_BTN5, | ||
| 542 | KC_MS_BTN7 = KC_MS_BTN5, | ||
| 543 | KC_MS_BTN8 = KC_MS_BTN5, | ||
| 544 | #else | ||
| 536 | KC_MS_BTN6, | 545 | KC_MS_BTN6, |
| 537 | KC_MS_BTN7, | 546 | KC_MS_BTN7, |
| 538 | KC_MS_BTN8, | 547 | KC_MS_BTN8, |
| 548 | #endif | ||
| 539 | 549 | ||
| 540 | /* Mouse Wheel */ | 550 | /* Mouse Wheel */ |
| 541 | KC_MS_WH_UP, | 551 | KC_MS_WH_UP, |