Skip to content

Commit 1c58126

Browse files
SuGliderSuGlider
authored
Merge branch 'master' into bugfix/basic_http_client_cert
2 parents 1069e15 + c43187a commit 1c58126

File tree

23 files changed

+710
-41
lines changed

23 files changed

+710
-41
lines changed

Diff for: ‎.github/workflows/boards.yml

+14
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,19 @@ jobs:
5959
exit 1;
6060
fi
6161
62+
- name: Get libs cache
63+
uses: actions/cache@v4
64+
with:
65+
key: libs-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package/package_esp32_index.template.json', 'tools/get.py') }}
66+
path: |
67+
./tools/dist
68+
./tools/esp32-arduino-libs
69+
./tools/esptool
70+
./tools/mk*
71+
./tools/openocd-esp32
72+
./tools/riscv32-*
73+
./tools/xtensa-*
74+
6275
- name: Compile sketch
6376
uses: P-R-O-C-H-Y/compile-sketches@main
6477
with:
@@ -73,3 +86,4 @@ jobs:
7386
exit-on-fail: true
7487
sketch-paths:
7588
"- ./libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino"
89+
verbose: true

Diff for: ‎boards.txt

+289
Original file line numberDiff line numberDiff line change
@@ -4697,6 +4697,122 @@ lilygo_t_display_s3.menu.EraseFlash.all.upload.erase_cmd=-e
46974697

46984698
##############################################################
46994699

