sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-27 07:32:22 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-08 19:28:20 -05:00
parent 6b73cdbafb f6d69231e8
commit 959846ed89
5 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/__main__.py
View File

@@ -416,9 +416,7 @@ def upload_program(
exit_code = upload_using_esptool(config, host, file, args.upload_speed)
elif CORE.target_platform == PLATFORM_RP2040 or CORE.is_libretiny:
exit_code = upload_using_platformio(config, host)
else:
# Unknown target platform
pass
# else: Unknown target platform, exit_code remains 1
return exit_code, host if exit_code == 0 else None
@@ -561,7 +559,7 @@ def command_upload(args: ArgsProtocol, config: ConfigType) -> int | None:
purpose="uploading",
)
exit_code, successful_device = upload_program(config, args, devices)
exit_code, _ = upload_program(config, args, devices)
if exit_code == 0:
_LOGGER.info("Successfully uploaded program.")
else: