mirror of
https://github.com/esphome/esphome.git
synced 2025-09-04 04:12:23 +01:00
Merge branch 'drop_py_esptool' into integration
This commit is contained in:
@@ -277,7 +277,7 @@ def upload_using_esptool(config, port, file, speed):
|
||||
|
||||
def run_esptool(baud_rate):
|
||||
cmd = [
|
||||
"esptool.py",
|
||||
"esptool",
|
||||
"--before",
|
||||
"default_reset",
|
||||
"--after",
|
||||
@@ -290,7 +290,7 @@ def upload_using_esptool(config, port, file, speed):
|
||||
mcu,
|
||||
"write_flash",
|
||||
"-z",
|
||||
"--flash_size",
|
||||
"--flash-size",
|
||||
"detect",
|
||||
]
|
||||
for img in flash_images:
|
||||
|
@@ -93,8 +93,8 @@ def merge_factory_bin(source, target, env):
|
||||
"esptool",
|
||||
"--chip",
|
||||
chip,
|
||||
"merge_bin",
|
||||
"--flash_size",
|
||||
"merge-bin",
|
||||
"--flash-size",
|
||||
flash_size,
|
||||
"--output",
|
||||
str(output_path),
|
||||
@@ -110,7 +110,7 @@ def merge_factory_bin(source, target, env):
|
||||
if result == 0:
|
||||
print(f"Successfully created {output_path}")
|
||||
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):
|
||||
|
@@ -62,6 +62,7 @@ FILTER_PLATFORMIO_LINES = [
|
||||
r"Advanced Memory Usage is available via .*",
|
||||
r"Merged .* ELF section",
|
||||
r"esptool.py v.*",
|
||||
r"esptool v.*",
|
||||
r"Checking size .*",
|
||||
r"Retrieving maximum program size .*",
|
||||
r"PLATFORM: .*",
|
||||
|
Reference in New Issue
Block a user