velbus-aio 2024.4.0__py3-none-any.whl → 2024.5.1__py3-none-any.whl

{velbus_aio-2024.4.0.dist-info → velbus_aio-2024.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2024.4.0
+Version: 2024.5.1
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -26,7 +26,7 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyserial >=3.5.0
-Requires-Dist: pyserial-asyncio >=0.5
+Requires-Dist: pyserial-asyncio-fast >=0.11
 Requires-Dist: backoff >=1.10.0
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)

{velbus_aio-2024.4.0.dist-info → velbus_aio-2024.5.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
 velbusaio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-velbusaio/channels.py,sha256=RHX0YdaeyCMgXSV7f3VkN-grSIJu-lGStjC8CzGlU2s,22998
-velbusaio/command_registry.py,sha256=7oFAR6w-exVZJB9AVzQv5pBdvVmaR7tNVfwOsAaB_8Q,4838
-velbusaio/const.py,sha256=tqw1zC4Aq2iKMt4lHf_5h-W0aqDQR-XR3G0oeQLG1Ks,1551
-velbusaio/controller.py,sha256=zqoRPaWsaxZdiLf1jWWZqUmga9Hk3_n0xFZs1WOCxuY,9254
+velbusaio/channels.py,sha256=1fqxsNHmJmb6lYRr4UqP9HLeTprbvektzrjQ8QBvWi0,22889
+velbusaio/command_registry.py,sha256=j9KuLmada41PMEdtfPvLmXVOAZOkBM9zi-3kluwYffk,5140
+velbusaio/const.py,sha256=aysTlQcpACZaDVqoXAjWmaEDGlCB7KT04Rv-SAusPFc,1575
+velbusaio/controller.py,sha256=txOd0JuYi_OGMzO1t2u7KXlF085HWa1HVlszz7A2O5c,8846
 velbusaio/discovery.py,sha256=Px6qoZl4QhF17aMz6JxstCORBpLzZGWEK9h4Vyvg57o,1649
 velbusaio/exceptions.py,sha256=FHkXaM3dK5Gkk-QGAf9dLE3FPlCU2FRZWUyY-4KRNnA,515
-velbusaio/handler.py,sha256=xqUguhhEeyagSEyCdtZ1IFnZSPd91atfhZ-sYSzygFQ,5907
-velbusaio/helpers.py,sha256=zIHWVIizhvqJXOgbkLB3IromoGyeyk0DYqeVLCbMpkg,2543
-velbusaio/message.py,sha256=7lf2kzI74SDXQubvnQm8weqHS4YGUSTquPm_KvNR3q0,5049
-velbusaio/module.py,sha256=cLkNVWMchUfa_THLf17VRySly8Oe-GXkUJM7juVYxRk,34978
-velbusaio/protocol.json,sha256=KEyfib_UUkntP9WGmCeutUQw1WgH4nT7GkGLB-Grg4E,250285
+velbusaio/handler.py,sha256=jTWIV26ibAqs3rcTku81NIHlPUeyWjStSih1Nfx-an0,5946
+velbusaio/helpers.py,sha256=iqpoereRH4JY5WAkozIqWvXWyRmhko-J-UGXDylFyEM,2537
+velbusaio/message.py,sha256=gnhXpA5NAG4qnI9vlxwlWQKETWneDb1lp0P9w_-nxhQ,5020
+velbusaio/module.py,sha256=_yFxZIi71eqq9xxNal-9ATNHGMjZDOr-dcpKYIxa7_8,35458
+velbusaio/protocol.json,sha256=7PifRZXctU5zSsodDGsUAhnnSsGNlcGcim1gr2su720,250396
 velbusaio/protocol.py,sha256=ofDwJfwyrVQDQ40WX2QdH1nTK-y2HibQPTo5dFY7SkQ,8224
 velbusaio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velbusaio/raw_message.py,sha256=ODoTPVAvyXXQSMXxtQO1U5OxcoQ4W8JJN5fotEDGSTo,4690
-velbusaio/util.py,sha256=eCsGQJ9nuzk_B2skBlv3MsNaMaHDXo1a1qSPjObzXH4,1540
+velbusaio/util.py,sha256=FW6YCiPYWOCgqHDs8-LbzME0h81mqftYVG0qqZ-oo7Y,1568
 velbusaio/messages/__init__.py,sha256=hLkLhsJ5hcgRnhaoyFWz1g2vphdnjrXURxgwezkDBwU,5893
 velbusaio/messages/blind_status.py,sha256=yzjoYLBxH85tBjihiGzLqebRg1urz0obBA-3q1pqSCE,3418
 velbusaio/messages/bus_active.py,sha256=AB1mEvbMXRuOaC2CQ7hzKSLmbaJnyFqqXrARi-aSdtg,749
@@ -28,8 +28,8 @@ velbusaio/messages/clear_led.py,sha256=AcGRCD0OdlHcFonvHA075nVwvOtZ6KfyjrXeE6A7D
 velbusaio/messages/counter_status.py,sha256=UgSRw-pipFb8C2DxauHw8Pjem1qTvzUFpiahui73-Is,1240
 velbusaio/messages/counter_status_request.py,sha256=VLFaI7MFnTCH1s8acfKlcAGscJElwxYRC56eT3bbB7Y,919
 velbusaio/messages/cover_down.py,sha256=tdjsRijrEa5oNBZk6uKWUK39k5gIjcWq0kgfOf4f1lQ,2552
-velbusaio/messages/cover_off.py,sha256=Y4dzJL_BKSATmztD444KOWlEnPuoAy3OfQ7CWaYRbMs,2258
-velbusaio/messages/cover_position.py,sha256=3ZcNSMpj-3Y355vb7bu4IiGGgjw_2nENlo4wEseya1Q,1283
+velbusaio/messages/cover_off.py,sha256=0RHAJb4et99yAoo8LD85Rzlnhrqr40Wjba-BhzHSr4o,2243
+velbusaio/messages/cover_position.py,sha256=PhRocdkbwf8CUfdL8-rZHEDFD2Z9u7DLZOpH3h6gAtg,1268
 velbusaio/messages/cover_up.py,sha256=P20AZx8qQScbyV0sxtZOlO03Q8pFO8NunpqIr4mZ6Lw,2547
 velbusaio/messages/dali_device_settings.py,sha256=KzJ7OFkFRPuCXSOThuplM48J_kH0I3RE82ZRCpmiqYA,4870
 velbusaio/messages/dali_device_settings_request.py,sha256=InTnrwLD7l9gCHXKlJ69FHMXcejtYMUZBtnffx9nDQU,1476
@@ -67,11 +67,11 @@ velbusaio/messages/select_program.py,sha256=9jLhsCuYGQsw-FMxpmNljPZifGeE_oJ6A5bg
 velbusaio/messages/sensor_settings_request.py,sha256=Uwywf0JGwBwc_2ZlfxVJicm3oUlWBNEcclcHA2_Mv5I,819
 velbusaio/messages/sensor_temp_request.py,sha256=bTChj9udOjIww9vJ2SWmMtbry_8jLDvbWSAy_ZPmrb4,599
 velbusaio/messages/sensor_temperature.py,sha256=ThA_4FFhQutCSt8147yCy7ocUFfizWaUV2JHoNzesNc,1558
-velbusaio/messages/set_date.py,sha256=SH11ufAZgcGDd0Fwf9Lm2UoIsL_02ZkUfsWZxl5hej4,1460
-velbusaio/messages/set_daylight_saving.py,sha256=A3sEEVi1Wnj9AaWbNyuW_Itp7pfKNYjjMBrMTQe_QHY,1118
-velbusaio/messages/set_dimmer.py,sha256=f2XWLbxoo0Tbj8_DUu28XSiib32VLUDtw8QRzRZBDdA,1975
+velbusaio/messages/set_date.py,sha256=jcWb8c5mB71HNBwLCQ9ocEPSHQdZP0yfGJL4_swsRWQ,1359
+velbusaio/messages/set_daylight_saving.py,sha256=CpoKrSt62UzzNxl8SDcpDcb0GKnLcD1f73-ULzqDEzU,1049
+velbusaio/messages/set_dimmer.py,sha256=b32lBHrvZRQ7kKIFhQwuBqk9rXagnBtcJxo1V7V5x_0,2050
 velbusaio/messages/set_led.py,sha256=X8tIDzJgtf5EsH92rjoUyrECNFW-ECgAQoQ9TnvJEQk,900
-velbusaio/messages/set_realtime_clock.py,sha256=c52JLvULnf-WgKfju1sYHZRGZ4PjP3v1GS8fbxYxIBc,1309
+velbusaio/messages/set_realtime_clock.py,sha256=h34pCvyPm7tSQ5BdB8yC8SRulrtldeX-ZJFv3Wcvdk0,1209
 velbusaio/messages/set_temperature.py,sha256=78LfGOBZo2bw7eF38uyXOjUcJrsSvQPDW2qbXLOYd0o,959
 velbusaio/messages/slider_status.py,sha256=AlBI1DJPLUwxOFfPIKYv15bFOnVXm__Tym7AW4xGMxo,1418
 velbusaio/messages/slow_blinking_led.py,sha256=UktzpRtyM4mR7_KQuNjqenPEeM3P1vgTyMW8dnVwylQ,909
@@ -96,8 +96,8 @@ velbusaio/messages/very_fast_blinking_led.py,sha256=vlMEern8PoOvtO5JaAk9erMR4IKJ
 velbusaio/messages/write_data_to_memory.py,sha256=gr6bi4SzK8Mw8fnp8yV-STq5jts7NoeV7zZgdptH5Vs,1039
 velbusaio/messages/write_memory_block.py,sha256=zGnNxx_M66HpBQ8S7kagtNw8_qSRHsOLk1MuiS0uygM,1032
 velbusaio/messages/write_module_address_and_serial_number.py,sha256=6y57j-md3btNtQddX5CUREtSs1Dzgkd953sQPZ3Pioo,1597
-velbus_aio-2024.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-velbus_aio-2024.4.0.dist-info/METADATA,sha256=3PZCfpL0kS3j7hbvvbv7DwzkZe4kiUgemAP3jnrhNjo,3253
-velbus_aio-2024.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-velbus_aio-2024.4.0.dist-info/top_level.txt,sha256=W0-lSOwD23mm8FqaIe9vY20fKicBMIdUVjF-zmfxRnY,15
-velbus_aio-2024.4.0.dist-info/RECORD,,
+velbus_aio-2024.5.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+velbus_aio-2024.5.1.dist-info/METADATA,sha256=z1Q-cGFQfsDQYGHAppFwXJUDplFi6qaFKIGJW0Me3c4,3259
+velbus_aio-2024.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+velbus_aio-2024.5.1.dist-info/top_level.txt,sha256=W0-lSOwD23mm8FqaIe9vY20fKicBMIdUVjF-zmfxRnY,15
+velbus_aio-2024.5.1.dist-info/RECORD,,

velbusaio/channels.py

@@ -136,17 +136,11 @@ class Channel:
             if k != "_writer" and k != "_on_status_update" and k != "_name_parts"
         }
 
