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 /quantum/quantum_keycodes.h | |
| 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 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index dab9ba3d7..73955afe0 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -332,7 +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 | ||
| 336 | MI_VEL_1 = MIDI_VELOCITY_MIN, | ||
| 337 | #else | ||
| 335 | MI_VEL_1, | 338 | MI_VEL_1, |
| 339 | #endif | ||
| 336 | MI_VEL_2, | 340 | MI_VEL_2, |
| 337 | MI_VEL_3, | 341 | MI_VEL_3, |
| 338 | MI_VEL_4, | 342 | MI_VEL_4, |