Skip to content

Commit dc78883

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
committed
Merge branch 'feature/mac-adress-refactor' of https://github.com/P-R-O-C-H-Y/arduino-esp32 into feature/mac-adress-refactor
2 parents b3fec39 + fc4a0a3 commit dc78883

File tree

16 files changed

+422
-14
lines changed

16 files changed

+422
-14
lines changed

‎boards.txt

Lines changed: 289 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14249,20 +14249,20 @@ nodemcu-32s.menu.FlashFreq.80.build.flash_freq=80m
1424914249
nodemcu-32s.menu.FlashFreq.40=40MHz
1425014250
nodemcu-32s.menu.FlashFreq.40.build.flash_freq=40m
1425114251

14252-
nodemcu-32s.menu.UploadSpeed.921600=921600
14253-
nodemcu-32s.menu.UploadSpeed.921600.upload.speed=921600
14252+
nodemcu-32s.menu.UploadSpeed.460800.linux=460800
14253+
nodemcu-32s.menu.UploadSpeed.460800.macosx=460800
14254+
nodemcu-32s.menu.UploadSpeed.460800.upload.speed=460800
1425414255
nodemcu-32s.menu.UploadSpeed.115200=115200
1425514256
nodemcu-32s.menu.UploadSpeed.115200.upload.speed=115200
1425614257
nodemcu-32s.menu.UploadSpeed.256000.windows=256000
1425714258
nodemcu-32s.menu.UploadSpeed.256000.upload.speed=256000
1425814259
nodemcu-32s.menu.UploadSpeed.230400.windows.upload.speed=256000
1425914260
nodemcu-32s.menu.UploadSpeed.230400=230400
1426014261
nodemcu-32s.menu.UploadSpeed.230400.upload.speed=230400
14261-
nodemcu-32s.menu.UploadSpeed.460800.linux=460800
14262-
nodemcu-32s.menu.UploadSpeed.460800.macosx=460800
14263-
nodemcu-32s.menu.UploadSpeed.460800.upload.speed=460800
1426414262
nodemcu-32s.menu.UploadSpeed.512000.windows=512000
1426514263
nodemcu-32s.menu.UploadSpeed.512000.upload.speed=512000
14264+
nodemcu-32s.menu.UploadSpeed.921600=921600
14265+
nodemcu-32s.menu.UploadSpeed.921600.upload.speed=921600
1426614266

1426714267
nodemcu-32s.menu.DebugLevel.none=None
1426814268
nodemcu-32s.menu.DebugLevel.none.build.code_debug=0
@@ -22771,6 +22771,158 @@ wt32-eth01.menu.EraseFlash.all.upload.erase_cmd=-e
2277122771

2277222772
##############################################################
2277322773

