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

fix python

Browse Source
This commit is contained in:
Tomasz Duda 2024-04-24 22:04:45 +02:00
parent 5486d634ed
commit 625e328e97
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
esphome/__main__.py
View File

@ -124,17 +124,16 @@ def choose_upload_log_host(
(f"OTA over Bluetooth LE ({default})", f"mcumgr {default}") (f"OTA over Bluetooth LE ({default})", f"mcumgr {default}")
) )
return choose_prompt(options, purpose=purpose) return choose_prompt(options, purpose=purpose)
else: ble_devices = asyncio.run(smpmgr_scan(CORE.config["esphome"]["name"]))
ble_devices = asyncio.run(smpmgr_scan(CORE.config["esphome"]["name"])) if len(ble_devices) == 0:
if len(ble_devices) == 0: _LOGGER.warning("No OTA over Bluetooth LE service found!")
_LOGGER.warning("No OTA over Bluetooth LE service found!") for device in ble_devices:
for device in ble_devices: options.append(
options.append( (
( f"OTA over Bluetooth LE({device.address}) {device.name}",
f"OTA over Bluetooth LE({device.address}) {device.name}", f"mcumgr {device.address}",
f"mcumgr {device.address}",
)
) )
)
else: else:
if (show_ota and ota) or (show_api and "api" in CORE.config): if (show_ota and ota) or (show_api and "api" in CORE.config):
options.append((f"Over The Air ({CORE.address})", CORE.address)) options.append((f"Over The Air ({CORE.address})", CORE.address))
@ -346,11 +345,11 @@ def upload_using_esptool(config, port, file):
return run_esptool(115200) return run_esptool(115200)
def upload_using_platformio( def upload_using_platformio(config, port, upload_args=None):
config, port, upload_args=["-t", "upload", "-t", "nobuild"]
):
from esphome import platformio_api from esphome import platformio_api
if upload_args is None:
upload_args = ["-t", "upload", "-t", "nobuild"]
if port is not None: if port is not None:
upload_args += ["--upload-port", port] upload_args += ["--upload-port", port]
return platformio_api.run_platformio_cli_run(config, CORE.verbose, *upload_args) return platformio_api.run_platformio_cli_run(config, CORE.verbose, *upload_args)

39
esphome/zephyr_tools.py
View File

