diff options
| author | Ryan <fauxpark@gmail.com> | 2022-11-07 13:26:15 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 02:26:15 +0000 |
| commit | 8b658dcc9a826b03fedb1ef2bfcc692f3e25da1b (patch) | |
| tree | e8a4c156505d5e81046145d9dcffb60b0797253f /quantum | |
| parent | 442e7653cc833e95a84178dedafb4034738c52a1 (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')
| -rw-r--r-- | quantum/keycodes.h | 495 | ||||
| -rw-r--r-- | quantum/process_keycode/process_midi.c | 48 | ||||
| -rw-r--r-- | quantum/process_keycode/process_music.c | 6 | ||||
| -rw-r--r-- | quantum/quantum_keycodes.h | 20 | ||||
| -rw-r--r-- | quantum/quantum_keycodes_legacy.h | 130 | ||||
| -rw-r--r-- | quantum/sequencer/tests/sequencer_tests.cpp | 22 |
6 files changed, 497 insertions, 224 deletions
diff --git a/quantum/keycodes.h b/quantum/keycodes.h index db4d373234..deb3565262 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h | |||
| @@ -346,150 +346,150 @@ enum qk_keycode_defines { | |||
| 346 | MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020, | 346 | MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020, |
| 347 | MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021, | 347 | MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021, |
| 348 | MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022, | 348 | MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022, |
| 349 | MI_ON = 0x7100, | 349 | QK_MIDI_ON = 0x7100, |
| 350 | MI_OFF = 0x7101, | 350 | QK_MIDI_OFF = 0x7101, |
| 351 | MI_TOG = 0x7102, | 351 | QK_MIDI_TOGGLE = 0x7102, |
| 352 | MI_C = 0x7110, | 352 | QK_MIDI_NOTE_C_0 = 0x7110, |
| 353 | MI_Cs = 0x7111, | 353 | QK_MIDI_NOTE_C_SHARP_0 = 0x7111, |
| 354 | MI_D = 0x7112, | 354 | QK_MIDI_NOTE_D_0 = 0x7112, |
| 355 | MI_Ds = 0x7113, | 355 | QK_MIDI_NOTE_D_SHARP_0 = 0x7113, |
| 356 | MI_E = 0x7114, | 356 | QK_MIDI_NOTE_E_0 = 0x7114, |
| 357 | MI_F = 0x7115, | 357 | QK_MIDI_NOTE_F_0 = 0x7115, |
| 358 | MI_Fs = 0x7116, | 358 | QK_MIDI_NOTE_F_SHARP_0 = 0x7116, |
| 359 | MI_G = 0x7117, | 359 | QK_MIDI_NOTE_G_0 = 0x7117, |
| 360 | MI_Gs = 0x7118, | 360 | QK_MIDI_NOTE_G_SHARP_0 = 0x7118, |
| 361 | MI_A = 0x7119, | 361 | QK_MIDI_NOTE_A_0 = 0x7119, |
| 362 | MI_As = 0x711A, | 362 | QK_MIDI_NOTE_A_SHARP_0 = 0x711A, |
| 363 | MI_B = 0x711B, | 363 | QK_MIDI_NOTE_B_0 = 0x711B, |
| 364 | MI_C_1 = 0x7120, | 364 | QK_MIDI_NOTE_C_1 = 0x7120, |
| 365 | MI_Cs_1 = 0x7121, | 365 | QK_MIDI_NOTE_C_SHARP_1 = 0x7121, |
| 366 | MI_D_1 = 0x7122, | 366 | QK_MIDI_NOTE_D_1 = 0x7122, |
| 367 | MI_Ds_1 = 0x7123, | 367 | QK_MIDI_NOTE_D_SHARP_1 = 0x7123, |
| 368 | MI_E_1 = 0x7124, | 368 | QK_MIDI_NOTE_E_1 = 0x7124, |
| 369 | MI_F_1 = 0x7125, | 369 | QK_MIDI_NOTE_F_1 = 0x7125, |
| 370 | MI_Fs_1 = 0x7126, | 370 | QK_MIDI_NOTE_F_SHARP_1 = 0x7126, |
| 371 | MI_G_1 = 0x7127, | 371 | QK_MIDI_NOTE_G_1 = 0x7127, |
| 372 | MI_Gs_1 = 0x7128, | 372 | QK_MIDI_NOTE_G_SHARP_1 = 0x7128, |
| 373 | MI_A_1 = 0x7129, | 373 | QK_MIDI_NOTE_A_1 = 0x7129, |
| 374 | MI_As_1 = 0x712A, | 374 | QK_MIDI_NOTE_A_SHARP_1 = 0x712A, |
| 375 | MI_B_1 = 0x712B, | 375 | QK_MIDI_NOTE_B_1 = 0x712B, |
| 376 | MI_C_2 = 0x7130, | 376 | QK_MIDI_NOTE_C_2 = 0x7130, |
| 377 | MI_Cs_2 = 0x7131, | 377 | QK_MIDI_NOTE_C_SHARP_2 = 0x7131, |
| 378 | MI_D_2 = 0x7132, | 378 | QK_MIDI_NOTE_D_2 = 0x7132, |
| 379 | MI_Ds_2 = 0x7133, | 379 | QK_MIDI_NOTE_D_SHARP_2 = 0x7133, |
| 380 | MI_E_2 = 0x7134, | 380 | QK_MIDI_NOTE_E_2 = 0x7134, |
| 381 | MI_F_2 = 0x7135, | 381 | QK_MIDI_NOTE_F_2 = 0x7135, |
| 382 | MI_Fs_2 = 0x7136, | 382 | QK_MIDI_NOTE_F_SHARP_2 = 0x7136, |
| 383 | MI_G_2 = 0x7137, | 383 | QK_MIDI_NOTE_G_2 = 0x7137, |
| 384 | MI_Gs_2 = 0x7138, | 384 | QK_MIDI_NOTE_G_SHARP_2 = 0x7138, |
| 385 | MI_A_2 = 0x7139, | 385 | QK_MIDI_NOTE_A_2 = 0x7139, |
| 386 | MI_As_2 = 0x713A, | 386 | QK_MIDI_NOTE_A_SHARP_2 = 0x713A, |
| 387 | MI_B_2 = 0x713B, | 387 | QK_MIDI_NOTE_B_2 = 0x713B, |
| 388 | MI_C_3 = 0x7140, | 388 | QK_MIDI_NOTE_C_3 = 0x7140, |
| 389 | MI_Cs_3 = 0x7141, | 389 | QK_MIDI_NOTE_C_SHARP_3 = 0x7141, |
| 390 | MI_D_3 = 0x7142, | 390 | QK_MIDI_NOTE_D_3 = 0x7142, |
| 391 | MI_Ds_3 = 0x7143, | 391 | QK_MIDI_NOTE_D_SHARP_3 = 0x7143, |
| 392 | MI_E_3 = 0x7144, | 392 | QK_MIDI_NOTE_E_3 = 0x7144, |
| 393 | MI_F_3 = 0x7145, | 393 | QK_MIDI_NOTE_F_3 = 0x7145, |
| 394 | MI_Fs_3 = 0x7146, | 394 | QK_MIDI_NOTE_F_SHARP_3 = 0x7146, |
| 395 | MI_G_3 = 0x7147, | 395 | QK_MIDI_NOTE_G_3 = 0x7147, |
| 396 | MI_Gs_3 = 0x7148, | 396 | QK_MIDI_NOTE_G_SHARP_3 = 0x7148, |
| 397 | MI_A_3 = 0x7149, | 397 | QK_MIDI_NOTE_A_3 = 0x7149, |
| 398 | MI_As_3 = 0x714A, | 398 | QK_MIDI_NOTE_A_SHARP_3 = 0x714A, |
| 399 | MI_B_3 = 0x714B, | 399 | QK_MIDI_NOTE_B_3 = 0x714B, |
| 400 | MI_C_4 = 0x7150, | 400 | QK_MIDI_NOTE_C_4 = 0x7150, |
| 401 | MI_Cs_4 = 0x7151, | 401 | QK_MIDI_NOTE_C_SHARP_4 = 0x7151, |
| 402 | MI_D_4 = 0x7152, | 402 | QK_MIDI_NOTE_D_4 = 0x7152, |
| 403 | MI_Ds_4 = 0x7153, | 403 | QK_MIDI_NOTE_D_SHARP_4 = 0x7153, |
| 404 | MI_E_4 = 0x7154, | 404 | QK_MIDI_NOTE_E_4 = 0x7154, |
| 405 | MI_F_4 = 0x7155, | 405 | QK_MIDI_NOTE_F_4 = 0x7155, |
| 406 | MI_Fs_4 = 0x7156, | 406 | QK_MIDI_NOTE_F_SHARP_4 = 0x7156, |
| 407 | MI_G_4 = 0x7157, | 407 | QK_MIDI_NOTE_G_4 = 0x7157, |
| 408 | MI_Gs_4 = 0x7158, | 408 | QK_MIDI_NOTE_G_SHARP_4 = 0x7158, |
| 409 | MI_A_4 = 0x7159, | 409 | QK_MIDI_NOTE_A_4 = 0x7159, |
| 410 | MI_As_4 = 0x715A, | 410 | QK_MIDI_NOTE_A_SHARP_4 = 0x715A, |
| 411 | MI_B_4 = 0x715B, | 411 | QK_MIDI_NOTE_B_4 = 0x715B, |
| 412 | MI_C_5 = 0x7160, | 412 | QK_MIDI_NOTE_C_5 = 0x7160, |
| 413 | MI_Cs_5 = 0x7161, | 413 | QK_MIDI_NOTE_C_SHARP_5 = 0x7161, |
| 414 | MI_D_5 = 0x7162, | 414 | QK_MIDI_NOTE_D_5 = 0x7162, |
| 415 | MI_Ds_5 = 0x7163, | 415 | QK_MIDI_NOTE_D_SHARP_5 = 0x7163, |
| 416 | MI_E_5 = 0x7164, | 416 | QK_MIDI_NOTE_E_5 = 0x7164, |
| 417 | MI_F_5 = 0x7165, | 417 | QK_MIDI_NOTE_F_5 = 0x7165, |
| 418 | MI_Fs_5 = 0x7166, | 418 | QK_MIDI_NOTE_F_SHARP_5 = 0x7166, |
| 419 | MI_G_5 = 0x7167, | 419 | QK_MIDI_NOTE_G_5 = 0x7167, |
| 420 | MI_Gs_5 = 0x7168, | 420 | QK_MIDI_NOTE_G_SHARP_5 = 0x7168, |
| 421 | MI_A_5 = 0x7169, | 421 | QK_MIDI_NOTE_A_5 = 0x7169, |
| 422 | MI_As_5 = 0x716A, | 422 | QK_MIDI_NOTE_A_SHARP_5 = 0x716A, |
| 423 | MI_B_5 = 0x716B, | 423 | QK_MIDI_NOTE_B_5 = 0x716B, |
| 424 | MI_OCT_N2 = 0x7170, | 424 | QK_MIDI_OCTAVE_N2 = 0x7170, |
| 425 | MI_OCT_N1 = 0x7171, | 425 | QK_MIDI_OCTAVE_N1 = 0x7171, |
| 426 | MI_OCT_0 = 0x7172, | 426 | QK_MIDI_OCTAVE_0 = 0x7172, |
| 427 | MI_OCT_1 = 0x7173, | 427 | QK_MIDI_OCTAVE_1 = 0x7173, |
| 428 | MI_OCT_2 = 0x7174, | 428 | QK_MIDI_OCTAVE_2 = 0x7174, |
| 429 | MI_OCT_3 = 0x7175, | 429 | QK_MIDI_OCTAVE_3 = 0x7175, |
| 430 | MI_OCT_4 = 0x7176, | 430 | QK_MIDI_OCTAVE_4 = 0x7176, |
| 431 | MI_OCT_5 = 0x7177, | 431 | QK_MIDI_OCTAVE_5 = 0x7177, |
| 432 | MI_OCT_6 = 0x7178, | 432 | QK_MIDI_OCTAVE_6 = 0x7178, |
| 433 | MI_OCT_7 = 0x7179, | 433 | QK_MIDI_OCTAVE_7 = 0x7179, |
| 434 | MI_OCTD = 0x717A, | 434 | QK_MIDI_OCTAVE_DOWN = 0x717A, |
| 435 | MI_OCTU = 0x717B, | 435 | QK_MIDI_OCTAVE_UP = 0x717B, |
| 436 | MI_TRNS_N6 = 0x7180, | 436 | QK_MIDI_TRANSPOSE_N6 = 0x7180, |
| 437 | MI_TRNS_N5 = 0x7181, | 437 | QK_MIDI_TRANSPOSE_N5 = 0x7181, |
| 438 | MI_TRNS_N4 = 0x7182, | 438 | QK_MIDI_TRANSPOSE_N4 = 0x7182, |
| 439 | MI_TRNS_N3 = 0x7183, | 439 | QK_MIDI_TRANSPOSE_N3 = 0x7183, |
| 440 | MI_TRNS_N2 = 0x7184, | 440 | QK_MIDI_TRANSPOSE_N2 = 0x7184, |
| 441 | MI_TRNS_N1 = 0x7185, | 441 | QK_MIDI_TRANSPOSE_N1 = 0x7185, |
| 442 | MI_TRNS_0 = 0x7186, | 442 | QK_MIDI_TRANSPOSE_0 = 0x7186, |
| 443 | MI_TRNS_1 = 0x7187, | 443 | QK_MIDI_TRANSPOSE_1 = 0x7187, |
| 444 | MI_TRNS_2 = 0x7188, | 444 | QK_MIDI_TRANSPOSE_2 = 0x7188, |
| 445 | MI_TRNS_3 = 0x7189, | 445 | QK_MIDI_TRANSPOSE_3 = 0x7189, |
| 446 | MI_TRNS_4 = 0x718A, | 446 | QK_MIDI_TRANSPOSE_4 = 0x718A, |
| 447 | MI_TRNS_5 = 0x718B, | 447 | QK_MIDI_TRANSPOSE_5 = 0x718B, |
| 448 | MI_TRNS_6 = 0x718C, | 448 | QK_MIDI_TRANSPOSE_6 = 0x718C, |
| 449 | MI_TRNSD = 0x718D, | 449 | QK_MIDI_TRANSPOSE_DOWN = 0x718D, |
| 450 | MI_TRNSU = 0x718E, | 450 | QK_MIDI_TRANSPOSE_UP = 0x718E, |
| 451 | MI_VEL_0 = 0x7190, | 451 | QK_MIDI_VELOCITY_0 = 0x7190, |
| 452 | MI_VEL_1 = 0x7191, | 452 | QK_MIDI_VELOCITY_1 = 0x7191, |
| 453 | MI_VEL_2 = 0x7192, | 453 | QK_MIDI_VELOCITY_2 = 0x7192, |
| 454 | MI_VEL_3 = 0x7193, | 454 | QK_MIDI_VELOCITY_3 = 0x7193, |
| 455 | MI_VEL_4 = 0x7194, | 455 | QK_MIDI_VELOCITY_4 = 0x7194, |
| 456 | MI_VEL_5 = 0x7195, | 456 | QK_MIDI_VELOCITY_5 = 0x7195, |
| 457 | MI_VEL_6 = 0x7196, | 457 | QK_MIDI_VELOCITY_6 = 0x7196, |
| 458 | MI_VEL_7 = 0x7197, | 458 | QK_MIDI_VELOCITY_7 = 0x7197, |
| 459 | MI_VEL_8 = 0x7198, | 459 | QK_MIDI_VELOCITY_8 = 0x7198, |
| 460 | MI_VEL_9 = 0x7199, | 460 | QK_MIDI_VELOCITY_9 = 0x7199, |
| 461 | MI_VEL_10 = 0x719A, | 461 | QK_MIDI_VELOCITY_10 = 0x719A, |
| 462 | MI_VELD = 0x719B, | 462 | QK_MIDI_VELOCITY_DOWN = 0x719B, |
| 463 | MI_VELU = 0x719C, | 463 | QK_MIDI_VELOCITY_UP = 0x719C, |
| 464 | MI_CH1 = 0x71A0, | 464 | QK_MIDI_CHANNEL_1 = 0x71A0, |
| 465 | MI_CH2 = 0x71A1, | 465 | QK_MIDI_CHANNEL_2 = 0x71A1, |
| 466 | MI_CH3 = 0x71A2, | 466 | QK_MIDI_CHANNEL_3 = 0x71A2, |
| 467 | MI_CH4 = 0x71A3, | 467 | QK_MIDI_CHANNEL_4 = 0x71A3, |
| 468 | MI_CH5 = 0x71A4, | 468 | QK_MIDI_CHANNEL_5 = 0x71A4, |
| 469 | MI_CH6 = 0x71A5, | 469 | QK_MIDI_CHANNEL_6 = 0x71A5, |
| 470 | MI_CH7 = 0x71A6, | 470 | QK_MIDI_CHANNEL_7 = 0x71A6, |
| 471 | MI_CH8 = 0x71A7, | 471 | QK_MIDI_CHANNEL_8 = 0x71A7, |
| 472 | MI_CH9 = 0x71A8, | 472 | QK_MIDI_CHANNEL_9 = 0x71A8, |
| 473 | MI_CH10 = 0x71A9, | 473 | QK_MIDI_CHANNEL_10 = 0x71A9, |
| 474 | MI_CH11 = 0x71AA, | 474 | QK_MIDI_CHANNEL_11 = 0x71AA, |
| 475 | MI_CH12 = 0x71AB, | 475 | QK_MIDI_CHANNEL_12 = 0x71AB, |
| 476 | MI_CH13 = 0x71AC, | 476 | QK_MIDI_CHANNEL_13 = 0x71AC, |
| 477 | MI_CH14 = 0x71AD, | 477 | QK_MIDI_CHANNEL_14 = 0x71AD, |
| 478 | MI_CH15 = 0x71AE, | 478 | QK_MIDI_CHANNEL_15 = 0x71AE, |
| 479 | MI_CH16 = 0x71AF, | 479 | QK_MIDI_CHANNEL_16 = 0x71AF, |
| 480 | MI_CHD = 0x71B0, | 480 | QK_MIDI_CHANNEL_DOWN = 0x71B0, |
| 481 | MI_CHU = 0x71B1, | 481 | QK_MIDI_CHANNEL_UP = 0x71B1, |
| 482 | MI_ALLOFF = 0x71C0, | 482 | QK_MIDI_ALL_NOTES_OFF = 0x71C0, |
| 483 | MI_SUS = 0x71C1, | 483 | QK_MIDI_SUSTAIN = 0x71C1, |
| 484 | MI_PORT = 0x71C2, | 484 | QK_MIDI_PORTAMENTO = 0x71C2, |
| 485 | MI_SOST = 0x71C3, | 485 | QK_MIDI_SOSTENUTO = 0x71C3, |
| 486 | MI_SOFT = 0x71C4, | 486 | QK_MIDI_SOFT = 0x71C4, |
| 487 | MI_LEG = 0x71C5, | 487 | QK_MIDI_LEGATO = 0x71C5, |
| 488 | MI_MOD = 0x71C6, | 488 | QK_MIDI_MODULATION = 0x71C6, |
| 489 | MI_MODSD = 0x71C7, | 489 | QK_MIDI_MODULATION_SPEED_DOWN = 0x71C7, |
| 490 | MI_MODSU = 0x71C8, | 490 | QK_MIDI_MODULATION_SPEED_UP = 0x71C8, |
| 491 | MI_BENDD = 0x71C9, | 491 | QK_MIDI_PITCH_BEND_DOWN = 0x71C9, |
| 492 | MI_BENDU = 0x71CA, | 492 | QK_MIDI_PITCH_BEND_UP = 0x71CA, |
| 493 | SQ_ON = 0x7200, | 493 | SQ_ON = 0x7200, |
| 494 | SQ_OFF = 0x7201, | 494 | SQ_OFF = 0x7201, |
| 495 | SQ_TOG = 0x7202, | 495 | SQ_TOG = 0x7202, |
| @@ -898,36 +898,180 @@ enum qk_keycode_defines { | |||
| 898 | EC_SWAP = MAGIC_SWAP_ESCAPE_CAPSLOCK, | 898 | EC_SWAP = MAGIC_SWAP_ESCAPE_CAPSLOCK, |
| 899 | EC_NORM = MAGIC_UNSWAP_ESCAPE_CAPSLOCK, | 899 | EC_NORM = MAGIC_UNSWAP_ESCAPE_CAPSLOCK, |
| 900 | EC_TOGG = MAGIC_TOGGLE_ESCAPE_CAPSLOCK, | 900 | EC_TOGG = MAGIC_TOGGLE_ESCAPE_CAPSLOCK, |
| 901 | MI_Db = MI_Cs, | 901 | MI_ON = QK_MIDI_ON, |
| 902 | MI_Eb = MI_Ds, | 902 | MI_OFF = QK_MIDI_OFF, |
| 903 | MI_Gb = MI_Fs, | 903 | MI_TOGG = QK_MIDI_TOGGLE, |
| 904 | MI_Ab = MI_Gs, | 904 | MI_C = QK_MIDI_NOTE_C_0, |
| 905 | MI_Bb = MI_As, | 905 | MI_Cs = QK_MIDI_NOTE_C_SHARP_0, |
| 906 | MI_Db_1 = MI_Cs_1, | 906 | MI_Db = QK_MIDI_NOTE_C_SHARP_0, |
| 907 | MI_Eb_1 = MI_Ds_1, | 907 | MI_D = QK_MIDI_NOTE_D_0, |
| 908 | MI_Gb_1 = MI_Fs_1, | 908 | MI_Ds = QK_MIDI_NOTE_D_SHARP_0, |
| 909 | MI_Ab_1 = MI_Gs_1, | 909 | MI_Eb = QK_MIDI_NOTE_D_SHARP_0, |
| 910 | MI_Bb_1 = MI_As_1, | 910 | MI_E = QK_MIDI_NOTE_E_0, |
| 911 | MI_Db_2 = MI_Cs_2, | 911 | MI_F = QK_MIDI_NOTE_F_0, |
| 912 | MI_Eb_2 = MI_Ds_2, | 912 | MI_Fs = QK_MIDI_NOTE_F_SHARP_0, |
| 913 | MI_Gb_2 = MI_Fs_2, | 913 | MI_Gb = QK_MIDI_NOTE_F_SHARP_0, |
| 914 | MI_Ab_2 = MI_Gs_2, | 914 | MI_G = QK_MIDI_NOTE_G_0, |
| 915 | MI_Bb_2 = MI_As_2, | 915 | MI_Gs = QK_MIDI_NOTE_G_SHARP_0, |
| 916 | MI_Db_3 = MI_Cs_3, | 916 | MI_Ab = QK_MIDI_NOTE_G_SHARP_0, |
| 917 | MI_Eb_3 = MI_Ds_3, | 917 | MI_A = QK_MIDI_NOTE_A_0, |
| 918 | MI_Gb_3 = MI_Fs_3, | 918 | MI_As = QK_MIDI_NOTE_A_SHARP_0, |
| 919 | MI_Ab_3 = MI_Gs_3, | 919 | MI_Bb = QK_MIDI_NOTE_A_SHARP_0, |
| 920 | MI_Bb_3 = MI_As_3, | 920 | MI_B = QK_MIDI_NOTE_B_0, |
| 921 | MI_Db_4 = MI_Cs_4, | 921 | MI_C1 = QK_MIDI_NOTE_C_1, |
| 922 | MI_Eb_4 = MI_Ds_4, | 922 | MI_Cs1 = QK_MIDI_NOTE_C_SHARP_1, |
| 923 | MI_Gb_4 = MI_Fs_4, | 923 | MI_Db1 = QK_MIDI_NOTE_C_SHARP_1, |
| 924 | MI_Ab_4 = MI_Gs_4, | 924 | MI_D1 = QK_MIDI_NOTE_D_1, |
| 925 | MI_Bb_4 = MI_As_4, | 925 | MI_Ds1 = QK_MIDI_NOTE_D_SHARP_1, |
| 926 | MI_Db_5 = MI_Cs_5, | 926 | MI_Eb1 = QK_MIDI_NOTE_D_SHARP_1, |
| 927 | MI_Eb_5 = MI_Ds_5, | 927 | MI_E1 = QK_MIDI_NOTE_E_1, |
| 928 | MI_Gb_5 = MI_Fs_5, | 928 | MI_F1 = QK_MIDI_NOTE_F_1, |
| 929 | MI_Ab_5 = MI_Gs_5, | 929 | MI_Fs1 = QK_MIDI_NOTE_F_SHARP_1, |
| 930 | MI_Bb_5 = MI_As_5, | 930 | MI_Gb1 = QK_MIDI_NOTE_F_SHARP_1, |
| 931 | MI_G1 = QK_MIDI_NOTE_G_1, | ||
| 932 | MI_Gs1 = QK_MIDI_NOTE_G_SHARP_1, | ||
| 933 | MI_Ab1 = QK_MIDI_NOTE_G_SHARP_1, | ||
| 934 | MI_A1 = QK_MIDI_NOTE_A_1, | ||
| 935 | MI_As1 = QK_MIDI_NOTE_A_SHARP_1, | ||
| 936 | MI_Bb1 = QK_MIDI_NOTE_A_SHARP_1, | ||
| 937 | MI_B1 = QK_MIDI_NOTE_B_1, | ||
| 938 | MI_C2 = QK_MIDI_NOTE_C_2, | ||
| 939 | MI_Cs2 = QK_MIDI_NOTE_C_SHARP_2, | ||
| 940 | MI_Db2 = QK_MIDI_NOTE_C_SHARP_2, | ||
| 941 | MI_D2 = QK_MIDI_NOTE_D_2, | ||
| 942 | MI_Ds2 = QK_MIDI_NOTE_D_SHARP_2, | ||
| 943 | MI_Eb2 = QK_MIDI_NOTE_D_SHARP_2, | ||
| 944 | MI_E2 = QK_MIDI_NOTE_E_2, | ||
| 945 | MI_F2 = QK_MIDI_NOTE_F_2, | ||
| 946 | MI_Fs2 = QK_MIDI_NOTE_F_SHARP_2, | ||
| 947 | MI_Gb2 = QK_MIDI_NOTE_F_SHARP_2, | ||
| 948 | MI_G2 = QK_MIDI_NOTE_G_2, | ||
| 949 | MI_Gs2 = QK_MIDI_NOTE_G_SHARP_2, | ||
| 950 | MI_Ab2 = QK_MIDI_NOTE_G_SHARP_2, | ||
| 951 | MI_A2 = QK_MIDI_NOTE_A_2, | ||
| 952 | MI_As2 = QK_MIDI_NOTE_A_SHARP_2, | ||
| 953 | MI_Bb2 = QK_MIDI_NOTE_A_SHARP_2, | ||
| 954 | MI_B2 = QK_MIDI_NOTE_B_2, | ||
| 955 | MI_C3 = QK_MIDI_NOTE_C_3, | ||
| 956 | MI_Cs3 = QK_MIDI_NOTE_C_SHARP_3, | ||
| 957 | MI_Db3 = QK_MIDI_NOTE_C_SHARP_3, | ||
| 958 | MI_D3 = QK_MIDI_NOTE_D_3, | ||
| 959 | MI_Ds3 = QK_MIDI_NOTE_D_SHARP_3, | ||
| 960 | MI_Eb3 = QK_MIDI_NOTE_D_SHARP_3, | ||
| 961 | MI_E3 = QK_MIDI_NOTE_E_3, | ||
| 962 | MI_F3 = QK_MIDI_NOTE_F_3, | ||
| 963 | MI_Fs3 = QK_MIDI_NOTE_F_SHARP_3, | ||
| 964 | MI_Gb3 = QK_MIDI_NOTE_F_SHARP_3, | ||
| 965 | MI_G3 = QK_MIDI_NOTE_G_3, | ||
| 966 | MI_Gs3 = QK_MIDI_NOTE_G_SHARP_3, | ||
| 967 | MI_Ab3 = QK_MIDI_NOTE_G_SHARP_3, | ||
| 968 | MI_A3 = QK_MIDI_NOTE_A_3, | ||
| 969 | MI_As3 = QK_MIDI_NOTE_A_SHARP_3, | ||
| 970 | MI_Bb3 = QK_MIDI_NOTE_A_SHARP_3, | ||
| 971 | MI_B3 = QK_MIDI_NOTE_B_3, | ||
| 972 | MI_C4 = QK_MIDI_NOTE_C_4, | ||
| 973 | MI_Cs4 = QK_MIDI_NOTE_C_SHARP_4, | ||
| 974 | MI_Db4 = QK_MIDI_NOTE_C_SHARP_4, | ||
| 975 | MI_D4 = QK_MIDI_NOTE_D_4, | ||
| 976 | MI_Ds4 = QK_MIDI_NOTE_D_SHARP_4, | ||
| 977 | MI_Eb4 = QK_MIDI_NOTE_D_SHARP_4, | ||
| 978 | MI_E4 = QK_MIDI_NOTE_E_4, | ||
| 979 | MI_F4 = QK_MIDI_NOTE_F_4, | ||
| 980 | MI_Fs4 = QK_MIDI_NOTE_F_SHARP_4, | ||
| 981 | MI_Gb4 = QK_MIDI_NOTE_F_SHARP_4, | ||
| 982 | MI_G4 = QK_MIDI_NOTE_G_4, | ||
| 983 | MI_Gs4 = QK_MIDI_NOTE_G_SHARP_4, | ||
| 984 | MI_Ab4 = QK_MIDI_NOTE_G_SHARP_4, | ||
| 985 | MI_A4 = QK_MIDI_NOTE_A_4, | ||
| 986 | MI_As4 = QK_MIDI_NOTE_A_SHARP_4, | ||
| 987 | MI_Bb4 = QK_MIDI_NOTE_A_SHARP_4, | ||
| 988 | MI_B4 = QK_MIDI_NOTE_B_4, | ||
| 989 | MI_C5 = QK_MIDI_NOTE_C_5, | ||
| 990 | MI_Cs5 = QK_MIDI_NOTE_C_SHARP_5, | ||
| 991 | MI_Db5 = QK_MIDI_NOTE_C_SHARP_5, | ||
| 992 | MI_D5 = QK_MIDI_NOTE_D_5, | ||
| 993 | MI_Ds5 = QK_MIDI_NOTE_D_SHARP_5, | ||
| 994 | MI_Eb5 = QK_MIDI_NOTE_D_SHARP_5, | ||
| 995 | MI_E5 = QK_MIDI_NOTE_E_5, | ||
| 996 | MI_F5 = QK_MIDI_NOTE_F_5, | ||
| 997 | MI_Fs5 = QK_MIDI_NOTE_F_SHARP_5, | ||
| 998 | MI_Gb5 = QK_MIDI_NOTE_F_SHARP_5, | ||
| 999 | MI_G5 = QK_MIDI_NOTE_G_5, | ||
| 1000 | MI_Gs5 = QK_MIDI_NOTE_G_SHARP_5, | ||
| 1001 | MI_Ab5 = QK_MIDI_NOTE_G_SHARP_5, | ||
| 1002 | MI_A5 = QK_MIDI_NOTE_A_5, | ||
| 1003 | MI_As5 = QK_MIDI_NOTE_A_SHARP_5, | ||
| 1004 | MI_Bb5 = QK_MIDI_NOTE_A_SHARP_5, | ||
| 1005 | MI_B5 = QK_MIDI_NOTE_B_5, | ||
| 1006 | MI_OCN2 = QK_MIDI_OCTAVE_N2, | ||
| 1007 | MI_OCN1 = QK_MIDI_OCTAVE_N1, | ||
| 1008 | MI_OC0 = QK_MIDI_OCTAVE_0, | ||
| 1009 | MI_OC1 = QK_MIDI_OCTAVE_1, | ||
| 1010 | MI_OC2 = QK_MIDI_OCTAVE_2, | ||
| 1011 | MI_OC3 = QK_MIDI_OCTAVE_3, | ||
| 1012 | MI_OC4 = QK_MIDI_OCTAVE_4, | ||
| 1013 | MI_OC5 = QK_MIDI_OCTAVE_5, | ||
| 1014 | MI_OC6 = QK_MIDI_OCTAVE_6, | ||
| 1015 | MI_OC7 = QK_MIDI_OCTAVE_7, | ||
| 1016 | MI_OCTD = QK_MIDI_OCTAVE_DOWN, | ||
| 1017 | MI_OCTU = QK_MIDI_OCTAVE_UP, | ||
| 1018 | MI_TRN6 = QK_MIDI_TRANSPOSE_N6, | ||
| 1019 | MI_TRN5 = QK_MIDI_TRANSPOSE_N5, | ||
| 1020 | MI_TRN4 = QK_MIDI_TRANSPOSE_N4, | ||
| 1021 | MI_TRN3 = QK_MIDI_TRANSPOSE_N3, | ||
| 1022 | MI_TRN2 = QK_MIDI_TRANSPOSE_N2, | ||
| 1023 | MI_TRN1 = QK_MIDI_TRANSPOSE_N1, | ||
| 1024 | MI_TR0 = QK_MIDI_TRANSPOSE_0, | ||
| 1025 | MI_TR1 = QK_MIDI_TRANSPOSE_1, | ||
| 1026 | MI_TR2 = QK_MIDI_TRANSPOSE_2, | ||
| 1027 | MI_TR3 = QK_MIDI_TRANSPOSE_3, | ||
| 1028 | MI_TR4 = QK_MIDI_TRANSPOSE_4, | ||
| 1029 | MI_TR5 = QK_MIDI_TRANSPOSE_5, | ||
| 1030 | MI_TR6 = QK_MIDI_TRANSPOSE_6, | ||
| 1031 | MI_TRSD = QK_MIDI_TRANSPOSE_DOWN, | ||
| 1032 | MI_TRSU = QK_MIDI_TRANSPOSE_UP, | ||
| 1033 | MI_VL0 = QK_MIDI_VELOCITY_0, | ||
| 1034 | MI_VL1 = QK_MIDI_VELOCITY_1, | ||
| 1035 | MI_VL2 = QK_MIDI_VELOCITY_2, | ||
| 1036 | MI_VL3 = QK_MIDI_VELOCITY_3, | ||
| 1037 | MI_VL4 = QK_MIDI_VELOCITY_4, | ||
| 1038 | MI_VL5 = QK_MIDI_VELOCITY_5, | ||
| 1039 | MI_VL6 = QK_MIDI_VELOCITY_6, | ||
| 1040 | MI_VL7 = QK_MIDI_VELOCITY_7, | ||
| 1041 | MI_VL8 = QK_MIDI_VELOCITY_8, | ||
| 1042 | MI_VL9 = QK_MIDI_VELOCITY_9, | ||
| 1043 | MI_VL10 = QK_MIDI_VELOCITY_10, | ||
| 1044 | MI_VELD = QK_MIDI_VELOCITY_DOWN, | ||
| 1045 | MI_VELU = QK_MIDI_VELOCITY_UP, | ||
| 1046 | MI_CH1 = QK_MIDI_CHANNEL_1, | ||
| 1047 | MI_CH2 = QK_MIDI_CHANNEL_2, | ||
| 1048 | MI_CH3 = QK_MIDI_CHANNEL_3, | ||
| 1049 | MI_CH4 = QK_MIDI_CHANNEL_4, | ||
| 1050 | MI_CH5 = QK_MIDI_CHANNEL_5, | ||
| 1051 | MI_CH6 = QK_MIDI_CHANNEL_6, | ||
| 1052 | MI_CH7 = QK_MIDI_CHANNEL_7, | ||
| 1053 | MI_CH8 = QK_MIDI_CHANNEL_8, | ||
| 1054 | MI_CH9 = QK_MIDI_CHANNEL_9, | ||
| 1055 | MI_CH10 = QK_MIDI_CHANNEL_10, | ||
| 1056 | MI_CH11 = QK_MIDI_CHANNEL_11, | ||
| 1057 | MI_CH12 = QK_MIDI_CHANNEL_12, | ||
| 1058 | MI_CH13 = QK_MIDI_CHANNEL_13, | ||
| 1059 | MI_CH14 = QK_MIDI_CHANNEL_14, | ||
| 1060 | MI_CH15 = QK_MIDI_CHANNEL_15, | ||
| 1061 | MI_CH16 = QK_MIDI_CHANNEL_16, | ||
| 1062 | MI_CHND = QK_MIDI_CHANNEL_DOWN, | ||
| 1063 | MI_CHNU = QK_MIDI_CHANNEL_UP, | ||
| 1064 | MI_AOFF = QK_MIDI_ALL_NOTES_OFF, | ||
| 1065 | MI_SUST = QK_MIDI_SUSTAIN, | ||
| 1066 | MI_PORT = QK_MIDI_PORTAMENTO, | ||
| 1067 | MI_SOST = QK_MIDI_SOSTENUTO, | ||
| 1068 | MI_SOFT = QK_MIDI_SOFT, | ||
| 1069 | MI_LEG = QK_MIDI_LEGATO, | ||
| 1070 | MI_MOD = QK_MIDI_MODULATION, | ||
| 1071 | MI_MODD = QK_MIDI_MODULATION_SPEED_DOWN, | ||
| 1072 | MI_MODU = QK_MIDI_MODULATION_SPEED_UP, | ||
| 1073 | MI_BNDD = QK_MIDI_PITCH_BEND_DOWN, | ||
| 1074 | MI_BNDU = QK_MIDI_PITCH_BEND_UP, | ||
| 931 | JS_0 = QK_JOYSTICK_BUTTON_0, | 1075 | JS_0 = QK_JOYSTICK_BUTTON_0, |
| 932 | JS_1 = QK_JOYSTICK_BUTTON_1, | 1076 | JS_1 = QK_JOYSTICK_BUTTON_1, |
| 933 | JS_2 = QK_JOYSTICK_BUTTON_2, | 1077 | JS_2 = QK_JOYSTICK_BUTTON_2, |
| @@ -1151,7 +1295,7 @@ enum qk_keycode_defines { | |||
| 1151 | #define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) | 1295 | #define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) |
| 1152 | #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS) | 1296 | #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS) |
| 1153 | #define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) | 1297 | #define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) |
| 1154 | #define IS_MIDI_KEYCODE(code) ((code) >= MI_ON && (code) <= MI_BENDU) | 1298 | #define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP) |
| 1155 | #define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR) | 1299 | #define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR) |
| 1156 | #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31) | 1300 | #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31) |
| 1157 | #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32) | 1301 | #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32) |
| @@ -1161,4 +1305,3 @@ enum qk_keycode_defines { | |||
| 1161 | #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) | 1305 | #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) |
| 1162 | #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) | 1306 | #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) |
| 1163 | #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE) | 1307 | #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE) |
| 1164 | |||
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 | ||
| 54 | void midi_init(void) { | 54 | void 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 { |
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 6b0e890792..688fb892eb 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -193,16 +193,16 @@ | |||
| 193 | #define QK_SWAP_HANDS_GET_TAP_KEYCODE(kc) ((kc)&0xFF) | 193 | #define QK_SWAP_HANDS_GET_TAP_KEYCODE(kc) ((kc)&0xFF) |
| 194 | 194 | ||
| 195 | // MIDI aliases | 195 | // MIDI aliases |
| 196 | #define MIDI_TONE_MIN MI_C | 196 | #define MIDI_TONE_MIN QK_MIDI_NOTE_C_0 |
| 197 | #define MIDI_TONE_MAX MI_B_5 | 197 | #define MIDI_TONE_MAX QK_MIDI_NOTE_B_5 |
| 198 | #define MIDI_OCTAVE_MIN MI_OCT_N2 | 198 | #define MIDI_OCTAVE_MIN QK_MIDI_OCTAVE_N2 |
| 199 | #define MIDI_OCTAVE_MAX MI_OCT_7 | 199 | #define MIDI_OCTAVE_MAX QK_MIDI_OCTAVE_7 |
| 200 | #define MIDI_TRANSPOSE_MIN MI_TRNS_N6 | 200 | #define MIDI_TRANSPOSE_MIN QK_MIDI_TRANSPOSE_N6 |
| 201 | #define MIDI_TRANSPOSE_MAX MI_TRNS_6 | 201 | #define MIDI_TRANSPOSE_MAX QK_MIDI_TRANSPOSE_6 |
| 202 | #define MIDI_VELOCITY_MIN MI_VEL_0 | 202 | #define MIDI_VELOCITY_MIN QK_MIDI_VELOCITY_0 |
| 203 | #define MIDI_VELOCITY_MAX MI_VEL_10 | 203 | #define MIDI_VELOCITY_MAX QK_MIDI_VELOCITY_10 |
| 204 | #define MIDI_CHANNEL_MIN MI_CH1 | 204 | #define MIDI_CHANNEL_MIN QK_MIDI_CHANNEL_1 |
| 205 | #define MIDI_CHANNEL_MAX MI_CH16 | 205 | #define MIDI_CHANNEL_MAX QK_MIDI_CHANNEL_16 |
| 206 | 206 | ||
| 207 | // TODO: somehow migrate sequencer to DD? | 207 | // TODO: somehow migrate sequencer to DD? |
| 208 | #include "sequencer.h" | 208 | #include "sequencer.h" |
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index e2133513bd..04bf687561 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h | |||
| @@ -138,6 +138,136 @@ | |||
| 138 | #define MUV_IN QK_AUDIO_VOICE_NEXT | 138 | #define MUV_IN QK_AUDIO_VOICE_NEXT |
| 139 | #define MUV_DE QK_AUDIO_VOICE_PREVIOUS | 139 | #define MUV_DE QK_AUDIO_VOICE_PREVIOUS |
| 140 | 140 | ||
| 141 | #define MI_TOG QK_MIDI_TOGGLE | ||
| 142 | #define MI_C_1 QK_MIDI_NOTE_C_1 | ||
| 143 | #define MI_Cs_1 QK_MIDI_NOTE_C_SHARP_1 | ||
| 144 | #define MI_Db_1 QK_MIDI_NOTE_C_SHARP_1 | ||
| 145 | #define MI_D_1 QK_MIDI_NOTE_D_1 | ||
| 146 | #define MI_Ds_1 QK_MIDI_NOTE_D_SHARP_1 | ||
| 147 | #define MI_Eb_1 QK_MIDI_NOTE_D_SHARP_1 | ||
| 148 | #define MI_E_1 QK_MIDI_NOTE_E_1 | ||
| 149 | #define MI_F_1 QK_MIDI_NOTE_F_1 | ||
| 150 | #define MI_Fs_1 QK_MIDI_NOTE_F_SHARP_1 | ||
| 151 | #define MI_Gb_1 QK_MIDI_NOTE_F_SHARP_1 | ||
| 152 | #define MI_G_1 QK_MIDI_NOTE_G_1 | ||
| 153 | #define MI_Gs_1 QK_MIDI_NOTE_G_SHARP_1 | ||
| 154 | #define MI_Ab_1 QK_MIDI_NOTE_G_SHARP_1 | ||
| 155 | #define MI_A_1 QK_MIDI_NOTE_A_1 | ||
| 156 | #define MI_As_1 QK_MIDI_NOTE_A_SHARP_1 | ||
| 157 | #define MI_Bb_1 QK_MIDI_NOTE_A_SHARP_1 | ||
| 158 | #define MI_B_1 QK_MIDI_NOTE_B_1 | ||
| 159 | #define MI_C_2 QK_MIDI_NOTE_C_2 | ||
| 160 | #define MI_Cs_2 QK_MIDI_NOTE_C_SHARP_2 | ||
| 161 | #define MI_Db_2 QK_MIDI_NOTE_C_SHARP_2 | ||
| 162 | #define MI_D_2 QK_MIDI_NOTE_D_2 | ||
| 163 | #define MI_Ds_2 QK_MIDI_NOTE_D_SHARP_2 | ||
| 164 | #define MI_Eb_2 QK_MIDI_NOTE_D_SHARP_2 | ||
| 165 | #define MI_E_2 QK_MIDI_NOTE_E_2 | ||
| 166 | #define MI_F_2 QK_MIDI_NOTE_F_2 | ||
| 167 | #define MI_Fs_2 QK_MIDI_NOTE_F_SHARP_2 | ||
| 168 | #define MI_Gb_2 QK_MIDI_NOTE_F_SHARP_2 | ||
| 169 | #define MI_G_2 QK_MIDI_NOTE_G_2 | ||
| 170 | #define MI_Gs_2 QK_MIDI_NOTE_G_SHARP_2 | ||
| 171 | #define MI_Ab_2 QK_MIDI_NOTE_G_SHARP_2 | ||
| 172 | #define MI_A_2 QK_MIDI_NOTE_A_2 | ||
| 173 | #define MI_As_2 QK_MIDI_NOTE_A_SHARP_2 | ||
| 174 | #define MI_Bb_2 QK_MIDI_NOTE_A_SHARP_2 | ||
| 175 | #define MI_B_2 QK_MIDI_NOTE_B_2 | ||
| 176 | #define MI_C_3 QK_MIDI_NOTE_C_3 | ||
| 177 | #define MI_Cs_3 QK_MIDI_NOTE_C_SHARP_3 | ||
| 178 | #define MI_Db_3 QK_MIDI_NOTE_C_SHARP_3 | ||
| 179 | #define MI_D_3 QK_MIDI_NOTE_D_3 | ||
| 180 | #define MI_Ds_3 QK_MIDI_NOTE_D_SHARP_3 | ||
| 181 | #define MI_Eb_3 QK_MIDI_NOTE_D_SHARP_3 | ||
| 182 | #define MI_E_3 QK_MIDI_NOTE_E_3 | ||
| 183 | #define MI_F_3 QK_MIDI_NOTE_F_3 | ||
| 184 | #define MI_Fs_3 QK_MIDI_NOTE_F_SHARP_3 | ||
| 185 | #define MI_Gb_3 QK_MIDI_NOTE_F_SHARP_3 | ||
| 186 | #define MI_G_3 QK_MIDI_NOTE_G_3 | ||
| 187 | #define MI_Gs_3 QK_MIDI_NOTE_G_SHARP_3 | ||
| 188 | #define MI_Ab_3 QK_MIDI_NOTE_G_SHARP_3 | ||
| 189 | #define MI_A_3 QK_MIDI_NOTE_A_3 | ||
| 190 | #define MI_As_3 QK_MIDI_NOTE_A_SHARP_3 | ||
| 191 | #define MI_Bb_3 QK_MIDI_NOTE_A_SHARP_3 | ||
| 192 | #define MI_B_3 QK_MIDI_NOTE_B_3 | ||
| 193 | #define MI_C_4 QK_MIDI_NOTE_C_4 | ||
| 194 | #define MI_Cs_4 QK_MIDI_NOTE_C_SHARP_4 | ||
| 195 | #define MI_Db_4 QK_MIDI_NOTE_C_SHARP_4 | ||
| 196 | #define MI_D_4 QK_MIDI_NOTE_D_4 | ||
| 197 | #define MI_Ds_4 QK_MIDI_NOTE_D_SHARP_4 | ||
| 198 | #define MI_Eb_4 QK_MIDI_NOTE_D_SHARP_4 | ||
| 199 | #define MI_E_4 QK_MIDI_NOTE_E_4 | ||
| 200 | #define MI_F_4 QK_MIDI_NOTE_F_4 | ||
| 201 | #define MI_Fs_4 QK_MIDI_NOTE_F_SHARP_4 | ||
| 202 | #define MI_Gb_4 QK_MIDI_NOTE_F_SHARP_4 | ||
| 203 | #define MI_G_4 QK_MIDI_NOTE_G_4 | ||
| 204 | #define MI_Gs_4 QK_MIDI_NOTE_G_SHARP_4 | ||
| 205 | #define MI_Ab_4 QK_MIDI_NOTE_G_SHARP_4 | ||
| 206 | #define MI_A_4 QK_MIDI_NOTE_A_4 | ||
| 207 | #define MI_As_4 QK_MIDI_NOTE_A_SHARP_4 | ||
| 208 | #define MI_Bb_4 QK_MIDI_NOTE_A_SHARP_4 | ||
| 209 | #define MI_B_4 QK_MIDI_NOTE_B_4 | ||
| 210 | #define MI_C_5 QK_MIDI_NOTE_C_5 | ||
| 211 | #define MI_Cs_5 QK_MIDI_NOTE_C_SHARP_5 | ||
| 212 | #define MI_Db_5 QK_MIDI_NOTE_C_SHARP_5 | ||
| 213 | #define MI_D_5 QK_MIDI_NOTE_D_5 | ||
| 214 | #define MI_Ds_5 QK_MIDI_NOTE_D_SHARP_5 | ||
| 215 | #define MI_Eb_5 QK_MIDI_NOTE_D_SHARP_5 | ||
| 216 | #define MI_E_5 QK_MIDI_NOTE_E_5 | ||
| 217 | #define MI_F_5 QK_MIDI_NOTE_F_5 | ||
| 218 | #define MI_Fs_5 QK_MIDI_NOTE_F_SHARP_5 | ||
| 219 | #define MI_Gb_5 QK_MIDI_NOTE_F_SHARP_5 | ||
| 220 | #define MI_G_5 QK_MIDI_NOTE_G_5 | ||
| 221 | #define MI_Gs_5 QK_MIDI_NOTE_G_SHARP_5 | ||
| 222 | #define MI_Ab_5 QK_MIDI_NOTE_G_SHARP_5 | ||
| 223 | #define MI_A_5 QK_MIDI_NOTE_A_5 | ||
| 224 | #define MI_As_5 QK_MIDI_NOTE_A_SHARP_5 | ||
| 225 | #define MI_Bb_5 QK_MIDI_NOTE_A_SHARP_5 | ||
| 226 | #define MI_B_5 QK_MIDI_NOTE_B_5 | ||
| 227 | #define MI_OCT_N2 QK_MIDI_OCTAVE_N2 | ||
| 228 | #define MI_OCT_N1 QK_MIDI_OCTAVE_N1 | ||
| 229 | #define MI_OCT_0 QK_MIDI_OCTAVE_0 | ||
| 230 | #define MI_OCT_1 QK_MIDI_OCTAVE_1 | ||
| 231 | #define MI_OCT_2 QK_MIDI_OCTAVE_2 | ||
| 232 | #define MI_OCT_3 QK_MIDI_OCTAVE_3 | ||
| 233 | #define MI_OCT_4 QK_MIDI_OCTAVE_4 | ||
| 234 | #define MI_OCT_5 QK_MIDI_OCTAVE_5 | ||
| 235 | #define MI_OCT_6 QK_MIDI_OCTAVE_6 | ||
| 236 | #define MI_OCT_7 QK_MIDI_OCTAVE_7 | ||
| 237 | #define MI_TRNS_N6 QK_MIDI_TRANSPOSE_N6 | ||
| 238 | #define MI_TRNS_N5 QK_MIDI_TRANSPOSE_N5 | ||
| 239 | #define MI_TRNS_N4 QK_MIDI_TRANSPOSE_N4 | ||
| 240 | #define MI_TRNS_N3 QK_MIDI_TRANSPOSE_N3 | ||
| 241 | #define MI_TRNS_N2 QK_MIDI_TRANSPOSE_N2 | ||
| 242 | #define MI_TRNS_N1 QK_MIDI_TRANSPOSE_N1 | ||
| 243 | #define MI_TRNS_0 QK_MIDI_TRANSPOSE_0 | ||
| 244 | #define MI_TRNS_1 QK_MIDI_TRANSPOSE_1 | ||
| 245 | #define MI_TRNS_2 QK_MIDI_TRANSPOSE_2 | ||
| 246 | #define MI_TRNS_3 QK_MIDI_TRANSPOSE_3 | ||
| 247 | #define MI_TRNS_4 QK_MIDI_TRANSPOSE_4 | ||
| 248 | #define MI_TRNS_5 QK_MIDI_TRANSPOSE_5 | ||
| 249 | #define MI_TRNS_6 QK_MIDI_TRANSPOSE_6 | ||
| 250 | #define MI_TRNSD QK_MIDI_TRANSPOSE_DOWN | ||
| 251 | #define MI_TRNSU QK_MIDI_TRANSPOSE_UP | ||
| 252 | #define MI_VEL_0 QK_MIDI_VELOCITY_0 | ||
| 253 | #define MI_VEL_1 QK_MIDI_VELOCITY_1 | ||
| 254 | #define MI_VEL_2 QK_MIDI_VELOCITY_2 | ||
| 255 | #define MI_VEL_3 QK_MIDI_VELOCITY_3 | ||
| 256 | #define MI_VEL_4 QK_MIDI_VELOCITY_4 | ||
| 257 | #define MI_VEL_5 QK_MIDI_VELOCITY_5 | ||
| 258 | #define MI_VEL_6 QK_MIDI_VELOCITY_6 | ||
| 259 | #define MI_VEL_7 QK_MIDI_VELOCITY_7 | ||
| 260 | #define MI_VEL_8 QK_MIDI_VELOCITY_8 | ||
| 261 | #define MI_VEL_9 QK_MIDI_VELOCITY_9 | ||
| 262 | #define MI_VEL_10 QK_MIDI_VELOCITY_10 | ||
| 263 | #define MI_CHD QK_MIDI_CHANNEL_DOWN | ||
| 264 | #define MI_CHU QK_MIDI_CHANNEL_UP | ||
| 265 | #define MI_ALLOFF QK_MIDI_ALL_NOTES_OFF | ||
| 266 | #define MI_MODSD QK_MIDI_MODULATION_SPEED_DOWN | ||
| 267 | #define MI_MODSU QK_MIDI_MODULATION_SPEED_UP | ||
| 268 | #define MI_BENDD QK_MIDI_PITCH_BEND_DOWN | ||
| 269 | #define MI_BENDU QK_MIDI_PITCH_BEND_UP | ||
| 270 | |||
| 141 | #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.") | 271 | #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.") |
| 142 | #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.") | 272 | #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.") |
| 143 | // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.") | 273 | // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.") |
diff --git a/quantum/sequencer/tests/sequencer_tests.cpp b/quantum/sequencer/tests/sequencer_tests.cpp index 05e58e4111..79ec10cabf 100644 --- a/quantum/sequencer/tests/sequencer_tests.cpp +++ b/quantum/sequencer/tests/sequencer_tests.cpp | |||
| @@ -371,14 +371,14 @@ void setUpMatrixScanSequencerTest(void) { | |||
| 371 | sequencer_config.resolution = SQ_RES_16; | 371 | sequencer_config.resolution = SQ_RES_16; |
| 372 | 372 | ||
| 373 | // Configure the notes for each track | 373 | // Configure the notes for each track |
| 374 | sequencer_config.track_notes[0] = MI_C; | 374 | sequencer_config.track_notes[0] = QK_MIDI_NOTE_C_0; |
| 375 | sequencer_config.track_notes[1] = MI_D; | 375 | sequencer_config.track_notes[1] = QK_MIDI_NOTE_D_0; |
| 376 | sequencer_config.track_notes[2] = MI_E; | 376 | sequencer_config.track_notes[2] = QK_MIDI_NOTE_E_0; |
| 377 | sequencer_config.track_notes[3] = MI_F; | 377 | sequencer_config.track_notes[3] = QK_MIDI_NOTE_F_0; |
| 378 | sequencer_config.track_notes[4] = MI_G; | 378 | sequencer_config.track_notes[4] = QK_MIDI_NOTE_G_0; |
| 379 | sequencer_config.track_notes[5] = MI_A; | 379 | sequencer_config.track_notes[5] = QK_MIDI_NOTE_A_0; |
| 380 | sequencer_config.track_notes[6] = MI_B; | 380 | sequencer_config.track_notes[6] = QK_MIDI_NOTE_B_0; |
| 381 | sequencer_config.track_notes[7] = MI_C; | 381 | sequencer_config.track_notes[7] = QK_MIDI_NOTE_C_0; |
| 382 | 382 | ||
| 383 | // Turn on some steps | 383 | // Turn on some steps |
| 384 | sequencer_config.steps[0] = (1 << 0); | 384 | sequencer_config.steps[0] = (1 << 0); |
| @@ -389,7 +389,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackFirstTrackOfFirstStep) | |||
| 389 | setUpMatrixScanSequencerTest(); | 389 | setUpMatrixScanSequencerTest(); |
| 390 | 390 | ||
| 391 | sequencer_task(); | 391 | sequencer_task(); |
| 392 | EXPECT_EQ(last_noteon, MI_C); | 392 | EXPECT_EQ(last_noteon, QK_MIDI_NOTE_C_0); |
| 393 | EXPECT_EQ(last_noteoff, 0); | 393 | EXPECT_EQ(last_noteoff, 0); |
| 394 | } | 394 | } |
| 395 | 395 | ||
| @@ -499,7 +499,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldReleaseFirstTrackFirstStep) { | |||
| 499 | 499 | ||
| 500 | sequencer_task(); | 500 | sequencer_task(); |
| 501 | EXPECT_EQ(last_noteon, 0); | 501 | EXPECT_EQ(last_noteon, 0); |
| 502 | EXPECT_EQ(last_noteoff, MI_C); | 502 | EXPECT_EQ(last_noteoff, QK_MIDI_NOTE_C_0); |
| 503 | } | 503 | } |
| 504 | 504 | ||
| 505 | TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterPausePhaseAfterRelease) { | 505 | TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterPausePhaseAfterRelease) { |
| @@ -565,7 +565,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessSecondTrackOnTime) { | |||
| 565 | advance_time(SEQUENCER_TRACK_THROTTLE); | 565 | advance_time(SEQUENCER_TRACK_THROTTLE); |
| 566 | 566 | ||
| 567 | sequencer_task(); | 567 | sequencer_task(); |
| 568 | EXPECT_EQ(last_noteon, MI_D); | 568 | EXPECT_EQ(last_noteon, QK_MIDI_NOTE_D_0); |
| 569 | EXPECT_EQ(last_noteoff, 0); | 569 | EXPECT_EQ(last_noteoff, 0); |
| 570 | } | 570 | } |
| 571 | 571 | ||
