velbus-aio 2024.7.6__tar.gz → 2024.11.0__tar.gz

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/MANIFEST.in

@@ -2,4 +2,4 @@ include LICENSE
 include README.md
 include requirements.txt
 include velbusaio/py.typed
-include velbusaio/protocol.json
+include velbusaio/module_spec/*

{velbus_aio-2024.7.6/velbus_aio.egg-info → velbus_aio-2024.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2024.7.6
+Version: 2024.11.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -18,10 +18,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyserial>=3.5.0
@@ -31,6 +32,17 @@ Requires-Dist: aiofile
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)
+[![PyPI version](https://badge.fury.io/py/velbus-aio.svg)](https://badge.fury.io/py/velbus-aio)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/velbus-aio.svg)](https://github.com/Cereal2nd/velbus-aio)
+[![License](https://img.shields.io/github/license/Cereal2nd/velbus-aio)](https://github.com/cereal2nd/velbus-aio/blob/master/LICENSE)
+[![Downloads](https://pepy.tech/badge/velbus-aio)](https://pepy.tech/project/velbus-aio)
+[![Downloads](https://pepy.tech/badge/velbus-aio/month)](https://pepy.tech/project/velbus-aio)
+[![Downloads](https://pepy.tech/badge/velbus-aio/week)](https://pepy.tech/project/velbus-aio)
+[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
+> This project requires financial support, but it is free for you to use. You can join those helping to keep the lights on at:
+>
+> [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/bmc-button.svg" width=150 height=40 style="margin: 5px"/>](https://buymeacoffee.com/cereal2nd) [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/github-sponsors-button.svg" width=150 height=40 style="margin: 5px"/>](https://github.com/sponsors/Cereal2nd/)
 
 # velbus-aio
 

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/README.md

@@ -1,5 +1,16 @@
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)
+[![PyPI version](https://badge.fury.io/py/velbus-aio.svg)](https://badge.fury.io/py/velbus-aio)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/velbus-aio.svg)](https://github.com/Cereal2nd/velbus-aio)
+[![License](https://img.shields.io/github/license/Cereal2nd/velbus-aio)](https://github.com/cereal2nd/velbus-aio/blob/master/LICENSE)
+[![Downloads](https://pepy.tech/badge/velbus-aio)](https://pepy.tech/project/velbus-aio)
+[![Downloads](https://pepy.tech/badge/velbus-aio/month)](https://pepy.tech/project/velbus-aio)
+[![Downloads](https://pepy.tech/badge/velbus-aio/week)](https://pepy.tech/project/velbus-aio)
+[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
+> This project requires financial support, but it is free for you to use. You can join those helping to keep the lights on at:
+>
+> [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/bmc-button.svg" width=150 height=40 style="margin: 5px"/>](https://buymeacoffee.com/cereal2nd) [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/github-sponsors-button.svg" width=150 height=40 style="margin: 5px"/>](https://github.com/sponsors/Cereal2nd/)
 
 # velbus-aio
 

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"]
 [project]
 name = "velbus-aio"
 license = {text = "MIT"}
-version = "2024.7.6"
+version = "2024.11.0"
 description = "Open-source home automation platform running on Python 3."
 readme = "README.md"
 authors = [
@@ -22,11 +22,12 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Home Automation",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-requires-python = ">=3.8.0"
+requires-python = ">=3.9.0"
 dependencies = [
     "pyserial>=3.5.0",
     "pyserial-asyncio_fast>=0.11",
@@ -51,7 +52,7 @@ exclude_dirs = ["tests"]
 skips = ["B301", "B403", "B323", "B104", "B110"]
 
 [tool.bumpver]
-current_version = "2024.7.6"
+current_version = "2024.11.0"
 version_pattern = "YYYY.MM.INC0"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0/velbus_aio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2024.7.6
+Version: 2024.11.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -18,10 +18,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyserial>=3.5.0
@@ -31,6 +32,17 @@ Requires-Dist: aiofile
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)
+[![PyPI version](https://badge.fury.io/py/velbus-aio.svg)](https://badge.fury.io/py/velbus-aio)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/velbus-aio.svg)](https://github.com/Cereal2nd/velbus-aio)
+[![License](https://img.shields.io/github/license/Cereal2nd/velbus-aio)](https://github.com/cereal2nd/velbus-aio/blob/master/LICENSE)
+[![Downloads](https://pepy.tech/badge/velbus-aio)](https://pepy.tech/project/velbus-aio)
+[![Downloads](https://pepy.tech/badge/velbus-aio/month)](https://pepy.tech/project/velbus-aio)
+[![Downloads](https://pepy.tech/badge/velbus-aio/week)](https://pepy.tech/project/velbus-aio)
+[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
+> This project requires financial support, but it is free for you to use. You can join those helping to keep the lights on at:
+>
+> [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/bmc-button.svg" width=150 height=40 style="margin: 5px"/>](https://buymeacoffee.com/cereal2nd) [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/github-sponsors-button.svg" width=150 height=40 style="margin: 5px"/>](https://github.com/sponsors/Cereal2nd/)
 
 # velbus-aio
 

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/velbus_aio.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ velbusaio/handler.py
 velbusaio/helpers.py
 velbusaio/message.py
 velbusaio/module.py
-velbusaio/protocol.json
 velbusaio/protocol.py
 velbusaio/py.typed
 velbusaio/raw_message.py
@@ -107,4 +106,85 @@ velbusaio/messages/update_led_status.py
 velbusaio/messages/very_fast_blinking_led.py
 velbusaio/messages/write_data_to_memory.py
 velbusaio/messages/write_memory_block.py
-velbusaio/messages/write_module_address_and_serial_number.py
+velbusaio/messages/write_module_address_and_serial_number.py
+velbusaio/module_spec/01.json
+velbusaio/module_spec/02.json
+velbusaio/module_spec/03.json
+velbusaio/module_spec/05.json
+velbusaio/module_spec/06.json
+velbusaio/module_spec/07.json
+velbusaio/module_spec/08.json
+velbusaio/module_spec/09.json
+velbusaio/module_spec/0A.json
+velbusaio/module_spec/0B.json
+velbusaio/module_spec/0C.json
+velbusaio/module_spec/0E.json
+velbusaio/module_spec/0F.json
+velbusaio/module_spec/10.json
+velbusaio/module_spec/11.json
+velbusaio/module_spec/12.json
+velbusaio/module_spec/13.json
+velbusaio/module_spec/14.json
+velbusaio/module_spec/15.json
+velbusaio/module_spec/16.json
+velbusaio/module_spec/17.json
+velbusaio/module_spec/18.json
+velbusaio/module_spec/1A.json
+velbusaio/module_spec/1B.json
+velbusaio/module_spec/1D.json
+velbusaio/module_spec/1E.json
+velbusaio/module_spec/1F.json
+velbusaio/module_spec/20.json
+velbusaio/module_spec/21.json
+velbusaio/module_spec/22.json
+velbusaio/module_spec/23.json
+velbusaio/module_spec/25.json
+velbusaio/module_spec/28.json
+velbusaio/module_spec/29.json
+velbusaio/module_spec/2A.json
+velbusaio/module_spec/2B.json
+velbusaio/module_spec/2C.json
+velbusaio/module_spec/2D.json
+velbusaio/module_spec/2E.json
+velbusaio/module_spec/2F.json
+velbusaio/module_spec/30.json
+velbusaio/module_spec/31.json
+velbusaio/module_spec/32.json
+velbusaio/module_spec/33.json
+velbusaio/module_spec/34.json
+velbusaio/module_spec/35.json
+velbusaio/module_spec/36.json
+velbusaio/module_spec/37.json
+velbusaio/module_spec/38.json
+velbusaio/module_spec/39.json
+velbusaio/module_spec/3A.json
+velbusaio/module_spec/3B.json
+velbusaio/module_spec/3C.json
+velbusaio/module_spec/3D.json
+velbusaio/module_spec/3E.json
+velbusaio/module_spec/3F.json
+velbusaio/module_spec/40.json
+velbusaio/module_spec/41.json
+velbusaio/module_spec/42.json
+velbusaio/module_spec/43.json
+velbusaio/module_spec/44.json
+velbusaio/module_spec/45.json
+velbusaio/module_spec/48.json
+velbusaio/module_spec/49.json
+velbusaio/module_spec/4A.json
+velbusaio/module_spec/4B.json
+velbusaio/module_spec/4C.json
+velbusaio/module_spec/4D.json
+velbusaio/module_spec/4E.json
+velbusaio/module_spec/4F.json
+velbusaio/module_spec/50.json
+velbusaio/module_spec/51.json
+velbusaio/module_spec/52.json
+velbusaio/module_spec/54.json
+velbusaio/module_spec/55.json
+velbusaio/module_spec/56.json
+velbusaio/module_spec/57.json
+velbusaio/module_spec/5A.json
+velbusaio/module_spec/5C.json
+velbusaio/module_spec/5F.json
+velbusaio/module_spec/broadcast.json

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/velbusaio/channels.py

@@ -19,7 +19,7 @@ from velbusaio.const import (
     VOLUME_LITERS_HOUR,
 )
 from velbusaio.message import Message
-from velbusaio.messages.edge_set_color import SetEdgeColorMessage, CustomColorPriority
+from velbusaio.messages.edge_set_color import CustomColorPriority, SetEdgeColorMessage
 from velbusaio.messages.module_status import PROGRAM_SELECTION
 
 if TYPE_CHECKING:
@@ -38,12 +38,14 @@ class Channel:
         num: int,
         name: str,
         nameEditable: bool,
+        subDevice: bool,
         writer: Callable[[Message], Awaitable[None]],
         address: int,
     ):
         self._num = num
         self._module = module
         self._name = name
+        self._subDevice = subDevice
         if not nameEditable:
             self._is_loaded = True
         else:
@@ -80,6 +82,8 @@ class Channel:
         return self._num
 
     def get_full_name(self) -> str:
+        if self._subDevice:
+            return f"{self._module.get_name()} ({self._module.get_type_name()}) - {self._name}"
         return f"{self._module.get_name()} ({self._module.get_type_name()})"
 
     def is_loaded(self) -> bool:
@@ -94,6 +98,9 @@ class Channel:
     def is_temperature(self) -> bool:
         return False
 
+    def is_sub_device(self) -> bool:
+        return self._subDevice
+
     def get_name(self) -> str:
         """
         :return: the channel name
@@ -137,7 +144,11 @@ class Channel:
         }
 
     def to_cache(self) -> dict:
-        dst = {"name": self._name, "type": type(self).__name__}
+        dst = {
+            "name": self._name,
+            "type": type(self).__name__,
+            "subdevice": self._subDevice,
+        }
         if hasattr(self, "_Unit"):
             dst["Unit"] = self._Unit
         return dst
@@ -448,11 +459,12 @@ class Dimmer(Channel):
         num: int,
         name: str,
         nameEditable: bool,
+        subDevice: bool,
         writer: Callable[[Message], Awaitable[None]],
         address: int,
         slider_scale: int = 100,
     ):
-        super().__init__(module, num, name, nameEditable, writer, address)
+        super().__init__(module, num, name, nameEditable, subDevice, writer, address)
 
         self.slider_scale = slider_scale
         # VMB4DC has dim values 0(off), 1-99(dimmed), 100(full on)
@@ -508,7 +520,7 @@ class Temperature(Channel):
     _min = None
     _target = 0
     _cmode = None
-    _coolmode = None
+    _cool_mode = None
     _cstatus = None
     _thermostat = False
     _sleep_timer = 0

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/velbusaio/command_registry.py

@@ -9,8 +9,8 @@ MODULE_DIRECTORY = {
     0x01: "VMB8PB",
     0x02: "VMB1RY",
     0x03: "VMB1BL",
-    0x04: "VMB4LEDPWM-20",
     0x05: "VMB6IN",
+    0x06: "VMB4LEDPWM-20",
     0x07: "VMB1DM",
     0x08: "VMB4RY",
     0x09: "VMB2BL",
@@ -73,14 +73,16 @@ MODULE_DIRECTORY = {
     0x4A: "VMB2BLE-10",
     0x4B: "VMB8DC-20",
     0x4C: "VMB6PB-20",
+    0x4D: "VMBPIR-20",
+    0x4E: "VMB8IN-20",
     0x4F: "VMBEL1-20",
     0x50: "VMBEL2-20",
     0x51: "VMBEL4-20",
     0x52: "VMBELO-20",
-    0x53: "VMBGP1-20",
-    0x54: "VMBGP2-20",
-    0x55: "VMBGP4-20",
-    0x56: "VMBGPO-20",
+    0x54: "VMBGP1-20",
+    0x55: "VMBGP2-20",
+    0x56: "VMBGP4-20",
+    0x57: "VMBGPO-20",
     0x5A: "VMBDALI-20",
     0x5C: "VMBEL4PIR-20",
     0x5F: "VMBGP4PIR-20",

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/velbusaio/const.py

@@ -40,7 +40,7 @@ NO_RTR: Final = 0x00
 CACHEDIR: Final = ".velbuscache"
 
 # Module scan timeout values (in mSec)
-SCAN_MODULETYPE_TIMEOUT: Final = 2000  # time to wait for ModuleTypeRequest
+SCAN_MODULETYPE_TIMEOUT: Final = 3000  # time to wait for ModuleTypeRequest
 SCAN_MODULEINFO_TIMEOUT_INITIAL: Final = 1000  # time to wait for first info (status)
 SCAN_MODULEINFO_TIMEOUT_INTERVAL: Final = (
     150  # time to wait for info interval (between next message)

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/velbusaio/controller.py

@@ -34,6 +34,7 @@ class Velbus:
         self,
         dsn: str,
         cache_dir: str = get_cache_dir(),
+        one_address: int | None = None,
     ) -> None:
         """Init the Velbus controller."""
         self._log = logging.getLogger("velbus")
@@ -46,7 +47,7 @@ class Velbus:
         self._auto_reconnect = True
 
         self._dsn = dsn
-        self._handler = PacketHandler(self)
+        self._handler = PacketHandler(self, one_address)
         self._modules: dict[int, Module] = {}
         self._submodules: list[int] = []
         self._send_queue: asyncio.Queue = asyncio.Queue()
@@ -67,11 +68,10 @@ class Velbus:
             self._log.debug("Reconnecting to transport")
             asyncio.ensure_future(self.connect())
 
-    def add_module(
+    async def add_module(
         self,
         addr: int,
         typ: int,
-        data: dict,
         serial: int | None = None,
         memorymap: int | None = None,
         build_year: int | None = None,
@@ -81,14 +81,13 @@ class Velbus:
         module = Module.factory(
             addr,
             typ,
-            data,
             serial=serial,
             build_year=build_year,
             build_week=build_week,
             memorymap=memorymap,
             cache_dir=self._cache_dir,
         )
-        module.initialize(self.send)
+        await module.initialize(self.send)
         self._modules[addr] = module
         self._log.info(f"Found module {addr}: {module}")
 
@@ -102,6 +101,10 @@ class Velbus:
             self._modules[sub_addr] = module
         module.cleanupSubChannels()
 
+    def addr_is_submodule(self, addr: int) -> bool:
+        """Check if an address is a submodule."""
+        return addr in self._submodules
+
     def get_modules(self) -> dict:
         """Return the module cache."""
         return self._modules

{velbus_aio-2024.7.6 → velbus_aio-2024.11.0}/velbusaio/handler.py

@@ -5,30 +5,30 @@ Velbus packet handler
 
 from __future__ import annotations
 
-from velbusaio.const import SCAN_MODULETYPE_TIMEOUT
-from velbusaio.const import SCAN_MODULEINFO_TIMEOUT_INITIAL
-from velbusaio.const import SCAN_MODULEINFO_TIMEOUT_INTERVAL
-
 import asyncio
+import importlib.resources
 import json
 import logging
-import threading
 import os
 import pathlib
+import pprint
+import sys
+from typing import TYPE_CHECKING, Awaitable, Callable
 
 from aiofile import async_open
 
-from typing import TYPE_CHECKING, Awaitable, Callable
-import pkg_resources
-
 from velbusaio.command_registry import commandRegistry
+from velbusaio.const import (
+    SCAN_MODULEINFO_TIMEOUT_INITIAL,
+    SCAN_MODULEINFO_TIMEOUT_INTERVAL,
+    SCAN_MODULETYPE_TIMEOUT,
+)
 from velbusaio.helpers import h2, keys_exists
 from velbusaio.message import Message
 from velbusaio.messages.module_subtype import ModuleSubTypeMessage
-from velbusaio.messages.module_type import ModuleTypeMessage, ModuleType2Message
+from velbusaio.messages.module_type import ModuleType2Message, ModuleTypeMessage
 from velbusaio.raw_message import RawMessage
 
-
 if TYPE_CHECKING:
     from velbusaio.controller import Velbus
 
@@ -41,21 +41,34 @@ class PacketHandler:
     def __init__(
         self,
         velbus: Velbus,
+        one_address: int | None = None,
     ) -> None:
         self._log = logging.getLogger("velbus-handler")
         self._log.setLevel(logging.DEBUG)
         self._velbus = velbus
+        self._one_address = one_address
         self._typeResponseReceived = asyncio.Event()
-        self._scanLock = threading.Lock()
+        self._scanLock = asyncio.Lock()
         self._modulescan_address = 0
         self._scan_complete = False
         self._scan_delay_msec = 0
 
     async def read_protocol_data(self):
-        async with async_open(
-            pkg_resources.resource_filename(__name__, "protocol.json")
-        ) as protocol_file:
-            self.pdata = json.loads(await protocol_file.read())
+        if sys.version_info >= (3, 13):
+            with importlib.resources.path(
+                __name__, "module_spec/broadcast.json"
+            ) as fspath:
+                async with async_open(fspath) as protocol_file:
+                    self.broadcast = json.loads(await protocol_file.read())
+        else:
+            async with async_open(
+                str(
+                    importlib.resources.files(__name__.split(".")[0]).joinpath(
+                        "module_spec/broadcast.json"
+                    )
+                )
+            ) as protocol_file:
+                self.broadcast = json.loads(await protocol_file.read())
 
     def empty_cache(self) -> bool:
         if (
@@ -84,12 +97,22 @@ class PacketHandler:
         while self._modulescan_address < 254:
             address = 0
             module = None
-            with self._scanLock:
+            async with self._scanLock:
                 self._modulescan_address = self._modulescan_address + 1
                 address = self._modulescan_address
+                if self._velbus.addr_is_submodule(address):
+                    self._log.info(
+                        f"Skipping submodule address {address}, already handled"
+                    )
+                    continue
+                self._log.info(f"Starting handling scan {address}")
                 module = self._velbus.get_module(address)
 
-            self._log.info(f"Starting handling scan {address}")
+            if self._one_address is not None and address != int(self._one_address):
+                self._log.info(
+                    f"Skipping address {address} as we requested to only scan one address {self._one_address}"
+                )
+                continue
 
             cfile = pathlib.Path(f"{self._velbus.get_cache_dir()}/{address}.json")
             # cleanup the old module cache if needed
@@ -107,7 +130,7 @@ class PacketHandler:
                         self._typeResponseReceived.wait(),
                         SCAN_MODULETYPE_TIMEOUT / 1000.0,
                     )
-                    with self._scanLock:
+                    async with self._scanLock:
                         module = self._velbus.get_module(address)
                 except asyncio.TimeoutError:
                     self._log.info(
@@ -115,20 +138,24 @@ class PacketHandler:
                     )
                 if module is not None:
                     try:
-                        self._log.debug(f"Module {address} detected: start loading")
+                        self._log.debug(
+                            f"Module {module._address} detected: start loading"
+                        )
                         await asyncio.wait_for(
                             module.load(from_cache=True),
                             SCAN_MODULEINFO_TIMEOUT_INITIAL / 1000.0,
                         )
-                        self._scan_delay_msec = SCAN_MODULEINFO_TIMEOUT_INITIAL
-                        while self._scan_delay_msec > 50 and not module.is_loaded():
+                        self._scan_delay_msec = module.get_initial_timeout()
+                        while (
+                            self._scan_delay_msec > 50 and not await module.is_loaded()
+                        ):
                             # self._log.debug(
-                            #    f"\t... waiting {self._scan_delay_msec} is_loaded={module.is_loaded()}"
+                            #    f"\t... waiting {self._scan_delay_msec} is_loaded={await module.is_loaded()}"
                             # )
                             self._scan_delay_msec = self._scan_delay_msec - 50
                             await asyncio.sleep(0.05)
                         self._log.info(
-                            f"Scan module {address} completed, module loaded={module.is_loaded()}"
+                            f"Scan module {address} completed, module loaded={await module.is_loaded()}"
                         )
                     except asyncio.TimeoutError:
                         self._log.error(
@@ -153,49 +180,47 @@ class PacketHandler:
         data = rawmsg.data_only
 
         # handle module type response message
-        if command_value == 0xFF:
-            if not self._scan_complete:
-                tmsg: ModuleTypeMessage = ModuleTypeMessage()
-                tmsg.populate(priority, address, rtr, data)
-                with self._scanLock:
-                    self._handle_module_type(tmsg)
-                    if address == self._modulescan_address:
-                        self._typeResponseReceived.set()
-                    else:
-                        self._log.debug(
-                            f"Unexpected module type message module address {address}, Velbuslink scan?"
-                        )
-                        self._modulescan_address = address - 1
+        if command_value == 0xFF and not self._scan_complete:
+            tmsg: ModuleTypeMessage = ModuleTypeMessage()
+            tmsg.populate(priority, address, rtr, data)
+            async with self._scanLock:
+                await self._handle_module_type(tmsg)
+                if address == self._modulescan_address:
+                    self._typeResponseReceived.set()
+                else:
+                    self._log.debug(
+                        f"Unexpected module type message module address {address}, Velbuslink scan?"
+                    )
+                    self._modulescan_address = address - 1
 
-                self._typeResponseReceived.set()
+            self._typeResponseReceived.set()
 
         # handle module subtype response message
-        elif command_value in (0xB0, 0xA7, 0xA6):
-            if not self._scan_complete:
-                msg: ModuleSubTypeMessage = ModuleSubTypeMessage()
-                msg.populate(priority, address, rtr, data)
-                if command_value == 0xB0:
-                    msg.sub_address_offset = 0
-                elif command_value == 0xA7:
-                    msg.sub_address_offset = 4
-                elif command_value == 0xA6:
-                    msg.sub_address_offset = 8
-                with self._scanLock:
-                    self._scan_delay_msec = SCAN_MODULEINFO_TIMEOUT_INITIAL
-                    self._handle_module_subtype(msg)
+        elif command_value in (0xB0, 0xA7, 0xA6) and not self._scan_complete:
+            msg: ModuleSubTypeMessage = ModuleSubTypeMessage()
+            msg.populate(priority, address, rtr, data)
+            if command_value == 0xB0:
+                msg.sub_address_offset = 0
+            elif command_value == 0xA7:
+                msg.sub_address_offset = 4
+            elif command_value == 0xA6:
+                msg.sub_address_offset = 8
+            async with self._scanLock:
+                self._scan_delay_msec += SCAN_MODULEINFO_TIMEOUT_INTERVAL
+                self._handle_module_subtype(msg)
 
         # ignore broadcast
-        elif command_value in self.pdata["MessagesBroadCast"]:
+        elif command_value in self.broadcast:
             self._log.debug(
                 "Received broadcast message {} from {}, ignoring".format(
-                    self.pdata["MessageBroadCast"][str(command_value).upper()], address
+                    self.broadcast[str(command_value).upper()], address
                 )
             )
 
         # handle other messages for modules that are already scanned
         else:
             module = None
-            with self._scanLock:
+            async with self._scanLock:
                 module = self._velbus.get_module(address)
             if module is not None:
                 module_type = module.get_type()
@@ -214,28 +239,29 @@ class PacketHandler:
                         0xFE,
                         0xCC,
                     ):  # names, memory data, memory block
-                        self._scan_delay_msec = SCAN_MODULEINFO_TIMEOUT_INTERVAL
+                        self._scan_delay_msec += SCAN_MODULEINFO_TIMEOUT_INTERVAL
                         # self._log.debug(f"Restart timeout {msg}")
                     # send the message to the modules
                     await module.on_message(msg)
                 else:
                     self._log.warning(f"NOT FOUND IN command_registry: {rawmsg}")
 
-    def _handle_module_type(self, msg: ModuleTypeMessage | ModuleType2Message) -> None:
+    async def _handle_module_type(
+        self, msg: ModuleTypeMessage | ModuleType2Message
+    ) -> None:
         """
         load the module data
         """
         if msg is not None:
             module = self._velbus.get_module(msg.address)
             if module is None:
-                data = keys_exists(self.pdata, "ModuleTypes", h2(msg.module_type))
-                if not data:
-                    self._log.warning(f"Module not recognized: {msg.module_type}")
-                    return
-                self._velbus.add_module(
+                # data = keys_exists(self.pdata, "ModuleTypes", h2(msg.module_type))
+                # if not data:
+                #    self._log.warning(f"Module not recognized: {msg.module_type}")
+                #    return
+                await self._velbus.add_module(
                     msg.address,
                     msg.module_type,
-                    data,
                     memorymap=msg.memory_map_version,
                     build_year=msg.build_year,
                     build_week=msg.build_week,