Fix USB MIDI, add LED startup animation, improve logging

- Use ArduinoUSBMIDI library for proper USB MIDI device recognition
- Add LED startup colour cycle (red, green, blue, yellow, magenta, cyan, white)
- Add comprehensive console logging for all MIDI in/out and switch events
- Log unmapped MIDI messages
This commit is contained in:
2026-06-23 13:06:57 +00:00
parent c1b163c8b8
commit 4d81386f78
6 changed files with 130 additions and 98 deletions
+69 -64
View File
@@ -1,6 +1,8 @@
#include "midi_transport.h"
#include <Arduino.h>
#include "tusb.h"
#include <USBMIDI.h>
static USBMIDI MIDI;
UsbMidiTransport::UsbMidiTransport() : initialized(false) {
}
@@ -9,92 +11,95 @@ UsbMidiTransport::~UsbMidiTransport() {
}
bool UsbMidiTransport::begin() {
tusb_init();
MIDI.begin(MIDI_CHANNEL_OMNI);
initialized = true;
Serial.println("[MIDI] USB MIDI transport initialized");
Serial.println("[MIDI] USB MIDI initialized (ArduinoUSBMIDI)");
return true;
}
void UsbMidiTransport::update() {
if (!initialized) return;
tud_task();
while (tud_midi_available()) {
uint8_t packet[4];
if (tud_midi_packet_read(packet)) {
MidiEvent event;
parse_midi_packet(packet, 4, event);
const char* type_str = "UNK";
switch (event.type) {
case MidiEvent::NOTE_ON: type_str = "NOTE_ON"; break;
case MidiEvent::NOTE_OFF: type_str = "NOTE_OFF"; break;
case MidiEvent::CONTROL_CHANGE: type_str = "CC"; break;
case MidiEvent::PROGRAM_CHANGE: type_str = "PC"; break;
case MidiEvent::PITCH_BEND: type_str = "PB"; break;
default: break;
}
Serial.printf("[MIDI IN] Ch:%d %s:%d:%d\n", event.channel, type_str, event.data1, event.data2);
if (receive_callback) {
receive_callback(event);
}
}
}
MIDI.read();
}
void UsbMidiTransport::on_midi_receive(std::function<void(const MidiEvent&)> callback) {
receive_callback = callback;
MIDI.setHandleNoteOn([this](uint8_t channel, uint8_t note, uint8_t velocity) {
MidiEvent event;
event.type = (velocity > 0) ? MidiEvent::NOTE_ON : MidiEvent::NOTE_OFF;
event.channel = channel;
event.data1 = note;
event.data2 = velocity;
event.timestamp = millis();
Serial.printf("[MIDI IN] Ch:%d NOTE_ON:%d:%d\n", channel, note, velocity);
if (receive_callback) receive_callback(event);
});
MIDI.setHandleNoteOff([this](uint8_t channel, uint8_t note, uint8_t velocity) {
MidiEvent event;
event.type = MidiEvent::NOTE_OFF;
event.channel = channel;
event.data1 = note;
event.data2 = velocity;
event.timestamp = millis();
Serial.printf("[MIDI IN] Ch:%d NOTE_OFF:%d:%d\n", channel, note, velocity);
if (receive_callback) receive_callback(event);
});
MIDI.setHandleControlChange([this](uint8_t channel, uint8_t cc, uint8_t value) {
MidiEvent event;
event.type = MidiEvent::CONTROL_CHANGE;
event.channel = channel;
event.data1 = cc;
event.data2 = value;
event.timestamp = millis();
Serial.printf("[MIDI IN] Ch:%d CC:%d:%d\n", channel, cc, value);
if (receive_callback) receive_callback(event);
});
MIDI.setHandleProgramChange([this](uint8_t channel, uint8_t program) {
MidiEvent event;
event.type = MidiEvent::PROGRAM_CHANGE;
event.channel = channel;
event.data1 = program;
event.data2 = 0;
event.timestamp = millis();
Serial.printf("[MIDI IN] Ch:%d PC:%d\n", channel, program);
if (receive_callback) receive_callback(event);
});
MIDI.setHandlePitchBend([this](uint8_t channel, int bend) {
MidiEvent event;
event.type = MidiEvent::PITCH_BEND;
event.channel = channel;
event.data1 = bend & 0x7F;
event.data2 = (bend >> 7) & 0x7F;
event.timestamp = millis();
Serial.printf("[MIDI IN] Ch:%d PB:%d\n", channel, bend);
if (receive_callback) receive_callback(event);
});
}
void UsbMidiTransport::send_note_on(uint8_t channel, uint8_t note, uint8_t velocity) {
if (!initialized) return;
uint8_t packet[4] = {0x09, (uint8_t)(0x90 | (channel - 1)), note, velocity};
tud_midi_packet_write(packet);
MIDI.sendNoteOn(note, velocity, channel);
Serial.printf("[MIDI OUT] Ch:%d NOTE_ON:%d:%d\n", channel, note, velocity);
}
void UsbMidiTransport::send_note_off(uint8_t channel, uint8_t note, uint8_t velocity) {
if (!initialized) return;
uint8_t packet[4] = {0x08, (uint8_t)(0x80 | (channel - 1)), note, velocity};
tud_midi_packet_write(packet);
MIDI.sendNoteOff(note, velocity, channel);
Serial.printf("[MIDI OUT] Ch:%d NOTE_OFF:%d:%d\n", channel, note, velocity);
}
void UsbMidiTransport::send_cc(uint8_t channel, uint8_t cc, uint8_t value) {
if (!initialized) return;
uint8_t packet[4] = {0x0B, (uint8_t)(0xB0 | (channel - 1)), cc, value};
tud_midi_packet_write(packet);
MIDI.sendControlChange(cc, value, channel);
Serial.printf("[MIDI OUT] Ch:%d CC:%d:%d\n", channel, cc, value);
}
void UsbMidiTransport::parse_midi_packet(const uint8_t* buffer, uint32_t size, MidiEvent& event) {
if (size < 4) return;
uint8_t cin = buffer[0] & 0x0F;
uint8_t status = buffer[1];
uint8_t type = status & 0xF0;
uint8_t channel = (status & 0x0F) + 1;
event.channel = channel;
event.data1 = buffer[2];
event.data2 = buffer[3];
switch (cin) {
case 0x8: event.type = MidiEvent::NOTE_OFF; break;
case 0x9:
event.type = (event.data2 > 0) ? MidiEvent::NOTE_ON : MidiEvent::NOTE_OFF;
break;
case 0xB: event.type = MidiEvent::CONTROL_CHANGE; break;
case 0xC: event.type = MidiEvent::PROGRAM_CHANGE; break;
case 0xE: event.type = MidiEvent::PITCH_BEND; break;
default:
switch (type) {
case 0x80: event.type = MidiEvent::NOTE_OFF; break;
case 0x90: event.type = (event.data2 > 0) ? MidiEvent::NOTE_ON : MidiEvent::NOTE_OFF; break;
case 0xB0: event.type = MidiEvent::CONTROL_CHANGE; break;
case 0xC0: event.type = MidiEvent::PROGRAM_CHANGE; break;
case 0xE0: event.type = MidiEvent::PITCH_BEND; break;
default: event.type = MidiEvent::NOTE_ON; break;
}
break;
}
bool UsbMidiTransport::is_connected() {
return initialized;
}