-    def to_json(self) -> dict:
-        d = self.__dict__
-        return {
-            k: d[k]
-            for k in d
-            if k != "_writer"
-            and k != "_on_status_update"
-            and k != "_name_parts"
-            and k != "_module"
-            and k != "__name__"
-        }
+    def to_cache(self) -> dict:
+        dst = {"name": self._name, "type": type(self).__name__}
+        if hasattr(self, "_Unit"):
+            dst["Unit"] = self._Unit
+        return dst
 
     def __setstate__(self, state):
         self.__dict__.update(state)

velbusaio/command_registry.py

@@ -1,4 +1,5 @@
-"""
+"""Command registry.
+
 :author: Maikel Punie <maikel.punie@gmail.com> and Thomas Delaet <thomas@delaet.org>
 """
 
@@ -87,7 +88,10 @@ MODULE_DIRECTORY = {
 
 
 class CommandRegistry:
+    """Command registry class."""
+
     def __init__(self, module_directory: dict) -> None:
+        """Init method."""
         self._module_directory = module_directory
         self._default_commands = {}
         self._overrides = {}
@@ -95,6 +99,7 @@ class CommandRegistry:
     def register_command(
         self, command_value: int, command_class: type, module_name: str | None = None
     ) -> None:
+        """Register a command."""
         if command_value < 0 or command_value > 255:
             raise ValueError("Command_value should be >=0 and <=255")
         if module_name and module_name not in self._module_directory.values():
@@ -115,6 +120,7 @@ class CommandRegistry:
     def _register_override(
         self, command_value: int, command_class: type, module_type: str
     ) -> None:
+        """Register and override."""
         if module_type not in self._overrides:
             self._overrides[module_type] = {}
         if command_value not in self._overrides[module_type]:
@@ -125,12 +131,14 @@ class CommandRegistry:
             )
 
     def _register_default(self, command_value: int, command_class: type) -> None:
+        """Register a default command."""
         if command_value not in self._default_commands:
             self._default_commands[command_value] = command_class
         else:
             raise Exception("double registration in command registry")
 
     def has_command(self, command_value: int, module_type: int = 0) -> bool:
+        """Find a command."""
         if module_type in self._overrides:
             if command_value in self._overrides[module_type]:
                 return True
@@ -139,6 +147,7 @@ class CommandRegistry:
         return False
 
     def get_command(self, command_value: int, module_type: int = 0) -> None | type:
+        """Search a command in the registry."""
         if module_type in self._overrides:
             if command_value in self._overrides[module_type]:
                 return self._overrides[module_type][command_value]
@@ -151,6 +160,8 @@ commandRegistry = CommandRegistry(MODULE_DIRECTORY)
 
 
 def register(command_value: int, module_types: list[str] | None = None):
+    """Register decorator."""
+
     def inner_register(command_class):
         if module_types:
             for module_type in module_types:

velbusaio/const.py

@@ -1,4 +1,5 @@
-"""
+"""Constant for velbusaio.
+
 Author: Maikel Punie <maikel.punie@gmail.com>
 """
 