@ -11,9 +11,9 @@ from smpclient import SMPClient
from smpclient.mcuboot import IMAGE_TLV, ImageInfo, TLVNotFound from smpclient.mcuboot import IMAGE_TLV, ImageInfo, TLVNotFound
from smpclient.requests.image_management import ImageStatesRead, ImageStatesWrite from smpclient.requests.image_management import ImageStatesRead, ImageStatesWrite
from smpclient.requests.os_management import ResetWrite from smpclient.requests.os_management import ResetWrite
from smpclient.generics import error, success
from smp.exceptions import SMPBadStartDelimiter from smp.exceptions import SMPBadStartDelimiter
from smpclient.generics import error, success
from esphome.espota2 import ProgressBar from esphome.espota2 import ProgressBar
SMP_SERVICE_UUID = "8D53DC1D-1DB7-4CD3-868B-8A527460AA84" SMP_SERVICE_UUID = "8D53DC1D-1DB7-4CD3-868B-8A527460AA84"
@ -31,7 +31,7 @@ def is_mac_address(value):
async def logger_scan(name): async def logger_scan(name):
_LOGGER.info(f"Scanning bluetooth for {name}...") _LOGGER.info("Scanning bluetooth for %s...", name)
device = await BleakScanner.find_device_by_name(name) device = await BleakScanner.find_device_by_name(name)
return device return device
@ -45,19 +45,19 @@ async def logger_connect(host):
def handle_rx(_, data: bytearray): def handle_rx(_, data: bytearray):
print(data.decode("utf-8"), end="") print(data.decode("utf-8"), end="")
_LOGGER.info(f"Connecting {host}...") _LOGGER.info("Connecting %s...", host)
async with BleakClient(host, disconnected_callback=handle_disconnect) as client: async with BleakClient(host, disconnected_callback=handle_disconnect) as client:
_LOGGER.info(f"Connected {host}...") _LOGGER.info("Connected %s...", host)
try: try:
await client.start_notify(NUS_TX_CHAR_UUID, handle_rx) await client.start_notify(NUS_TX_CHAR_UUID, handle_rx)
except BleakDBusError as e: except BleakDBusError as e:
_LOGGER.error(f"Bluetooth LE logger: {e}") _LOGGER.error("Bluetooth LE logger: %s", e)
disconnected_event.set() disconnected_event.set()
await disconnected_event.wait() await disconnected_event.wait()
async def smpmgr_scan(name): async def smpmgr_scan(name):
_LOGGER.info(f"Scanning bluetooth for {name}...") _LOGGER.info("Scanning bluetooth for %s...", name)
devices = [] devices = []
for device in await BleakScanner.discover(service_uuids=[SMP_SERVICE_UUID]): for device in await BleakScanner.discover(service_uuids=[SMP_SERVICE_UUID]):
if device.name == name: if device.name == name:
@ -66,18 +66,18 @@ async def smpmgr_scan(name):
def get_image_tlv_sha256(file): def get_image_tlv_sha256(file):
_LOGGER.info(f"Checking image: {str(file)}") _LOGGER.info("Checking image: %s", str(file))
try: try:
image_info = ImageInfo.load_file(str(file)) image_info = ImageInfo.load_file(str(file))
pprint(image_info.header) pprint(image_info.header)
_LOGGER.debug(str(image_info)) _LOGGER.debug(str(image_info))
except Exception as e: except Exception as e:
_LOGGER.error(f"Inspection of FW image failed: {e}") _LOGGER.error("Inspection of FW image failed: %s", e)
return None return None
try: try:
image_tlv_sha256 = image_info.get_tlv(IMAGE_TLV.SHA256) image_tlv_sha256 = image_info.get_tlv(IMAGE_TLV.SHA256)
_LOGGER.debug(f"IMAGE_TLV_SHA256: {image_tlv_sha256}") _LOGGER.debug("IMAGE_TLV_SHA256: %s", image_tlv_sha256)
except TLVNotFound: except TLVNotFound:
_LOGGER.error("Could not find IMAGE_TLV_SHA256 in image.") _LOGGER.error("Could not find IMAGE_TLV_SHA256 in image.")
return None return None
@ -94,21 +94,21 @@ async def smpmgr_upload(config, host, firmware):
else: else:
smp_client = SMPClient(SMPSerialTransport(mtu=256), host) smp_client = SMPClient(SMPSerialTransport(mtu=256), host)
_LOGGER.info(f"Connecting {host}...") _LOGGER.info("Connecting %s...", host)
try: try:
await smp_client.connect() await smp_client.connect()
except BleakDeviceNotFoundError: except BleakDeviceNotFoundError:
_LOGGER.error(f"Device {host} not found") _LOGGER.error("Device %s not found", host)
return 1 return 1
_LOGGER.info(f"Connected {host}...") _LOGGER.info("Connected %s...", host)
try: try:
image_state = await asyncio.wait_for( image_state = await asyncio.wait_for(
smp_client.request(ImageStatesRead()), timeout=SMPClient.MEDIUM_TIMEOUT smp_client.request(ImageStatesRead()), timeout=SMPClient.MEDIUM_TIMEOUT
) )
except SMPBadStartDelimiter as e: except SMPBadStartDelimiter as e:
_LOGGER.error(f"mcumgr is not supported by device ({e})") _LOGGER.error("mcumgr is not supported by device (%s)", e)
return 1 return 1
already_uploaded = False already_uploaded = False
@ -116,7 +116,7 @@ async def smpmgr_upload(config, host, firmware):
if error(image_state): if error(image_state):
_LOGGER.error(image_state) _LOGGER.error(image_state)
return 1 return 1
elif success(image_state): if success(image_state):
if len(image_state.images) == 0: if len(image_state.images) == 0:
_LOGGER.warning("No images on device!") _LOGGER.warning("No images on device!")
for image in image_state.images: for image in image_state.images:
@ -128,12 +128,11 @@ async def smpmgr_upload(config, host, firmware):
if already_uploaded: if already_uploaded:
_LOGGER.error("Both slots have the same image") _LOGGER.error("Both slots have the same image")
return 1 return 1
else: if image.confirmed:
if image.confirmed: _LOGGER.error("Image already confirmted")
_LOGGER.error("Image already confirmted") return 1
return 1 _LOGGER.warning("The same image already uploaded")
_LOGGER.warning("The same image already uploaded") already_uploaded = True
already_uploaded = True
if not already_uploaded: if not already_uploaded:
with open(firmware, "rb") as file: with open(firmware, "rb") as file: