Implement new zigpy network state

.gitignore

@@ -70,4 +70,8 @@ ENV/
 .*.swp
 
 # Visual Studio Code
-.vscode
+.vscode
+
+
+# macOS
+.DS_Store

bellows/ezsp/v7/commands.py

@@ -137,7 +137,7 @@
     "getChildData": (
         0x4A,
         (t.uint8_t,),
-        (t.EmberStatus, t.EmberNodeId, t.EmberEUI64, t.EmberNodeType),
+        (t.EmberStatus, t.EmberChildData),
     ),
     "getSourceRouteTableTotalSize": (0xC3, (), (t.uint8_t,)),
     "getSourceRouteTableFilledSize": (0xC2, (), (t.uint8_t,)),

bellows/ezsp/v7/types/struct.py

@@ -189,3 +189,25 @@ class EmberPerDeviceDutyCycle(EzspStruct):
     nodeId: named.EmberNodeId
     # Amount of overall duty cycle consumed (up to suspend limit).
     dutyCycleConsumed: named.EmberDutyCycleHectoPct
+
+
+class EmberChildData(EzspStruct):
+    """A structure containing a child node's data."""
+
+    # The EUI64 of the child
+    eui64: named.EmberEUI64
+    # The node type of the child
+    type: named.EmberNodeType
+    # The short address of the child
+    id: named.EmberNodeId
+    # The phy of the child
+    phy: basic.uint8_t
+    # The power of the child
+    power: basic.uint8_t
+    # The timeout of the child
+    timeout: basic.uint8_t
+
+    # The GPD's EUI64.
+    # gpdIeeeAddress: named.EmberEUI64
+    # The GPD's source ID.
+    # sourceId: basic.uint32_t

bellows/ezsp/v8/commands.py

@@ -134,7 +134,7 @@
     "getChildData": (
         0x004A,
         (t.uint8_t,),
-        (t.EmberStatus, t.EmberNodeId, t.EmberEUI64, t.EmberNodeType),
+        (t.EmberStatus, t.EmberChildData),
     ),
     "getSourceRouteTableTotalSize": (0x00C3, (), (t.uint8_t,)),
     "getSourceRouteTableFilledSize": (0x00C2, (), (t.uint8_t,)),

bellows/ezsp/v8/types/struct.py

@@ -202,3 +202,25 @@ class EmberTransientKeyData(EzspStruct):
     # The number of seconds remaining before the key is automatically timed out of the
     # transient key table.
     remainingTimeSeconds: basic.uint16_t
+
+
+class EmberChildData(EzspStruct):
+    """A structure containing a child node's data."""
+
+    # The EUI64 of the child
+    eui64: named.EmberEUI64
+    # The node type of the child
+    type: named.EmberNodeType
+    # The short address of the child
+    id: named.EmberNodeId
+    # The phy of the child
+    phy: basic.uint8_t
+    # The power of the child
+    power: basic.uint8_t
+    # The timeout of the child
+    timeout: basic.uint8_t
+
+    # The GPD's EUI64.
+    # gpdIeeeAddress: named.EmberEUI64
+    # The GPD's source ID.
+    # sourceId: basic.uint32_t

bellows/types/named.py

@@ -610,6 +610,9 @@ class EmberStatus(basic.enum8):
     # An index was passed into the function that was larger than the valid
     # range.
     INDEX_OUT_OF_RANGE = 0xB1
+    # The passed key data is not valid. A key of all zeros or all F's are reserved
+    # values and cannot be used.
+    KEY_INVALID = 0xB2
     # There are no empty entries left in the table.
     TABLE_FULL = 0xB4
     # The requested table entry has been erased and contains no valid data.
@@ -970,6 +973,8 @@ class EmberCurrentSecurityBitmask(basic.bitmap16):
     GLOBAL_LINK_KEY = 0x0004
     # This denotes that the node has a Trust Center Link Key.
     HAVE_TRUST_CENTER_LINK_KEY = 0x0010
+    # TODO: 0x0020 is unknown
+    # TODO: 0x0040 is unknown
     # This denotes that the Trust Center is using a Hashed Link Key.
     TRUST_CENTER_USES_HASHED_LINK_KEY = 0x0084
 
@@ -994,6 +999,12 @@ class EmberKeyStructBitmask(basic.bitmap16):
     # hears a device announce from the partner indicating it is not
     # an 'RX on when idle' device.
     KEY_PARTNER_IS_SLEEPY = 0x0020
+    # This indicates that the transient key which is being added is unconfirmed. This
+    # bit is set when we add a transient key while the EmberTcLinkKeyRequestPolicy is
+    # EMBER_ALLOW_TC_LINK_KEY_REQUEST_AND_GENERATE_NEW_KEY
+    UNCONFIRMED_TRANSIENT_KEY = 0x0040
+
+    # TODO: 0x0080 is unknown
 
 
 class EmberKeyStatus(basic.enum8):
@@ -1757,3 +1768,22 @@ class sl_Status(basic.enum32):
     SL_STATUS_WIFI_RETRY_EXCEEDED = 0x0B1F
     #  The request failed because the MSDU life time was exceeded
     SL_STATUS_WIFI_TX_LIFETIME_EXCEEDED = 0x0B20
+
+
+class EmberDistinguishedNodeId(basic.enum16):
+    """A distinguished network ID that will never be assigned to any node"""
+
+    # This value is used when getting the remote node ID from the address or binding
+    # tables. It indicates that the address or binding table entry is currently in use
+    # and network address discovery is underway.
+    DISCOVERY_ACTIVE = 0xFFFC
+
+    # This value is used when getting the remote node ID from the address or binding
+    # tables. It indicates that the address or binding table entry is currently in use
+    # but the node ID corresponding to the EUI64 in the table is currently unknown.
+    UNKNOWN = 0xFFFD
+
+    # This value is used when setting or getting the remote node ID in the address table
+    # or getting the remote node ID from the binding table. It indicates that the
+    # address or binding table entry is not in use.
+    TABLE_ENTRY_UNUSED = 0xFFFF

bellows/types/struct.py

@@ -2,8 +2,6 @@
 import inspect
 import typing
 
-import zigpy.state as app_state
-
 from . import basic, named
 
 NoneType = type(None)
@@ -282,19 +280,6 @@ class EmberNetworkParameters(EzspStruct):
     # method.
     channels: named.Channels
 
-    @property
-    def zigpy_network_information(self) -> app_state.NetworkInformation:
-        """Convert to NetworkInformation."""
-        r = app_state.NetworkInformation(
-            self.extendedPanId,
-            app_state.t.PanId(self.panId),
-            self.nwkUpdateId,
-            app_state.t.NWK(self.nwkManagerId),
-            self.radioChannel,
-            channel_mask=self.channels,
-        )
-        return r
-
 
 class EmberZigbeeNetwork(EzspStruct):
     # The parameters of a ZigBee network.