Allow CDC, FirmwareMSC and DFU to be enabled on boot

Author: me-no-dev

boards.txt

@@ -1,5 +1,7 @@
 menu.UploadSpeed=Upload Speed
-menu.SerialMode=Serial Connected To
+menu.CDCOnBoot=USB CDC On Boot
+menu.MSCOnBoot=USB Firmware MSC On Boot
+menu.DFUOnBoot=USB DFU On Boot
 menu.UploadMode=Upload Mode
 menu.CPUFreq=CPU Frequency
 menu.FlashFreq=Flash Frequency
@@ -37,7 +39,7 @@ esp32c3.build.variant=esp32c3
 esp32c3.build.board=ESP32C3_DEV
 esp32c3.build.bootloader_addr=0x0
 
-esp32c3.build.serial=0
+esp32c3.build.cdc_on_boot=0
 esp32c3.build.f_cpu=160000000L
 esp32c3.build.flash_size=4MB
 esp32c3.build.flash_freq=80m
@@ -173,7 +175,9 @@ esp32s2.build.core=esp32
 esp32s2.build.variant=esp32s2
 esp32s2.build.board=ESP32S2_DEV
 
-esp32s2.build.serial=0
+esp32s2.build.cdc_on_boot=0
+esp32s2.build.msc_on_boot=0
+esp32s2.build.dfu_on_boot=0
 esp32s2.build.f_cpu=240000000L
 esp32s2.build.flash_size=4MB
 esp32s2.build.flash_freq=80m
@@ -182,10 +186,20 @@ esp32s2.build.boot=qio
 esp32s2.build.partitions=default
 esp32s2.build.defines=
 
-esp32s2.menu.SerialMode.default=UART0
-esp32s2.menu.SerialMode.default.build.serial=0
-esp32s2.menu.SerialMode.cdc=USB CDC
-esp32s2.menu.SerialMode.cdc.build.serial=1
+esp32s2.menu.CDCOnBoot.default=Disabled
+esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
+esp32s2.menu.CDCOnBoot.cdc=Enabled
+esp32s2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+esp32s2.menu.MSCOnBoot.default=Disabled
+esp32s2.menu.MSCOnBoot.default.build.msc_on_boot=0
+esp32s2.menu.MSCOnBoot.msc=Enabled
+esp32s2.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+esp32s2.menu.DFUOnBoot.default=Disabled
+esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
+esp32s2.menu.DFUOnBoot.dfu=Enabled
+esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
 
 esp32s2.menu.UploadMode.default=UART0
 esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
@@ -865,7 +879,7 @@ feathers2.build.core=esp32
 feathers2.build.variant=um_feathers2
 feathers2.build.board=FEATHERS2
 
-feathers2.build.serial=1
+feathers2.build.cdc_on_boot=1
 feathers2.build.f_cpu=240000000L
 feathers2.build.flash_size=16MB
 feathers2.build.flash_freq=80m
@@ -874,10 +888,10 @@ feathers2.build.boot=qio
 feathers2.build.partitions=fatflash
 feathers2.build.defines=
 
-feathers2.menu.SerialMode.cdc=USB CDC
-feathers2.menu.SerialMode.cdc.build.serial=1
-feathers2.menu.SerialMode.default=UART0
-feathers2.menu.SerialMode.default.build.serial=0
+feathers2.menu.CDCOnBoot.cdc=Enabled
+feathers2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+feathers2.menu.CDCOnBoot.default=Disabled
+feathers2.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 feathers2.menu.PSRAM.enabled=Enabled
 feathers2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
@@ -993,7 +1007,7 @@ tinys2.build.core=esp32
 tinys2.build.variant=um_tinys2
 tinys2.build.board=TINYS2
 
-tinys2.build.serial=1
+tinys2.build.cdc_on_boot=1
 tinys2.build.f_cpu=240000000L
 tinys2.build.flash_size=4MB
 tinys2.build.flash_freq=80m
@@ -1002,10 +1016,10 @@ tinys2.build.boot=qio
 tinys2.build.partitions=default
 tinys2.build.defines=
 
