jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-31 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[esp32] Fix post build

Browse Source
This commit is contained in:
Jesse Hills 2025-07-29 14:18:40 +12:00
parent f5f0a01a85
commit fe61e4eacd
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/esp32/post_build.py.script
View File

@ -51,9 +51,12 @@ def merge_factory_bin(source, target, env):
continue continue
file_path = pathlib.Path(str(fname)) file_path = pathlib.Path(str(fname))
if file_path.exists(): if file_path.exists():
sections.append((addr, str(file_path))) sections.append((addr, file_path))
else: else:
print(f"Info: {file_path.name} not found — skipping") print(f"Info: {file_path.name} not found — skipping")
if sections:
# Append main firmware to sections
sections.append(("0x10000", firmware_path))
# 3. Final fallback: guess standard image locations # 3. Final fallback: guess standard image locations
if not sections: if not sections:
@ -66,7 +69,7 @@ def merge_factory_bin(source, target, env):
] ]
for addr, file_path in guesses: for addr, file_path in guesses:
if file_path.exists(): if file_path.exists():
sections.append((addr, str(file_path))) sections.append((addr, file_path))
else: else:
print(f"Info: {file_path.name} not found — skipping") print(f"Info: {file_path.name} not found — skipping")
@ -77,20 +80,19 @@ def merge_factory_bin(source, target, env):
output_path = firmware_path.with_suffix(".factory.bin") output_path = firmware_path.with_suffix(".factory.bin")
cmd = [ cmd = [
f'"{env.subst("$PYTHONEXE")}"', "-m", "esptool",
"--chip", chip, "--chip", chip,
"merge_bin", "merge_bin",
"--flash_size", flash_size, "--flash_size", flash_size,
"--output", str(output_path) "--output", str(output_path)
] ]
for addr, file_path in sections: for addr, file_path in sections:
cmd += [addr, file_path] cmd += [addr, str(file_path)]
print(f"Merging binaries into {output_path}") print(f"Merging binaries into {output_path}")
result = env.Execute( result = env.Execute(
env.VerboseAction( env.VerboseAction(" ".join(cmd), "Merging binaries with esptool")
f"{env.subst('$PYTHONEXE')} -m esptool " + " ".join(cmd),
"Merging binaries with esptool"
)
) )
if result == 0: if result == 0: