Skip to content

Commit

Permalink
Merge branch 'mega' into feature/Core-extend-custom-task-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
tonhuisman authored Apr 24, 2024
2 parents 5a402ac + c428918 commit 0232929
Show file tree
Hide file tree
Showing 73 changed files with 5,011 additions and 132 deletions.
29 changes: 29 additions & 0 deletions dist/Release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
-------------------------------------------------
Changes in release mega-20240414 (since mega-20240401)
-------------------------------------------------

Release date: Sun Apr 14 03:08:46 PM CEST 2024

TD-er (16):
[HWCDC] Revert to older ESP-IDF/Arduino build
[Time] Fix updating %sunrise% and %sunset% when no NTP available
[HWCDC] Fix bootloop on ESP32-C3/C6
[HWCDC] Cleanup unused test code
[ESP-IDF5.1] Move to newly network refactored code
[ESP-IDF5.x] Fix build issue
[ESP-IDF5.x] Fix building ESP32-solo1 builds
[Ethernet[ Fix crashes when using Ethernet + IPv6 on LittleFS builds
[Ethernet] Fix getting DNS from DHCP switch from WiFi to Ethernet
[ESP-IDF5.x] Fix LittleFS builds without Ethernet
[IMPROV] Fix provisioning WiFi via web flasher
[ESP-IDF5.1] Update to latest 2024.04.11 platform build
[SPI ETH] Fix SPI selection to actual SPI bus for Ethernet
[SPI Eth] Fix build on ESP32-C3
[HWCDC] Tweak HWCDC to be more stable
[Build] Revert unintended change of default PIO env.

Ton Huisman (2):
[Dist] Update Espressif Flash Download tool 3.9.6
[JSON] Add extra data in `/json` output


-------------------------------------------------
Changes in release mega-20240401 (since mega-20240331)
-------------------------------------------------
Expand Down
Binary file not shown.
161 changes: 161 additions & 0 deletions dist/flash_download_tool_3.9.6/configure/esp32/multi_download.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
[EFUSE CHECK]
efuse_mode = 1
efuse_err_halt = 1

[MULTI_UI_CONFIG]
multi_col = 2

[DOWNLOAD PATH]
file_sel0 = 0
file_path0 =
file_flag0 = False
file_offset0 =
file_sel1 = 0
file_path1 =
file_flag1 = False
file_offset1 =
file_sel2 = 0
file_path2 =
file_flag2 = False
file_offset2 =
file_sel3 = 0
file_path3 =
file_flag3 = False
file_offset3 =
file_sel4 = 0
file_path4 =
file_flag4 = False
file_offset4 =
file_sel5 = 0
file_path5 =
file_flag5 = False
file_offset5 =
file_sel6 = 0
file_path6 =
file_flag6 = False
file_offset6 =
file_sel7 = 0
file_path7 =
file_flag7 = False
file_offset7 =
file_sel8 = 0
file_path8 =
file_flag8 = False
file_offset8 =
file_sel9 = 0
file_path9 =
file_flag9 = False
file_offset9 =
file_sel10 = 0
file_path10 =
file_flag10 = False
file_offset10 =
file_sel11 = 0
file_path11 =
file_flag11 = False
file_offset11 =
file_sel12 = 0
file_path12 =
file_flag12 = False
file_offset12 =
file_sel13 = 0
file_path13 =
file_flag13 = False
file_offset13 =
default_path = ./bin/

[LOCK]
lock_setting_password =

[FLASH_CRYSTAL]
spicfgdis = 1
spispeed = 0
spimode = 2

[DOWNLOAD]
erase_button_en = True
autostart1 = 0
com_port1 =
baudrate1 = 0
checkmac1 = 1
autostart2 = 0
com_port2 =
baudrate2 = 0
checkmac2 = 1
autostart3 = 0
com_port3 =
baudrate3 = 0
checkmac3 = 1
autostart4 = 0
com_port4 =
baudrate4 = 0
checkmac4 = 1
autostart5 = 0
com_port5 =
baudrate5 = 0
checkmac5 = 1
autostart6 = 0
com_port6 =
baudrate6 = 0
checkmac6 = 1
autostart7 = 0
com_port7 =
baudrate7 = 0
checkmac7 = 1
autostart8 = 0
com_port8 =
baudrate8 = 0
checkmac8 = 1
autostart9 = 0
com_port9 =
baudrate9 = 0
checkmac9 = 1
autostart10 = 0
com_port10 =
baudrate10 = 0
checkmac10 = 1

[LOG_CHECK]
log_check_enable = False
log_check_baud = 115200
log_check_str = 1.0.0
log_check_delaytime = 3
log_check_timeout = 3
log_check_cmd_str = AT+GMR
log_check_enable_cmd = False

[MAC_SAVE]
mac_save_enable = False

[ESPTOOL_PARAM]
after = no_reset
before = default_reset
compress = True
flash_size = keep
no_stub = False
verify = True
flash_freq = keep
flash_mode = keep

[STATISTICS]
pass1 = 0
fail1 = 0
pass2 = 0
fail2 = 0
pass3 = 0
fail3 = 0
pass4 = 0
fail4 = 0
pass5 = 0
fail5 = 0
pass6 = 0
fail6 = 0
pass7 = 0
fail7 = 0
pass8 = 0
fail8 = 0
pass9 = 0
fail9 = 0
pass10 = 0
fail10 = 0

25 changes: 25 additions & 0 deletions dist/flash_download_tool_3.9.6/configure/esp32/security.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[SECURE BOOT]
secure_boot_en = False
secure_boot_version = 1
public_key_digest_path = .\secure\public_key_digest.bin

[FLASH ENCRYPTION]
flash_encryption_en = False
reserved_burn_times = 0

[SECURE OTHER CONFIG]
flash_encryption_use_customer_key_enable = False
flash_encryption_use_customer_key_path = .\secure\flash_encrypt_key.bin
flash_force_write_enable = False

[FLASH ENCRYPTION KEYS LOCAL SAVE]
keys_save_enable = False
encrypt_keys_enable = False
encrypt_keys_aeskey_path =

[ESP32 EFUSE BIT CONFIG]
jtag_disable = False
dl_encrypt_disable = False
dl_decrypt_disable = False
dl_cache_disable = False

100 changes: 100 additions & 0 deletions dist/flash_download_tool_3.9.6/configure/esp32/spi_download.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
[EFUSE CHECK]
efuse_mode = 1
efuse_err_halt = 1

[MULTI_UI_CONFIG]
multi_col = 2

[DOWNLOAD PATH]
file_sel0 = 0
file_path0 =
file_flag0 = False
file_offset0 =
file_sel1 = 0
file_path1 =
file_flag1 = False
file_offset1 =
file_sel2 = 0
file_path2 =
file_flag2 = False
file_offset2 =
file_sel3 = 0
file_path3 =
file_flag3 = False
file_offset3 =
file_sel4 = 0
file_path4 =
file_flag4 = False
file_offset4 =
file_sel5 = 0
file_path5 =
file_flag5 = False
file_offset5 =
file_sel6 = 0
file_path6 =
file_flag6 = False
file_offset6 =
file_sel7 = 0
file_path7 =
file_flag7 = False
file_offset7 =
file_sel8 = 0
file_path8 =
file_flag8 = False
file_offset8 =
file_sel9 = 0
file_path9 =
file_flag9 = False
file_offset9 =
file_sel10 = 0
file_path10 =
file_flag10 = False
file_offset10 =
file_sel11 = 0
file_path11 =
file_flag11 = False
file_offset11 =
file_sel12 = 0
file_path12 =
file_flag12 = False
file_offset12 =
file_sel13 = 0
file_path13 =
file_flag13 = False
file_offset13 =
default_path = D:\DOWNLOAD_TOOL\���ع���\release\3.9.6

[FLASH_CRYSTAL]
spicfgdis = 1
spispeed = 0
spimode = 2

[DOWNLOAD]
erase_button_en = True
autostart1 = 0
com_port1 =
baudrate1 = 0
checkmac1 = 1

[LOG_CHECK]
log_check_enable = False
log_check_baud = 115200
log_check_str = 1.0.0
log_check_delaytime = 3
log_check_timeout = 3
log_check_cmd_str = AT+GMR
log_check_enable_cmd = False

[MAC_SAVE]
mac_save_enable = False

[ESPTOOL_PARAM]
after = no_reset
before = default_reset
compress = True
flash_size = keep
no_stub = False
verify = True
flash_freq = keep
flash_mode = keep

16 changes: 16 additions & 0 deletions dist/flash_download_tool_3.9.6/configure/esp32/utility.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[LOG_LEVEL]
utility_log_level = ERROR
spi_log_level = ERROR
multi_log_level = ERROR

[MAC_SAVE]
mac_save_enable = False

[SECTOR_PROTECT]
sector_protect_enable = False
sector_protect_start = 0xe000
sector_protect_end = 0x3000

[ESP32_EFUSE_CONFIG]
config_voltage = OFF

Loading

0 comments on commit 0232929

Please sign in to comment.