-tinys2.menu.SerialMode.cdc=USB CDC
-tinys2.menu.SerialMode.cdc.build.serial=1
-tinys2.menu.SerialMode.default=UART0
-tinys2.menu.SerialMode.default.build.serial=0
+tinys2.menu.CDCOnBoot.cdc=Enabled
+tinys2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+tinys2.menu.CDCOnBoot.default=Disabled
+tinys2.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 tinys2.menu.PSRAM.enabled=Enabled
 tinys2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
@@ -1166,7 +1180,7 @@ micros2.build.core=esp32
 micros2.build.variant=micro_s2
 micros2.build.board=MICROS2
 
-micros2.build.serial=1
+micros2.build.cdc_on_boot=1
 micros2.build.f_cpu=240000000L
 micros2.build.flash_size=16MB
 micros2.build.flash_freq=80m
@@ -1175,10 +1189,10 @@ micros2.build.boot=qio
 micros2.build.partitions=fatflash
 micros2.build.defines=
 
-micros2.menu.SerialMode.cdc=USB CDC
-micros2.menu.SerialMode.cdc.build.serial=1
-micros2.menu.SerialMode.default=UART0
-micros2.menu.SerialMode.default.build.serial=0
+micros2.menu.CDCOnBoot.cdc=Enabled
+micros2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+micros2.menu.CDCOnBoot.default=Disabled
+micros2.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 micros2.menu.PSRAM.enabled=Enabled
 micros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
@@ -2025,7 +2039,7 @@ sparkfun_esp32s2_thing_plus.build.core=esp32
 sparkfun_esp32s2_thing_plus.build.variant=esp32s2thing_plus
 sparkfun_esp32s2_thing_plus.build.board=ESP32S2_THING_PLUS
 
-sparkfun_esp32s2_thing_plus.build.serial=0
+sparkfun_esp32s2_thing_plus.build.cdc_on_boot=0
 sparkfun_esp32s2_thing_plus.build.f_cpu=240000000L
 sparkfun_esp32s2_thing_plus.build.flash_size=4MB
 sparkfun_esp32s2_thing_plus.build.flash_freq=80m
@@ -2034,10 +2048,10 @@ sparkfun_esp32s2_thing_plus.build.boot=qio
 sparkfun_esp32s2_thing_plus.build.partitions=default
 sparkfun_esp32s2_thing_plus.build.defines=
 
-sparkfun_esp32s2_thing_plus.menu.SerialMode.default=UART0
-sparkfun_esp32s2_thing_plus.menu.SerialMode.default.build.serial=0
-sparkfun_esp32s2_thing_plus.menu.SerialMode.cdc=USB CDC
-sparkfun_esp32s2_thing_plus.menu.SerialMode.cdc.build.serial=1
+sparkfun_esp32s2_thing_plus.menu.CDCOnBoot.default=Disabled
+sparkfun_esp32s2_thing_plus.menu.CDCOnBoot.default.build.cdc_on_boot=0
+sparkfun_esp32s2_thing_plus.menu.CDCOnBoot.cdc=Enabled
+sparkfun_esp32s2_thing_plus.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
 
 sparkfun_esp32s2_thing_plus.menu.PSRAM.disabled=Disabled
 sparkfun_esp32s2_thing_plus.menu.PSRAM.disabled.build.defines=
@@ -3334,7 +3348,7 @@ adafruit_metro_esp32s2.build.core=esp32
 adafruit_metro_esp32s2.build.variant=adafruit_metro_esp32s2
 adafruit_metro_esp32s2.build.board=METRO_ESP32S2
 
-adafruit_metro_esp32s2.build.serial=0
+adafruit_metro_esp32s2.build.cdc_on_boot=0
 adafruit_metro_esp32s2.build.f_cpu=240000000L
 adafruit_metro_esp32s2.build.flash_size=4MB
 adafruit_metro_esp32s2.build.flash_freq=80m
@@ -3343,10 +3357,10 @@ adafruit_metro_esp32s2.build.boot=qio
 adafruit_metro_esp32s2.build.partitions=default
 adafruit_metro_esp32s2.build.defines=
 