4700+
lilygo_t_eth_lite.name=LilyGo T-ETH-Lite
4701+
4702+
lilygo_t_eth_lite.bootloader.tool=esptool_py
4703+
lilygo_t_eth_lite.bootloader.tool.default=esptool_py
4704+
4705+
lilygo_t_eth_lite.upload.tool=esptool_py
4706+
lilygo_t_eth_lite.upload.tool.default=esptool_py
4707+
lilygo_t_eth_lite.upload.tool.network=esp_ota
4708+
4709+
lilygo_t_eth_lite.upload.maximum_size=3145728
4710+
lilygo_t_eth_lite.upload.maximum_data_size=327680
4711+
lilygo_t_eth_lite.upload.speed=921600
4712+
lilygo_t_eth_lite.upload.flags=
4713+
lilygo_t_eth_lite.upload.extra_flags=
4714+
lilygo_t_eth_lite.upload.use_1200bps_touch=false
4715+
lilygo_t_eth_lite.upload.wait_for_upload_port=false
4716+
4717+
lilygo_t_eth_lite.serial.disableDTR=false
4718+
lilygo_t_eth_lite.serial.disableRTS=false
4719+
4720+
lilygo_t_eth_lite.build.tarch=xtensa
4721+
lilygo_t_eth_lite.build.bootloader_addr=0x0
4722+
lilygo_t_eth_lite.build.target=esp32s3
4723+
lilygo_t_eth_lite.build.mcu=esp32s3
4724+
lilygo_t_eth_lite.build.core=esp32
4725+
lilygo_t_eth_lite.build.variant=lilygo_t_eth_lite
4726+
lilygo_t_eth_lite.build.board=LILYGO_T_ETH_LITE
4727+
4728+
lilygo_t_eth_lite.build.usb_mode=1
4729+
lilygo_t_eth_lite.build.cdc_on_boot=0
4730+
lilygo_t_eth_lite.build.msc_on_boot=0
4731+
lilygo_t_eth_lite.build.dfu_on_boot=0
4732+
lilygo_t_eth_lite.build.f_cpu=240000000L
4733+
lilygo_t_eth_lite.build.flash_size=16MB
4734+
lilygo_t_eth_lite.build.flash_freq=80m
4735+
lilygo_t_eth_lite.build.flash_mode=dio
4736+
lilygo_t_eth_lite.build.boot=qio
4737+
lilygo_t_eth_lite.build.boot_freq=80m
4738+
lilygo_t_eth_lite.build.partitions=app3M_fat9M_16MB
4739+
lilygo_t_eth_lite.build.defines=
4740+
lilygo_t_eth_lite.build.loop_core=
4741+
lilygo_t_eth_lite.build.event_core=
4742+
lilygo_t_eth_lite.build.psram_type=opi
4743+
lilygo_t_eth_lite.build.memory_type={build.boot}_{build.psram_type}
4744+
4745+
## IDE 2.0 Seems to not update the value
4746+
lilygo_t_eth_lite.menu.JTAGAdapter.default=Disabled
4747+
lilygo_t_eth_lite.menu.JTAGAdapter.default.build.copy_jtag_files=0
4748+
lilygo_t_eth_lite.menu.JTAGAdapter.builtin=Integrated USB JTAG
4749+
lilygo_t_eth_lite.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
4750+
lilygo_t_eth_lite.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
4751+
4752+
lilygo_t_eth_lite.menu.LoopCore.1=Core 1
4753+
lilygo_t_eth_lite.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
4754+
lilygo_t_eth_lite.menu.LoopCore.0=Core 0
4755+
lilygo_t_eth_lite.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
4756+
4757+
lilygo_t_eth_lite.menu.EventsCore.1=Core 1
4758+
lilygo_t_eth_lite.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
4759+
lilygo_t_eth_lite.menu.EventsCore.0=Core 0
4760+
lilygo_t_eth_lite.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
4761+
4762+
lilygo_t_eth_lite.menu.USBMode.hwcdc=Hardware CDC and JTAG
4763+
lilygo_t_eth_lite.menu.USBMode.hwcdc.build.usb_mode=1
4764+
lilygo_t_eth_lite.menu.USBMode.default=USB-OTG (TinyUSB)
4765+
lilygo_t_eth_lite.menu.USBMode.default.build.usb_mode=0
4766+
4767+
lilygo_t_eth_lite.menu.CDCOnBoot.default=Disabled
4768+
lilygo_t_eth_lite.menu.CDCOnBoot.default.build.cdc_on_boot=0
4769+
lilygo_t_eth_lite.menu.CDCOnBoot.cdc=Enabled
4770+
lilygo_t_eth_lite.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
4771+
4772+
lilygo_t_eth_lite.menu.MSCOnBoot.default=Disabled
4773+
lilygo_t_eth_lite.menu.MSCOnBoot.default.build.msc_on_boot=0
4774+
lilygo_t_eth_lite.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
4775+
lilygo_t_eth_lite.menu.MSCOnBoot.msc.build.msc_on_boot=1
4776+
4777+
lilygo_t_eth_lite.menu.DFUOnBoot.default=Disabled
4778+
lilygo_t_eth_lite.menu.DFUOnBoot.default.build.dfu_on_boot=0
4779+
lilygo_t_eth_lite.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
4780+
lilygo_t_eth_lite.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
4781+
4782+
lilygo_t_eth_lite.menu.UploadMode.default=UART0 / Hardware CDC
4783+
lilygo_t_eth_lite.menu.UploadMode.default.upload.use_1200bps_touch=false
4784+
lilygo_t_eth_lite.menu.UploadMode.default.upload.wait_for_upload_port=false
4785+
lilygo_t_eth_lite.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
4786+
lilygo_t_eth_lite.menu.UploadMode.cdc.upload.use_1200bps_touch=true
4787+
lilygo_t_eth_lite.menu.UploadMode.cdc.upload.wait_for_upload_port=true
4788+
4789+
lilygo_t_eth_lite.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
4790+
lilygo_t_eth_lite.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
4791+
lilygo_t_eth_lite.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
4792+
lilygo_t_eth_lite.menu.PartitionScheme.rainmaker=RainMaker
4793+
lilygo_t_eth_lite.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
4794+
lilygo_t_eth_lite.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
4795+
4796+
lilygo_t_eth_lite.menu.DebugLevel.none=None
4797+
lilygo_t_eth_lite.menu.DebugLevel.none.build.code_debug=0
4798+
lilygo_t_eth_lite.menu.DebugLevel.error=Error
4799+
lilygo_t_eth_lite.menu.DebugLevel.error.build.code_debug=1
4800+
lilygo_t_eth_lite.menu.DebugLevel.warn=Warn
4801+
lilygo_t_eth_lite.menu.DebugLevel.warn.build.code_debug=2
4802+
lilygo_t_eth_lite.menu.DebugLevel.info=Info
4803+
lilygo_t_eth_lite.menu.DebugLevel.info.build.code_debug=3
4804+
lilygo_t_eth_lite.menu.DebugLevel.debug=Debug
4805+
lilygo_t_eth_lite.menu.DebugLevel.debug.build.code_debug=4
4806+
lilygo_t_eth_lite.menu.DebugLevel.verbose=Verbose
4807+
lilygo_t_eth_lite.menu.DebugLevel.verbose.build.code_debug=5
4808+
4809+
lilygo_t_eth_lite.menu.EraseFlash.none=Disabled
4810+
lilygo_t_eth_lite.menu.EraseFlash.none.upload.erase_cmd=
4811+
lilygo_t_eth_lite.menu.EraseFlash.all=Enabled
4812+
lilygo_t_eth_lite.menu.EraseFlash.all.upload.erase_cmd=-e
4813+
4814+
##############################################################
4815+
47004816
micros2.name=microS2
47014817
micros2.vid.0=0x239A
47024818
micros2.pid.0=0x80C5
@@ -36821,3 +36937,176 @@ aslcanx2.menu.EraseFlash.all=Enabled
3682136937
aslcanx2.menu.EraseFlash.all.upload.erase_cmd=-e
3682236938