velbusaio/controller.py

@@ -1,19 +1,17 @@
-"""
-Main interface for the velbusaio lib
-"""
+"""Main interface for the velbusaio lib."""
 
 from __future__ import annotations
 
 import asyncio
 import logging
 import pathlib
-import pickle
 import re
 import ssl
+import time
 from urllib.parse import urlparse
 
 import serial
-import serial_asyncio
+import serial_asyncio_fast
 
 from velbusaio.channels import Channel
 from velbusaio.const import LOAD_TIMEOUT
@@ -31,15 +29,14 @@ from velbusaio.raw_message import RawMessage
 
 
 class Velbus:
-    """
-    A velbus controller
-    """
+    """A velbus controller."""
 
     def __init__(
         self,
         dsn: str,
         cache_dir: str = get_cache_dir(),
     ) -> None:
+        """Init the Velbus controller."""
         self._log = logging.getLogger("velbus")
 
         self._protocol = VelbusProtocol(
@@ -60,6 +57,7 @@ class Velbus:
         pathlib.Path(self._cache_dir).mkdir(parents=True, exist_ok=True)
 
     async def _on_message_received(self, msg: RawMessage) -> None:
+        """On message received function."""
         await self._handler.handle(msg)
 
     def _on_connection_lost(self, exc: Exception) -> None:
@@ -69,6 +67,7 @@ class Velbus:
             asyncio.ensure_future(self.connect())
 
     def _on_end_of_scan(self) -> None:
+        """Notify the scan failure."""
         self._handler.scan_finished()
 
     async def add_module(
@@ -81,31 +80,23 @@ class Velbus:
         build_year: int | None = None,
         build_week: int | None = None,
     ) -> None:
-        """
-        Add a found module to the module cache
-        """
-        mod = self._load_module_from_cache(self._cache_dir, addr)
-        if mod is not None:
-            self._log.info(f"Load module from CACHE: {addr}")
-            self._modules[addr] = mod
-            self._modules[addr].initialize(self.send)
-            await self._modules[addr].load(True)
-        else:
-            self._log.info(f"Load NEW module: {typ} @ {addr}")
-            self._modules[addr] = Module.factory(
-                addr,
-                typ,
-                data,
-                serial=serial,
-                build_year=build_year,
-                build_week=build_week,
-                memorymap=memorymap,
-                cache_dir=self._cache_dir,
-            )
-            self._modules[addr].initialize(self.send)
-            await self._modules[addr].load()
+        """Add a found module to the module cache."""
+        self._log.info(f"Found module: type:{typ} address:{addr}")
+        self._modules[addr] = Module.factory(
+            addr,
+            typ,
+            data,
+            serial=serial,
+            build_year=build_year,
+            build_week=build_week,
+            memorymap=memorymap,
+            cache_dir=self._cache_dir,
+        )
+        self._modules[addr].initialize(self.send)
+        await self._modules[addr].load()
 
     async def add_submodules(self, addr: int, subList: dict[int, int]) -> None:
+        """Add submodules address to module."""
         for sub_num, sub_addr in subList.items():
             if sub_addr == 0xFF:
                 continue
@@ -114,48 +105,30 @@ class Velbus:
             self._modules[sub_addr] = self._modules[addr]
         self._modules[addr].cleanupSubChannels()
 
-    def _load_module_from_cache(self, cache_dir: str, address: int) -> None | Module:
-        try:
-            cfile = pathlib.Path(f"{cache_dir}/{address}.p")
-            with cfile.open("rb") as fl:
-                o = pickle.load(fl)
-                if isinstance(o, Module):
-                    return o
-        except OSError:
-            pass
-        return None
-
     def get_modules(self) -> dict:
-        """
-        Return the module cache
-        """
+        """Return the module cache."""
         return self._modules
 
     def get_module(self, addr: str) -> None | Module:
-        """
-        Get a module on an address
-        """
-        if addr in self._modules.keys():
+        """Get a module on an address."""
+        if addr in self._modules:
             return self._modules[addr]
         return None
 
     def get_channels(self, addr: str) -> None | dict:
-        """
-        Get the channels for an address
-        """
+        """Get the channels for an address."""
         if addr in self._modules:
             return (self._modules[addr]).get_channels()
         return None
 
     async def stop(self) -> None:
+        """Stop the controller."""
         self._closing = True
         self._auto_reconnect = False
         self._protocol.close()
 
     async def connect(self, test_connect: bool = False) -> None:
-        """
-        Connect to the bus and load all the data
-        """
+        """Connect to the bus and load all the data."""
         auth = None
         # connect to the bus
         if ":" in self._dsn:
@@ -182,23 +155,25 @@ class Velbus:
                 )
 
             except (ConnectionRefusedError, OSError) as err:
