diff --git a/pyproject.toml b/pyproject.toml index 858949b..0d7614c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,11 +17,12 @@ dependencies = [ "click", "coloredlogs", "scapy", - "zigpy>=0.54.0", - "bellows>=0.35.0", - "zigpy-deconz>=0.12.0", - "zigpy-znp>=0.10.0", - "zigpy-xbee>=0.17.0", + "zigpy>=0.55.0", + "bellows>=0.35.1", + "zigpy-deconz>=0.21.0", + "zigpy-xbee>=0.18.0", + "zigpy-zigate>=0.11.0", + "zigpy-znp>=0.11.1" ] [tool.setuptools.packages.find] diff --git a/zigpy_cli/radio.py b/zigpy_cli/radio.py index faaeb35..089069f 100644 --- a/zigpy_cli/radio.py +++ b/zigpy_cli/radio.py @@ -236,37 +236,4 @@ async def change_channel(app, channel): LOGGER.info("Current channel is %s", app.state.network_info.channel) - await zigpy.zdo.broadcast( - app=app, - command=zigpy.zdo.types.ZDOCmd.Mgmt_NWK_Update_req, - grpid=None, - radius=0, - broadcast_address=zigpy.types.BroadcastAddress.ALL_DEVICES, - NwkUpdate=zigpy.zdo.types.NwkUpdate( - ScanChannels=zigpy.types.Channels.from_channel_list([channel]), - ScanDuration=zigpy.zdo.types.NwkUpdate.CHANNEL_CHANGE_REQ, - nwkUpdateId=app.state.network_info.nwk_update_id + 1, - ), - ) - - try: - await app.get_device(nwk=0x0000).zdo.Mgmt_NWK_Update_req( - zigpy.zdo.types.NwkUpdate( - ScanChannels=zigpy.types.Channels.from_channel_list([channel]), - ScanDuration=zigpy.zdo.types.NwkUpdate.CHANNEL_CHANGE_REQ, - nwkUpdateId=app.state.network_info.nwk_update_id + 1, - ), - ) - except asyncio.TimeoutError: - pass - - while True: - await app.load_network_info() - - LOGGER.info("Channel is currently %s", app.state.network_info.channel) - - if app.state.network_info.channel == channel: - break - - LOGGER.info("Waiting...") - await asyncio.sleep(3) + await app.move_network_to_channel(channel)