velbus-aio 2023.12.0__tar.gz → 2024.4.0__tar.gz

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/MANIFEST.in

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

{velbus-aio-2023.12.0/velbus_aio.egg-info → velbus-aio-2024.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2023.12.0
+Version: 2024.4.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -30,6 +30,7 @@ Requires-Dist: pyserial-asyncio>=0.5
 Requires-Dist: backoff>=1.10.0
 
 ![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)
 
 # velbus-aio
 

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/README.md

@@ -1,4 +1,5 @@
 ![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)
 
 # velbus-aio
 

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"]
 [project]
 name = "velbus-aio"
 license = {text = "MIT"}
-version = "2023.12.0"
+version = "2024.4.0"
 description = "Open-source home automation platform running on Python 3."
 readme = "README.md"
 authors = [
@@ -51,7 +51,7 @@ exclude_dirs = ["tests"]
 skips = ["B301", "B403", "B323", "B104", "B110"]
 
 [tool.bumpver]
-current_version = "2023.12.0"
+current_version = "2024.4.0"
 version_pattern = "YYYY.MM.INC0"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0/velbus_aio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2023.12.0
+Version: 2024.4.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -30,6 +30,7 @@ Requires-Dist: pyserial-asyncio>=0.5
 Requires-Dist: backoff>=1.10.0
 
 ![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)
 
 # velbus-aio
 

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbus_aio.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ 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
@@ -106,5 +107,4 @@ 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/moduleprotocol/protocol.json
+velbusaio/messages/write_module_address_and_serial_number.py

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/channels.py

@@ -1,6 +1,7 @@
 """
 author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import asyncio
@@ -276,6 +277,10 @@ class Blind(Channel):
 
     async def set_position(self, position: int) -> None:
         # may not be supported by the module
+        if position == 100:
+            # at least VMB1BLS ignores command 0x1C with position 0x64
+            await self.close()
+            return
         cls = commandRegistry.get_command(0x1C, self._module.get_type())
         msg = cls(self._address)
         msg.channel = self._num

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/command_registry.py

@@ -1,12 +1,14 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com> and Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 MODULE_DIRECTORY = {
     0x01: "VMB8PB",
     0x02: "VMB1RY",
     0x03: "VMB1BL",
+    0x04: "VMB4LEDPWM-20",
     0x05: "VMB6IN",
     0x07: "VMB1DM",
     0x08: "VMB4RY",
@@ -68,6 +70,7 @@ MODULE_DIRECTORY = {
     0x48: "VMB4RYLD-10",
     0x49: "VMB4RYNO-10",
     0x4A: "VMB2BLE-10",
+    0x4B: "VMB8DC-20",
     0x4C: "VMB6PB-20",
     0x4F: "VMBEL1-20",
     0x50: "VMBEL2-20",

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/const.py

@@ -1,6 +1,7 @@
 """
 Author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from typing import Final

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/controller.py

@@ -1,6 +1,7 @@
 """
 Main interface for the velbusaio lib
 """
+
 from __future__ import annotations
 
 import asyncio

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/handler.py

@@ -2,6 +2,7 @@
 Velbus packet handler
 :Author maikel punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import asyncio
@@ -9,7 +10,6 @@ import json
 import logging
 import re
 from typing import TYPE_CHECKING, Awaitable, Callable
-
 import pkg_resources
 
 from velbusaio.command_registry import commandRegistry
@@ -39,7 +39,7 @@ class PacketHandler:
         self._scan_complete = False
         self._scan_complete_event = asyncio.Event()
         with open(
-            pkg_resources.resource_filename(__name__, "moduleprotocol/protocol.json")
+            pkg_resources.resource_filename(__name__, "protocol.json")
         ) as protocol_file:
             self.pdata = json.load(protocol_file)
 
@@ -118,63 +118,6 @@ class PacketHandler:
                 )
             )
 