22774+
wt32-sc01-plus.name=WT32-SC01 PLUS
22775+
wt32-sc01-plus.vid.0=0x303a
22776+
wt32-sc01-plus.pid.0=0x80D0
22777+
22778+
wt32-sc01-plus.bootloader.tool=esptool_py
22779+
wt32-sc01-plus.bootloader.tool.default=esptool_py
22780+
22781+
wt32-sc01-plus.upload.tool=esptool_py
22782+
wt32-sc01-plus.upload.tool.default=esptool_py
22783+
wt32-sc01-plus.upload.tool.network=esp_ota
22784+
22785+
wt32-sc01-plus.upload.maximum_size=1310720
22786+
wt32-sc01-plus.upload.maximum_data_size=327680
22787+
wt32-sc01-plus.upload.flags=
22788+
wt32-sc01-plus.upload.extra_flags=
22789+
wt32-sc01-plus.upload.use_1200bps_touch=false
22790+
wt32-sc01-plus.upload.wait_for_upload_port=false
22791+
22792+
wt32-sc01-plus.serial.disableDTR=false
22793+
wt32-sc01-plus.serial.disableRTS=false
22794+
22795+
wt32-sc01-plus.build.tarch=xtensa
22796+
wt32-sc01-plus.build.bootloader_addr=0x0
22797+
wt32-sc01-plus.build.target=esp32s3
22798+
wt32-sc01-plus.build.mcu=esp32s3
22799+
wt32-sc01-plus.build.core=esp32
22800+
wt32-sc01-plus.build.variant=wt32-sc01-plus
22801+
wt32-sc01-plus.build.board=WT32_SC01_PLUS
22802+
22803+
wt32-sc01-plus.build.usb_mode=1
22804+
wt32-sc01-plus.build.cdc_on_boot=1
22805+
wt32-sc01-plus.build.msc_on_boot=0
22806+
wt32-sc01-plus.build.dfu_on_boot=0
22807+
wt32-sc01-plus.build.f_cpu=240000000L
22808+
wt32-sc01-plus.build.flash_size=16MB
22809+
wt32-sc01-plus.build.flash_freq=80m
22810+
wt32-sc01-plus.build.flash_mode=dio
22811+
wt32-sc01-plus.build.boot=qio
22812+
wt32-sc01-plus.build.partitions=default
22813+
wt32-sc01-plus.build.defines=
22814+
wt32-sc01-plus.build.loop_core=
22815+
wt32-sc01-plus.build.event_core=
22816+
wt32-sc01-plus.build.flash_type=qio
22817+
wt32-sc01-plus.build.psram_type=qspi
22818+
wt32-sc01-plus.build.memory_type=qio_qspi
22819+
22820+
wt32-sc01-plus.menu.LoopCore.1=Core 1
22821+
wt32-sc01-plus.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
22822+
wt32-sc01-plus.menu.LoopCore.0=Core 0
22823+
wt32-sc01-plus.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
22824+
22825+
wt32-sc01-plus.menu.EventsCore.1=Core 1
22826+
wt32-sc01-plus.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
22827+
wt32-sc01-plus.menu.EventsCore.0=Core 0
22828+
wt32-sc01-plus.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
22829+
22830+
wt32-sc01-plus.menu.USBMode.hwcdc=Hardware CDC and JTAG
22831+
wt32-sc01-plus.menu.USBMode.hwcdc.build.usb_mode=1
22832+
wt32-sc01-plus.menu.USBMode.default=USB-OTG (TinyUSB)
22833+
wt32-sc01-plus.menu.USBMode.default.build.usb_mode=0
22834+
22835+
wt32-sc01-plus.menu.CDCOnBoot.cdc=Enabled
22836+
wt32-sc01-plus.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
22837+
wt32-sc01-plus.menu.CDCOnBoot.default=Disabled
22838+
wt32-sc01-plus.menu.CDCOnBoot.default.build.cdc_on_boot=0
22839+
22840+
wt32-sc01-plus.menu.MSCOnBoot.default=Disabled
22841+
wt32-sc01-plus.menu.MSCOnBoot.default.build.msc_on_boot=0
22842+
wt32-sc01-plus.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
22843+
wt32-sc01-plus.menu.MSCOnBoot.msc.build.msc_on_boot=1
22844+
22845+
wt32-sc01-plus.menu.DFUOnBoot.default=Disabled
22846+
wt32-sc01-plus.menu.DFUOnBoot.default.build.dfu_on_boot=0
22847+
wt32-sc01-plus.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
22848+
wt32-sc01-plus.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
22849+
22850+
wt32-sc01-plus.menu.UploadMode.cdc.upload.wait_for_upload_port=true
22851+
wt32-sc01-plus.menu.UploadMode.default=UART0 / Hardware CDC
22852+
wt32-sc01-plus.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
22853+
wt32-sc01-plus.menu.UploadMode.cdc.upload.use_1200bps_touch=true
22854+
wt32-sc01-plus.menu.UploadMode.default.upload.use_1200bps_touch=false
22855+
wt32-sc01-plus.menu.UploadMode.default.upload.wait_for_upload_port=false
22856+
22857+
wt32-sc01-plus.menu.PSRAM.enabled=Enabled
22858+
wt32-sc01-plus.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
22859+
wt32-sc01-plus.menu.PSRAM.disabled=Disabled
22860+
wt32-sc01-plus.menu.PSRAM.disabled.build.defines=
22861+
22862+
wt32-sc01-plus.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
22863+
wt32-sc01-plus.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
22864+
wt32-sc01-plus.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
22865+
wt32-sc01-plus.menu.PartitionScheme.tinyuf2=TinyUF2 Compatibility (2MB APP/3.7MB FFAT)
22866+
wt32-sc01-plus.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader_tinyuf2
22867+
wt32-sc01-plus.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions_tinyuf2
22868+
wt32-sc01-plus.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
22869+
wt32-sc01-plus.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
22870+
22871+
wt32-sc01-plus.menu.CPUFreq.240=240MHz (WiFi)
22872+
wt32-sc01-plus.menu.CPUFreq.240.build.f_cpu=240000000L
22873+
wt32-sc01-plus.menu.CPUFreq.160=160MHz (WiFi)
22874+
wt32-sc01-plus.menu.CPUFreq.160.build.f_cpu=160000000L
22875+
wt32-sc01-plus.menu.CPUFreq.80=80MHz (WiFi)
22876+
wt32-sc01-plus.menu.CPUFreq.80.build.f_cpu=80000000L
22877+
wt32-sc01-plus.menu.CPUFreq.40=40MHz
22878+
wt32-sc01-plus.menu.CPUFreq.40.build.f_cpu=40000000L
22879+
wt32-sc01-plus.menu.CPUFreq.20=20MHz
22880+
wt32-sc01-plus.menu.CPUFreq.20.build.f_cpu=20000000L
22881+
wt32-sc01-plus.menu.CPUFreq.10=10MHz
22882+
wt32-sc01-plus.menu.CPUFreq.10.build.f_cpu=10000000L
22883+
22884+
wt32-sc01-plus.menu.FlashMode.qio=QIO
22885+
wt32-sc01-plus.menu.FlashMode.qio.build.flash_mode=dio
22886+
wt32-sc01-plus.menu.FlashMode.qio.build.boot=qio
22887+
wt32-sc01-plus.menu.FlashMode.dio=DIO
22888+
wt32-sc01-plus.menu.FlashMode.dio.build.flash_mode=dio
22889+
wt32-sc01-plus.menu.FlashMode.dio.build.boot=dio
22890+
22891+
wt32-sc01-plus.menu.UploadSpeed.921600=921600
22892+
wt32-sc01-plus.menu.UploadSpeed.921600.upload.speed=921600
22893+
wt32-sc01-plus.menu.UploadSpeed.115200=115200
22894+
wt32-sc01-plus.menu.UploadSpeed.115200.upload.speed=115200
22895+
wt32-sc01-plus.menu.UploadSpeed.256000.windows=256000
22896+
wt32-sc01-plus.menu.UploadSpeed.256000.upload.speed=256000
22897+
wt32-sc01-plus.menu.UploadSpeed.230400.windows.upload.speed=256000
22898+
wt32-sc01-plus.menu.UploadSpeed.230400=230400
22899+
wt32-sc01-plus.menu.UploadSpeed.230400.upload.speed=230400
22900+
wt32-sc01-plus.menu.UploadSpeed.460800.linux=460800
22901+
wt32-sc01-plus.menu.UploadSpeed.460800.macosx=460800
22902+
wt32-sc01-plus.menu.UploadSpeed.460800.upload.speed=460800
22903+
wt32-sc01-plus.menu.UploadSpeed.512000.windows=512000
22904+
wt32-sc01-plus.menu.UploadSpeed.512000.upload.speed=512000
22905+
22906+
wt32-sc01-plus.menu.DebugLevel.none=None
22907+
wt32-sc01-plus.menu.DebugLevel.none.build.code_debug=0
22908+
wt32-sc01-plus.menu.DebugLevel.error=Error
22909+
wt32-sc01-plus.menu.DebugLevel.error.build.code_debug=1
22910+
wt32-sc01-plus.menu.DebugLevel.warn=Warn
22911+
wt32-sc01-plus.menu.DebugLevel.warn.build.code_debug=2
22912+
wt32-sc01-plus.menu.DebugLevel.info=Info
22913+
wt32-sc01-plus.menu.DebugLevel.info.build.code_debug=3
22914+
wt32-sc01-plus.menu.DebugLevel.debug=Debug
22915+
wt32-sc01-plus.menu.DebugLevel.debug.build.code_debug=4
22916+
wt32-sc01-plus.menu.DebugLevel.verbose=Verbose
22917+
wt32-sc01-plus.menu.DebugLevel.verbose.build.code_debug=5
22918+
22919+
wt32-sc01-plus.menu.EraseFlash.none=Disabled
22920+
wt32-sc01-plus.menu.EraseFlash.none.upload.erase_cmd=
22921+
wt32-sc01-plus.menu.EraseFlash.all=Enabled
22922+
wt32-sc01-plus.menu.EraseFlash.all.upload.erase_cmd=-e
22923+
22924+
##############################################################
22925+
2277422926
bpi-bit.name=BPI-BIT
2277522927

