darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-03-15 01:21:48 +00:00
commit 2f59e1c1d9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
quantum/quantum_keycodes.h
View file

@ -332,11 +332,11 @@ enum quantum_keycodes {
MIDI_VELOCITY_MIN, MIDI_VELOCITY_MIN,
MI_VEL_0 = MIDI_VELOCITY_MIN, MI_VEL_0 = MIDI_VELOCITY_MIN,
#ifdef VIA_ENABLE # ifdef VIA_ENABLE
MI_VEL_1 = MIDI_VELOCITY_MIN, MI_VEL_1 = MIDI_VELOCITY_MIN,
#else # else
MI_VEL_1, MI_VEL_1,
#endif # endif
MI_VEL_2, MI_VEL_2,
MI_VEL_3, MI_VEL_3,
MI_VEL_4, MI_VEL_4,

2
tmk_core/common/keycode.h
View file

@ -523,7 +523,7 @@ enum internal_special_keycodes {
}; };
enum mouse_keys { enum mouse_keys {
/* Mouse Buttons */ /* Mouse Buttons */
#ifdef VIA_ENABLE #ifdef VIA_ENABLE
KC_MS_UP = 0xF0, KC_MS_UP = 0xF0,
#else #else