-                raise VelbusConnectionFailed() from err
+                raise VelbusConnectionFailed from err
         else:
             # serial port
             try:
-                _transport, _protocol = await serial_asyncio.create_serial_connection(
-                    asyncio.get_event_loop(),
-                    lambda: self._protocol,
-                    url=self._dsn,
-                    baudrate=38400,
-                    bytesize=serial.EIGHTBITS,
-                    parity=serial.PARITY_NONE,
-                    stopbits=serial.STOPBITS_ONE,
-                    xonxoff=0,
-                    rtscts=1,
+                _transport, _protocol = (
+                    await serial_asyncio_fast.create_serial_connection(
+                        asyncio.get_event_loop(),
+                        lambda: self._protocol,
+                        url=self._dsn,
+                        baudrate=38400,
+                        bytesize=serial.EIGHTBITS,
+                        parity=serial.PARITY_NONE,
+                        stopbits=serial.STOPBITS_ONE,
+                        xonxoff=0,
+                        rtscts=1,
+                    )
                 )
             except (FileNotFoundError, serial.SerialException) as err:
-                raise VelbusConnectionFailed() from err
+                raise VelbusConnectionFailed from err
         if test_connect:
             return
         # if auth is required send the auth key
@@ -209,6 +184,7 @@ class Velbus:
         await self.scan()
 
     async def scan(self) -> None:
+        """Scan the bus."""
         self._handler.scan_started()
         for addr in range(1, 256):
             msg = ModuleTypeRequestMessage(addr)
@@ -230,9 +206,7 @@ class Velbus:
             )
 
     async def _check_if_modules_are_loaded(self) -> None:
