|
|
@ -85,7 +85,7 @@ void setup() |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
// start MIDI
|
|
|
|
// start MIDI
|
|
|
|
MIDI.begin(MIDI_CHANNEL_OMNI); |
|
|
|
MIDI.begin(DEFAULT_MIDI_CHANNEL); |
|
|
|
|
|
|
|
|
|
|
|
// start audio card
|
|
|
|
// start audio card
|
|
|
|
AudioMemory(AUDIO_MEM); |
|
|
|
AudioMemory(AUDIO_MEM); |
|
|
@ -184,12 +184,12 @@ void handle_midi_input(void) |
|
|
|
#ifdef DEBUG |
|
|
|
#ifdef DEBUG |
|
|
|
Serial.println(F("MIDI-USB")); |
|
|
|
Serial.println(F("MIDI-USB")); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
if (MIDI.getType() >= 0xf0) // SysEX
|
|
|
|
if (midi_usb.getType() >= 0xf0) // SysEX
|
|
|
|
{ |
|
|
|
{ |
|
|
|
handle_sysex_parameter(MIDI.getSysExArray(), MIDI.getSysExArrayLength()); |
|
|
|
handle_sysex_parameter(midi_usb.getSysExArray(), midi_usb.getSysExArrayLength()); |
|
|
|
} |
|
|
|
} |
|
|
|
else if (queue_midi_event(midi_usb.getType(), midi_usb.getData1(), midi_usb.getData2())) |
|
|
|
else |
|
|
|
return; |
|
|
|
queue_midi_event(midi_usb.getType(), midi_usb.getData1(), midi_usb.getData2()); |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
@ -203,10 +203,7 @@ void handle_midi_input(void) |
|
|
|
handle_sysex_parameter(MIDI.getSysExArray(), MIDI.getSysExArrayLength()); |
|
|
|
handle_sysex_parameter(MIDI.getSysExArray(), MIDI.getSysExArrayLength()); |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
queue_midi_event(MIDI.getType(), MIDI.getData1(), MIDI.getData2()); |
|
|
|
if (queue_midi_event(MIDI.getType(), MIDI.getData1(), MIDI.getData2())) |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|