Consolidate all EZSP types

bellows/ezsp/__init__.py

@@ -357,9 +357,7 @@ async def get_board_info(
 
             tokens[token] = result
 
-        (status, ver_info_bytes) = await self.getValue(
-            self.types.EzspValueId.VALUE_VERSION_INFO
-        )
+        (status, ver_info_bytes) = await self.getValue(t.EzspValueId.VALUE_VERSION_INFO)
         version = None
 
         if t.sl_Status.from_ember_status(status) == t.sl_Status.OK:
@@ -500,7 +498,7 @@ async def set_source_routing(self) -> None:
         """Enable source routing on NCP."""
         res = await self.setConcentrator(
             True,
-            self.types.EmberConcentratorType.HIGH_RAM_CONCENTRATOR,
+            t.EmberConcentratorType.HIGH_RAM_CONCENTRATOR,
             MTOR_MIN_INTERVAL,
             MTOR_MAX_INTERVAL,
             MTOR_ROUTE_ERROR_THRESHOLD,
@@ -548,11 +546,11 @@ async def write_config(self, config: dict) -> None:
         for cfg in DEFAULT_CONFIG[self._ezsp_version]:
             if isinstance(cfg, RuntimeConfig):
                 ezsp_config[cfg.config_id.name] = dataclasses.replace(
-                    cfg, config_id=self.types.EzspConfigId[cfg.config_id.name]
+                    cfg, config_id=t.EzspConfigId[cfg.config_id.name]
                 )
             elif isinstance(cfg, ValueConfig):
                 ezsp_values[cfg.value_id.name] = dataclasses.replace(
-                    cfg, value_id=self.types.EzspValueId[cfg.value_id.name]
+                    cfg, value_id=t.EzspValueId[cfg.value_id.name]
                 )
 
         # Override the defaults with user-specified values (or `None` for deletions)
@@ -562,16 +560,16 @@ async def write_config(self, config: dict) -> None:
                 continue
 
             ezsp_config[name] = RuntimeConfig(
-                config_id=self.types.EzspConfigId[name],
+                config_id=t.EzspConfigId[name],
                 value=value,
             )
 
         # Make sure CONFIG_PACKET_BUFFER_COUNT is always set last
-        if self.types.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT.name in ezsp_config:
+        if t.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT.name in ezsp_config:
             ezsp_config = {
                 **ezsp_config,
-                self.types.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT.name: ezsp_config[
-                    self.types.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT.name
+                t.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT.name: ezsp_config[
+                    t.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT.name
                 ],
             }
 

bellows/ezsp/config.py

@@ -3,9 +3,6 @@
 import dataclasses
 import typing
 
-import bellows.ezsp.v4.types as types_v4
-import bellows.ezsp.v6.types as types_v6
-import bellows.ezsp.v7.types as types_v7
 import bellows.types as t
 
 
@@ -24,97 +21,95 @@ class ValueConfig:
 
 DEFAULT_CONFIG_COMMON = [
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_INDIRECT_TRANSMISSION_TIMEOUT,
+        config_id=t.EzspConfigId.CONFIG_INDIRECT_TRANSMISSION_TIMEOUT,
         value=7680,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_STACK_PROFILE,
+        config_id=t.EzspConfigId.CONFIG_STACK_PROFILE,
         value=2,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_SUPPORTED_NETWORKS,
+        config_id=t.EzspConfigId.CONFIG_SUPPORTED_NETWORKS,
         value=1,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_MULTICAST_TABLE_SIZE,
+        config_id=t.EzspConfigId.CONFIG_MULTICAST_TABLE_SIZE,
         value=16,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_TRUST_CENTER_ADDRESS_CACHE_SIZE,
+        config_id=t.EzspConfigId.CONFIG_TRUST_CENTER_ADDRESS_CACHE_SIZE,
         value=2,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_SECURITY_LEVEL,
+        config_id=t.EzspConfigId.CONFIG_SECURITY_LEVEL,
         value=5,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_ADDRESS_TABLE_SIZE,
+        config_id=t.EzspConfigId.CONFIG_ADDRESS_TABLE_SIZE,
         value=16,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_PAN_ID_CONFLICT_REPORT_THRESHOLD,
+        config_id=t.EzspConfigId.CONFIG_PAN_ID_CONFLICT_REPORT_THRESHOLD,
         value=2,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_KEY_TABLE_SIZE,
+        config_id=t.EzspConfigId.CONFIG_KEY_TABLE_SIZE,
         value=4,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_MAX_END_DEVICE_CHILDREN,
+        config_id=t.EzspConfigId.CONFIG_MAX_END_DEVICE_CHILDREN,
         value=32,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_APPLICATION_ZDO_FLAGS,
+        config_id=t.EzspConfigId.CONFIG_APPLICATION_ZDO_FLAGS,
         value=(
             t.EmberZdoConfigurationFlags.APP_RECEIVES_SUPPORTED_ZDO_REQUESTS
             | t.EmberZdoConfigurationFlags.APP_HANDLES_UNSUPPORTED_ZDO_REQUESTS
         ),
     ),
     # Must be set last
-    RuntimeConfig(types_v4.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT, value=0xFF),
+    RuntimeConfig(t.EzspConfigId.CONFIG_PACKET_BUFFER_COUNT, value=0xFF),
 ]
 
 DEFAULT_CONFIG_LEGACY = [
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_SOURCE_ROUTE_TABLE_SIZE,
+        config_id=t.EzspConfigId.CONFIG_SOURCE_ROUTE_TABLE_SIZE,
         value=16,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_END_DEVICE_POLL_TIMEOUT,
+        config_id=t.EzspConfigId.CONFIG_END_DEVICE_POLL_TIMEOUT,
         value=60,
     ),
     RuntimeConfig(
-        config_id=types_v4.EzspConfigId.CONFIG_END_DEVICE_POLL_TIMEOUT_SHIFT,
+        config_id=t.EzspConfigId.CONFIG_END_DEVICE_POLL_TIMEOUT_SHIFT,
         value=8,
     ),
 ] + DEFAULT_CONFIG_COMMON
 
 
 DEFAULT_CONFIG_NEW = [
     RuntimeConfig(
-        config_id=types_v6.EzspConfigId.CONFIG_SOURCE_ROUTE_TABLE_SIZE,
+        config_id=t.EzspConfigId.CONFIG_SOURCE_ROUTE_TABLE_SIZE,
         value=200,
         minimum=True,
     ),
     RuntimeConfig(
-        config_id=types_v6.EzspConfigId.CONFIG_END_DEVICE_POLL_TIMEOUT,
+        config_id=t.EzspConfigId.CONFIG_END_DEVICE_POLL_TIMEOUT,
         value=8,
     ),
     RuntimeConfig(
-        config_id=(
-            types_v6.EzspConfigId.CONFIG_TC_REJOINS_USING_WELL_KNOWN_KEY_TIMEOUT_S
-        ),
+        config_id=(t.EzspConfigId.CONFIG_TC_REJOINS_USING_WELL_KNOWN_KEY_TIMEOUT_S),
         value=90,
     ),
     ValueConfig(
-        value_id=types_v7.EzspValueId.VALUE_FORCE_TX_AFTER_FAILED_CCA_ATTEMPTS,
+        value_id=t.EzspValueId.VALUE_FORCE_TX_AFTER_FAILED_CCA_ATTEMPTS,
         value=t.uint8_t(1),
     ),
 ] + DEFAULT_CONFIG_COMMON

bellows/ezsp/protocol.py

@@ -47,7 +47,7 @@ def _ezsp_frame(self, name: str, *args: tuple[Any, ...]) -> bytes:
         """Serialize the named frame and data."""
         c = self.COMMANDS[name]
         frame = self._ezsp_frame_tx(name)
-        data = self.types.serialize(args, c[1])
+        data = t.serialize(args, c[1])
         return frame + data
 
     @abc.abstractmethod
@@ -75,10 +75,10 @@ async def update_policies(self, policy_config: dict) -> None:
         """Set up the policies for what the NCP should do."""
 
         policies = self.SCHEMAS[CONF_EZSP_POLICIES](policy_config)
-        self.tc_policy = policies[self.types.EzspPolicyId.TRUST_CENTER_POLICY.name]
+        self.tc_policy = policies[t.EzspPolicyId.TRUST_CENTER_POLICY.name]
 
         for policy, value in policies.items():
-            (status,) = await self.setPolicy(self.types.EzspPolicyId[policy], value)
+            (status,) = await self.setPolicy(t.EzspPolicyId[policy], value)
             assert (
                 t.sl_Status.from_ember_status(status) == t.sl_Status.OK
             )  # TODO: Better check
@@ -101,7 +101,7 @@ def __call__(self, data: bytes) -> None:
 
         try:
             if isinstance(rx_schema, tuple):
-                result, data = self.types.deserialize(data, rx_schema)
+                result, data = t.deserialize(data, rx_schema)
             else:
                 result, data = rx_schema.deserialize(data)
         except Exception:

bellows/ezsp/v10/__init__.py

@@ -8,7 +8,7 @@
 import bellows.config
 import bellows.types as t
 
-from . import commands, config, types as v10_types
+from . import commands, config
 from ..v9 import EZSPv9
 
 LOGGER = logging.getLogger(__name__)
@@ -23,13 +23,12 @@ class EZSPv10(EZSPv9):
         bellows.config.CONF_EZSP_CONFIG: voluptuous.Schema(config.EZSP_SCHEMA),
         bellows.config.CONF_EZSP_POLICIES: voluptuous.Schema(config.EZSP_POLICIES_SCH),
     }
