Merge branch 'main' into preferences

edrumulus.ino

@@ -35,7 +35,13 @@ const int number_pads4 = 8; // example: do not use tom3 and shrink number of pad
 #ifdef USE_MIDI
 # ifdef ESP_PLATFORM
 #  include <MIDI.h>
+#  ifdef USE_TINYUSB
+#    include <Adafruit_TinyUSB.h>
+     Adafruit_USBD_MIDI usb_midi; 
+     MIDI_CREATE_INSTANCE(Adafruit_USBD_MIDI, usb_midi, MIDI);
+#  else
      MIDI_CREATE_DEFAULT_INSTANCE();
+#  endif
 #  define MYMIDI                     MIDI
 #  define MIDI_CONTROL_CHANGE_TYPE   midi::ControlChange
 #  define MIDI_SEND_AFTER_TOUCH      sendAfterTouch
@@ -76,6 +82,9 @@ void setup()
   number_pads = min ( number_pads, 7 ); // only max. 7 pads are supported for ESP32 serial debug plotting
 #endif
 #ifdef USE_MIDI
+# ifdef USE_TINYUSB
+    TinyUSBDevice.setProductDescriptor("Edrumulus");
+# endif
   MYMIDI.begin();
 #endif
 #ifdef MIDI_SERIAL

platformio.ini

@@ -48,3 +48,13 @@ board = az-delivery-devkit-v4
 [env:esp32-s3-devkitc-1]
 platform = espressif32
 board = esp32-s3-devkitc-1
+build_unflags = -DARDUINO_USB_MODE=1
+build_flags = 
+	-DUSE_TINYUSB=1
+	-DARDUINO_USB_MODE=0
+	-DARDUINO_USB_CDC_ON_BOOT=1
+	'-DCFG_TUSB_CONFIG_FILE="${platformio.core_dir}/packages/framework-arduinoespressif32/tools/sdk/esp32s3/include/arduino_tinyusb/include/tusb_config.h"'
+lib_archive = no
+lib_deps = 
+	fortyseveneffects/MIDI Library
+	adafruit/Adafruit TinyUSB Library