2277622928
bpi-bit.bootloader.tool=esptool_py
@@ -34360,3 +34512,135 @@ epulse_feather.menu.EraseFlash.all=Enabled
3436034512
epulse_feather.menu.EraseFlash.all.upload.erase_cmd=-e
3436134513

3436234514
##############################################################
34515+
34516+
Geekble_ESP32C3.name=Geekble ESP32-C3
34517+
Geekble_ESP32C3.vid.0=0x303A
34518+
Geekble_ESP32C3.pid.0=0x1001
34519+
34520+
Geekble_ESP32C3.bootloader.tool=esptool_py
34521+
Geekble_ESP32C3.bootloader.tool.default=esptool_py
34522+
34523+
Geekble_ESP32C3.upload.tool=esptool_py
34524+
Geekble_ESP32C3.upload.tool.default=esptool_py
34525+
Geekble_ESP32C3.upload.tool.network=esp_ota
34526+
34527+
Geekble_ESP32C3.upload.maximum_size=1310720
34528+
Geekble_ESP32C3.upload.maximum_data_size=327680
34529+
Geekble_ESP32C3.upload.flags=
34530+
Geekble_ESP32C3.upload.extra_flags=
34531+
Geekble_ESP32C3.upload.use_1200bps_touch=false
34532+
Geekble_ESP32C3.upload.wait_for_upload_port=false
34533+
34534+
Geekble_ESP32C3.serial.disableDTR=true
34535+
Geekble_ESP32C3.serial.disableRTS=true
34536+
34537+
Geekble_ESP32C3.build.tarch=riscv32
34538+
Geekble_ESP32C3.build.target=esp
34539+
Geekble_ESP32C3.build.mcu=esp32c3
34540+
Geekble_ESP32C3.build.core=esp32
34541+
Geekble_ESP32C3.build.variant=Geekble_ESP32C3
34542+
Geekble_ESP32C3.build.board=GEEKBLE_ESP32C3
34543+
Geekble_ESP32C3.build.bootloader_addr=0x0
34544+
34545+
Geekble_ESP32C3.build.cdc_on_boot=1
34546+
Geekble_ESP32C3.build.f_cpu=160000000L
34547+
Geekble_ESP32C3.build.flash_size=4MB
34548+
Geekble_ESP32C3.build.flash_freq=80m
34549+
Geekble_ESP32C3.build.flash_mode=dio
34550+
Geekble_ESP32C3.build.boot=qio
34551+
Geekble_ESP32C3.build.partitions=default
34552+
Geekble_ESP32C3.build.defines=
34553+
34554+
Geekble_ESP32C3.menu.CDCOnBoot.default=Enabled
34555+
Geekble_ESP32C3.menu.CDCOnBoot.default.build.cdc_on_boot=1
34556+
Geekble_ESP32C3.menu.CDCOnBoot.cdc=Disabled
34557+
Geekble_ESP32C3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
34558+
34559+
Geekble_ESP32C3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
34560+
Geekble_ESP32C3.menu.PartitionScheme.default.build.partitions=default
34561+
Geekble_ESP32C3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
34562+
Geekble_ESP32C3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
34563+
Geekble_ESP32C3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
34564+
Geekble_ESP32C3.menu.PartitionScheme.no_ota.build.partitions=no_ota
34565+
Geekble_ESP32C3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
34566+
Geekble_ESP32C3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
34567+
Geekble_ESP32C3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
34568+
Geekble_ESP32C3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
34569+
Geekble_ESP32C3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
34570+
Geekble_ESP32C3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
34571+
Geekble_ESP32C3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
34572+
Geekble_ESP32C3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
34573+
Geekble_ESP32C3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
34574+
Geekble_ESP32C3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
34575+
Geekble_ESP32C3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
34576+
Geekble_ESP32C3.menu.PartitionScheme.huge_app.build.partitions=huge_app
34577+
Geekble_ESP32C3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
34578+
34579+
Geekble_ESP32C3.menu.CPUFreq.160=160MHz (WiFi) (Default)
34580+
Geekble_ESP32C3.menu.CPUFreq.160.build.f_cpu=160000000L
34581+
Geekble_ESP32C3.menu.CPUFreq.80=80MHz (WiFi)
34582+
Geekble_ESP32C3.menu.CPUFreq.80.build.f_cpu=80000000L
34583+
Geekble_ESP32C3.menu.CPUFreq.40=40MHz
34584+
Geekble_ESP32C3.menu.CPUFreq.40.build.f_cpu=40000000L
34585+
Geekble_ESP32C3.menu.CPUFreq.20=20MHz
34586+
Geekble_ESP32C3.menu.CPUFreq.20.build.f_cpu=20000000L
34587+
Geekble_ESP32C3.menu.CPUFreq.10=10MHz
34588+
Geekble_ESP32C3.menu.CPUFreq.10.build.f_cpu=10000000L
34589+
34590+
Geekble_ESP32C3.menu.FlashMode.qio=QIO (Default)
34591+
Geekble_ESP32C3.menu.FlashMode.qio.build.flash_mode=dio
34592+
Geekble_ESP32C3.menu.FlashMode.qio.build.boot=qio
34593+
Geekble_ESP32C3.menu.FlashMode.dio=DIO
34594+
Geekble_ESP32C3.menu.FlashMode.dio.build.flash_mode=dio
34595+
Geekble_ESP32C3.menu.FlashMode.dio.build.boot=dio
34596+
Geekble_ESP32C3.menu.FlashMode.qout=QOUT
34597+
Geekble_ESP32C3.menu.FlashMode.qout.build.flash_mode=dout
34598+
Geekble_ESP32C3.menu.FlashMode.qout.build.boot=qout
34599+
Geekble_ESP32C3.menu.FlashMode.dout=DOUT
34600+
Geekble_ESP32C3.menu.FlashMode.dout.build.flash_mode=dout
34601+
34602+
Geekble_ESP32C3.menu.FlashFreq.80=80MHz (Default)
34603+
Geekble_ESP32C3.menu.FlashFreq.80.build.flash_freq=80m
34604+
Geekble_ESP32C3.menu.FlashFreq.40=40MHz
34605+
Geekble_ESP32C3.menu.FlashFreq.40.build.flash_freq=40m
34606+
34607+
Geekble_ESP32C3.menu.FlashSize.4M=4MB (Default)
34608+
Geekble_ESP32C3.menu.FlashSize.4M.build.flash_size=4MB
34609+
Geekble_ESP32C3.menu.FlashSize.2M=2MB
34610+
Geekble_ESP32C3.menu.FlashSize.2M.build.flash_size=2MB
34611+
Geekble_ESP32C3.menu.FlashSize.2M.build.partitions=minimal
34612+
34613+
Geekble_ESP32C3.menu.UploadSpeed.921600=921600 (Default)
34614+
Geekble_ESP32C3.menu.UploadSpeed.921600.upload.speed=921600
34615+
Geekble_ESP32C3.menu.UploadSpeed.115200=115200
34616+
Geekble_ESP32C3.menu.UploadSpeed.115200.upload.speed=115200
34617+
Geekble_ESP32C3.menu.UploadSpeed.256000.windows=256000
34618+
Geekble_ESP32C3.menu.UploadSpeed.256000.upload.speed=256000
34619+
Geekble_ESP32C3.menu.UploadSpeed.230400.windows.upload.speed=256000
34620+
Geekble_ESP32C3.menu.UploadSpeed.230400=230400
34621+
Geekble_ESP32C3.menu.UploadSpeed.230400.upload.speed=230400
34622+
Geekble_ESP32C3.menu.UploadSpeed.460800.linux=460800
34623+
Geekble_ESP32C3.menu.UploadSpeed.460800.macosx=460800
34624+
Geekble_ESP32C3.menu.UploadSpeed.460800.upload.speed=460800
34625+
Geekble_ESP32C3.menu.UploadSpeed.512000.windows=512000
34626+
Geekble_ESP32C3.menu.UploadSpeed.512000.upload.speed=512000
34627+
34628+
Geekble_ESP32C3.menu.DebugLevel.none=None
34629+
Geekble_ESP32C3.menu.DebugLevel.none.build.code_debug=0
34630+
Geekble_ESP32C3.menu.DebugLevel.error=Error
34631+
Geekble_ESP32C3.menu.DebugLevel.error.build.code_debug=1
34632+
Geekble_ESP32C3.menu.DebugLevel.warn=Warn
34633+
Geekble_ESP32C3.menu.DebugLevel.warn.build.code_debug=2
34634+
Geekble_ESP32C3.menu.DebugLevel.info=Info
34635+
Geekble_ESP32C3.menu.DebugLevel.info.build.code_debug=3
34636+
Geekble_ESP32C3.menu.DebugLevel.debug=Debug
34637+
Geekble_ESP32C3.menu.DebugLevel.debug.build.code_debug=4
34638+
Geekble_ESP32C3.menu.DebugLevel.verbose=Verbose
34639+
Geekble_ESP32C3.menu.DebugLevel.verbose.build.code_debug=5
34640+
34641+
Geekble_ESP32C3.menu.EraseFlash.none=Disabled
34642+
Geekble_ESP32C3.menu.EraseFlash.none.upload.erase_cmd=
34643+
Geekble_ESP32C3.menu.EraseFlash.all=Enabled
34644+
Geekble_ESP32C3.menu.EraseFlash.all.upload.erase_cmd=-e
34645+
34646+
##############################################################