-    types = v10_types
 
     async def write_child_data(self, children: dict[t.EUI64, t.NWK]) -> None:
         for index, (eui64, nwk) in enumerate(children.items()):
             await self.setChildData(
                 index,
-                self.types.EmberChildData(
+                t.EmberChildDataV10(
                     eui64=eui64,
                     type=t.EmberNodeType.SLEEPY_END_DEVICE,
                     id=nwk,

bellows/ezsp/v10/commands.py

@@ -1,4 +1,5 @@
-from . import types as t
+import bellows.types as t
+
 from ..v9.commands import COMMANDS as COMMANDS_v9
 
 COMMANDS = {
@@ -7,11 +8,11 @@
     "getChildData": (
         0x004A,
         (t.uint8_t,),
-        (t.EmberStatus, t.EmberChildData),
+        (t.EmberStatus, t.EmberChildDataV10),
     ),
     "setChildData": (
         0x00AC,
-        (t.uint8_t, t.EmberChildData),
+        (t.uint8_t, t.EmberChildDataV10),
         (t.EmberStatus,),
     ),
 }

bellows/ezsp/v10/config.py

@@ -1,10 +1,10 @@
 import voluptuous as vol
 
 from bellows.config import cv_uint16
+from bellows.types import EzspPolicyId
 
 from ..v4.config import EZSP_POLICIES_SHARED
 from ..v9 import config as v9_config
-from .types import EzspPolicyId
 
 EZSP_SCHEMA = {
     **v9_config.EZSP_SCHEMA,