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

add OTA update

Browse Source
This commit is contained in:
Tomasz Duda
2024-02-19 22:57:31 +01:00
parent 91ed57b64f
commit 4df58663d7
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
esphome/__main__.py
View File

@@ -48,7 +48,7 @@ from esphome.util import (
get_serial_ports, get_serial_ports,
) )
from esphome.log import color, setup_log, Fore from esphome.log import color, setup_log, Fore
from .zephyr_tools import smpmgr_upload from .zephyr_tools import smpmgr_upload, smpmgr_scan
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@@ -100,23 +100,24 @@ def choose_upload_log_host(
if default == "PYOCD": if default == "PYOCD":
options = [("pyocd", "PYOCD")] options = [("pyocd", "PYOCD")]
return choose_prompt(options, purpose=purpose) return choose_prompt(options, purpose=purpose)
if (show_ota and "ota" in CORE.config) or (show_api and "api" in CORE.config): if CORE.target_platform in (PLATFORM_NRF52):
options.append((f"Over The Air ({CORE.address})", CORE.address)) if (show_ota and "ota" in CORE.config) and default is None:
if default == "OTA": ble_devices = asyncio.run(smpmgr_scan())
return CORE.address if len(ble_devices) == 0:
# if show_ota and CONF_FOTA in CORE.config: _LOGGER.warning("No OTA service found!")
# if default is None or default == "FOTA": for device in ble_devices:
# ble_devices = asyncio.run(smpmgr_scan()) options.append(
# if len(ble_devices) == 0: (
# _LOGGER.warning("No FOTA service found!") f"FOTA over Bluetooth LE({device.address}) {device.name}",
# for device in ble_devices: f"mcumgr {device.address}",
# options.append( )
# ( )
# f"FOTA over Bluetooth LE({device.address}) {device.name}", return choose_prompt(options, purpose=purpose)
# f"mcumgr {device.address}", else:
# ) if (show_ota and "ota" in CORE.config) or (show_api and "api" in CORE.config):
# ) options.append((f"Over The Air ({CORE.address})", CORE.address))
# return choose_prompt(options, purpose=purpose) if default == "OTA":
return CORE.address
if show_mqtt and CONF_MQTT in CORE.config: if show_mqtt and CONF_MQTT in CORE.config:
options.append((f"MQTT ({CORE.config['mqtt'][CONF_BROKER]})", "MQTT")) options.append((f"MQTT ({CORE.config['mqtt'][CONF_BROKER]})", "MQTT"))
if default == "OTA": if default == "OTA":
@@ -344,7 +345,6 @@ def upload_program(config, args, host):
if host == "PYOCD": if host == "PYOCD":
return upload_using_platformio(config, host, ["-t", "flash_pyocd"]) return upload_using_platformio(config, host, ["-t", "flash_pyocd"])
if host.startswith("mcumgr"): if host.startswith("mcumgr"):
firmware = os.path.abspath( firmware = os.path.abspath(
CORE.relative_pioenvs_path(CORE.name, "zephyr", "app_update.bin") CORE.relative_pioenvs_path(CORE.name, "zephyr", "app_update.bin")