-        """
-        Task to wait until modules are loaded
-        """
+        """Task to wait until modules are loaded."""
         while True:
             mods_loaded = 0
             for mod in (self.get_modules()).values():
@@ -247,9 +221,7 @@ class Velbus:
             await asyncio.sleep(15)
 
     async def send(self, msg: Message) -> None:
-        """
-        Send a packet
-        """
+        """Send a packet."""
         await self._protocol.send_message(
             RawMessage(
                 priority=msg.priority,
@@ -260,6 +232,7 @@ class Velbus:
         )
 
     def get_all(self, class_name: str) -> list[Channel]:
+        """Get all channels."""
         lst = []
         for addr, mod in (self.get_modules()).items():
             if addr in self._submodules:
@@ -270,9 +243,8 @@ class Velbus:
         return lst
 
     async def sync_clock(self) -> None:
-        """
-        This will send all the needed messages to sync the clock
-        """
-        await self.send(SetRealtimeClock())
-        await self.send(SetDate())
-        await self.send(SetDaylightSaving())
+        """Will send all the needed messages to sync the clock."""
+        lclt = time.localtime()
+        await self.send(SetRealtimeClock(wday=lclt[6], hour=lclt[3], min=lclt[4]))
+        await self.send(SetDate(day=lclt[2], mon=lclt[1], year=lclt[0]))
+        await self.send(SetDaylightSaving(ds=not lclt[8]))

velbusaio/handler.py

@@ -8,7 +8,6 @@ from __future__ import annotations
 import asyncio
 import json
 import logging
-import re
 from typing import TYPE_CHECKING, Awaitable, Callable
 import pkg_resources
 
@@ -105,7 +104,9 @@ class PacketHandler:
             else:
                 self._log.warning(
                     "NOT FOUND IN command_registry: addr={} cmd={} packet={}".format(
-                        address, command_value, ":".join(format(x, "02x") for x in data)
+                        address,
+                        command_value,
+                        ":".join(format(x, "02x") for x in data),
                     )
                 )
         elif self._scan_complete:

velbusaio/helpers.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import os
 import re
-from typing import Any, Dict
+from typing import Any
 
 from velbusaio.const import CACHEDIR
 

velbusaio/message.py

@@ -5,7 +5,6 @@ The velbus abstract message class
 from __future__ import annotations
 
 import json
-from typing import Optional
 
 from velbusaio.const import PRIORITY_FIRMWARE, PRIORITY_HIGH, PRIORITY_LOW
 

velbusaio/messages/cover_off.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-import struct
-
 from velbusaio.command_registry import register
 from velbusaio.message import Message
 

velbusaio/messages/cover_position.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-import struct
-
 from velbusaio.command_registry import register
 from velbusaio.message import Message
 

velbusaio/messages/set_date.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-import time
-
 from velbusaio.command_registry import register
 from velbusaio.message import Message
 
@@ -18,11 +16,11 @@ class SetDate(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00) -> None:
+    def __init__(self, address=0x00, day=None, mon=None, year=None) -> None:
         Message.__init__(self)
-        self._day = None
-        self._mon = None
-        self._year = None
+        self._day = day
+        self._mon = mon
+        self._year = year
         self.set_defaults(address)
 
     def set_defaults(self, address) -> None:
@@ -30,10 +28,6 @@ class SetDate(Message):
             self.set_address(address)
         self.set_low_priority()
         self.set_no_rtr()
-        lclt = time.localtime()
-        self._day = lclt[2]
-        self._mon = lclt[1]
-        self._year = lclt[0]
 
     def populate(self, priority, address, rtr, data) -> None:
         """

velbusaio/messages/set_daylight_saving.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-import time
-
 from velbusaio.command_registry import register
 from velbusaio.message import Message
 
@@ -18,9 +16,9 @@ class SetDaylightSaving(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00) -> None:
+    def __init__(self, address=0x00, ds=None) -> None:
         Message.__init__(self)
-        self._ds = None
+        self._ds = ds
         self.set_defaults(address)
 
     def set_defaults(self, address) -> None:
@@ -28,8 +26,6 @@ class SetDaylightSaving(Message):
             self.set_address(address)
         self.set_low_priority()
         self.set_no_rtr()
-        lclt = time.localtime()
-        self._ds = not lclt[8]
 
     def populate(self, priority, address, rtr, data) -> None:
         """

velbusaio/messages/set_dimmer.py

@@ -1,5 +1,4 @@
-"""
-:author: Frank van Breugel
+""":author: Frank van Breugel
 """
 
 from __future__ import annotations
@@ -12,10 +11,10 @@ COMMAND_CODE = 0x07
 
 @register(
     COMMAND_CODE,
-    ["VMB1DM", "VMBDME", "VMB4DC", "VMBDMI", "VMBDMI-R", "VMB1LED", "VMB8DC-20"],
+    ["VMB1DM", "VMBDME", "VMB4DC", "VMB1LED"],
 )
 class SetDimmerMessage(Message):
-    """
+    """with this message the channel numbering is a bitnumber
     send by:
     received by: VMBDME, VMB4DC
     """
@@ -34,9 +33,7 @@ class SetDimmerMessage(Message):
         self.set_no_rtr()
 
     def populate(self, priority, address, rtr, data):
-        """
-        :return: None
-        """
+        """:return: None"""
         self.needs_high_priority(priority)
         self.needs_no_rtr(rtr)
         self.needs_data(data, 4)
@@ -48,9 +45,7 @@ class SetDimmerMessage(Message):
         )
 
     def data_to_binary(self):
