mirror of
https://github.com/esphome/esphome.git
synced 2025-09-01 19:02:18 +01:00
Merge branch 'integration' into memory_api
This commit is contained in:
@@ -132,14 +132,17 @@ def choose_upload_log_host(
|
|||||||
]
|
]
|
||||||
resolved.append(choose_prompt(options, purpose=purpose))
|
resolved.append(choose_prompt(options, purpose=purpose))
|
||||||
elif device == "OTA":
|
elif device == "OTA":
|
||||||
if (show_ota and "ota" in CORE.config) or (
|
if CORE.address and (
|
||||||
show_api and "api" in CORE.config
|
(show_ota and "ota" in CORE.config)
|
||||||
|
or (show_api and "api" in CORE.config)
|
||||||
):
|
):
|
||||||
resolved.append(CORE.address)
|
resolved.append(CORE.address)
|
||||||
elif show_mqtt and has_mqtt_logging():
|
elif show_mqtt and has_mqtt_logging():
|
||||||
resolved.append("MQTT")
|
resolved.append("MQTT")
|
||||||
else:
|
else:
|
||||||
resolved.append(device)
|
resolved.append(device)
|
||||||
|
if not resolved:
|
||||||
|
_LOGGER.error("All specified devices: %s could not be resolved.", defaults)
|
||||||
return resolved
|
return resolved
|
||||||
|
|
||||||
# No devices specified, show interactive chooser
|
# No devices specified, show interactive chooser
|
||||||
|
Reference in New Issue
Block a user