-    # def _handle_message(self, rawMsg: RawMessage) -> None:
-    #    module_type = self._velbus.get_module(rawMsg.address).get_type()
-    #    this_msg = keys_exists(
-    #        self.pdata, "ModuleTypes", h2(module_type), "Messages", h2(rawMsg.command), "Data"
-    #    )
-    #    if this_msg and "PerByte" in this_msg:
-    #        self._per_byte(this_msg["PerByte"], rawMsg)
-
-    # def _per_byte(self, cmsg, rawMsg: RawMessage) -> dict:
-    #    result = {}
-    #    byte_index = 0
-    #    for byte in rawMsg.data:
-    #        num = str(byte_index)
-    #        # only do something if its defined
-    #        if num not in cmsg:
-    #            continue
-    #        # check if we can do a binary match
-    #        for mat in cmsg[num]["Match"]:
-    #            if (
-    #                (mat.startswith("%") and re.match(mat[1:], f"{byte:08b}"))
-    #                or mat == f"{byte:08b}"
-    #                or mat == f"{byte:02x}"
-    #            ):
-    #                result = self._per_byte_handle(
-    #                    result, cmsg[num]["Match"][mat], byte
-    #                )
-    #        byte_index += 1
-    #    return result
-
-    # def _per_byte_handle(self, result: dict, todo: dict, byte: int) -> dict:
-    #    if "Channel" in todo:
-    #        result["Channel"] = todo["Channel"]
-    #    if "Value" in todo:
-    #        result["Value"] = todo["Value"]
-    #    if "Convert" in todo:
-    #        result["ValueList"] = []
-    #        if todo["Convert"] == "Decimal":
-    #            result["ValueList"].append(int(byte))
-    #        elif todo["Convert"] == "Counter":
-    #            result["ValueList"].append(f"{byte:02x}")
-    #        elif todo["Convert"] == "Temperature":
-    #            print("CONVERT temperature")
-    #        elif todo["Convert"] == "Divider":
-    #            bin_str = f"{byte:08b}"
-    #            chan = bin_str[6:]
-    #            val = bin_str[:5]
-    #            print(f"CONVERT Divider {chan} {val}")
-    #        elif todo["Convert"] == "Channel":
-    #            print("CONVERT Channel")
-    #        elif todo["Convert"] == "ChannelBit":
-    #            print("CONVERT ChannelBit")
-    #        elif todo["Convert"].startswith("ChannelBitStatus"):
-    #            print("CONVERT ChannelBitStatus")
-    #        else:
-    #            self._log.error("UNKNOWN convert requested: {}".format(todo["Convert"]))
-    #    return result
-
     async def _handle_module_type(self, msg: Message) -> None:
         """
         load the module data

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/helpers.py

@@ -1,6 +1,7 @@
 """
 Helper functions
 """
+
 from __future__ import annotations
 
 import os

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/message.py

@@ -1,6 +1,7 @@
 """
 The velbus abstract message class
 """
+
 from __future__ import annotations
 
 import json

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/__init__.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.messages.blind_status import BlindStatusMessage, BlindStatusNgMessage

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/blind_status.py

@@ -1,6 +1,7 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
 import json

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/bus_active.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/bus_error_counter_status.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/bus_error_counter_status_request.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/bus_off.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/channel_name_part1.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -69,6 +70,20 @@ class ChannelNamePart1Message(Message):
         "VMBELPIR",
         "VMBDALI",
         "VMB4AN",
+        "VMB6PB-20",
+        "VMBEL1-20",
+        "VMBEL2-20",
+        "VMBEL4-20",
+        "VMBELO-20",
+        "VMBGP1-20",
+        "VMBGP2-20",
+        "VMBGP4-20",
+        "VMBGPO-20",
+        "VMBDALI-20",
+        "VMBEL4PIR-20",
+        "VMBGP4PIR-20",
+        "VMB4LEDPWM-20",
+        "VMB8DC-20",
     ],
 )
 class ChannelNamePart1Message2(ChannelNamePart1Message):

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/channel_name_part2.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -69,6 +70,19 @@ class ChannelNamePart2Message(Message):
         "VMBELPIR",
         "VMBDALI",
         "VMB4AN",
+        "VMB6PB-20",
+        "VMBEL1-20",
+        "VMBEL2-20",
+        "VMBEL4-20",
+        "VMBELO-20",
+        "VMBGP1-20",
+        "VMBGP2-20",
+        "VMBGP4-20",
+        "VMBGPO-20",
+        "VMBDALI-20",
+        "VMBEL4PIR-20",
+        "VMBGP4PIR-20",
+        "VMB8DC-20",
     ],
 )
 class ChannelNamePart2Message2(ChannelNamePart2Message):

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/channel_name_part3.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -69,6 +70,19 @@ class ChannelNamePart3Message(Message):
         "VMBELPIR",
         "VMBDALI",
         "VMB4AN",
+        "VMB6PB-20",
+        "VMBEL1-20",
+        "VMBEL2-20",
+        "VMBEL4-20",
+        "VMBELO-20",
+        "VMBGP1-20",
+        "VMBGP2-20",
+        "VMBGP4-20",
+        "VMBGPO-20",
+        "VMBDALI-20",
+        "VMBEL4PIR-20",
+        "VMBGP4PIR-20",
+        "VMB8DC-20",
     ],
 )
 class ChannelNamePart3Message2(ChannelNamePart3Message):

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/channel_name_request.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org> and Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -70,7 +71,7 @@ class ChannelNameRequestMessage2(ChannelNameRequestMessage):
         return bytes([COMMAND_CODE, tmp])
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
 class ChannelNameRequestMessage3(ChannelNameRequestMessage):
     """
     send by:

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/clear_led.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/counter_status.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/counter_status_request.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/cover_down.py

