diff options
| author | Jack Humbert <[email protected]> | 2016-07-24 22:07:43 -0400 | 
|---|---|---|
| committer | Jack Humbert <[email protected]> | 2016-07-24 22:07:43 -0400 | 
| commit | 8b94e26d7c3b30cc57d710a11e5651d15e8e3b20 (patch) | |
| tree | 365c257a28cafbb40e1b430db810e2fa4101d7e1 /quantum/process_keycode | |
| parent | 4aa7d2e20627020c74172c0173b6d9700b84ff9b (diff) | |
| download | qmk_firmware-8b94e26d7c3b30cc57d710a11e5651d15e8e3b20.tar.gz qmk_firmware-8b94e26d7c3b30cc57d710a11e5651d15e8e3b20.zip | |
Fixes midi functionality
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_midi.c | 24 | 
1 files changed, 12 insertions, 12 deletions
| diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c index d6ab9c6264..8784e64f36 100644 --- a/quantum/process_keycode/process_midi.c +++ b/quantum/process_keycode/process_midi.c @@ -1,8 +1,8 @@  #include "process_midi.h"  bool midi_activated = false; -uint8_t starting_note = 0x0C; -int offset = 7; +uint8_t midi_starting_note = 0x0C; +int midi_offset = 7;  bool process_midi(uint16_t keycode, keyrecord_t *record) {      if (keycode == MI_ON && record->event.pressed) { @@ -20,42 +20,42 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {      if (midi_activated) {        if (record->event.key.col == (MATRIX_COLS - 1) && record->event.key.row == (MATRIX_ROWS - 1)) {            if (record->event.pressed) { -              starting_note++; // Change key +              midi_starting_note++; // Change key                midi_send_cc(&midi_device, 0, 0x7B, 0);            }            return false;        }        if (record->event.key.col == (MATRIX_COLS - 2) && record->event.key.row == (MATRIX_ROWS - 1)) {            if (record->event.pressed) { -              starting_note--; // Change key +              midi_starting_note--; // Change key                midi_send_cc(&midi_device, 0, 0x7B, 0);            }            return false;        }        if (record->event.key.col == (MATRIX_COLS - 3) && record->event.key.row == (MATRIX_ROWS - 1) && record->event.pressed) { -          offset++; // Change scale +          midi_offset++; // Change scale            midi_send_cc(&midi_device, 0, 0x7B, 0);            return false;        }        if (record->event.key.col == (MATRIX_COLS - 4) && record->event.key.row == (MATRIX_ROWS - 1) && record->event.pressed) { -          offset--; // Change scale +          midi_offset--; // Change scale            midi_send_cc(&midi_device, 0, 0x7B, 0);            return false;        }        // basic -      // uint8_t note = (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row); +      // uint8_t note = (midi_starting_note + SCALE[record->event.key.col + midi_offset])+12*(MATRIX_ROWS - record->event.key.row);        // advanced -      // uint8_t note = (starting_note + record->event.key.col + offset)+12*(MATRIX_ROWS - record->event.key.row); +      // uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+12*(MATRIX_ROWS - record->event.key.row);        // guitar -      uint8_t note = (starting_note + record->event.key.col + offset)+5*(MATRIX_ROWS - record->event.key.row); +      uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+5*(MATRIX_ROWS - record->event.key.row);        // violin -      // uint8_t note = (starting_note + record->event.key.col + offset)+7*(MATRIX_ROWS - record->event.key.row); +      // uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+7*(MATRIX_ROWS - record->event.key.row);        if (record->event.pressed) { -        // midi_send_noteon(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127); +        // midi_send_noteon(&midi_device, record->event.key.row, midi_starting_note + SCALE[record->event.key.col], 127);          midi_send_noteon(&midi_device, 0, note, 127);        } else { -        // midi_send_noteoff(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127); +        // midi_send_noteoff(&midi_device, record->event.key.row, midi_starting_note + SCALE[record->event.key.col], 127);          midi_send_noteoff(&midi_device, 0, note, 127);        } | 