3682336939
##############################################################
36940+
36941+
walter.name=DPTechnics Walter
36942+
36943+
walter.bootloader.tool=esptool_py
36944+
walter.bootloader.tool.default=esptool_py
36945+
36946+
walter.upload.tool=esptool_py
36947+
walter.upload.tool.default=esptool_py
36948+
walter.upload.tool.network=esp_ota
36949+
36950+
walter.upload.maximum_size=1310720
36951+
walter.upload.maximum_data_size=327680
36952+
walter.upload.flags=
36953+
walter.upload.extra_flags=
36954+
walter.upload.use_1200bps_touch=false
36955+
walter.upload.wait_for_upload_port=false
36956+
36957+
walter.serial.disableDTR=false
36958+
walter.serial.disableRTS=false
36959+
36960+
walter.build.tarch=xtensa
36961+
walter.build.bootloader_addr=0x0
36962+
walter.build.target=esp32s3
36963+
walter.build.mcu=esp32s3
36964+
walter.build.core=esp32
36965+
walter.build.variant=walter
36966+
walter.build.board=DPTECHNICS_WALTER
36967+
36968+
walter.build.usb_mode=1
36969+
walter.build.cdc_on_boot=1
36970+
walter.build.msc_on_boot=0
36971+
walter.build.dfu_on_boot=0
36972+
walter.build.f_cpu=240000000L
36973+
walter.build.flash_size=16MB
36974+
walter.build.flash_freq=80m
36975+
walter.build.flash_mode=dio
36976+
walter.build.boot=qio
36977+
walter.build.boot_freq=80m
36978+
walter.build.partitions=default
36979+
walter.build.defines=
36980+
walter.build.loop_core=
36981+
walter.build.event_core=
36982+
walter.build.psram_type=qspi
36983+
walter.build.memory_type={build.boot}_{build.psram_type}
36984+
36985+
## IDE 2.0 Seems to not update the value
36986+
walter.menu.JTAGAdapter.default=Disabled
36987+
walter.menu.JTAGAdapter.default.build.copy_jtag_files=0
36988+
walter.menu.JTAGAdapter.builtin=Integrated USB JTAG
36989+
walter.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
36990+
walter.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
36991+
walter.menu.JTAGAdapter.external=FTDI Adapter
36992+
walter.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
36993+
walter.menu.JTAGAdapter.external.build.copy_jtag_files=1
36994+
walter.menu.JTAGAdapter.bridge=ESP USB Bridge
36995+
walter.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
36996+
walter.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
36997+
36998+
walter.menu.PSRAM.enabled=QSPI PSRAM
36999+
walter.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
37000+
walter.menu.PSRAM.enabled.build.psram_type=qspi
37001+
walter.menu.PSRAM.disabled=Disabled
37002+
walter.menu.PSRAM.disabled.build.defines=
37003+
walter.menu.PSRAM.disabled.build.psram_type=qspi
37004+
37005+
walter.menu.FlashMode.qio=QIO 80MHz
37006+
walter.menu.FlashMode.qio.build.flash_mode=dio
37007+
walter.menu.FlashMode.qio.build.boot=qio
37008+
walter.menu.FlashMode.qio.build.boot_freq=80m
37009+
walter.menu.FlashMode.qio.build.flash_freq=80m
37010+
walter.menu.FlashMode.dio=DIO 80MHz
37011+
walter.menu.FlashMode.dio.build.flash_mode=dio
37012+
walter.menu.FlashMode.dio.build.boot=dio
37013+
walter.menu.FlashMode.dio.build.boot_freq=80m
37014+
walter.menu.FlashMode.dio.build.flash_freq=80m
37015+
37016+
walter.menu.FlashSize.16M=16MB (128Mb)
37017+
walter.menu.FlashSize.16M.build.flash_size=16MB
37018+
37019+
walter.menu.LoopCore.1=Core 1
37020+
walter.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
37021+
walter.menu.LoopCore.0=Core 0
37022+
walter.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
37023+
37024+
walter.menu.EventsCore.1=Core 1
37025+
walter.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
37026+
walter.menu.EventsCore.0=Core 0
37027+
walter.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
37028+
37029+
walter.menu.USBMode.hwcdc=Hardware CDC and JTAG
37030+
walter.menu.USBMode.hwcdc.build.usb_mode=1
37031+
walter.menu.USBMode.default=USB-OTG (TinyUSB)
37032+
walter.menu.USBMode.default.build.usb_mode=0
37033+
37034+
walter.menu.CDCOnBoot.cdc=Enabled
37035+
walter.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
37036+
walter.menu.CDCOnBoot.default=Disabled
37037+
walter.menu.CDCOnBoot.default.build.cdc_on_boot=0
37038+
37039+
walter.menu.MSCOnBoot.default=Disabled
37040+
walter.menu.MSCOnBoot.default.build.msc_on_boot=0
37041+
walter.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
37042+
walter.menu.MSCOnBoot.msc.build.msc_on_boot=1
37043+
37044+
walter.menu.DFUOnBoot.default=Disabled
37045+
walter.menu.DFUOnBoot.default.build.dfu_on_boot=0
37046+
walter.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
37047+
walter.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
37048+
37049+
walter.menu.UploadMode.default=UART0 / Hardware CDC
37050+
walter.menu.UploadMode.default.upload.use_1200bps_touch=false
37051+
walter.menu.UploadMode.default.upload.wait_for_upload_port=false
37052+
walter.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
37053+
walter.menu.UploadMode.cdc.upload.use_1200bps_touch=true
37054+
walter.menu.UploadMode.cdc.upload.wait_for_upload_port=true
37055+
37056+
walter.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
37057+
walter.menu.PartitionScheme.fatflash.build.partitions=ffat
37058+
walter.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
37059+
walter.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
37060+
walter.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
37061+
walter.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
37062+
walter.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
37063+
walter.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
37064+
walter.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
37065+
37066+
walter.menu.CPUFreq.240=240MHz (WiFi)
37067+
walter.menu.CPUFreq.240.build.f_cpu=240000000L
37068+
walter.menu.CPUFreq.160=160MHz (WiFi)
37069+
walter.menu.CPUFreq.160.build.f_cpu=160000000L
37070+
walter.menu.CPUFreq.80=80MHz (WiFi)
37071+
walter.menu.CPUFreq.80.build.f_cpu=80000000L
37072+
walter.menu.CPUFreq.40=40MHz
37073+
walter.menu.CPUFreq.40.build.f_cpu=40000000L
37074+
walter.menu.CPUFreq.20=20MHz
37075+
walter.menu.CPUFreq.20.build.f_cpu=20000000L
37076+
walter.menu.CPUFreq.10=10MHz
37077+
walter.menu.CPUFreq.10.build.f_cpu=10000000L
37078+
37079+
walter.menu.UploadSpeed.921600=921600
37080+
walter.menu.UploadSpeed.921600.upload.speed=921600
37081+
walter.menu.UploadSpeed.115200=115200
37082+
walter.menu.UploadSpeed.115200.upload.speed=115200
37083+
walter.menu.UploadSpeed.256000.windows=256000
37084+
walter.menu.UploadSpeed.256000.upload.speed=256000
37085+
walter.menu.UploadSpeed.230400.windows.upload.speed=256000
37086+
walter.menu.UploadSpeed.230400=230400
37087+
walter.menu.UploadSpeed.230400.upload.speed=230400
37088+
walter.menu.UploadSpeed.460800.linux=460800
37089+
walter.menu.UploadSpeed.460800.macosx=460800
37090+
walter.menu.UploadSpeed.460800.upload.speed=460800
37091+
walter.menu.UploadSpeed.512000.windows=512000
37092+
walter.menu.UploadSpeed.512000.upload.speed=512000
37093+
37094+
walter.menu.DebugLevel.none=None
37095+
walter.menu.DebugLevel.none.build.code_debug=0
37096+
walter.menu.DebugLevel.error=Error
37097+
walter.menu.DebugLevel.error.build.code_debug=1
37098+
walter.menu.DebugLevel.warn=Warn
37099+
walter.menu.DebugLevel.warn.build.code_debug=2
37100+
walter.menu.DebugLevel.info=Info
37101+
walter.menu.DebugLevel.info.build.code_debug=3
37102+
walter.menu.DebugLevel.debug=Debug
37103+
walter.menu.DebugLevel.debug.build.code_debug=4
37104+
walter.menu.DebugLevel.verbose=Verbose
37105+
walter.menu.DebugLevel.verbose.build.code_debug=5
37106+
37107+
walter.menu.EraseFlash.none=Disabled
37108+
walter.menu.EraseFlash.none.upload.erase_cmd=
37109+
walter.menu.EraseFlash.all=Enabled
37110+
walter.menu.EraseFlash.all.upload.erase_cmd=-e
37111+
37112+
##############################################################