@@ -1,6 +1,7 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
 import struct

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/cover_off.py

@@ -1,6 +1,7 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
 import struct

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/cover_position.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import struct

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/cover_up.py

@@ -1,6 +1,7 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
 import struct

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/dali_device_settings.py

@@ -1,6 +1,7 @@
 """
 :author: Niels Laukens
 """
+
 from __future__ import annotations
 
 import dataclasses
@@ -12,7 +13,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0xE8
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
 class DaliDeviceSettingMsg(Message):
     """
     send by: VMBDALI

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/dali_device_settings_request.py

@@ -1,6 +1,7 @@
 """
 :author: Niels Laukens
 """
+
 from __future__ import annotations
 
 import enum
@@ -17,7 +18,7 @@ class DataSource(enum.Enum):
     FromDaliDevice = 1
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
 class DaliDeviceSettingsRequest(Message):
     """
     send by:

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/dali_dim_value_status.py

@@ -1,6 +1,7 @@
 """
 :author: Niels Laukens
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -9,7 +10,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0xA5
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
 class DimValueStatus(Message):
     """
     send by: VMBDALI

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/dimmer_channel_status.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 import struct
@@ -21,7 +22,7 @@ LED_FAST_BLINKING = 1 << 5
 LED_VERY_FAST_BLINKING = 1 << 4
 
 
-@register(COMMAND_CODE, ["VMB4DC", "VMBDMI", "VMBDMI-R"])
+@register(COMMAND_CODE, ["VMB4DC", "VMBDMI", "VMBDMI-R", "VMB8DC-20"])
 class DimmerChannelStatusMessage(Message):
     """
     sent by: VMB4DC

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/dimmer_status.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 import struct

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/edge_set_custom_color.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/fast_blinking_led.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/forced_off.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/forced_on.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/interface_status_request.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/ir_receiver_status.py

@@ -1,6 +1,7 @@
 """
 :author: David Danssaert <david.danssaert@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/kwh_status.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/light_value_request.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/memo_text.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/memory_data.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/memory_data_block.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

{velbus-aio-2023.12.0 → velbus-aio-2024.4.0}/velbusaio/messages/memory_dump_request.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register