@@ -147,24 +147,19 @@ async def load_network_info(self, *, load_devices=False):
147
147
partner_ieee = node_info .ieee ,
148
148
),
149
149
tc_link_key = zigpy .state .Key (
150
- key = None ,
150
+ key = const . DEFAULT_TC_LINK_KEY ,
151
151
seq = 0 ,
152
152
tx_counter = 0 ,
153
153
rx_counter = 0 ,
154
- partner_ieee = None ,
154
+ partner_ieee = t . EUI64 . convert ( "FF:FF:FF:FF:FF:FF:FF:FF" ) ,
155
155
),
156
156
children = [],
157
157
nwk_addresses = {},
158
158
key_table = [],
159
- stack_specific = None ,
159
+ stack_specific = {} ,
160
160
)
161
161
162
- if self .version == 1.2 :
163
- tc_link_key = await self .nvram .osal_read (
164
- OsalNvIds .TCLK_SEED , item_type = t .TCLinkKey
165
- )
166
- network_info .tc_link_key .key = tc_link_key .key
167
- else :
162
+ if self .version > 1.2 :
168
163
tclk_seed = await self .nvram .osal_read (
169
164
OsalNvIds .TCLK_SEED , item_type = t .KeyData
170
165
)
@@ -374,12 +369,15 @@ async def write_network_info(
374
369
# TCLK_SEED is TCLK_TABLE_START in Z-Stack 1
375
370
nvram [OsalNvIds .TCLK_SEED ] = t .TCLinkKey (
376
371
ExtAddr = t .EUI64 .convert ("FF:FF:FF:FF:FF:FF:FF:FF" ), # global
377
- Key = network_info .tc_link_key .key ,
372
+ Key = network_info .tc_link_key .key or const . DEFAULT_TC_LINK_KEY ,
378
373
TxFrameCounter = 0 ,
379
374
RxFrameCounter = 0 ,
380
375
)
381
376
else :
382
- if network_info .tc_link_key .key != const .DEFAULT_TC_LINK_KEY :
377
+ if (
378
+ network_info .tc_link_key is not None
379
+ and network_info .tc_link_key .key != const .DEFAULT_TC_LINK_KEY
380
+ ):
383
381
LOGGER .warning (
384
382
"TC link key is configured at build time in Z-Stack 3 and cannot be"
385
383
" changed at runtime: %s" ,
0 commit comments