Diff for: ‎idf_component.yml

+3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ dependencies:
8484
espressif/libsodium:
8585
version: "^1.0.20~1"
8686
require: public
87+
espressif/esp-modbus:
88+
version: "^1.0.15"
89+
require: public
8790
joltwallet/littlefs:
8891
version: "^1.10.2"
8992
chmorgan/esp-libhelix-mp3:

Diff for: ‎libraries/ArduinoOTA/src/ArduinoOTA.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,28 @@ String ArduinoOTAClass::getHostname() {
5757
}
5858

5959
ArduinoOTAClass &ArduinoOTAClass::setPassword(const char *password) {
60-
if (!_initialized && !_password.length() && password) {
60+
if (_state == OTA_IDLE && password) {
6161
MD5Builder passmd5;
6262
passmd5.begin();
6363
passmd5.add(password);
6464
passmd5.calculate();
65+
_password.clear();
6566
_password = passmd5.toString();
6667
}
6768
return *this;
6869
}
6970

7071
ArduinoOTAClass &ArduinoOTAClass::setPasswordHash(const char *password) {
71-
if (!_initialized && !_password.length() && password) {
72+
if (_state == OTA_IDLE && password) {
73+
_password.clear();
7274
_password = password;
7375
}
7476
return *this;
7577
}
7678

7779
ArduinoOTAClass &ArduinoOTAClass::setPartitionLabel(const char *partition_label) {
78-
if (!_initialized && !_partition_label.length() && partition_label) {
80+
if (_state == OTA_IDLE && partition_label) {
81+
_partition_label.clear();
7982
_partition_label = partition_label;
8083
}
8184
return *this;

0 commit comments

Comments
 (0)