diff --git a/boards.txt b/boards.txt
index b39c070e8a8..bced4f872d7 100755
--- a/boards.txt
+++ b/boards.txt
@@ -1542,6 +1542,564 @@ tinys2.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+tinys3.name=UM TinyS3
+tinys3.vid.0=0x303a
+tinys3.pid.0=0x80D0
+
+tinys3.upload.tool=esptool_py
+tinys3.upload.maximum_size=1310720
+tinys3.upload.maximum_data_size=327680
+tinys3.upload.flags=
+tinys3.upload.extra_flags=
+tinys3.upload.use_1200bps_touch=false
+tinys3.upload.wait_for_upload_port=false
+
+tinys3.serial.disableDTR=false
+tinys3.serial.disableRTS=false
+
+tinys3.build.tarch=xtensa
+tinys3.build.bootloader_addr=0x0
+tinys3.build.target=esp32s3
+tinys3.build.mcu=esp32s3
+tinys3.build.core=esp32
+tinys3.build.variant=um_tinys3
+tinys3.build.board=TINYS3
+
+tinys3.build.usb_mode=1
+tinys3.build.cdc_on_boot=0
+tinys3.build.msc_on_boot=0
+tinys3.build.dfu_on_boot=0
+tinys3.build.f_cpu=240000000L
+tinys3.build.flash_size=4MB
+tinys3.build.flash_freq=80m
+tinys3.build.flash_mode=dio
+tinys3.build.boot=qio
+tinys3.build.partitions=default
+tinys3.build.defines=
+tinys3.build.loop_core=
+tinys3.build.event_core=
+
+tinys3.menu.LoopCore.1=Core 1
+tinys3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+tinys3.menu.LoopCore.0=Core 0
+tinys3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+tinys3.menu.EventsCore.1=Core 1
+tinys3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+tinys3.menu.EventsCore.0=Core 0
+tinys3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+tinys3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+tinys3.menu.USBMode.hwcdc.build.usb_mode=1
+tinys3.menu.USBMode.default=USB-OTG
+tinys3.menu.USBMode.default.build.usb_mode=0
+
+
+tinys3.menu.CDCOnBoot.cdc=Enabled
+tinys3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+tinys3.menu.CDCOnBoot.default=Disabled
+tinys3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+tinys3.menu.MSCOnBoot.default=Disabled
+tinys3.menu.MSCOnBoot.default.build.msc_on_boot=0
+tinys3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+tinys3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+tinys3.menu.DFUOnBoot.default=Disabled
+tinys3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+tinys3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+tinys3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+tinys3.menu.UploadMode.cdc=Internal USB
+tinys3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+tinys3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+tinys3.menu.UploadMode.default=UART0
+tinys3.menu.UploadMode.default.upload.use_1200bps_touch=false
+tinys3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+tinys3.menu.PSRAM.enabled=Enabled
+tinys3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+tinys3.menu.PSRAM.disabled=Disabled
+tinys3.menu.PSRAM.disabled.build.defines=
+
+tinys3.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+tinys3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+tinys3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+tinys3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+tinys3.menu.PartitionScheme.default.build.partitions=default
+tinys3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+tinys3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+tinys3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+tinys3.menu.PartitionScheme.minimal.build.partitions=minimal
+tinys3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+tinys3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+tinys3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+tinys3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+tinys3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+tinys3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+tinys3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+tinys3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+tinys3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+tinys3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+tinys3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+tinys3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+tinys3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+tinys3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+tinys3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+tinys3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+tinys3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+tinys3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+tinys3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+tinys3.menu.PartitionScheme.fatflash.build.partitions=ffat
+tinys3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+tinys3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+tinys3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+tinys3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+
+tinys3.menu.CPUFreq.240=240MHz (WiFi)
+tinys3.menu.CPUFreq.240.build.f_cpu=240000000L
+tinys3.menu.CPUFreq.160=160MHz (WiFi)
+tinys3.menu.CPUFreq.160.build.f_cpu=160000000L
+tinys3.menu.CPUFreq.80=80MHz (WiFi)
+tinys3.menu.CPUFreq.80.build.f_cpu=80000000L
+tinys3.menu.CPUFreq.40=40MHz
+tinys3.menu.CPUFreq.40.build.f_cpu=40000000L
+tinys3.menu.CPUFreq.20=20MHz
+tinys3.menu.CPUFreq.20.build.f_cpu=20000000L
+tinys3.menu.CPUFreq.10=10MHz
+tinys3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+tinys3.menu.FlashMode.qio=QIO
+tinys3.menu.FlashMode.qio.build.flash_mode=dio
+tinys3.menu.FlashMode.qio.build.boot=qio
+tinys3.menu.FlashMode.dio=DIO
+tinys3.menu.FlashMode.dio.build.flash_mode=dio
+tinys3.menu.FlashMode.dio.build.boot=dio
+tinys3.menu.FlashMode.qout=QOUT
+tinys3.menu.FlashMode.qout.build.flash_mode=dout
+tinys3.menu.FlashMode.qout.build.boot=qout
+tinys3.menu.FlashMode.dout=DOUT
+tinys3.menu.FlashMode.dout.build.flash_mode=dout
+tinys3.menu.FlashMode.dout.build.boot=dout
+
+tinys3.menu.FlashFreq.80=80MHz
+tinys3.menu.FlashFreq.80.build.flash_freq=80m
+tinys3.menu.FlashFreq.40=40MHz
+tinys3.menu.FlashFreq.40.build.flash_freq=40m
+
+tinys3.menu.FlashSize.8M=8MB (64Mb)
+tinys3.menu.FlashSize.8M.build.flash_size=8MB
+tinys3.menu.FlashSize.8M.build.partitions=default_8MB
+tinys3.menu.FlashSize.4M=4MB (32Mb)
+tinys3.menu.FlashSize.4M.build.flash_size=4MB
+tinys3.menu.FlashSize.2M=2MB (16Mb)
+tinys3.menu.FlashSize.2M.build.flash_size=2MB
+tinys3.menu.FlashSize.2M.build.partitions=minimal
+tinys3.menu.FlashSize.16M=16MB (128Mb)
+tinys3.menu.FlashSize.16M.build.flash_size=16MB
+
+tinys3.menu.UploadSpeed.921600=921600
+tinys3.menu.UploadSpeed.921600.upload.speed=921600
+tinys3.menu.UploadSpeed.115200=115200
+tinys3.menu.UploadSpeed.115200.upload.speed=115200
+tinys3.menu.UploadSpeed.256000.windows=256000
+tinys3.menu.UploadSpeed.256000.upload.speed=256000
+tinys3.menu.UploadSpeed.230400.windows.upload.speed=256000
+tinys3.menu.UploadSpeed.230400=230400
+tinys3.menu.UploadSpeed.230400.upload.speed=230400
+tinys3.menu.UploadSpeed.460800.linux=460800
+tinys3.menu.UploadSpeed.460800.macosx=460800
+tinys3.menu.UploadSpeed.460800.upload.speed=460800
+tinys3.menu.UploadSpeed.512000.windows=512000
+tinys3.menu.UploadSpeed.512000.upload.speed=512000
+
+tinys3.menu.DebugLevel.none=None
+tinys3.menu.DebugLevel.none.build.code_debug=0
+tinys3.menu.DebugLevel.error=Error
+tinys3.menu.DebugLevel.error.build.code_debug=1
+tinys3.menu.DebugLevel.warn=Warn
+tinys3.menu.DebugLevel.warn.build.code_debug=2
+tinys3.menu.DebugLevel.info=Info
+tinys3.menu.DebugLevel.info.build.code_debug=3
+tinys3.menu.DebugLevel.debug=Debug
+tinys3.menu.DebugLevel.debug.build.code_debug=4
+tinys3.menu.DebugLevel.verbose=Verbose
+tinys3.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
+pros3.name=UM PROS3
+pros3.vid.0=0x303a
+pros3.pid.0=0x80D3
+
+pros3.upload.tool=esptool_py
+pros3.upload.maximum_size=1310720
+pros3.upload.maximum_data_size=327680
+pros3.upload.flags=
+pros3.upload.extra_flags=
+pros3.upload.use_1200bps_touch=false
+pros3.upload.wait_for_upload_port=false
+
+pros3.serial.disableDTR=false
+pros3.serial.disableRTS=false
+
+pros3.build.tarch=xtensa
+pros3.build.bootloader_addr=0x0
+pros3.build.target=esp32s3
+pros3.build.mcu=esp32s3
+pros3.build.core=esp32
+pros3.build.variant=um_pros3
+pros3.build.board=PROS3
+
+pros3.build.usb_mode=1
+pros3.build.cdc_on_boot=0
+pros3.build.msc_on_boot=0
+pros3.build.dfu_on_boot=0
+pros3.build.f_cpu=240000000L
+pros3.build.flash_size=4MB
+pros3.build.flash_freq=80m
+pros3.build.flash_mode=dio
+pros3.build.boot=qio
+pros3.build.partitions=default
+pros3.build.defines=
+pros3.build.loop_core=
+pros3.build.event_core=
+
+pros3.menu.LoopCore.1=Core 1
+pros3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+pros3.menu.LoopCore.0=Core 0
+pros3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+pros3.menu.EventsCore.1=Core 1
+pros3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+pros3.menu.EventsCore.0=Core 0
+pros3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+pros3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+pros3.menu.USBMode.hwcdc.build.usb_mode=1
+pros3.menu.USBMode.default=USB-OTG
+pros3.menu.USBMode.default.build.usb_mode=0
+
+
+pros3.menu.CDCOnBoot.cdc=Enabled
+pros3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+pros3.menu.CDCOnBoot.default=Disabled
+pros3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+pros3.menu.MSCOnBoot.default=Disabled
+pros3.menu.MSCOnBoot.default.build.msc_on_boot=0
+pros3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+pros3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+pros3.menu.DFUOnBoot.default=Disabled
+pros3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+pros3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+pros3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+pros3.menu.UploadMode.cdc=Internal USB
+pros3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+pros3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+pros3.menu.UploadMode.default=UART0
+pros3.menu.UploadMode.default.upload.use_1200bps_touch=false
+pros3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+pros3.menu.PSRAM.enabled=Enabled
+pros3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+pros3.menu.PSRAM.disabled=Disabled
+pros3.menu.PSRAM.disabled.build.defines=
+
+pros3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+pros3.menu.PartitionScheme.fatflash.build.partitions=ffat
+pros3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+pros3.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+pros3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+pros3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+pros3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+pros3.menu.PartitionScheme.default.build.partitions=default
+pros3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+pros3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+pros3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+pros3.menu.PartitionScheme.minimal.build.partitions=minimal
+pros3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+pros3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+pros3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+pros3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+pros3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+pros3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+pros3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+pros3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+pros3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+pros3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+pros3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+pros3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+pros3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+pros3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+pros3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+pros3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+pros3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+pros3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+pros3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+pros3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+pros3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+
+pros3.menu.CPUFreq.240=240MHz (WiFi)
+pros3.menu.CPUFreq.240.build.f_cpu=240000000L
+pros3.menu.CPUFreq.160=160MHz (WiFi)
+pros3.menu.CPUFreq.160.build.f_cpu=160000000L
+pros3.menu.CPUFreq.80=80MHz (WiFi)
+pros3.menu.CPUFreq.80.build.f_cpu=80000000L
+pros3.menu.CPUFreq.40=40MHz
+pros3.menu.CPUFreq.40.build.f_cpu=40000000L
+pros3.menu.CPUFreq.20=20MHz
+pros3.menu.CPUFreq.20.build.f_cpu=20000000L
+pros3.menu.CPUFreq.10=10MHz
+pros3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+pros3.menu.FlashMode.qio=QIO
+pros3.menu.FlashMode.qio.build.flash_mode=dio
+pros3.menu.FlashMode.qio.build.boot=qio
+pros3.menu.FlashMode.dio=DIO
+pros3.menu.FlashMode.dio.build.flash_mode=dio
+pros3.menu.FlashMode.dio.build.boot=dio
+pros3.menu.FlashMode.qout=QOUT
+pros3.menu.FlashMode.qout.build.flash_mode=dout
+pros3.menu.FlashMode.qout.build.boot=qout
+pros3.menu.FlashMode.dout=DOUT
+pros3.menu.FlashMode.dout.build.flash_mode=dout
+pros3.menu.FlashMode.dout.build.boot=dout
+
+pros3.menu.FlashFreq.80=80MHz
+pros3.menu.FlashFreq.80.build.flash_freq=80m
+pros3.menu.FlashFreq.40=40MHz
+pros3.menu.FlashFreq.40.build.flash_freq=40m
+
+pros3.menu.FlashSize.16M=16MB (128Mb)
+pros3.menu.FlashSize.16M.build.flash_size=16MB
+pros3.menu.FlashSize.8M=8MB (64Mb)
+pros3.menu.FlashSize.8M.build.flash_size=8MB
+pros3.menu.FlashSize.8M.build.partitions=default_8MB
+pros3.menu.FlashSize.4M=4MB (32Mb)
+pros3.menu.FlashSize.4M.build.flash_size=4MB
+pros3.menu.FlashSize.2M=2MB (16Mb)
+pros3.menu.FlashSize.2M.build.flash_size=2MB
+pros3.menu.FlashSize.2M.build.partitions=minimal
+
+pros3.menu.UploadSpeed.921600=921600
+pros3.menu.UploadSpeed.921600.upload.speed=921600
+pros3.menu.UploadSpeed.115200=115200
+pros3.menu.UploadSpeed.115200.upload.speed=115200
+pros3.menu.UploadSpeed.256000.windows=256000
+pros3.menu.UploadSpeed.256000.upload.speed=256000
+pros3.menu.UploadSpeed.230400.windows.upload.speed=256000
+pros3.menu.UploadSpeed.230400=230400
+pros3.menu.UploadSpeed.230400.upload.speed=230400
+pros3.menu.UploadSpeed.460800.linux=460800
+pros3.menu.UploadSpeed.460800.macosx=460800
+pros3.menu.UploadSpeed.460800.upload.speed=460800
+pros3.menu.UploadSpeed.512000.windows=512000
+pros3.menu.UploadSpeed.512000.upload.speed=512000
+
+pros3.menu.DebugLevel.none=None
+pros3.menu.DebugLevel.none.build.code_debug=0
+pros3.menu.DebugLevel.error=Error
+pros3.menu.DebugLevel.error.build.code_debug=1
+pros3.menu.DebugLevel.warn=Warn
+pros3.menu.DebugLevel.warn.build.code_debug=2
+pros3.menu.DebugLevel.info=Info
+pros3.menu.DebugLevel.info.build.code_debug=3
+pros3.menu.DebugLevel.debug=Debug
+pros3.menu.DebugLevel.debug.build.code_debug=4
+pros3.menu.DebugLevel.verbose=Verbose
+pros3.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
+feathers3.name=UM FeatherS3
+feathers3.vid.0=0x303a
+feathers3.pid.0=0x80D6
+
+feathers3.upload.tool=esptool_py
+feathers3.upload.maximum_size=1310720
+feathers3.upload.maximum_data_size=327680
+feathers3.upload.flags=
+feathers3.upload.extra_flags=
+feathers3.upload.use_1200bps_touch=false
+feathers3.upload.wait_for_upload_port=false
+
+feathers3.serial.disableDTR=false
+feathers3.serial.disableRTS=false
+
+feathers3.build.tarch=xtensa
+feathers3.build.bootloader_addr=0x0
+feathers3.build.target=esp32s3
+feathers3.build.mcu=esp32s3
+feathers3.build.core=esp32
+feathers3.build.variant=um_feathers3
+feathers3.build.board=FEATHERS3
+
+feathers3.build.usb_mode=1
+feathers3.build.cdc_on_boot=0
+feathers3.build.msc_on_boot=0
+feathers3.build.dfu_on_boot=0
+feathers3.build.f_cpu=240000000L
+feathers3.build.flash_size=4MB
+feathers3.build.flash_freq=80m
+feathers3.build.flash_mode=dio
+feathers3.build.boot=qio
+feathers3.build.partitions=default
+feathers3.build.defines=
+feathers3.build.loop_core=
+feathers3.build.event_core=
+
+feathers3.menu.LoopCore.1=Core 1
+feathers3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+feathers3.menu.LoopCore.0=Core 0
+feathers3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+feathers3.menu.EventsCore.1=Core 1
+feathers3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+feathers3.menu.EventsCore.0=Core 0
+feathers3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+feathers3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+feathers3.menu.USBMode.hwcdc.build.usb_mode=1
+feathers3.menu.USBMode.default=USB-OTG
+feathers3.menu.USBMode.default.build.usb_mode=0
+
+
+feathers3.menu.CDCOnBoot.cdc=Enabled
+feathers3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+feathers3.menu.CDCOnBoot.default=Disabled
+feathers3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+feathers3.menu.MSCOnBoot.default=Disabled
+feathers3.menu.MSCOnBoot.default.build.msc_on_boot=0
+feathers3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+feathers3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+feathers3.menu.DFUOnBoot.default=Disabled
+feathers3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+feathers3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+feathers3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+feathers3.menu.UploadMode.cdc=Internal USB
+feathers3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+feathers3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+feathers3.menu.UploadMode.default=UART0
+feathers3.menu.UploadMode.default.upload.use_1200bps_touch=false
+feathers3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+feathers3.menu.PSRAM.enabled=Enabled
+feathers3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+feathers3.menu.PSRAM.disabled=Disabled
+feathers3.menu.PSRAM.disabled.build.defines=
+
+feathers3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+feathers3.menu.PartitionScheme.fatflash.build.partitions=ffat
+feathers3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+feathers3.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+feathers3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+feathers3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+feathers3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+feathers3.menu.PartitionScheme.default.build.partitions=default
+feathers3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+feathers3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+feathers3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+feathers3.menu.PartitionScheme.minimal.build.partitions=minimal
+feathers3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+feathers3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+feathers3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+feathers3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+feathers3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+feathers3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+feathers3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+feathers3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+feathers3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+feathers3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+feathers3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+feathers3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+feathers3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+feathers3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+feathers3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+feathers3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+feathers3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+feathers3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+feathers3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+feathers3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+feathers3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+
+feathers3.menu.CPUFreq.240=240MHz (WiFi)
+feathers3.menu.CPUFreq.240.build.f_cpu=240000000L
+feathers3.menu.CPUFreq.160=160MHz (WiFi)
+feathers3.menu.CPUFreq.160.build.f_cpu=160000000L
+feathers3.menu.CPUFreq.80=80MHz (WiFi)
+feathers3.menu.CPUFreq.80.build.f_cpu=80000000L
+feathers3.menu.CPUFreq.40=40MHz
+feathers3.menu.CPUFreq.40.build.f_cpu=40000000L
+feathers3.menu.CPUFreq.20=20MHz
+feathers3.menu.CPUFreq.20.build.f_cpu=20000000L
+feathers3.menu.CPUFreq.10=10MHz
+feathers3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+feathers3.menu.FlashMode.qio=QIO
+feathers3.menu.FlashMode.qio.build.flash_mode=dio
+feathers3.menu.FlashMode.qio.build.boot=qio
+feathers3.menu.FlashMode.dio=DIO
+feathers3.menu.FlashMode.dio.build.flash_mode=dio
+feathers3.menu.FlashMode.dio.build.boot=dio
+feathers3.menu.FlashMode.qout=QOUT
+feathers3.menu.FlashMode.qout.build.flash_mode=dout
+feathers3.menu.FlashMode.qout.build.boot=qout
+feathers3.menu.FlashMode.dout=DOUT
+feathers3.menu.FlashMode.dout.build.flash_mode=dout
+feathers3.menu.FlashMode.dout.build.boot=dout
+
+feathers3.menu.FlashFreq.80=80MHz
+feathers3.menu.FlashFreq.80.build.flash_freq=80m
+feathers3.menu.FlashFreq.40=40MHz
+feathers3.menu.FlashFreq.40.build.flash_freq=40m
+
+feathers3.menu.FlashSize.16M=16MB (128Mb)
+feathers3.menu.FlashSize.16M.build.flash_size=16MB
+feathers3.menu.FlashSize.8M=8MB (64Mb)
+feathers3.menu.FlashSize.8M.build.flash_size=8MB
+feathers3.menu.FlashSize.8M.build.partitions=default_8MB
+feathers3.menu.FlashSize.4M=4MB (32Mb)
+feathers3.menu.FlashSize.4M.build.flash_size=4MB
+feathers3.menu.FlashSize.2M=2MB (16Mb)
+feathers3.menu.FlashSize.2M.build.flash_size=2MB
+feathers3.menu.FlashSize.2M.build.partitions=minimal
+
+feathers3.menu.UploadSpeed.921600=921600
+feathers3.menu.UploadSpeed.921600.upload.speed=921600
+feathers3.menu.UploadSpeed.115200=115200
+feathers3.menu.UploadSpeed.115200.upload.speed=115200
+feathers3.menu.UploadSpeed.256000.windows=256000
+feathers3.menu.UploadSpeed.256000.upload.speed=256000
+feathers3.menu.UploadSpeed.230400.windows.upload.speed=256000
+feathers3.menu.UploadSpeed.230400=230400
+feathers3.menu.UploadSpeed.230400.upload.speed=230400
+feathers3.menu.UploadSpeed.460800.linux=460800
+feathers3.menu.UploadSpeed.460800.macosx=460800
+feathers3.menu.UploadSpeed.460800.upload.speed=460800
+feathers3.menu.UploadSpeed.512000.windows=512000
+feathers3.menu.UploadSpeed.512000.upload.speed=512000
+
+feathers3.menu.DebugLevel.none=None
+feathers3.menu.DebugLevel.none.build.code_debug=0
+feathers3.menu.DebugLevel.error=Error
+feathers3.menu.DebugLevel.error.build.code_debug=1
+feathers3.menu.DebugLevel.warn=Warn
+feathers3.menu.DebugLevel.warn.build.code_debug=2
+feathers3.menu.DebugLevel.info=Info
+feathers3.menu.DebugLevel.info.build.code_debug=3
+feathers3.menu.DebugLevel.debug=Debug
+feathers3.menu.DebugLevel.debug.build.code_debug=4
+feathers3.menu.DebugLevel.verbose=Verbose
+feathers3.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 S_ODI_Ultra.name=S.ODI Ultra v1
 
 S_ODI_Ultra.upload.tool=esptool_py
diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h
new file mode 100644
index 00000000000..b0c8d473c5b
--- /dev/null
+++ b/variants/um_feathers3/pins_arduino.h
@@ -0,0 +1,68 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303A
+#define USB_PID 0x80D6
+#define USB_MANUFACTURER "Unexpected Maker"
+#define USB_PRODUCT "FeatherS3"
+#define USB_SERIAL ""
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        21
+#define NUM_ANALOG_INPUTS       13
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS    = 5;
+static const uint8_t MOSI  = 35;
+static const uint8_t MISO  = 37;
+static const uint8_t SDO  = 35;
+static const uint8_t SDI  = 37;
+static const uint8_t SCK   = 36;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+
+static const uint8_t T1 = 1;
+static const uint8_t T3 = 3;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T14 = 14;
+
+static const uint8_t VBAT_SENSE = 2;
+static const uint8_t VBUS_SENSE = 34;
+
+static const uint8_t RGB_DATA = 40;
+static const uint8_t RGB_PWR = 39;
+static const uint8_t LDO2 = 39;
+static const uint8_t LED_BUILTIN = 13;
+static const uint8_t LED = 13;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h
new file mode 100644
index 00000000000..dc8b76768b5
--- /dev/null
+++ b/variants/um_pros3/pins_arduino.h
@@ -0,0 +1,68 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303A
+#define USB_PID 0x80D3
+#define USB_MANUFACTURER "Unexpected Maker"
+#define USB_PRODUCT "ProS3"
+#define USB_SERIAL ""
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        27
+#define NUM_ANALOG_INPUTS       14
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS    = 34;
+static const uint8_t MOSI  = 35;
+static const uint8_t MISO  = 37;
+static const uint8_t SDO  = 35;
+static const uint8_t SDI  = 37;
+static const uint8_t SCK   = 36;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+static const uint8_t VBAT_SENSE = 10;
+static const uint8_t VBUS_SENSE = 33;
+
+static const uint8_t RGB_DATA = 18;
+static const uint8_t RGB_PWR = 17;
+static const uint8_t LDO2 = 17;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h
new file mode 100644
index 00000000000..780482cf5a0
--- /dev/null
+++ b/variants/um_tinys3/pins_arduino.h
@@ -0,0 +1,59 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303A
+#define USB_PID 0x80D0
+#define USB_MANUFACTURER "Unexpected Maker"
+#define USB_PRODUCT "TinyS3"
+#define USB_SERIAL ""
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        17
+#define NUM_ANALOG_INPUTS       9
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS    = 34;
+static const uint8_t MOSI  = 35;
+static const uint8_t MISO  = 37;
+static const uint8_t SDO  = 35;
+static const uint8_t SDI  = 37;
+static const uint8_t SCK   = 36;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+
+static const uint8_t VBAT_SENSE = 10;
+static const uint8_t VBUS_SENSE = 33;
+
+static const uint8_t RGB_DATA = 18;
+static const uint8_t RGB_PWR = 17;
+
+#endif /* Pins_Arduino_h */