-adafruit_metro_esp32s2.menu.SerialMode.cdc=USB CDC
-adafruit_metro_esp32s2.menu.SerialMode.cdc.build.serial=1
-adafruit_metro_esp32s2.menu.SerialMode.default=UART0
-adafruit_metro_esp32s2.menu.SerialMode.default.build.serial=0
+adafruit_metro_esp32s2.menu.CDCOnBoot.cdc=Enabled
+adafruit_metro_esp32s2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_metro_esp32s2.menu.CDCOnBoot.default=Disabled
+adafruit_metro_esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 adafruit_metro_esp32s2.menu.PSRAM.enabled=Enabled
 adafruit_metro_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
@@ -3487,7 +3501,7 @@ adafruit_magtag29_esp32s2.build.core=esp32
 adafruit_magtag29_esp32s2.build.variant=adafruit_magtag29_esp32s2
 adafruit_magtag29_esp32s2.build.board=MAGTAG29_ESP32S2
 
-adafruit_magtag29_esp32s2.build.serial=0
+adafruit_magtag29_esp32s2.build.cdc_on_boot=0
 adafruit_magtag29_esp32s2.build.f_cpu=240000000L
 adafruit_magtag29_esp32s2.build.flash_size=4MB
 adafruit_magtag29_esp32s2.build.flash_freq=80m
@@ -3496,10 +3510,10 @@ adafruit_magtag29_esp32s2.build.boot=qio
 adafruit_magtag29_esp32s2.build.partitions=default
 adafruit_magtag29_esp32s2.build.defines=
 
-adafruit_magtag29_esp32s2.menu.SerialMode.cdc=USB CDC
-adafruit_magtag29_esp32s2.menu.SerialMode.cdc.build.serial=1
-adafruit_magtag29_esp32s2.menu.SerialMode.default=UART0
-adafruit_magtag29_esp32s2.menu.SerialMode.default.build.serial=0
+adafruit_magtag29_esp32s2.menu.CDCOnBoot.cdc=Enabled
+adafruit_magtag29_esp32s2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_magtag29_esp32s2.menu.CDCOnBoot.default=Disabled
+adafruit_magtag29_esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 adafruit_magtag29_esp32s2.menu.PSRAM.enabled=Enabled
 adafruit_magtag29_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
@@ -3640,7 +3654,7 @@ adafruit_funhouse_esp32s2.build.core=esp32
 adafruit_funhouse_esp32s2.build.variant=adafruit_funhouse_esp32s2
 adafruit_funhouse_esp32s2.build.board=FUNHOUSE_ESP32S2
 
-adafruit_funhouse_esp32s2.build.serial=0
+adafruit_funhouse_esp32s2.build.cdc_on_boot=0
 adafruit_funhouse_esp32s2.build.f_cpu=240000000L
 adafruit_funhouse_esp32s2.build.flash_size=4MB
 adafruit_funhouse_esp32s2.build.flash_freq=80m
@@ -3649,10 +3663,10 @@ adafruit_funhouse_esp32s2.build.boot=qio
 adafruit_funhouse_esp32s2.build.partitions=default
 adafruit_funhouse_esp32s2.build.defines=
 
-adafruit_funhouse_esp32s2.menu.SerialMode.cdc=USB CDC
-adafruit_funhouse_esp32s2.menu.SerialMode.cdc.build.serial=1
-adafruit_funhouse_esp32s2.menu.SerialMode.default=UART0
-adafruit_funhouse_esp32s2.menu.SerialMode.default.build.serial=0
+adafruit_funhouse_esp32s2.menu.CDCOnBoot.cdc=Enabled
+adafruit_funhouse_esp32s2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_funhouse_esp32s2.menu.CDCOnBoot.default=Disabled
+adafruit_funhouse_esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 adafruit_funhouse_esp32s2.menu.PSRAM.enabled=Enabled
 adafruit_funhouse_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
@@ -3793,7 +3807,7 @@ adafruit_feather_esp32s2_nopsram.build.core=esp32
 adafruit_feather_esp32s2_nopsram.build.variant=adafruit_feather_esp32s2
 adafruit_feather_esp32s2_nopsram.build.board=ADAFRUIT_FEATHER_ESP32S2_NOPSRAM
 
