ash/loopy_midi_controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Phase 1 skeleton: add build system, fix compilation errors

Browse Source 
- Add CMakeLists.txt for project and all components
- Add idf_component.yml with TinyUSB dependency
- Create switch_stub.cpp implementation
- Fix app_task.h to match .cpp implementation (2-param signature)
- Fix led_stub.h/cpp class naming (DefaultLedStub)
- Fix midi_transport.cpp TinyUSB API usage (tud_midi_*)
- Move main.cpp to main/ directory
- Add sdkconfig.defaults for ESP32-S3
This commit is contained in:
Ashley Strahle
2026-06-23 08:59:53 +00:00
parent db4b63c755
commit 458cb5060f
15 changed files with 234 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/midi/CMakeLists.txt
+3
View File
@@ -0,0 +1,3 @@
idf_component_register(SRCS "midi_transport.cpp"
INCLUDE_DIRS "."
REQUIRES driver)
components/midi/midi_transport.cpp
+64 -58
View File
@@ -1,8 +1,7 @@
// midi/midi_transport.cpp
// components/midi/midi_transport.cpp
#include "midi/midi_transport.h"
#include "esp_log.h"
#include "tusb.h"
#include "class/midi/midi.h"
static const char* TAG = "midi_transport";
@@ -23,15 +22,9 @@ bool UsbMidiTransport::begin() {
return false;
}
// Initialize TinyUSB MIDI
// Initialize TinyUSB
tusb_init();
// Configure USB device descriptors
tusb_device_set_string(1, "Loopy Foot Controller");
// Register MIDI callback
tuh_midi_set_cb(usb_midi_callback);
initialized = true;
ESP_LOGI(TAG, "USB MIDI transport initialized");
return true;
@@ -40,82 +33,95 @@ bool UsbMidiTransport::begin() {
void UsbMidiTransport::task() {
if (!initialized) return;
// Process USB MIDI events
while (tuh_uart_read_available()) {
uint8_t buffer[128];
uint32_t bytes_read = tuh_midi_read_packet(buffer, sizeof(buffer));
if (bytes_read > 0) {
// TinyUSB device task handling
tuh_task();
// Check for MIDI data on the USB host interface
uint8_t cable_num;
uint8_t midi_packet[4];
while (tud_midi_available()) {
if (tud_midi_packet_read(midi_packet)) {
MidiEvent event;
parse_midi_packet(buffer, bytes_read, event);
parse_midi_packet(midi_packet, 4, event);
// Log incoming event
log_incoming("USB", event);
// Send to event queue
if (xQueueSend(event_queue, &event, portMAX_DELAY) != pdPASS) {
ESP_LOGW(TAG, "Failed to queue MIDI event");
if (xQueueSend(event_queue, &event, 0) != pdPASS) {
ESP_LOGW(TAG, "Failed to queue MIDI event (queue full)");
}
}
}
}
void usb_midi_callback(const uint8_t* event, uint32_t size) {
// This callback is called by TinyUSB when MIDI data is received
// For now, we'll implement a simple version
// In a full implementation, this would parse the MIDI packet
MidiEvent midi_event;
// TODO: Implement actual MIDI parsing based on event type
// For Phase 1, we'll handle basic Note On/Off messages
}
void UsbMidiTransport::log_incoming(const char* source, const MidiEvent& event) {
const char* type_str;
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 = "CONTROL_CHANGE"; break;
case MidiEvent::CONTROL_CHANGE: type_str = "CC"; break;
case MidiEvent::PROGRAM_CHANGE: type_str = "PC"; break;
case MidiEvent::PITCH_BEND: type_str = "PITCH_BEND"; break;
default: type_str = "UNKNOWN"; break;
}
ESP_LOGI(TAG, "MIDI IN: %s Channel: %d Type: %s Note: %d Velocity: %d",
ESP_LOGI(TAG, "MIDI IN: %s Ch:%d %s:%d:%d",
source, event.channel, type_str, event.data1, event.data2);
}
void UsbMidiTransport::parse_midi_packet(const uint8_t* buffer, uint32_t size, MidiEvent& event) {
// Simple MIDI parser for basic messages
// This is a simplified version for Phase 1
if (size < 4) return;
if (size < 2) return;
// USB MIDI packet format: [cable_num | CIN], [status], [data1], [data2]
uint8_t cin = buffer[0] & 0x0F;
uint8_t status = buffer[1];
uint8_t type = status & 0xF0;
uint8_t channel = (status & 0x0F) + 1; // Convert to 1-16 range
uint8_t status = buffer[0];
uint8_t type = status & 0xF0; // Message type
uint8_t channel = status & 0x0F; // Channel (0-15, but MIDI uses 1-16)
event.channel = channel;
event.data1 = buffer[2];
event.data2 = buffer[3];
event.channel = channel + 1; // Convert to 1-16 range
switch (type) {
case 0x90: // Note On
event.type = MidiEvent::NOTE_ON;
event.data1 = buffer[1];
event.data2 = buffer[2];
break;
case 0x80: // Note Off
switch (cin) {
case 0x8: // Note Off
event.type = MidiEvent::NOTE_OFF;
event.data1 = buffer[1];
event.data2 = buffer[2];
break;
case 0xB0: // Control Change
case 0x9: // Note On
event.type = MidiEvent::NOTE_ON;
if (event.data2 == 0) {
event.type = MidiEvent::NOTE_OFF;
}
break;
case 0xB: // Control Change
event.type = MidiEvent::CONTROL_CHANGE;
event.data1 = buffer[1];
event.data2 = buffer[2];
break;
case 0xC: // Program Change
event.type = MidiEvent::PROGRAM_CHANGE;
break;
case 0xE: // Pitch Bend
event.type = MidiEvent::PITCH_BEND;
break;
default:
// Unknown message type - ignore for now
return;
// Try to infer from status byte
switch (type) {
case 0x80: event.type = MidiEvent::NOTE_OFF; break;
case 0x90: event.type = MidiEvent::NOTE_ON; 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;
}
}
}
void usb_midi_task(void* pvParameters) {
UsbMidiTransport* transport = static_cast<UsbMidiTransport*>(pvParameters);
ESP_LOGI(TAG, "USB MIDI task started");
while (true) {
transport->task();
vTaskDelay(pdMS_TO_TICKS(1));
}
}
components/midi/midi_transport.h
+6 -3
View File
@@ -1,4 +1,4 @@
// midi/midi_transport.h
// components/midi/midi_transport.h
#pragma once
#include <cstdint>
@@ -40,7 +40,10 @@ public:
private:
QueueHandle_t event_queue;
bool initialized;
// MIDI packet parsing
void parse_midi_packet(const uint8_t* buffer, uint32_t size, MidiEvent& event);
};
// Forward declaration for USB callback
void usb_midi_callback(const uint8_t* event, uint32_t size);
// Task function for USB MIDI processing
void usb_midi_task(void* pvParameters);