11from __future__ import annotations
22
3+ import json
34import logging
45import importlib
56import collections
7+ import importlib .util
68
79import click
810import zigpy .state
911import zigpy .types
10- import zigpy .config as conf
1112import zigpy .zdo .types
1213
1314from zigpy_cli .cli import cli , click_coroutine
14- from zigpy_cli .utils import format_bytes
15- from zigpy_cli .common import (
16- RADIO_TO_PYPI ,
17- HEX_OR_DEC_INT ,
18- RADIO_TO_PACKAGE ,
19- RADIO_LOGGING_CONFIGS ,
20- )
15+ from zigpy_cli .const import RADIO_TO_PYPI , RADIO_TO_PACKAGE , RADIO_LOGGING_CONFIGS
16+ from zigpy_cli .common import HEX_OR_DEC_INT
2117
2218LOGGER = logging .getLogger (__name__ )
2319
2622@click .pass_context
2723@click .argument ("radio" , type = click .Choice (list (RADIO_TO_PACKAGE .keys ())))
2824@click .argument ("port" , type = str )
25+ @click .option ("--baudrate" , type = int , default = None )
2926@click_coroutine
30- async def radio (ctx , radio , port ):
27+ async def radio (ctx , radio , port , baudrate = None ):
3128 # Setup logging for the radio
3229 verbose = ctx .parent .params ["verbose" ]
3330 logging_configs = RADIO_LOGGING_CONFIGS [radio ]
@@ -36,26 +33,25 @@ async def radio(ctx, radio, port):
3633 for logger , level in logging_config .items ():
3734 logging .getLogger (logger ).setLevel (level )
3835
39- # Import the radio library
4036 module = RADIO_TO_PACKAGE [radio ] + ".zigbee.application"
4137
42- try :
43- radio_module = importlib .import_module (module )
44- except ImportError :
38+ # Catching just `ImportError` masks dependency errors and is annoying
39+ if importlib .util .find_spec (module ) is None :
4540 raise click .ClickException (
4641 f"Radio module for { radio !r}
4742 f" Install it with `pip install { RADIO_TO_PYPI [radio ]}
4843 )
4944
45+ # Import the radio library
46+ radio_module = importlib .import_module (module )
47+
5048 # Start the radio
5149 app_cls = radio_module .ControllerApplication
52- config = app_cls .SCHEMA (
53- {
54- conf .CONF_DEVICE : {
55- conf .CONF_DEVICE_PATH : port ,
56- },
57- }
58- )
50+ config = app_cls .SCHEMA ({"device" : {"path" : port }})
51+
52+ if baudrate is not None :
53+ config ["device" ]["baudrate" ] = baudrate
54+
5955 app = app_cls (config )
6056
6157 ctx .obj = app
@@ -66,36 +62,59 @@ async def radio(ctx, radio, port):
6662@click_coroutine
6763async def radio_cleanup (app ):
6864 try :
69- await app .pre_shutdown ()
65+ await app .shutdown ()
7066 except RuntimeError :
7167 LOGGER .warning ("Caught an exception when shutting down app" , exc_info = True )
7268
7369
74- def dump_app_info (app ):
75- if app .pan_id is not None :
76- print (f"PAN ID: 0x{ app .pan_id :04X} )
70+ @radio .command ()
71+ @click .pass_obj
72+ @click_coroutine
73+ async def info (app ):
74+ await app .connect ()
75+ await app .load_network_info (load_devices = False )
76+
77+ print (f"PAN ID: 0x{ app .state .network_info .pan_id :04X} )
78+ print (f"Extended PAN ID: { app .state .network_info .extended_pan_id } )
79+ print (f"Channel: { app .state .network_info .channel } )
80+ print (f"Channel mask: { list (app .state .network_info .channel_mask )} )
81+ print (f"NWK update ID: { app .state .network_info .nwk_update_id } )
82+ print (f"Device IEEE: { app .state .node_info .ieee } )
83+ print (f"Device NWK: 0x{ app .state .node_info .nwk :04X} )
84+ print (f"Network key: { app .state .network_info .network_key .key } )
85+ print (f"Network key sequence: { app .state .network_info .network_key .seq } )
86+ print (f"Network key counter: { app .state .network_info .network_key .tx_counter } )
7787
78- print (f"Extended PAN ID: { app .extended_pan_id } )
79- print (f"Channel: { app .channel } )
8088
81- if app .channels is not None :
82- print (f"Channel mask: { list (app .channels )} )
89+ @radio .command ()
90+ @click .argument ("output" , type = click .File ("w" ))
91+ @click .pass_obj
92+ @click_coroutine
93+ async def backup (app , output ):
94+ await app .connect ()
95+ await app .load_network_info (load_devices = True )
8396
84- print (f"NWK update ID: { app .nwk_update_id } )
85- print (f"Device IEEE: { app .ieee } )
86- print (f"Device NWK: 0x{ app .nwk :04X} )
97+ obj = zigpy .state .network_state_to_json (
98+ network_info = app .state .network_info ,
99+ node_info = app .state .node_info ,
100+ )
87101
88- if getattr (app , "network_key" , None ) is not None :
89- print (f"Network key: { format_bytes (app .network_key )} )
90- print (f"Network key sequence: { app .network_key_seq } )
102+ output .write (json .dumps (obj , indent = 4 ))
91103
92104
93105@radio .command ()
106+ @click .argument ("input" , type = click .File ("r" ))
107+ @click .option ("-c" , "--frame-counter-increment" , type = int , default = 5000 )
94108@click .pass_obj
95109@click_coroutine
96- async def info (app ):
97- await app .startup (auto_form = False )
98- dump_app_info (app )
110+ async def restore (app , frame_counter_increment , input ):
111+ obj = json .load (input )
112+
113+ network_info , node_info = zigpy .state .json_to_network_state (obj )
114+ network_info .network_key .tx_counter += frame_counter_increment
115+
116+ await app .connect ()
117+ await app .write_network_info (network_info = network_info , node_info = node_info )
99118
100119
101120@radio .command ()
@@ -104,7 +123,6 @@ async def info(app):
104123async def form (app ):
105124 await app .startup (auto_form = True )
106125 await app .form_network ()
107- dump_app_info (app )
108126
109127
110128@radio .command ()
@@ -149,14 +167,23 @@ async def energy_scan(app, nwk):
149167 print (" + TX on 26 in North America may be with lower power due to regulations" )
150168 print (" + Zigbee channels 15, 20, 25 fall between WiFi channels 1, 6, 11" )
151169 print (" + Some Zigbee devices only join networks on channels 15, 20, and 25" )
170+ print (" + Current channel is enclosed in [square brackets]" )
152171 print ("------------------------------------------------" )
153172
154173 for channel , energies in channel_energies .items ():
155174 count = sum (energies )
156175 asterisk = "*" if channel == 26 else " "
157176
177+ if channel == app .state .network_info .channel :
178+ bracket_open = "["
179+ bracket_close = "]"
180+ else :
181+ bracket_open = " "
182+ bracket_close = " "
183+
158184 print (
159- f" - { channel :>02} { asterisk } { count / total :>7.2%}
185+ f" - { bracket_open } { channel :>02} { asterisk } { bracket_close }
186+ + f" { count / total :>7.2%}
160187 + "#" * int (100 * count / total )
161188 )
162189
0 commit comments