summaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-11-07 13:26:15 +1100
committerGitHub <noreply@github.com>2022-11-07 02:26:15 +0000
commit8b658dcc9a826b03fedb1ef2bfcc692f3e25da1b (patch)
treee8a4c156505d5e81046145d9dcffb60b0797253f /quantum/process_keycode
parent442e7653cc833e95a84178dedafb4034738c52a1 (diff)
Normalise MIDI keycodes (#18972)
* `MI_ON`, `MI_OFF`, `MI_TOG` -> `MI_TOGG` * `MI_CH*`, `MI_CHU` -> `MI_CHNU`, `MI_CHD` -> `MI_CHND` * `MI_VEL_*` -> `MI_VL*`, `MI_VELU`, `MI_VELD` * `MI_TRNS_*` -> `MI_TR*`, `MI_TRNSU` -> `MI_TRSU`, `MI_TRNSD` -> `MI_TRSD` * `MI_OCT_*` -> `MI_OC*`, `MI_OCTU`, `MI_OCTD` * Misc controls * Note keycodes * Add legacy keycodes * Regenerate keycodes * Typo
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_midi.c48
-rw-r--r--quantum/process_keycode/process_music.c6
2 files changed, 27 insertions, 27 deletions
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index c49c31a525..ce62559849 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -52,7 +52,7 @@ inline uint8_t compute_velocity(uint8_t setting) {
52} 52}
53 53
54void midi_init(void) { 54void midi_init(void) {
55 midi_config.octave = MI_OCT_2 - MIDI_OCTAVE_MIN; 55 midi_config.octave = QK_MIDI_OCTAVE_2 - MIDI_OCTAVE_MIN;
56 midi_config.transpose = 0; 56 midi_config.transpose = 0;
57 midi_config.velocity = 127; 57 midi_config.velocity = 127;
58 midi_config.channel = 0; 58 midi_config.channel = 0;
@@ -103,13 +103,13 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
103 dprintf("midi octave %d\n", midi_config.octave); 103 dprintf("midi octave %d\n", midi_config.octave);
104 } 104 }
105 return false; 105 return false;
106 case MI_OCTD: 106 case QK_MIDI_OCTAVE_DOWN:
107 if (record->event.pressed && midi_config.octave > 0) { 107 if (record->event.pressed && midi_config.octave > 0) {
108 midi_config.octave--; 108 midi_config.octave--;
109 dprintf("midi octave %d\n", midi_config.octave); 109 dprintf("midi octave %d\n", midi_config.octave);
110 } 110 }
111 return false; 111 return false;
112 case MI_OCTU: 112 case QK_MIDI_OCTAVE_UP:
113 if (record->event.pressed && midi_config.octave < (MIDI_OCTAVE_MAX - MIDI_OCTAVE_MIN)) { 113 if (record->event.pressed && midi_config.octave < (MIDI_OCTAVE_MAX - MIDI_OCTAVE_MIN)) {
114 midi_config.octave++; 114 midi_config.octave++;
115 dprintf("midi octave %d\n", midi_config.octave); 115 dprintf("midi octave %d\n", midi_config.octave);
@@ -117,18 +117,18 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
117 return false; 117 return false;
118 case MIDI_TRANSPOSE_MIN ... MIDI_TRANSPOSE_MAX: 118 case MIDI_TRANSPOSE_MIN ... MIDI_TRANSPOSE_MAX:
119 if (record->event.pressed) { 119 if (record->event.pressed) {
120 midi_config.transpose = keycode - MI_TRNS_0; 120 midi_config.transpose = keycode - QK_MIDI_TRANSPOSE_0;
121 dprintf("midi transpose %d\n", midi_config.transpose); 121 dprintf("midi transpose %d\n", midi_config.transpose);
122 } 122 }
123 return false; 123 return false;
124 case MI_TRNSD: 124 case QK_MIDI_TRANSPOSE_DOWN:
125 if (record->event.pressed && midi_config.transpose > (MIDI_TRANSPOSE_MIN - MI_TRNS_0)) { 125 if (record->event.pressed && midi_config.transpose > (MIDI_TRANSPOSE_MIN - QK_MIDI_TRANSPOSE_0)) {
126 midi_config.transpose--; 126 midi_config.transpose--;
127 dprintf("midi transpose %d\n", midi_config.transpose); 127 dprintf("midi transpose %d\n", midi_config.transpose);
128 } 128 }
129 return false; 129 return false;
130 case MI_TRNSU: 130 case QK_MIDI_TRANSPOSE_UP:
131 if (record->event.pressed && midi_config.transpose < (MIDI_TRANSPOSE_MAX - MI_TRNS_0)) { 131 if (record->event.pressed && midi_config.transpose < (MIDI_TRANSPOSE_MAX - QK_MIDI_TRANSPOSE_0)) {
132 const bool positive = midi_config.transpose > 0; 132 const bool positive = midi_config.transpose > 0;
133 midi_config.transpose++; 133 midi_config.transpose++;
134 if (positive && midi_config.transpose < 0) midi_config.transpose--; 134 if (positive && midi_config.transpose < 0) midi_config.transpose--;
@@ -141,7 +141,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
141 dprintf("midi velocity %d\n", midi_config.velocity); 141 dprintf("midi velocity %d\n", midi_config.velocity);
142 } 142 }
143 return false; 143 return false;
144 case MI_VELD: 144 case QK_MIDI_VELOCITY_DOWN:
145 if (record->event.pressed && midi_config.velocity > 0) { 145 if (record->event.pressed && midi_config.velocity > 0) {
146 if (midi_config.velocity == 127) { 146 if (midi_config.velocity == 127) {
147 midi_config.velocity -= 10; 147 midi_config.velocity -= 10;
@@ -154,7 +154,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
154 dprintf("midi velocity %d\n", midi_config.velocity); 154 dprintf("midi velocity %d\n", midi_config.velocity);
155 } 155 }
156 return false; 156 return false;
157 case MI_VELU: 157 case QK_MIDI_VELOCITY_UP:
158 if (record->event.pressed && midi_config.velocity < 127) { 158 if (record->event.pressed && midi_config.velocity < 127) {
159 if (midi_config.velocity < 115) { 159 if (midi_config.velocity < 115) {
160 midi_config.velocity += 13; 160 midi_config.velocity += 13;
@@ -170,48 +170,48 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
170 dprintf("midi channel %d\n", midi_config.channel); 170 dprintf("midi channel %d\n", midi_config.channel);
171 } 171 }
172 return false; 172 return false;
173 case MI_CHD: 173 case QK_MIDI_CHANNEL_DOWN:
174 if (record->event.pressed) { 174 if (record->event.pressed) {
175 midi_config.channel--; 175 midi_config.channel--;
176 dprintf("midi channel %d\n", midi_config.channel); 176 dprintf("midi channel %d\n", midi_config.channel);
177 } 177 }
178 return false; 178 return false;
179 case MI_CHU: 179 case QK_MIDI_CHANNEL_UP:
180 if (record->event.pressed) { 180 if (record->event.pressed) {
181 midi_config.channel++; 181 midi_config.channel++;
182 dprintf("midi channel %d\n", midi_config.channel); 182 dprintf("midi channel %d\n", midi_config.channel);
183 } 183 }
184 return false; 184 return false;
185 case MI_ALLOFF: 185 case QK_MIDI_ALL_NOTES_OFF:
186 if (record->event.pressed) { 186 if (record->event.pressed) {
187 midi_send_cc(&midi_device, midi_config.channel, 0x7B, 0); 187 midi_send_cc(&midi_device, midi_config.channel, 0x7B, 0);
188 dprintf("midi all notes off\n"); 188 dprintf("midi all notes off\n");
189 } 189 }
190 return false; 190 return false;
191 case MI_SUS: 191 case QK_MIDI_SUSTAIN:
192 midi_send_cc(&midi_device, midi_config.channel, 0x40, record->event.pressed ? 127 : 0); 192 midi_send_cc(&midi_device, midi_config.channel, 0x40, record->event.pressed ? 127 : 0);
193 dprintf("midi sustain %d\n", record->event.pressed); 193 dprintf("midi sustain %d\n", record->event.pressed);
194 return false; 194 return false;
195 case MI_PORT: 195 case QK_MIDI_PORTAMENTO:
196 midi_send_cc(&midi_device, midi_config.channel, 0x41, record->event.pressed ? 127 : 0); 196 midi_send_cc(&midi_device, midi_config.channel, 0x41, record->event.pressed ? 127 : 0);
197 dprintf("midi portamento %d\n", record->event.pressed); 197 dprintf("midi portamento %d\n", record->event.pressed);
198 return false; 198 return false;
199 case MI_SOST: 199 case QK_MIDI_SOSTENUTO:
200 midi_send_cc(&midi_device, midi_config.channel, 0x42, record->event.pressed ? 127 : 0); 200 midi_send_cc(&midi_device, midi_config.channel, 0x42, record->event.pressed ? 127 : 0);
201 dprintf("midi sostenuto %d\n", record->event.pressed); 201 dprintf("midi sostenuto %d\n", record->event.pressed);
202 return false; 202 return false;
203 case MI_SOFT: 203 case QK_MIDI_SOFT:
204 midi_send_cc(&midi_device, midi_config.channel, 0x43, record->event.pressed ? 127 : 0); 204 midi_send_cc(&midi_device, midi_config.channel, 0x43, record->event.pressed ? 127 : 0);
205 dprintf("midi soft %d\n", record->event.pressed); 205 dprintf("midi soft %d\n", record->event.pressed);
206 return false; 206 return false;
207 case MI_LEG: 207 case QK_MIDI_LEGATO:
208 midi_send_cc(&midi_device, midi_config.channel, 0x43, record->event.pressed ? 127 : 0); 208 midi_send_cc(&midi_device, midi_config.channel, 0x44, record->event.pressed ? 127 : 0);
209 dprintf("midi legato %d\n", record->event.pressed); 209 dprintf("midi legato %d\n", record->event.pressed);
210 return false; 210 return false;
211 case MI_MOD: 211 case QK_MIDI_MODULATION:
212 midi_modulation_step = record->event.pressed ? 1 : -1; 212 midi_modulation_step = record->event.pressed ? 1 : -1;
213 return false; 213 return false;
214 case MI_MODSD: 214 case QK_MIDI_MODULATION_SPEED_DOWN:
215 if (record->event.pressed) { 215 if (record->event.pressed) {
216 midi_config.modulation_interval++; 216 midi_config.modulation_interval++;
217 // prevent overflow 217 // prevent overflow
@@ -219,13 +219,13 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
219 dprintf("midi modulation interval %d\n", midi_config.modulation_interval); 219 dprintf("midi modulation interval %d\n", midi_config.modulation_interval);
220 } 220 }
221 return false; 221 return false;
222 case MI_MODSU: 222 case QK_MIDI_MODULATION_SPEED_UP:
223 if (record->event.pressed && midi_config.modulation_interval > 0) { 223 if (record->event.pressed && midi_config.modulation_interval > 0) {
224 midi_config.modulation_interval--; 224 midi_config.modulation_interval--;
225 dprintf("midi modulation interval %d\n", midi_config.modulation_interval); 225 dprintf("midi modulation interval %d\n", midi_config.modulation_interval);
226 } 226 }
227 return false; 227 return false;
228 case MI_BENDD: 228 case QK_MIDI_PITCH_BEND_DOWN:
229 if (record->event.pressed) { 229 if (record->event.pressed) {
230 midi_send_pitchbend(&midi_device, midi_config.channel, -0x2000); 230 midi_send_pitchbend(&midi_device, midi_config.channel, -0x2000);
231 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, -0x2000); 231 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, -0x2000);
@@ -234,7 +234,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
234 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0); 234 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0);
235 } 235 }
236 return false; 236 return false;
237 case MI_BENDU: 237 case QK_MIDI_PITCH_BEND_UP:
238 if (record->event.pressed) { 238 if (record->event.pressed) {
239 midi_send_pitchbend(&midi_device, midi_config.channel, 0x1fff); 239 midi_send_pitchbend(&midi_device, midi_config.channel, 0x1fff);
240 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0x1fff); 240 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0x1fff);
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 950aec22f9..ee697a0cc6 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -120,17 +120,17 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
120 return false; 120 return false;
121 } 121 }
122 122
123 if (keycode == MI_ON && record->event.pressed) { 123 if (keycode == QK_MIDI_ON && record->event.pressed) {
124 midi_on(); 124 midi_on();
125 return false; 125 return false;
126 } 126 }
127 127
128 if (keycode == MI_OFF && record->event.pressed) { 128 if (keycode == QK_MIDI_OFF && record->event.pressed) {
129 midi_off(); 129 midi_off();
130 return false; 130 return false;
131 } 131 }
132 132
133 if (keycode == MI_TOG && record->event.pressed) { 133 if (keycode == QK_MIDI_TOGGLE && record->event.pressed) {
134 if (midi_activated) { 134 if (midi_activated) {
135 midi_off(); 135 midi_off();
136 } else { 136 } else {