diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-15 01:21:48 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-15 01:21:48 +0000 |
| commit | 2f59e1c1d9c1a8fd99d7a0c01202c0550646bfd8 (patch) | |
| tree | 8813a4d186c628f9e4fc4350b91b060e76139521 | |
| parent | 998c58e89be0a0bd86e564185967b7ad0fde0f26 (diff) | |
| parent | a18e1305b303be4b30c57f16e72ce27af0dd38d8 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | quantum/quantum_keycodes.h | 6 | ||||
| -rw-r--r-- | tmk_core/common/keycode.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 73955afe06..0361e4cf9c 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -332,11 +332,11 @@ enum quantum_keycodes { MIDI_VELOCITY_MIN, MI_VEL_0 = MIDI_VELOCITY_MIN, -#ifdef VIA_ENABLE +# ifdef VIA_ENABLE MI_VEL_1 = MIDI_VELOCITY_MIN, -#else +# else MI_VEL_1, -#endif +# endif MI_VEL_2, MI_VEL_3, MI_VEL_4, diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index a39a33be21..8facabd818 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -523,7 +523,7 @@ enum internal_special_keycodes { }; enum mouse_keys { - /* Mouse Buttons */ +/* Mouse Buttons */ #ifdef VIA_ENABLE KC_MS_UP = 0xF0, #else |