velbus-aio 2025.4.2__py3-none-any.whl → 2025.5.0__py3-none-any.whl

{velbus_aio-2025.4.2.dist-info → velbus_aio-2025.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velbus-aio
-Version: 2025.4.2
+Version: 2025.5.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT

{velbus_aio-2025.4.2.dist-info → velbus_aio-2025.5.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velbus_aio-2025.4.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+velbus_aio-2025.5.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 velbusaio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velbusaio/channels.py,sha256=pR-y7Res_MAPSFEM62eLx844HU0EjX7SyyEpJT4YU74,23556
 velbusaio/command_registry.py,sha256=nlx4__0ASr5WurOYLC-HEqswlg_qm3Y5trs4V8FhnvU,5350
@@ -6,15 +6,15 @@ velbusaio/const.py,sha256=aHClMaMS6NINTCrjeRwLbVzdvS91VgFKM8j61ks5tn0,1862
 velbusaio/controller.py,sha256=Ohc-18ydnm76-5fOD_b24Aa_uYu6CdkI3ulfhska5og,8887
 velbusaio/discovery.py,sha256=Px6qoZl4QhF17aMz6JxstCORBpLzZGWEK9h4Vyvg57o,1649
 velbusaio/exceptions.py,sha256=FHkXaM3dK5Gkk-QGAf9dLE3FPlCU2FRZWUyY-4KRNnA,515
-velbusaio/handler.py,sha256=gkRikfrTzekL0hFQSUV0AjVuMoUY1DNONEhbRBKyRko,11901
+velbusaio/handler.py,sha256=DmL6dTbolJUD9yRaeKj1vr29eSx4zkDwVtS8fPeAs8I,11906
 velbusaio/helpers.py,sha256=iqpoereRH4JY5WAkozIqWvXWyRmhko-J-UGXDylFyEM,2537
 velbusaio/message.py,sha256=_MRuI4XnMcqeduCDJ3AwhAPL1B8VMstFDnjjLo8QuxM,5018
-velbusaio/module.py,sha256=y5uegbCl0vowBqoeagycRjP6FPLDPaGJ4ZJeW22wMqA,37631
+velbusaio/module.py,sha256=pfYaUgMrbhYCWle8byqjYZvMhw2ikE-Ff5uAxKhY59w,37938
 velbusaio/protocol.py,sha256=RIpdL0vPlL4qE4bC8sEZSD0SRS4tWtR9MdzjTPSd2zs,8002
 velbusaio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velbusaio/raw_message.py,sha256=ODoTPVAvyXXQSMXxtQO1U5OxcoQ4W8JJN5fotEDGSTo,4690
 velbusaio/util.py,sha256=FW6YCiPYWOCgqHDs8-LbzME0h81mqftYVG0qqZ-oo7Y,1568
-velbusaio/vlp_reader.py,sha256=mHhp0Le-u8PT0Nk3glZrB7qK4JFR906NyB-nHDlnYC8,1039
+velbusaio/vlp_reader.py,sha256=2oSbBOR2bgaSGnL1JP8TJaHgbY20ZgmCfSivtINuiR8,3997
 velbusaio/messages/__init__.py,sha256=2Zgrk4VBoSJXKYhwS18gxuiE96jDvnpBBjeYI1yHjqs,6072
 velbusaio/messages/blind_status.py,sha256=q2CQgcU1ZsXMyjR2co8Eegj0LZRDfRqvpCTVvjovNWA,3432
 velbusaio/messages/bus_active.py,sha256=AB1mEvbMXRuOaC2CQ7hzKSLmbaJnyFqqXrARi-aSdtg,749
@@ -35,9 +35,9 @@ velbusaio/messages/cover_position.py,sha256=_BgQz3DqZGirXDthj7xq72hxr51FYv2tyrdC
 velbusaio/messages/cover_up.py,sha256=iFPCWuRhIc54oMQAFz5DZsUW23673_nNHoPFJC_HA_c,2561
 velbusaio/messages/dali_device_settings.py,sha256=KzJ7OFkFRPuCXSOThuplM48J_kH0I3RE82ZRCpmiqYA,4870
 velbusaio/messages/dali_device_settings_request.py,sha256=InTnrwLD7l9gCHXKlJ69FHMXcejtYMUZBtnffx9nDQU,1476
-velbusaio/messages/dali_dim_value_status.py,sha256=Kgtfb65HCku4OBm6uaxKFpK3VtlYaTemSjMhZqngqkY,1059
+velbusaio/messages/dali_dim_value_status.py,sha256=MS3bWgBYUsQ9w7jrRRUI8QoQmziTVCYExfweAezT2E0,1089
 velbusaio/messages/dimmer_channel_status.py,sha256=v3VszfQoPY05Dt3yzyWIlOJTKSXE1IP044x1x_sLHj4,2501
-velbusaio/messages/dimmer_status.py,sha256=pWsWXJGWmYGio4FyUktI9aYnIBQkGCQ5ZwaeqnenYsU,2938
+velbusaio/messages/dimmer_status.py,sha256=AikJN-jfdFy8rXrGMSMfrhFcYE1yHlorffxk-bcKCXU,3067
 velbusaio/messages/edge_set_color.py,sha256=YhxTv-WtDrZ_O67Ro6V-bcHrxj3tyBI1GuzTI5LkIVw,3306
 velbusaio/messages/edge_set_custom_color.py,sha256=Lz-7prBveqPwuDWv2Mn13X9TAXGBEquw8xz2_y9NtTk,1338
 velbusaio/messages/fast_blinking_led.py,sha256=_AaG6NcjzG_cBNARogzu56l7DNpGU11XGrDHIkMuKss,909
@@ -54,7 +54,7 @@ velbusaio/messages/memory_dump_request.py,sha256=xrPsdpygD9DUF3lp-BzJacuq1dNkqz2
 velbusaio/messages/module_status.py,sha256=Y2OQUzijtA27snTEVHlyoOrcaLQbSq_3KHKAVDLGR_o,6662
 velbusaio/messages/module_status_request.py,sha256=s3h8F6Dpmjcb4hqDQKIzdOgocW1F_st40cctcW7WmQ4,961
 velbusaio/messages/module_subtype.py,sha256=KG-OC0eW-ZRnP1P8EWmcay6O-no6Mn2cklEjokaIW9M,1487
-velbusaio/messages/module_type.py,sha256=pzIs4VmPRpquV-Z6UJg8dpwXp0TTGTLpoBNuqSY1t1I,4221
+velbusaio/messages/module_type.py,sha256=re4DSM0YZF3Jm-rv6cSYoX24gxTZSgM6COmjkjpA6P8,4372
 velbusaio/messages/module_type_request.py,sha256=fntMYCF1WVwSseCy3zRoZQH6JeGz8JDfTkwHC3AvcB4,754
 velbusaio/messages/psu_load.py,sha256=001KIz84CbnC54gHxhfAiNbcEMRpVUBzDwQ7T-yxY8s,1232
 velbusaio/messages/psu_values.py,sha256=Yd_ndU8yIei7CoL2NV6FHCefO5h_gzRsPNUYxGUGP0o,1300
@@ -121,7 +121,7 @@ velbusaio/module_spec/13.json,sha256=reXGXbaTfVVmLekrXHlfzjsV424bb0ozG7q-PxDv27U
 velbusaio/module_spec/14.json,sha256=ym2T2jCds-lC7QBZr7mqb0L9PlSmQflwpFnlEDxByjk,161
 velbusaio/module_spec/15.json,sha256=VDkI3bJRZgpfAsCiEzRJls7Hj7spmaKZ6XR8TjyymAQ,2698
 velbusaio/module_spec/16.json,sha256=9sdbNwyQQRkGsd477Oyu279tRcSydQC0bGwSQrhnVTU,3459
-velbusaio/module_spec/17.json,sha256=WeWeIV6euBGkPq7jBv5rbSykZwhDP6nPzrfk7rrYz-w,3490
+velbusaio/module_spec/17.json,sha256=bLZ7JDt58vZUxPT6JY1xYeWWb1-jHkOhpBRUghjkQSA,3714
 velbusaio/module_spec/18.json,sha256=ylZ7_86DYCkHxk40ZqsGYEkLeUslZ_-b_ftUihfJ2bQ,3484
 velbusaio/module_spec/1A.json,sha256=dvIxgufmgIhZhsBuVEa27KmukJyvnFciorqpxwRNWFM,2581
 velbusaio/module_spec/1B.json,sha256=JbHvdmoRnsqyqhCItsTOP-UK_Yz_ha1Km9CXDe68YVc,3159
@@ -184,7 +184,7 @@ velbusaio/module_spec/5C.json,sha256=yw_XlccuFp-buRL_NXThwQLwblVRa0diLpUDm9Exrg0
 velbusaio/module_spec/5F.json,sha256=ebSwLMUW5A4LCRGOrF-vwxSVvrWZMNUWz10Xrmz7SwM,1259
 velbusaio/module_spec/60.json,sha256=Teih3jAybl5AELjY3gFbZrFN0RIMSU1yuvdsYZlMvTo,74
 velbusaio/module_spec/broadcast.json,sha256=L2Sc9FhZ7NOuu7K5g5jAhvUQGDP6a2CKrg-uWh_v-sA,2250
-velbus_aio-2025.4.2.dist-info/METADATA,sha256=WSJ0-GV-TmG0ZqKE5t87kTenc4-PSzEEO-j1kn9QWmw,4562
-velbus_aio-2025.4.2.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-velbus_aio-2025.4.2.dist-info/top_level.txt,sha256=W0-lSOwD23mm8FqaIe9vY20fKicBMIdUVjF-zmfxRnY,15
-velbus_aio-2025.4.2.dist-info/RECORD,,
+velbus_aio-2025.5.0.dist-info/METADATA,sha256=-oLAazmVHGSg3lWfQHYa6dKIZ2JKt3qtqG5EKT1B1Lo,4562
+velbus_aio-2025.5.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+velbus_aio-2025.5.0.dist-info/top_level.txt,sha256=W0-lSOwD23mm8FqaIe9vY20fKicBMIdUVjF-zmfxRnY,15
+velbus_aio-2025.5.0.dist-info/RECORD,,

{velbus_aio-2025.4.2.dist-info → velbus_aio-2025.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

velbusaio/handler.py

@@ -139,7 +139,7 @@ class PacketHandler:
                 if module is not None:
                     try:
                         self._log.debug(
-                            f"Module {module._address} detected: start loading"
+                            f"Module {module.get_address()} detected: start loading"
                         )
                         await asyncio.wait_for(
                             module.load(from_cache=True),

velbusaio/messages/dali_dim_value_status.py

@@ -10,7 +10,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0xA5
 
 
-@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20", "VMB8DC-20", "VMB4LEDPWM-20"])
 class DimValueStatus(Message):
     """
     send by: VMBDALI

velbusaio/messages/dimmer_status.py

@@ -25,7 +25,18 @@ LED_FAST_BLINKING = 1 << 5
 LED_VERY_FAST_BLINKING = 1 << 4
 
 
-@register(COMMAND_CODE, ["VMB1DM", "VMBDME", "VMB1LED"])
+@register(
+    COMMAND_CODE,
+    [
+        "VMB1DM",
+        "VMBDME",
+        "VMB1LED",
+        "VMBDALI",
+        "VMBDALI-20",
+        "VMB8DC-20",
+        "VMB4LEDPWM-20",
+    ],
+)
 class DimmerStatusMessage(Message):
     """
     sent by: VMBDME

velbusaio/messages/module_type.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import struct
 
-from velbusaio.command_registry import register
+from velbusaio.command_registry import MODULE_DIRECTORY, register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xFF
@@ -110,11 +110,15 @@ class ModuleTypeMessage(Message):
         self.build_week = 0
         self.set_defaults(address)
 
-    def module_name(self) -> str:
+    def module_type_name(self) -> str:
         """
         :return: str
         """
-        return "Unknown"
+        return (
+            MODULE_DIRECTORY[self.module_type]
+            if self.module_type in MODULE_DIRECTORY
+            else "Unknown"
+        )
 
     def populate(self, priority, address, rtr, data) -> None:
         """

velbusaio/module.py

@@ -243,6 +243,9 @@ class Module:
             d["channels"][num] = chan.to_cache()
         return d
 
+    def get_address(self) -> int:
+        return self._address
+
     def get_addresses(self) -> list:
         """
         Get all addresses for this module
@@ -550,6 +553,10 @@ class Module:
             await self._update_channel(
                 message.channel, {"power": message.power, "energy": message.energy}
             )
+        elif isinstance(message, DimValueStatus):
+            for offset, dim_value in enumerate(message.dim_values):
+                channel = message.channel + offset
+                await self._update_channel(channel, {"state": dim_value})
 
     async def _update_channel(self, channel: int, updates: dict):
         try:

velbusaio/module_spec/17.json

@@ -113,7 +113,17 @@
       "03FE": { "ModuleName": "62" },
       "03FF": { "ModuleName": "64:Save" }
     },
-    "ModuleName": "03C0-03FF"
+    "ModuleName": "03C0-03FF",
+    "Channels": {
+      "01": "0000-000F",
+      "02": "0010-001F",
+      "03": "0020-002F",
+      "04": "0030-003F",
+      "05": "0040-004F",
+      "06": "0050-005F",
+      "07": "0060-006F",
+      "08": "0070-007F"
+    }
   },
   "Type": "VMB6PBN"
 }

velbusaio/vlp_reader.py

@@ -1,33 +1,113 @@
+import importlib.resources
+import json
+import logging
+import sys
+
+from aiofile import async_open
 from bs4 import BeautifulSoup
 
+from velbusaio.command_registry import MODULE_DIRECTORY
+from velbusaio.helpers import h2
+
 
 class vlpFile:
 
     def __init__(self, file_path) -> None:
         self._file_path = file_path
-        self._soup = None
         self._modules = {}
-        self._read()
-        self._parse()
-        print(self._modules)
+        self._log = logging.getLogger("velbus-vlpFile")
+
+    def get(self) -> dict:
+        return self._modules
 
-    def _read(self) -> None:
+    async def read(self) -> None:
         with open(self._file_path) as file:
             xml_content = file.read()
-        self._soup = BeautifulSoup(xml_content, "xml")
-
-    def _parse(self) -> None:
-        for module in self._soup.find_all("Module"):
-            self._parse_module(module)
-
-    def _parse_module(self, module) -> None:
-        mod_info = {}
-        mod_info["name"] = module.find("Caption").get_text()
-        mod_info["addresses"] = module["address"]
-        mod_info["build"] = module["build"]
-        mod_info["serial"] = module["serial"]
-        mod_info["build"] = module["build"]
-        mod_info["type"] = module["type"]
-        memory = module.find("Memory")
-        mod_info["memory"] = memory.get_text()
-        self._modules[mod_info["addresses"]] = mod_info
+        _soup = BeautifulSoup(xml_content, "xml")
+        for module in _soup.find_all("Module"):
+            self._modules[module["address"]] = vlpModule(
+                module.find("Caption").get_text(),
+                module["address"],
+                module["build"],
+                module["serial"],
+                module["type"],
+                module.find("Memory").get_text(),
+            )
+            await self._modules[module["address"]].load_module_spec()
+            print(self._modules[module["address"]].get_channel_name(1))
+            print(self._modules[module["address"]].get_channel_name(2))
+            print(self._modules[module["address"]].get_channel_name(3))
+            print(self._modules[module["address"]].get_channel_name(4))
+            print(self._modules[module["address"]].get_channel_name(5))
+            print(self._modules[module["address"]].get_channel_name(10))
+
+
+class vlpModule:
+
+    def __init__(self, name, addresses, build, serial, type, memory) -> None:
+        self._name = name
+        self._addresses = addresses
+        self._build = build
+        self._serial = serial
+        self._type = type
+        self._memory = memory
+        self._spec = {}
+        self._type_id = next(
+            (key for key, value in MODULE_DIRECTORY.items() if value == self._type),
+            None,
+        )
+        self._log = logging.getLogger("velbus-vlpFile")
+
+    def get(self) -> dict:
+        return {
+            "name": self._name,
+            "addresses": self._addresses,
+            "build": self._build,
+            "serial": self._serial,
+            "type": self._type,
+            "memory": self._memory,
+        }
+
+    def get_name(self) -> str:
+        return self._name
+
+    def get_channel_name(self, chan: int) -> str | None:
+        self._log.debug(f"get_channel_name: {chan}")
+        if "Memory" not in self._spec:
+            self._log.debug(" => no Memory locations found")
+            return None
+        if "Channels" not in self._spec["Memory"]:
+            self._log.debug(" => no Channels Memory locations found")
+            return None
+        if h2(chan) not in self._spec["Memory"]["Channels"]:
+            self._log.debug(f" => no chan {chan} Memory locations found")
+            return None
+        byte_data = bytes.fromhex(
+            self._read_from_memory(self._spec["Memory"]["Channels"][h2(chan)]).replace(
+                "FF", ""
+            )
+        )
+        return byte_data.decode("ascii")
+
+    async def load_module_spec(self) -> None:
+        if sys.version_info >= (3, 13):
+            with importlib.resources.path(
+                __name__, f"module_spec/{h2(self._type_id)}.json"
+            ) as fspath:
+                async with async_open(fspath) as protocol_file:
+                    self._spec = json.loads(await protocol_file.read())
+        else:
+            async with async_open(
+                str(
+                    importlib.resources.files(__name__.split(".")[0]).joinpath(
+                        f"module_spec/{h2(self._type)}.json"
+                    )
+                )
+            ) as protocol_file:
+                self._spec = json.loads(await protocol_file.read())
+
+    def _read_from_memory(self, address_range) -> str | None:
+        start_str, end_str = address_range.split("-")
+        start = int(start_str, 16) * 2
+        end = (int(end_str, 16) + 1) * 2
+        return self._memory[start:end]