From 4a1330d62429a58e2ef311634d5130f322a809ee Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 7 Nov 2022 13:26:15 +1100 Subject: [PATCH] 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 --- keyboards/bandominedoni/keymaps/via/keymap.c | 48 +++++++++---------- keyboards/chromatonemini/keymaps/via/keymap.c | 16 +++---- keyboards/giabalanai/keymaps/via/keymap.c | 24 +++++----- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c index 8273140e..859c74e3 100644 --- a/keyboards/bandominedoni/keymaps/via/keymap.c +++ b/keyboards/bandominedoni/keymaps/via/keymap.c @@ -35,33 +35,33 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_OPEN] = LAYOUT( - MI_Gs_1, MI_As_1, MI_Cs_2, MI_F_2, MI_Gs_3, - MI_E_1, MI_A_1, MI_G_2, MI_Ds_2, MI_F_3, MI_As_2, MI_F_1, - MI_D_2, MI_A_2, MI_C_3, MI_E_3, MI_C_2, MI_G_1, TG_SWAP, - MI_E_2, MI_Gs_2, MI_B_2, MI_D_3, MI_Fs_3, MI_Cs_3, MI_Fs_1, - MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1, + MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3, + MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1, + MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, TG_SWAP, + MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1, + MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1, - MO_SWAP, MI_B_5, MI_Gs_5, MI_G_5, MI_F_5, FN_MUTE, - MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5, - MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5, - TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4, - MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4, - MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_Ds_4, MI_Fs_4, MI_A_4, MI_Cs_5, MI_G_4 + MO_SWAP, MI_B5, MI_Gs5, MI_G5, MI_F5, FN_MUTE, + MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5, + MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5, + TG_SWAP, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4, + MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4, + MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4 ), [_CLOSE] = LAYOUT( - MI_Gs_1, MI_As_1, MI_Ds_2, MI_Ds_3, MI_G_3, - MI_D_1, MI_D_2, MI_As_2, MI_C_3, MI_Cs_2, MI_C_2, MI_Fs_1, - MI_G_1, MI_G_2, MI_B_2, MI_D_3, MI_F_3, MI_Fs_2, TG_SWAP, - MI_A_1, MI_E_2, MI_A_2, MI_Cs_3, MI_E_3, MI_Gs_2, MI_B_1, - MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1, + MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3, + MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1, + MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, TG_SWAP, + MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1, + MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1, - MO_SWAP, MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5, FN_MUTE, - MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5, - MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5, - TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4, - MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5, - MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_E_4, MI_Gs_4, MI_B_4, MI_E_5, MI_Ds_4 + MO_SWAP, MI_A5, MI_Gs5, MI_Fs5, MI_F5, FN_MUTE, + MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5, + MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5, + TG_SWAP, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4, + MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5, + MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4 ), [_MISC] = LAYOUT( @@ -105,8 +105,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { #endif void my_init(void){ - // Set octave to MI_OCT_0 - midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN; + // Set octave to 0 + midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN; // avoid using 127 since it is used as a special number in some sound sources. midi_config.velocity = MIDI_INITIAL_VELOCITY; diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c index 3a3a5f41..92694485 100644 --- a/keyboards/chromatonemini/keymaps/via/keymap.c +++ b/keyboards/chromatonemini/keymaps/via/keymap.c @@ -54,24 +54,24 @@ enum custom_keycodes { // Long press: go to _FN layer, tap: MUTE #define FN_MUTE LT(_FN, KC_MUTE) -// Used to set octave to MI_OCT_0 +// Used to set octave to 0 extern midi_config_t midi_config; static bool is_trans_mode = false; // By default, shift mode is chosen. const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - FN_MUTE, MI_SUS, - MI_BENDU, - SHIFT_L, SHIFT_R, MI_C_2, MI_D_2, MI_E_2, MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4, MI_D_4, MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5, - MI_BENDD, MI_Db_2, MI_Eb_2, MI_F_2, MI_G_2, MI_A_2, MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3, MI_G_3, MI_A_3, MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4, MI_G_4, MI_A_4, MI_B_4 + FN_MUTE, MI_SUST, + MI_BNDU, + SHIFT_L, SHIFT_R, MI_C2, MI_D2, MI_E2, MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4, MI_D4, MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5, + MI_BNDD, MI_Db2, MI_Eb2, MI_F2, MI_G2, MI_A2, MI_B2, MI_Db3, MI_Eb3, MI_F3, MI_G3, MI_A3, MI_B3, MI_Db4, MI_Eb4, MI_F4, MI_G4, MI_A4, MI_B4 ), /* TRANS This layer must locate 1 layer below _FN layer. */ [_TRANS] = LAYOUT( _______, _______, _______, - MI_TRNSD, MI_TRNSU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + MI_TRSD, MI_TRSU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -102,8 +102,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { // commom codes called from eeconfig_init_user() and keyboard_post_init_user(). void my_init(void){ - // Set octave to MI_OCT_1 - midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN; + // Set octave to 0 + midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN; // avoid using 127 since it is used as a special number in some sound sources. midi_config.velocity = MIDI_INITIAL_VELOCITY; default_layer_set(_LS_BASE); diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c index dbb575f8..06fa10d6 100644 --- a/keyboards/giabalanai/keymaps/via/keymap.c +++ b/keyboards/giabalanai/keymaps/via/keymap.c @@ -24,7 +24,7 @@ // Long press: go to _FN layer, tap: MUTE #define FN_MUTE LT(_FN, KC_MUTE) -// Used to set octave to MI_OCT_0 +// Used to set octave to 0 extern midi_config_t midi_config; uint8_t midi_bass_ch = 0, midi_chord_ch = 0; // By default, all use the same channel. @@ -156,10 +156,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7, MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7, - MI_Fs_2, - MI_Ab_2, MI_B_2, MI_D_3, MI_F_3, MI_Ab_3, MI_B_3, MI_D_4, MI_F_4, MI_Ab_4, MI_B_4, MI_D_5, MI_F_5, FN_MUTE, - MI_G_2, MI_Bb_2, MI_Db_3, MI_E_3, MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4, MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5, MI_G_5, - MI_A_2, MI_C_3, MI_Eb_3, MI_Fs_3, MI_A_3, MI_C_4, MI_Eb_4, MI_Fs_4, MI_A_4, MI_C_5, MI_Eb_5, MI_Fs_5 + MI_Fs2, + MI_Ab2, MI_B2, MI_D3, MI_F3, MI_Ab3, MI_B3, MI_D4, MI_F4, MI_Ab4, MI_B4, MI_D5, MI_F5, FN_MUTE, + MI_G2, MI_Bb2, MI_Db3, MI_E3, MI_G3, MI_Bb3, MI_Db4, MI_E4, MI_G4, MI_Bb4, MI_Db5, MI_E5, MI_G5, + MI_A2, MI_C3, MI_Eb3, MI_Fs3, MI_A3, MI_C4, MI_Eb4, MI_Fs4, MI_A4, MI_C5, MI_Eb5, MI_Fs5 ), /* QWERTY */ @@ -200,8 +200,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { #endif void keyboard_post_init_user(void) { - // Set otave to MI_OCT_0 - midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN; + // Set octave to 0 + midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN; // avoid using 127 since it is used as a special number in some sound sources. midi_config.velocity = MIDI_INITIAL_VELOCITY; @@ -228,30 +228,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // MIDI Chord Keycodes, on the left side. case MI_CH_Cr ... MI_CH_Br: // Root Notes - root_note = keycode - MI_CH_Cr + MI_C_1; + root_note = keycode - MI_CH_Cr + MI_C1; my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false); break; case MI_CH_C ... MI_CH_B: // Major Chords - root_note = keycode - MI_CH_C + MI_C_2; + root_note = keycode - MI_CH_C + MI_C2; // Root, Major Third, and Fifth Notes my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7); break; case MI_CH_Cm ... MI_CH_Bm: // Minor Chord - root_note = keycode - MI_CH_Cm + MI_C_2; + root_note = keycode - MI_CH_Cm + MI_C2; // Root, Minor Third, and Fifth Notes my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7); break; case MI_CH_CDom7 ... MI_CH_BDom7: // Dominant 7th Chord - root_note = keycode - MI_CH_CDom7 + MI_C_2; + root_note = keycode - MI_CH_CDom7 + MI_C2; // Major Third, Major Fifth, and Minor Seventh Notes my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10); break; case MI_CH_CDim7 ... MI_CH_BDim7: // Diminished 7th Chord - root_note = keycode - MI_CH_CDim7 + MI_C_2; + root_note = keycode - MI_CH_CDim7 + MI_C2; // Root, Minor Third, and Diminished 5th Note my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6); break;