Skip to content

Commit f9f37b7

Browse files
puddlyfrenck
authored andcommitted
Disable baudrate bootloader reset for ZBT-2 (home-assistant#153443)
1 parent 7bdd9dd commit f9f37b7

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

homeassistant/components/homeassistant_connect_zbt2/config_flow.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ class ZBT2FirmwareMixin(ConfigEntryBaseFlow, FirmwareInstallFlowProtocol):
6767
"""Mixin for Home Assistant Connect ZBT-2 firmware methods."""
6868

6969
context: ConfigFlowContext
70-
71-
# `rts_dtr` targets older adapters, `baudrate` works for newer ones. The reason we
72-
# try them in this order is that on older adapters `baudrate` entered the ESP32-S3
73-
# bootloader instead of the MG24 bootloader.
74-
BOOTLOADER_RESET_METHODS = [ResetTarget.RTS_DTR, ResetTarget.BAUDRATE]
70+
BOOTLOADER_RESET_METHODS = [ResetTarget.RTS_DTR]
7571

7672
async def async_step_install_zigbee_firmware(
7773
self, user_input: dict[str, Any] | None = None

homeassistant/components/homeassistant_connect_zbt2/update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ async def async_setup_entry(
157157
class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
158158
"""Connect ZBT-2 firmware update entity."""
159159

160-
bootloader_reset_methods = [ResetTarget.RTS_DTR, ResetTarget.BAUDRATE]
160+
bootloader_reset_methods = [ResetTarget.RTS_DTR]
161161

162162
def __init__(
163163
self,

tests/components/homeassistant_connect_zbt2/test_config_flow.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,7 @@ async def test_options_flow(
328328

329329
# Verify async_flash_silabs_firmware was called with ZBT-2's reset methods
330330
assert flash_mock.call_count == 1
331-
assert flash_mock.mock_calls[0].kwargs["bootloader_reset_methods"] == [
332-
"rts_dtr",
333-
"baudrate",
334-
]
331+
assert flash_mock.mock_calls[0].kwargs["bootloader_reset_methods"] == ["rts_dtr"]
335332

336333

337334
async def test_duplicate_discovery(hass: HomeAssistant) -> None:

0 commit comments

Comments
 (0)