Detect the CC2538 and include Z-Stack build in model number (#72)

Author: puddly

tests/application/test_startup.py

@@ -21,23 +21,23 @@
 
 DEV_NETWORK_SETTINGS = {
     FormedLaunchpadCC26X2R1: (
-        "CC13X2/CC26X2, Z-Stack 3.30.00/3.40.00/4.10.00",
+        "CC1352/CC2652, Z-Stack 3.30+ (build 20200805)",
         15,
         t.Channels.from_channel_list([15]),
         0x4402,
         t.EUI64.convert("a2:ba:38:a8:b5:e6:83:a0"),
         t.KeyData(bytes.fromhex("4c4e72b8412251799abf35251288ca83")),
     ),
     FormedZStack3CC2531: (
-        "CC2531, Z-Stack 3.0.1/3.0.2",
+        "CC2531, Z-Stack 3.0.x (build 20190425)",
         15,
         t.Channels.from_channel_list([15]),
         0xB6AB,
         t.EUI64.convert("62:92:32:46:3c:77:2d:b2"),
         t.KeyData(bytes.fromhex("6dde24eae28552b6de2956eb05851afa")),
     ),
     FormedZStack1CC2531: (
-        "CC2531, Z-Stack Home 1.2",
+        "CC2531, Z-Stack Home 1.2 (build 20190608)",
         11,
         t.Channels.from_channel_list([11]),
         0x1A62,

zigpy_znp/zigbee/application.py

@@ -91,17 +91,16 @@ def manufacturer(self):
 
     @property
     def model(self):
-        if self.application._znp.version == 1.2:
-            model = "CC2531"
-            version = "Home 1.2"
-        elif self.application._znp.version == 3.0:
-            model = "CC2531"
-            version = "3.0.1/3.0.2"
+        if self.application._znp.version > 3.0:
+            model = "CC1352/CC2652"
+            version = "3.30+"
         else:
-            model = "CC13X2/CC26X2"
-            version = "3.30.00/3.40.00/4.10.00"
+            model = "CC2538" if self.application._znp.nvram.align_structs else "CC2531"
+            version = "Home 1.2" if self.application._znp.version == 1.2 else "3.0.x"
 
-        return f"{model}, Z-Stack {version}"
+        build = self.application._version_rsp.CodeRevision
+
+        return f"{model}, Z-Stack {version} (build {build})"
 
 
 class ControllerApplication(zigpy.application.ControllerApplication):
@@ -122,6 +121,7 @@ def __init__(self, config: conf.ConfigType):
 
         self._network_key = None
         self._network_key_seq = None
+        self._version_rsp = None
         self._concurrent_requests_semaphore = None
         self._currently_waiting_requests = 0
         self._route_discovery_futures = {}
@@ -353,11 +353,11 @@ async def _startup(self, auto_form=False, force_form=False, read_only=False):
 
         self._concurrent_requests_semaphore = asyncio.Semaphore(max_concurrent_requests)
 
-        version_rsp = await self._znp.request(c.SYS.Version.Req())
+        self._version_rsp = await self._znp.request(c.SYS.Version.Req())
 
         LOGGER.info("Network settings")
         LOGGER.info("  Z-Stack version: %s", self._znp.version)
-        LOGGER.info("  Z-Stack build id: %s", version_rsp.CodeRevision)
+        LOGGER.info("  Z-Stack build id: %s", self._version_rsp.CodeRevision)
         LOGGER.info("  Max concurrent requests: %s", max_concurrent_requests)
         LOGGER.info("  Channel: %s", self.channel)
         LOGGER.info("  PAN ID: 0x%04X", self.pan_id)