mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-19 15:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

make midi example less ambigous for cable and channel

Browse Source
This commit is contained in:
hathach 2021-02-19 10:57:20 +07:00
parent aa85099171
commit 8f3f21045b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/device/dynamic_configuration/src/main.c
View File

@ -165,6 +165,9 @@ void midi_task(void)
{ {
static uint32_t start_ms = 0; static uint32_t start_ms = 0;
uint8_t const cable_num = 0; // MIDI jack associated with USB endpoint
uint8_t const channel = 0; // 0 for channel 1
// The MIDI interface always creates input and output port/jack descriptors // The MIDI interface always creates input and output port/jack descriptors
// regardless of these being used or not. Therefore incoming traffic should be read // regardless of these being used or not. Therefore incoming traffic should be read
// (possibly just discarded) to avoid the sender blocking in IO // (possibly just discarded) to avoid the sender blocking in IO
@ -183,10 +186,10 @@ void midi_task(void)
if (previous < 0) previous = sizeof(note_sequence) - 1; if (previous < 0) previous = sizeof(note_sequence) - 1;
// Send Note On for current position at full velocity (127) on channel 1. // Send Note On for current position at full velocity (127) on channel 1.
tudi_midi_write24(0, 0x90, note_sequence[note_pos], 127); tud_midi_write24(cable_num, 0x90 | channel, note_sequence[note_pos], 127);
// Send Note Off for previous note. // Send Note Off for previous note.
tudi_midi_write24(0, 0x80, note_sequence[previous], 0); tud_midi_write24(cable_num, 0x80 | channel, note_sequence[previous], 0);
// Increment position // Increment position
note_pos++; note_pos++;

7
examples/device/midi_test/src/main.c
View File

@ -125,6 +125,9 @@ void midi_task(void)
{ {
static uint32_t start_ms = 0; static uint32_t start_ms = 0;
uint8_t const cable_num = 0; // MIDI jack associated with USB endpoint
uint8_t const channel = 0; // 0 for channel 1
// The MIDI interface always creates input and output port/jack descriptors // The MIDI interface always creates input and output port/jack descriptors
// regardless of these being used or not. Therefore incoming traffic should be read // regardless of these being used or not. Therefore incoming traffic should be read
// (possibly just discarded) to avoid the sender blocking in IO // (possibly just discarded) to avoid the sender blocking in IO
@ -143,10 +146,10 @@ void midi_task(void)
if (previous < 0) previous = sizeof(note_sequence) - 1; if (previous < 0) previous = sizeof(note_sequence) - 1;
// Send Note On for current position at full velocity (127) on channel 1. // Send Note On for current position at full velocity (127) on channel 1.
tudi_midi_write24(0, 0x90, note_sequence[note_pos], 127); tud_midi_write24(cable_num, 0x90 | channel, note_sequence[note_pos], 127);
// Send Note Off for previous note. // Send Note Off for previous note.
tudi_midi_write24(0, 0x80, note_sequence[previous], 0); tud_midi_write24(cable_num, 0x80 | channel, note_sequence[previous], 0);
// Increment position // Increment position
note_pos++; note_pos++;