diff --git a/boards.txt b/boards.txt
index 9510f804ba77953f81af6c090cedfe4dbee5452e..ebc5d17d4b27a483fc6978570200ed8aa80765ae 100644
--- a/boards.txt
+++ b/boards.txt
@@ -14603,6 +14603,370 @@ wifiduino32.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+wifiduino32c3.name=WiFiduinoV2
+wifiduino32c3.vid.0=0x303a
+wifiduino32c3.pid.0=0x1001
+
+wifiduino32c3.bootloader.tool=esptool_py
+wifiduino32c3.bootloader.tool.default=esptool_py
+
+wifiduino32c3.upload.tool=esptool_py
+wifiduino32c3.upload.tool.default=esptool_py
+wifiduino32c3.upload.tool.network=esp_ota
+
+wifiduino32c3.upload.maximum_size=1310720
+wifiduino32c3.upload.maximum_data_size=327680
+wifiduino32c3.upload.flags=
+wifiduino32c3.upload.extra_flags=
+wifiduino32c3.upload.use_1200bps_touch=false
+wifiduino32c3.upload.wait_for_upload_port=false
+
+wifiduino32c3.serial.disableDTR=false
+wifiduino32c3.serial.disableRTS=false
+
+wifiduino32c3.build.tarch=riscv32
+wifiduino32c3.build.target=esp
+wifiduino32c3.build.mcu=esp32c3
+wifiduino32c3.build.core=esp32
+wifiduino32c3.build.variant=wifiduinov2
+wifiduino32c3.build.board=WiFiduinoV2
+wifiduino32c3.build.bootloader_addr=0x0
+
+wifiduino32c3.build.cdc_on_boot=0
+wifiduino32c3.build.f_cpu=160000000L
+wifiduino32c3.build.flash_size=4MB
+wifiduino32c3.build.flash_freq=80m
+wifiduino32c3.build.flash_mode=qio
+wifiduino32c3.build.boot=qio
+wifiduino32c3.build.partitions=default
+wifiduino32c3.build.defines=
+
+wifiduino32c3.menu.CDCOnBoot.default=Disabled
+wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+wifiduino32c3.menu.CDCOnBoot.cdc=Enabled
+wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+wifiduino32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.default.build.partitions=default
+wifiduino32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+wifiduino32c3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+wifiduino32c3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+wifiduino32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+wifiduino32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.minimal.build.partitions=minimal
+wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+wifiduino32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+wifiduino32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+wifiduino32c3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+wifiduino32c3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+wifiduino32c3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+wifiduino32c3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+wifiduino32c3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+wifiduino32c3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+wifiduino32c3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+wifiduino32c3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+wifiduino32c3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+wifiduino32c3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+wifiduino32c3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+wifiduino32c3.menu.PartitionScheme.fatflash.build.partitions=ffat
+wifiduino32c3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+wifiduino32c3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+wifiduino32c3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+wifiduino32c3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+wifiduino32c3.menu.PartitionScheme.rainmaker=RainMaker
+wifiduino32c3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+wifiduino32c3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+wifiduino32c3.menu.CPUFreq.160=160MHz (WiFi)
+wifiduino32c3.menu.CPUFreq.160.build.f_cpu=160000000L
+wifiduino32c3.menu.CPUFreq.80=80MHz (WiFi)
+wifiduino32c3.menu.CPUFreq.80.build.f_cpu=80000000L
+wifiduino32c3.menu.CPUFreq.40=40MHz
+wifiduino32c3.menu.CPUFreq.40.build.f_cpu=40000000L
+wifiduino32c3.menu.CPUFreq.20=20MHz
+wifiduino32c3.menu.CPUFreq.20.build.f_cpu=20000000L
+wifiduino32c3.menu.CPUFreq.10=10MHz
+wifiduino32c3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+wifiduino32c3.menu.FlashMode.qio=QIO
+wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
+wifiduino32c3.menu.FlashMode.qio.build.boot=qio
+wifiduino32c3.menu.FlashMode.dio=DIO
+wifiduino32c3.menu.FlashMode.dio.build.flash_mode=dio
+wifiduino32c3.menu.FlashMode.dio.build.boot=dio
+wifiduino32c3.menu.FlashMode.qout=QOUT
+wifiduino32c3.menu.FlashMode.qout.build.flash_mode=dout
+wifiduino32c3.menu.FlashMode.qout.build.boot=qout
+wifiduino32c3.menu.FlashMode.dout=DOUT
+wifiduino32c3.menu.FlashMode.dout.build.flash_mode=dout
+wifiduino32c3.menu.FlashMode.dout.build.boot=dout
+
+wifiduino32c3.menu.FlashFreq.80=80MHz
+wifiduino32c3.menu.FlashFreq.80.build.flash_freq=80m
+wifiduino32c3.menu.FlashFreq.40=40MHz
+wifiduino32c3.menu.FlashFreq.40.build.flash_freq=40m
+
+wifiduino32c3.menu.FlashSize.4M=4MB (32Mb)
+wifiduino32c3.menu.FlashSize.4M.build.flash_size=4MB
+wifiduino32c3.menu.FlashSize.8M=8MB (64Mb)
+wifiduino32c3.menu.FlashSize.8M.build.flash_size=8MB
+wifiduino32c3.menu.FlashSize.8M.build.partitions=default_8MB
+wifiduino32c3.menu.FlashSize.2M=2MB (16Mb)
+wifiduino32c3.menu.FlashSize.2M.build.flash_size=2MB
+wifiduino32c3.menu.FlashSize.2M.build.partitions=minimal
+wifiduino32c3.menu.FlashSize.16M=16MB (128Mb)
+wifiduino32c3.menu.FlashSize.16M.build.flash_size=16MB
+
+wifiduino32c3.menu.UploadSpeed.921600=921600
+wifiduino32c3.menu.UploadSpeed.921600.upload.speed=921600
+wifiduino32c3.menu.UploadSpeed.115200=115200
+wifiduino32c3.menu.UploadSpeed.115200.upload.speed=115200
+wifiduino32c3.menu.UploadSpeed.256000.windows=256000
+wifiduino32c3.menu.UploadSpeed.256000.upload.speed=256000
+wifiduino32c3.menu.UploadSpeed.230400.windows.upload.speed=256000
+wifiduino32c3.menu.UploadSpeed.230400=230400
+wifiduino32c3.menu.UploadSpeed.230400.upload.speed=230400
+wifiduino32c3.menu.UploadSpeed.460800.linux=460800
+wifiduino32c3.menu.UploadSpeed.460800.macosx=460800
+wifiduino32c3.menu.UploadSpeed.460800.upload.speed=460800
+wifiduino32c3.menu.UploadSpeed.512000.windows=512000
+wifiduino32c3.menu.UploadSpeed.512000.upload.speed=512000
+
+wifiduino32c3.menu.DebugLevel.none=None
+wifiduino32c3.menu.DebugLevel.none.build.code_debug=0
+wifiduino32c3.menu.DebugLevel.error=Error
+wifiduino32c3.menu.DebugLevel.error.build.code_debug=1
+wifiduino32c3.menu.DebugLevel.warn=Warn
+wifiduino32c3.menu.DebugLevel.warn.build.code_debug=2
+wifiduino32c3.menu.DebugLevel.info=Info
+wifiduino32c3.menu.DebugLevel.info.build.code_debug=3
+wifiduino32c3.menu.DebugLevel.debug=Debug
+wifiduino32c3.menu.DebugLevel.debug.build.code_debug=4
+wifiduino32c3.menu.DebugLevel.verbose=Verbose
+wifiduino32c3.menu.DebugLevel.verbose.build.code_debug=5
+
+wifiduino32c3.menu.EraseFlash.none=Disabled
+wifiduino32c3.menu.EraseFlash.none.upload.erase_cmd=
+wifiduino32c3.menu.EraseFlash.all=Enabled
+wifiduino32c3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
+wifiduino32s3.name=WiFiduino32S3
+wifiduino32s3.vid.0=0x303a
+wifiduino32s3.pid.0=0x1001
+
+wifiduino32s3.bootloader.tool=esptool_py
+wifiduino32s3.bootloader.tool.default=esptool_py
+
+wifiduino32s3.upload.tool=esptool_py
+wifiduino32s3.upload.tool.default=esptool_py
+wifiduino32s3.upload.tool.network=esp_ota
+
+wifiduino32s3.upload.maximum_size=1310720
+wifiduino32s3.upload.maximum_data_size=327680
+wifiduino32s3.upload.flags=
+wifiduino32s3.upload.extra_flags=
+wifiduino32s3.upload.use_1200bps_touch=false
+wifiduino32s3.upload.wait_for_upload_port=false
+
+wifiduino32s3.serial.disableDTR=false
+wifiduino32s3.serial.disableRTS=false
+
+wifiduino32s3.build.tarch=xtensa
+wifiduino32s3.build.bootloader_addr=0x0
+wifiduino32s3.build.target=esp32s3
+wifiduino32s3.build.mcu=esp32s3
+wifiduino32s3.build.core=esp32
+wifiduino32s3.build.variant=wifiduino32s3
+wifiduino32s3.build.board=WiFiduino32S3
+
+wifiduino32s3.build.usb_mode=1
+wifiduino32s3.build.cdc_on_boot=0
+wifiduino32s3.build.msc_on_boot=0
+wifiduino32s3.build.dfu_on_boot=0
+wifiduino32s3.build.f_cpu=240000000L
+wifiduino32s3.build.flash_size=4MB
+wifiduino32s3.build.flash_freq=80m
+wifiduino32s3.build.flash_mode=dio
+wifiduino32s3.build.boot=qio
+wifiduino32s3.build.boot_freq=80m
+wifiduino32s3.build.partitions=default
+wifiduino32s3.build.defines=
+wifiduino32s3.build.loop_core=
+wifiduino32s3.build.event_core=
+wifiduino32s3.build.psram_type=qspi
+wifiduino32s3.build.memory_type={build.boot}_{build.psram_type}
+
+wifiduino32s3.menu.PSRAM.disabled=Disabled
+wifiduino32s3.menu.PSRAM.disabled.build.defines=
+wifiduino32s3.menu.PSRAM.disabled.build.psram_type=qspi
+wifiduino32s3.menu.PSRAM.enabled=QSPI PSRAM
+wifiduino32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+wifiduino32s3.menu.PSRAM.enabled.build.psram_type=qspi
+wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
+wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
+
+wifiduino32s3.menu.FlashMode.qio=QIO 80MHz
+wifiduino32s3.menu.FlashMode.qio.build.flash_mode=dio
+wifiduino32s3.menu.FlashMode.qio.build.boot=qio
+wifiduino32s3.menu.FlashMode.qio.build.boot_freq=80m
+wifiduino32s3.menu.FlashMode.qio.build.flash_freq=80m
+wifiduino32s3.menu.FlashMode.qio120=QIO 120MHz
+wifiduino32s3.menu.FlashMode.qio120.build.flash_mode=dio
+wifiduino32s3.menu.FlashMode.qio120.build.boot=qio
+wifiduino32s3.menu.FlashMode.qio120.build.boot_freq=120m
+wifiduino32s3.menu.FlashMode.qio120.build.flash_freq=80m
+wifiduino32s3.menu.FlashMode.dio=DIO 80MHz
+wifiduino32s3.menu.FlashMode.dio.build.flash_mode=dio
+wifiduino32s3.menu.FlashMode.dio.build.boot=dio
+wifiduino32s3.menu.FlashMode.dio.build.boot_freq=80m
+wifiduino32s3.menu.FlashMode.dio.build.flash_freq=80m
+wifiduino32s3.menu.FlashMode.opi=OPI 80MHz
+wifiduino32s3.menu.FlashMode.opi.build.flash_mode=dout
+wifiduino32s3.menu.FlashMode.opi.build.boot=opi
+wifiduino32s3.menu.FlashMode.opi.build.boot_freq=80m
+wifiduino32s3.menu.FlashMode.opi.build.flash_freq=80m
+
+wifiduino32s3.menu.FlashSize.4M=4MB (32Mb)
+wifiduino32s3.menu.FlashSize.4M.build.flash_size=4MB
+wifiduino32s3.menu.FlashSize.8M=8MB (64Mb)
+wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB
+wifiduino32s3.menu.FlashSize.8M.build.partitions=default_8MB
+wifiduino32s3.menu.FlashSize.16M=16MB (128Mb)
+wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB
+#wifiduino32s3.menu.FlashSize.32M=32MB (256Mb)
+#wifiduino32s3.menu.FlashSize.32M.build.flash_size=32MB
+
+wifiduino32s3.menu.LoopCore.1=Core 1
+wifiduino32s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+wifiduino32s3.menu.LoopCore.0=Core 0
+wifiduino32s3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+wifiduino32s3.menu.EventsCore.1=Core 1
+wifiduino32s3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+wifiduino32s3.menu.EventsCore.0=Core 0
+wifiduino32s3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+wifiduino32s3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+wifiduino32s3.menu.USBMode.hwcdc.build.usb_mode=1
+wifiduino32s3.menu.USBMode.default=USB-OTG (TinyUSB)
+wifiduino32s3.menu.USBMode.default.build.usb_mode=0
+
+wifiduino32s3.menu.CDCOnBoot.default=Disabled
+wifiduino32s3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+wifiduino32s3.menu.CDCOnBoot.cdc=Enabled
+wifiduino32s3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+wifiduino32s3.menu.MSCOnBoot.default=Disabled
+wifiduino32s3.menu.MSCOnBoot.default.build.msc_on_boot=0
+wifiduino32s3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+wifiduino32s3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+wifiduino32s3.menu.DFUOnBoot.default=Disabled
+wifiduino32s3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+wifiduino32s3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+wifiduino32s3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+wifiduino32s3.menu.UploadMode.default=UART0 / Hardware CDC
+wifiduino32s3.menu.UploadMode.default.upload.use_1200bps_touch=false
+wifiduino32s3.menu.UploadMode.default.upload.wait_for_upload_port=false
+wifiduino32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+wifiduino32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+wifiduino32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+wifiduino32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.default.build.partitions=default
+wifiduino32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+wifiduino32s3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+wifiduino32s3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+wifiduino32s3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+wifiduino32s3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.minimal.build.partitions=minimal
+wifiduino32s3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+wifiduino32s3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+wifiduino32s3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+wifiduino32s3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+wifiduino32s3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+wifiduino32s3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+wifiduino32s3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+wifiduino32s3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+wifiduino32s3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+wifiduino32s3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+wifiduino32s3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+wifiduino32s3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+wifiduino32s3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+wifiduino32s3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+wifiduino32s3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+wifiduino32s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+wifiduino32s3.menu.PartitionScheme.fatflash.build.partitions=ffat
+wifiduino32s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+wifiduino32s3.menu.PartitionScheme.rainmaker=RainMaker
+wifiduino32s3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+wifiduino32s3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+wifiduino32s3.menu.CPUFreq.240=240MHz (WiFi)
+wifiduino32s3.menu.CPUFreq.240.build.f_cpu=240000000L
+wifiduino32s3.menu.CPUFreq.160=160MHz (WiFi)
+wifiduino32s3.menu.CPUFreq.160.build.f_cpu=160000000L
+wifiduino32s3.menu.CPUFreq.80=80MHz (WiFi)
+wifiduino32s3.menu.CPUFreq.80.build.f_cpu=80000000L
+wifiduino32s3.menu.CPUFreq.40=40MHz
+wifiduino32s3.menu.CPUFreq.40.build.f_cpu=40000000L
+wifiduino32s3.menu.CPUFreq.20=20MHz
+wifiduino32s3.menu.CPUFreq.20.build.f_cpu=20000000L
+wifiduino32s3.menu.CPUFreq.10=10MHz
+wifiduino32s3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+wifiduino32s3.menu.UploadSpeed.921600=921600
+wifiduino32s3.menu.UploadSpeed.921600.upload.speed=921600
+wifiduino32s3.menu.UploadSpeed.115200=115200
+wifiduino32s3.menu.UploadSpeed.115200.upload.speed=115200
+wifiduino32s3.menu.UploadSpeed.256000.windows=256000
+wifiduino32s3.menu.UploadSpeed.256000.upload.speed=256000
+wifiduino32s3.menu.UploadSpeed.230400.windows.upload.speed=256000
+wifiduino32s3.menu.UploadSpeed.230400=230400
+wifiduino32s3.menu.UploadSpeed.230400.upload.speed=230400
+wifiduino32s3.menu.UploadSpeed.460800.linux=460800
+wifiduino32s3.menu.UploadSpeed.460800.macosx=460800
+wifiduino32s3.menu.UploadSpeed.460800.upload.speed=460800
+wifiduino32s3.menu.UploadSpeed.512000.windows=512000
+wifiduino32s3.menu.UploadSpeed.512000.upload.speed=512000
+
+wifiduino32s3.menu.DebugLevel.none=None
+wifiduino32s3.menu.DebugLevel.none.build.code_debug=0
+wifiduino32s3.menu.DebugLevel.error=Error
+wifiduino32s3.menu.DebugLevel.error.build.code_debug=1
+wifiduino32s3.menu.DebugLevel.warn=Warn
+wifiduino32s3.menu.DebugLevel.warn.build.code_debug=2
+wifiduino32s3.menu.DebugLevel.info=Info
+wifiduino32s3.menu.DebugLevel.info.build.code_debug=3
+wifiduino32s3.menu.DebugLevel.debug=Debug
+wifiduino32s3.menu.DebugLevel.debug.build.code_debug=4
+wifiduino32s3.menu.DebugLevel.verbose=Verbose
+wifiduino32s3.menu.DebugLevel.verbose.build.code_debug=5
+
+wifiduino32s3.menu.EraseFlash.none=Disabled
+wifiduino32s3.menu.EraseFlash.none.upload.erase_cmd=
+wifiduino32s3.menu.EraseFlash.all=Enabled
+wifiduino32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 imbrios-logsens-v1p1.name=IMBRIOS LOGSENS_V1P1
 
 imbrios-logsens-v1p1.bootloader.tool=esptool_py
diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h
new file mode 100644
index 0000000000000000000000000000000000000000..9115256472b2e8a01f5500f56f0c358a76b947c4
--- /dev/null
+++ b/variants/wifiduino32s3/pins_arduino.h
@@ -0,0 +1,60 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       20
+
+// Some boards have too low voltage on this pin (board design bug)
+// Use different pin with 3V and connect with 48
+// and change this setup for the chosen pin (for example 38)
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define BOARD_HAS_NEOPIXEL
+#define LED_BRIGHTNESS 64
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 45;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS    = 46;
+static const uint8_t MOSI  = 3;
+static const uint8_t MISO  = 20;
+static const uint8_t SCK   = 19;
+
+static const uint8_t A0 = 7;
+static const uint8_t A1 = 6;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 1;
+static const uint8_t A4 = 4;
+static const uint8_t A5 = 5;
+
+static const uint8_t D0 = 44;
+static const uint8_t D1 = 45;
+static const uint8_t D2 = 42;
+static const uint8_t D3 = 41;
+static const uint8_t D4 = 0;
+static const uint8_t D5 = 45;
+static const uint8_t D6 = 48;
+static const uint8_t D7 = 47;
+static const uint8_t D8 = 21;
+static const uint8_t D9 = 14;
+static const uint8_t D10 = 46;
+static const uint8_t D11 = 3;
+static const uint8_t D12 = 20;
+static const uint8_t D13 = 19;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/wifiduinov2/pins_arduino.h b/variants/wifiduinov2/pins_arduino.h
new file mode 100644
index 0000000000000000000000000000000000000000..4eb83a7c3ae02a2a21b439a5f5c6611448d4aecc
--- /dev/null
+++ b/variants/wifiduinov2/pins_arduino.h
@@ -0,0 +1,54 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define EXTERNAL_NUM_INTERRUPTS 22
+#define NUM_DIGITAL_PINS        22
+#define NUM_ANALOG_INPUTS       6
+
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define BOARD_HAS_NEOPIXEL
+#define LED_BRIGHTNESS 64
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
+
+static const uint8_t TX = 21;
+static const uint8_t RX = 20;
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS    = 7;
+static const uint8_t MOSI  = 3;
+static const uint8_t MISO  = 10;
+static const uint8_t SCK   = 2;
+
+static const uint8_t A0 = 0;
+static const uint8_t A1 = 1;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 3;
+static const uint8_t A4 = 4;
+static const uint8_t A5 = 5;
+
+static const uint8_t D0 = 20;
+static const uint8_t D1 = 21;
+static const uint8_t D2 = 9;
+static const uint8_t D3 = 13;
+static const uint8_t D4 = 12;
+static const uint8_t D5 = 11;
+static const uint8_t D6 = 6;
+static const uint8_t D7 = 18;
+static const uint8_t D8 = 19;
+static const uint8_t D9 = 8;
+static const uint8_t D10 = 7;
+static const uint8_t D11 = 3;
+static const uint8_t D12 = 10;
+static const uint8_t D13 = 2;
+
+#endif /* Pins_Arduino_h */