-        """
-        :return: bytes
-        """
+        """:return: bytes"""
         return bytes(
             [
                 COMMAND_CODE,
@@ -60,9 +55,9 @@ class SetDimmerMessage(Message):
         ) + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
 
 
-@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20", "VMBDMI", "VMBDMI-R", "VMB8DC-20"])
 class SetDimmerMessage2(SetDimmerMessage):
-    """
+    """This with this message the channel numbering is an integer
     send by:
     received by: VMBDALI
     """

velbusaio/messages/set_realtime_clock.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-import time
-
 from velbusaio.command_registry import register
 from velbusaio.message import Message
 
@@ -18,11 +16,11 @@ class SetRealtimeClock(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00) -> None:
+    def __init__(self, address=0x00, wday=None, hour=None, min=None) -> None:
         Message.__init__(self)
-        self._wday = None
-        self._hour = None
-        self._min = None
+        self._wday = wday
+        self._hour = hour
+        self._min = min
         self.set_defaults(address)
 
     def set_defaults(self, address) -> None:
@@ -30,10 +28,6 @@ class SetRealtimeClock(Message):
             self.set_address(address)
         self.set_low_priority()
         self.set_no_rtr()
-        lclt = time.localtime()
-        self._wday = lclt[6]
-        self._hour = lclt[3]
-        self._min = lclt[4]
 
     def populate(self, priority, address, rtr, data) -> None:
         """

velbusaio/module.py

@@ -5,11 +5,10 @@ This represents a velbus module
 from __future__ import annotations
 
 import logging
-import os
 import pathlib
-import pickle
 import struct
 import sys
+import json
 from typing import Awaitable, Callable
 
 from velbusaio.channels import (
@@ -37,7 +36,7 @@ from velbusaio.const import (
 )
 from velbusaio.helpers import handle_match, keys_exists
 from velbusaio.message import Message
-from velbusaio.messages import DaliDeviceSettingMsg
+from velbusaio.messages.dali_device_settings import DaliDeviceSettingMsg
 from velbusaio.messages.blind_status import BlindStatusMessage, BlindStatusNgMessage
 from velbusaio.messages.channel_name_part1 import (
     ChannelNamePart1Message,
@@ -81,8 +80,6 @@ from velbusaio.messages.module_status import (
     ModuleStatusPirMessage,
 )
 from velbusaio.messages.module_status_request import ModuleStatusRequestMessage
-from velbusaio.messages.module_subtype import ModuleSubTypeMessage
-from velbusaio.messages.module_type import ModuleTypeMessage, ModuleType2Message
 from velbusaio.messages.push_button_status import PushButtonStatusMessage
 from velbusaio.messages.read_data_from_memory import ReadDataFromMemoryMessage
 from velbusaio.messages.relay_status import RelayStatusMessage, RelayStatusMessage2
@@ -188,9 +185,9 @@ class Module:
                         del self._channels[i]
 
     def _cache(self) -> None:
-        cfile = pathlib.Path(f"{self._cache_dir}/{self._address}.p")
-        with cfile.open("wb") as fl:
-            pickle.dump(self, fl)
+        cfile = pathlib.Path(f"{self._cache_dir}/{self._address}.json")
+        with cfile.open("w") as fl:
+            json.dump(self.to_cache(), fl, indent=4)
 
     def __getstate__(self) -> dict:
         d = self.__dict__
@@ -201,20 +198,17 @@ class Module:
         self.__dict__ = state
 
     def __repr__(self) -> str:
-        return (
-            "<{}: {{{}}} @ {{{}}} loaded:{{{}}} loading:{{{}}} channels{{:{}}}>".format(
-                self._name,
-                self._type,
-                self._address,
-                self.loaded,
-                self._is_loading,
-                self._channels,
-            )
-        )
+        return f"<{self._name} type:{self._type} address:{self._address} loaded:{self.loaded} loading:{self._is_loading} channels: {self._channels}>"
 
     def __str__(self) -> str:
         return self.__repr__()
 
+    def to_cache(self) -> dict:
+        d = {"name": self._name, "channels": {}}
+        for num, chan in self._channels.items():
+            d["channels"][num] = chan.to_cache()
+        return d
+
     def get_addresses(self) -> list:
         """
         Get all addresses for this module
@@ -232,7 +226,9 @@ class Module:
         return self._type
 
     def get_type_name(self) -> str:
-        return self._data["Type"]
+        if "Type" in self._data:
+            return self._data["Type"]
+        return "UNKNOWN"
 
     def get_serial(self) -> str | None:
         return self.serial
@@ -241,12 +237,7 @@ class Module:
         return self._name
 
     def get_sw_version(self) -> str:
-        return "{}-{}.{}.{}".format(
-            self.serial,
-            self.memory_map_version,
-            self.build_year,
-            self.build_week,
-        )
+        return f"{self.serial}-{self.memory_map_version}.{self.build_year}.{self.build_week}"
 
     def calc_channel_offset(self, address: int) -> int:
         _channel_offset = 0
@@ -549,14 +540,31 @@ class Module:
         self._log.info("Load Module")
         # start the loading
         self._is_loading = True
+        # see if we have a cache
+        try:
+            cfile = pathlib.Path(f"{self._cache_dir}/{self._address}.json")
+            with cfile.open("r") as fl:
+                cache = json.load(fl)
+        except OSError:
+            cache = {}
         # load default channels
-        await self.__load_default_channels()
+        await self._load_default_channels()
         # load the data from memory ( the stuff that we need)
-        await self.__load_memory()
+        if "name" in cache and cache["name"] != "":
+            self._name = cache["name"]
+        else:
+            await self.__load_memory()
         # load the module status
         await self._request_module_status()
         # load the channel names
-        await self._request_channel_name()
+        if "channels" in cache:
+            for num, chan in cache["channels"].items():
+                self._channels[int(num)]._name = chan["name"]
+                if "Unit" in chan:
+                    self._channels[int(num)]._Unit = chan["Unit"]
+                self._channels[int(num)]._is_loaded = True
+        else:
+            await self._request_channel_name()
         # load the module specific stuff
         self._load()
         # stop the loading
@@ -720,7 +728,7 @@ class Module:
                     msg.low_address = addr[1]
                     await self._writer(msg)
 
-    async def __load_default_channels(self) -> None:
+    async def _load_default_channels(self) -> None:
         if "Channels" not in self._data:
             return
 
@@ -768,19 +776,15 @@ class VmbDali(Module):
         )
         self.group_members: dict[int, set[int]] = {}
 
-    async def load(self, from_cache: bool = False) -> None:
-        await super().load(from_cache)
-
-        if not from_cache:
-            for chan in range(1, 64 + 1):
-                self._channels[chan] = Channel(
-                    self, chan, "placeholder", True, self._writer, self._address
-                )
-                # Placeholders will keep this module loading
-                # Until the DaliDeviceSettings messages either delete or replace these placeholder's
-                # with actual channels
-
-            await self._request_dali_channels()
+    async def _load_default_channels(self) -> None:
+        for chan in range(1, 64 + 1):
+            self._channels[chan] = Channel(
+                self, chan, "placeholder", True, self._writer, self._address
+            )
+            # Placeholders will keep this module loading
+            # Until the DaliDeviceSettings messages either delete or replace these placeholder's
+            # with actual channels
+        await self._request_dali_channels()
 
     async def _request_dali_channels(self):
         msg_type = commandRegistry.get_command(

velbusaio/protocol.json

@@ -8792,7 +8792,7 @@
     },
     "45": {
       "Info": "VMBDALI-20 DALI gateway module",
-      "Type": "VMBDALI"
+      "Type": "VMBDALI-20"
     },
     "48": {
       "Channels": {
@@ -9361,7 +9361,8 @@
         }
       },
       "TemperatureChannel": "09",
-      "ThermostatAddr": "0"
+      "ThermostatAddr": "0",
+      "Type": "VMBEL1-20"
     },
     "50": {
       "AllChannelStatus": "FF",
@@ -9449,7 +9450,8 @@
         }
       },
       "TemperatureChannel": "09",
-      "ThermostatAddr": "0"
+      "ThermostatAddr": "0",
+      "Type": "VMBEL2-20"
     },
     "51": {
       "AllChannelStatus": "FF",
@@ -9537,7 +9539,8 @@
         }
       },
       "TemperatureChannel": "09",
-      "ThermostatAddr": "0"
+      "ThermostatAddr": "0",
+      "Type": "VMBEL4-20"
     },
     "52": {
       "AllChannelStatus": "FF",
@@ -9725,7 +9728,8 @@
         }
       },
       "TemperatureChannel": "33",
-      "ThermostatAddr": "3"
+      "ThermostatAddr": "3",
+      "Type": "VMBELO-20"
     },
     "54": {
       "Info": "1 Button Touch panel",

velbusaio/util.py

@@ -1,3 +1,7 @@
+"""
+Some common utils.
+"""
+
 from typing import Union
 
 from velbusaio.const import MAXIMUM_MESSAGE_SIZE, MINIMUM_MESSAGE_SIZE