-adafruit_feather_esp32s2_nopsram.build.serial=0
+adafruit_feather_esp32s2_nopsram.build.cdc_on_boot=0
 adafruit_feather_esp32s2_nopsram.build.f_cpu=240000000L
 adafruit_feather_esp32s2_nopsram.build.flash_size=4MB
 adafruit_feather_esp32s2_nopsram.build.flash_freq=80m
@@ -3802,10 +3816,10 @@ adafruit_feather_esp32s2_nopsram.build.boot=qio
 adafruit_feather_esp32s2_nopsram.build.partitions=default
 adafruit_feather_esp32s2_nopsram.build.defines=
 
-adafruit_feather_esp32s2_nopsram.menu.SerialMode.cdc=USB CDC
-adafruit_feather_esp32s2_nopsram.menu.SerialMode.cdc.build.serial=1
-adafruit_feather_esp32s2_nopsram.menu.SerialMode.default=UART0
-adafruit_feather_esp32s2_nopsram.menu.SerialMode.default.build.serial=0
+adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.cdc=Enabled
+adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.default=Disabled
+adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled=Disabled
 adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled.build.defines=

libraries/USB/src/FirmwareMSC.cpp renamed to cores/esp32/FirmwareMSC.cpp

@@ -350,4 +350,8 @@ void FirmwareMSC::onEvent(arduino_firmware_msc_event_t event, esp_event_handler_
     arduino_usb_event_handler_register_with(ARDUINO_FIRMWARE_MSC_EVENTS, event, callback, this);
 }
 
+#if ARDUINO_USB_MSC_ON_BOOT
+FirmwareMSC MSC_Update;
+#endif
+
 #endif /* CONFIG_USB_MSC_ENABLED */

libraries/USB/src/FirmwareMSC.h renamed to cores/esp32/FirmwareMSC.h

@@ -60,4 +60,9 @@ class FirmwareMSC {
   void onEvent(esp_event_handler_t callback);
   void onEvent(arduino_firmware_msc_event_t event, esp_event_handler_t callback);
 };
+
+#if ARDUINO_USB_MSC_ON_BOOT
+extern FirmwareMSC MSC_Update;
+#endif
+
 #endif /* CONFIG_TINYUSB_MSC_ENABLED */

cores/esp32/HardwareSerial.cpp

@@ -37,7 +37,7 @@
 #endif
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
-#if ARDUINO_SERIAL_PORT //Serial used for USB CDC
+#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
 HardwareSerial Serial0(0);
 #else
 HardwareSerial Serial(0);

cores/esp32/HardwareSerial.h

@@ -113,10 +113,10 @@ class HardwareSerial: public Stream
 extern void serialEventRun(void) __attribute__((weak));
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
-#ifndef ARDUINO_SERIAL_PORT
-#define ARDUINO_SERIAL_PORT 0
+#ifndef ARDUINO_USB_CDC_ON_BOOT
+#define ARDUINO_USB_CDC_ON_BOOT 0
 #endif
-#if ARDUINO_SERIAL_PORT //Serial used for USB CDC
+#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
 #include "USB.h"
 #include "USBCDC.h"
 extern HardwareSerial Serial0;

cores/esp32/USB.h

@@ -21,6 +21,8 @@
 #include "common/tusb_common.h"
 #include "esp_event.h"
 
+#define ARDUINO_USB_ON_BOOT (ARDUINO_USB_CDC_ON_BOOT|ARDUINO_USB_MSC_ON_BOOT|ARDUINO_USB_DFU_ON_BOOT)
+
 ESP_EVENT_DECLARE_BASE(ARDUINO_USB_EVENTS);
 
 typedef enum {

cores/esp32/USBCDC.cpp

@@ -364,7 +364,7 @@ USBCDC::operator bool() const
     return connected;
 }
 
-#if ARDUINO_SERIAL_PORT //Serial used for USB CDC
+#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
 USBCDC Serial(0);
 #endif
 

cores/esp32/USBCDC.h

@@ -129,7 +129,7 @@ class USBCDC: public Stream
 
 };
 
-#if ARDUINO_SERIAL_PORT //Serial used for USB CDC
+#if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC
 extern USBCDC Serial;
 #endif