mirror of
https://github.com/esphome/esphome.git
synced 2025-08-04 09:27:47 +00:00
[core] Update to esptool 5.0+ command syntax (#10011)
This commit is contained in:
parent
494a1a216c
commit
9aad0733ef
@ -277,20 +277,20 @@ def upload_using_esptool(config, port, file, speed):
|
|||||||
|
|
||||||
def run_esptool(baud_rate):
|
def run_esptool(baud_rate):
|
||||||
cmd = [
|
cmd = [
|
||||||
"esptool.py",
|
"esptool",
|
||||||
"--before",
|
"--before",
|
||||||
"default_reset",
|
"default-reset",
|
||||||
"--after",
|
"--after",
|
||||||
"hard_reset",
|
"hard-reset",
|
||||||
"--baud",
|
"--baud",
|
||||||
str(baud_rate),
|
str(baud_rate),
|
||||||
"--port",
|
"--port",
|
||||||
port,
|
port,
|
||||||
"--chip",
|
"--chip",
|
||||||
mcu,
|
mcu,
|
||||||
"write_flash",
|
"write-flash",
|
||||||
"-z",
|
"-z",
|
||||||
"--flash_size",
|
"--flash-size",
|
||||||
"detect",
|
"detect",
|
||||||
]
|
]
|
||||||
for img in flash_images:
|
for img in flash_images:
|
||||||
|
@ -93,8 +93,8 @@ def merge_factory_bin(source, target, env):
|
|||||||
"esptool",
|
"esptool",
|
||||||
"--chip",
|
"--chip",
|
||||||
chip,
|
chip,
|
||||||
"merge_bin",
|
"merge-bin",
|
||||||
"--flash_size",
|
"--flash-size",
|
||||||
flash_size,
|
flash_size,
|
||||||
"--output",
|
"--output",
|
||||||
str(output_path),
|
str(output_path),
|
||||||
@ -110,7 +110,7 @@ def merge_factory_bin(source, target, env):
|
|||||||
if result == 0:
|
if result == 0:
|
||||||
print(f"Successfully created {output_path}")
|
print(f"Successfully created {output_path}")
|
||||||
else:
|
else:
|
||||||
print(f"Error: esptool merge_bin failed with code {result}")
|
print(f"Error: esptool merge-bin failed with code {result}")
|
||||||
|
|
||||||
|
|
||||||
def esp32_copy_ota_bin(source, target, env):
|
def esp32_copy_ota_bin(source, target, env):
|
||||||
|
@ -61,6 +61,7 @@ FILTER_PLATFORMIO_LINES = [
|
|||||||
r"Advanced Memory Usage is available via .*",
|
r"Advanced Memory Usage is available via .*",
|
||||||
r"Merged .* ELF section",
|
r"Merged .* ELF section",
|
||||||
r"esptool.py v.*",
|
r"esptool.py v.*",
|
||||||
|
r"esptool v.*",
|
||||||
r"Checking size .*",
|
r"Checking size .*",
|
||||||
r"Retrieving maximum program size .*",
|
r"Retrieving maximum program size .*",
|
||||||
r"PLATFORM: .*",
|
r"PLATFORM: .*",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user