diff options
| author | copilot-swe-agent[bot] <[email protected]> | 2026-05-25 19:15:45 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-05-25 19:15:45 +0000 |
| commit | 072c02e3684e886a93681ecb37f830be5b8c6b53 (patch) | |
| tree | 0b7cd9e7d287fa563726cfb0cc1f70e418ce499a /src/tinyusb.mk | |
| parent | e8baf2e0102660d51eb515d1b0651d8298178dc3 (diff) | |
| parent | 7b9f6eabd8623c2bbe188c8d53072b16a087cdda (diff) | |
chore: resolve .gitignore merge conflict with master
Co-authored-by: HiFiPhile <[email protected]>
Diffstat (limited to 'src/tinyusb.mk')
| -rw-r--r-- | src/tinyusb.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tinyusb.mk b/src/tinyusb.mk index 169098016..365043927 100644 --- a/src/tinyusb.mk +++ b/src/tinyusb.mk @@ -3,7 +3,6 @@ TINYUSB_SRC_C += \ src/tusb.c \ src/common/tusb_fifo.c \ src/device/usbd.c \ - src/device/usbd_control.c \ src/typec/usbc.c \ src/class/audio/audio_device.c \ src/class/cdc/cdc_device.c \ @@ -11,6 +10,7 @@ TINYUSB_SRC_C += \ src/class/dfu/dfu_rt_device.c \ src/class/hid/hid_device.c \ src/class/midi/midi_device.c \ + src/class/midi/midi2_device.c \ src/class/msc/msc_device.c \ src/class/mtp/mtp_device.c \ src/class/net/ecm_rndis_device.c \ @@ -24,5 +24,6 @@ TINYUSB_SRC_C += \ src/class/cdc/cdc_host.c \ src/class/hid/hid_host.c \ src/class/midi/midi_host.c \ + src/class/midi/midi2_host.c \ src/class/msc/msc_host.c \ src/class/vendor/vendor_host.c \ |