mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

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

pull/12258/head
QMK Bot 3 years ago
parent
998c58e89b a18e1305b3
commit
2f59e1c1d9
2 changed files with 4 additions and 4 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      quantum/quantum_keycodes.h
  2. +1
    -1
      tmk_core/common/keycode.h

+ 3
- 3
quantum/quantum_keycodes.h View File

@ -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,


+ 1
- 1
tmk_core/common/keycode.h View File

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


Write Preview
Loading…
Cancel
Save