Fix similarly-named but very different DeviceState enums (#22)

Author: puddly

tests/test_application.py

@@ -249,7 +249,7 @@ def on_endpoint_deletion(req):
                 Status=t.Status.SUCCESS,
                 IEEE=t.EUI64([0x00, 0x12, 0x4B, 0x00, 0x1C, 0xAA, 0xAC, 0x5C]),
                 NWK=t.NWK(0xFFFE),
-                DeviceType=t.DeviceLogicalType(7),
+                DeviceType=t.DeviceTypeCapabilities(7),
                 DeviceState=t.DeviceState.InitializedNotStarted,
                 AssociatedDevices=[],
             )

zigpy_znp/commands/app_config.py

@@ -40,7 +40,6 @@ class BDBCommissioningStatus(t.enum_uint8):
     TLNotPermitted = 0x06
     TCLKExFailure = 0x07
     FormationFailure = 0x08
-    Initialization = 0x00
     FBTargetInProgress = 0x09
     FBInitiatorInProgress = 0x0A
     FBNoIdentifyQueryResponse = 0x0B

zigpy_znp/commands/util.py

@@ -38,7 +38,7 @@ class Util(t.CommandsBase, subsystem=t.Subsystem.UTIL):
                 ),
                 t.Param("IEEE", t.EUI64, "Extended address of the device"),
                 t.Param("NWK", t.NWK, "Short address of the device"),
-                t.Param("DeviceType", t.DeviceLogicalType, "Device type"),
+                t.Param("DeviceType", t.DeviceTypeCapabilities, "Device type"),
                 t.Param(
                     "DeviceState", t.DeviceState, "Indicated the state of the device"
                 ),

zigpy_znp/types/named.py

@@ -281,7 +281,13 @@ class StartupOptions(basic.enum_flag_uint8):
     AutoStart = 1 << 2
 
 
-class DeviceLogicalType(basic.enum_flag_uint8):
+class DeviceLogicalType(basic.enum_uint8):
+    Coordinator = 0
+    Router = 1
+    EndDevice = 2
+
+
+class DeviceTypeCapabilities(basic.enum_flag_uint8):
     Coordinator = 1 << 0
     Router = 1 << 1
     EndDevice = 1 << 2