Merge pull request #37 from zha-ng/dev

0.4.0 Release

custom_components/zha_map/neighbour.py

@@ -43,12 +43,12 @@ def new_from_record(cls, record):
         r.pan_id = str(record.extended_pan_id)
         r.ieee = record.ieee
 
-        r.device_type = record.struct.device_type.name
-        r.rx_on_when_idle = record.struct.rx_on_when_idle.name
-        if record.struct.relationship == zdo_t.Neighbor.RelationShip.NoneOfTheAbove:
+        r.device_type = record.device_type.name
+        r.rx_on_when_idle = record.rx_on_when_idle.name
+        if record.relationship == zdo_t.Neighbor.RelationShip.NoneOfTheAbove:
             r.relation = "None_of_the_above"
         else:
-            r.relation = record.struct.relationship.name
+            r.relation = record.relationship.name
         r.new_joins_accepted = record.permit_joining.name
         r.depth = record.depth
         r.lqi = record.lqi
@@ -61,7 +61,10 @@ def _update_info(self):
         self.nwk = "0x{:04x}".format(self.device.nwk)
         self.model = self.device.model
         self.manufacturer = self.device.manufacturer
-        self.device_type = self.device.node_desc.logical_type.name
+        if self.device.node_desc.is_valid:
+            self.device_type = self.device.node_desc.logical_type.name
+        else:
+            self.device_type = "unknown"
 
     @classmethod
     async def scan_device(cls, device):