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 /quantum/quantum_keycodes.h | |
| parent | 998c58e89be0a0bd86e564185967b7ad0fde0f26 (diff) | |
| parent | a18e1305b303be4b30c57f16e72ce27af0dd38d8 (diff) | |
| download | qmk_firmware-2f59e1c1d9c1a8fd99d7a0c01202c0550646bfd8.tar.gz qmk_firmware-2f59e1c1d9c1a8fd99d7a0c01202c0550646bfd8.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 73955afe0..0361e4cf9 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -332,11 +332,11 @@ enum quantum_keycodes { | |||
| 332 | 332 | ||
| 333 | MIDI_VELOCITY_MIN, | 333 | MIDI_VELOCITY_MIN, |
| 334 | MI_VEL_0 = MIDI_VELOCITY_MIN, | 334 | MI_VEL_0 = MIDI_VELOCITY_MIN, |
| 335 | #ifdef VIA_ENABLE | 335 | # ifdef VIA_ENABLE |
| 336 | MI_VEL_1 = MIDI_VELOCITY_MIN, | 336 | MI_VEL_1 = MIDI_VELOCITY_MIN, |
| 337 | #else | 337 | # else |
| 338 | MI_VEL_1, | 338 | MI_VEL_1, |
| 339 | #endif | 339 | # endif |
| 340 | MI_VEL_2, | 340 | MI_VEL_2, |
| 341 | MI_VEL_3, | 341 | MI_VEL_3, |
| 342 | MI_VEL_4, | 342 | MI_VEL_4, |