‎cores/esp32/HWCDC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void HWCDC::setDebugOutput(bool en)
436436
}
437437
}
438438

439-
#if ARDUINO_USB_MODE // Hardware JTAG CDC selected
439+
#if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT // Hardware JTAG CDC selected
440440
// USBSerial is always available to be used
441441
HWCDC HWCDCSerial;
442442
#endif

‎cores/esp32/HWCDC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class HWCDC: public Stream
102102
uint32_t baudRate(){return 115200;}
103103

104104
};
105-
#if ARDUINO_USB_MODE // Hardware JTAG CDC selected
105+
#if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT // Hardware JTAG CDC selected
106106
#ifndef HWCDC_SERIAL_IS_DEFINED
107107
#define HWCDC_SERIAL_IS_DEFINED 1
108108
#endif

‎cores/esp32/USBCDC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ USBCDC::operator bool() const
455455
return connected;
456456
}
457457

458-
#if !ARDUINO_USB_MODE // Native USB CDC selected
458+
#if !ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT // Native USB CDC selected
459459
// USBSerial is always available to be used
460460
USBCDC USBSerial(0);
461461
#endif

‎cores/esp32/USBCDC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class USBCDC: public Stream
141141

142142
};
143143

144-
#if !ARDUINO_USB_MODE // Native USB CDC selected
144+
#if !ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT // Native USB CDC selected
145145
#ifndef USB_SERIAL_IS_DEFINED
146146
#define USB_SERIAL_IS_DEFINED 1
147147
#endif

‎idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ files:
4444
dependencies:
4545
idf: ">=5.1"
4646
# mdns 1.2.1 is necessary to build H2 with no WiFi
47-
mdns: "1.2.1"
47+
mdns: "^1.2.3"
4848
chmorgan/esp-libhelix-mp3:
4949
version: "1.0.3"
5050
require: public

0 commit comments

Comments
 (0)