velbus-aio 2023.12.0__py3-none-any.whl → 2025.11.0__py3-none-any.whl

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

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,23 @@ 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",
+        "VMB2DC-20",
+        "VMB8IN-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ChannelNamePart1Message2(ChannelNamePart1Message):

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,23 @@ 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",
+        "VMB2DC-20",
+        "VMB8IN-20",
+        "VMB4LEDPWM-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ChannelNamePart2Message2(ChannelNamePart2Message):

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,23 @@ 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",
+        "VMB2DC-20",
+        "VMB8IN-20",
+        "VMB4LEDPWM-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ChannelNamePart3Message2(ChannelNamePart3Message):

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:

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

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

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

velbusaio/messages/counter_value.py

@@ -0,0 +1,44 @@
+"""
+:author: Maikel Punie <maikel.punie@gmail.com>
+"""
+
+from __future__ import annotations
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xA4
+
+
+@register(COMMAND_CODE, ["VMB8IN-20"])
+class CounterValueMessage(Message):
+
+    def __init__(self, address=None):
+        Message.__init__(self)
+        self.channel = 0
+        self.power = 0
+        self.energy = 0
+
+    def populate(self, priority, address, rtr, data):
+        """
+        -DB0    bit 0-4      = channel
+        -DB0   bit 5-7      = Highest nibble (bits 19…16) of Power
+        -DB1                 = bits 15…8 of Power
+        -DB2                 = bits 7…0 of Power
+        -DB3    bit 0-7      = energy counter
+        -DB4    bit 0-7      = energy counter
+        -DB5    bit 0-7      = energy counter
+        :return: None
+        """
+        self.needs_no_rtr(rtr)
+        self.needs_data(data, 7)
+        self.set_attributes(priority, address, rtr)
+        self.channel = (data[0] & 0x0F0) + 1
+        self.power = (data[0] << 16) + (data[1] << 8) + data[2]
+        self.energy = (data[3] << 16) + (data[4] << 8) + data[5]
+
+    def get_channels(self):
+        """
+        :return: list
+        """
+        return self.channel

velbusaio/messages/cover_down.py

@@ -1,6 +1,7 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
 import struct
@@ -11,7 +12,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x06
 
 
-@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS"])
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverDownMessage(Message):
     """
     sent by:

velbusaio/messages/cover_off.py

@@ -1,9 +1,8 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
-from __future__ import annotations
 
-import struct
+from __future__ import annotations
 
 from velbusaio.command_registry import register
 from velbusaio.message import Message
@@ -11,7 +10,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x04
 
 
-@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS"])
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverOffMessage(Message):
     """
     sent by:

velbusaio/messages/cover_position.py

@@ -1,9 +1,8 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import struct
+from __future__ import annotations
 
 from velbusaio.command_registry import register
 from velbusaio.message import Message
@@ -11,7 +10,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x1C
 
 
-@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS"])
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverPosMessage(Message):
     """
     sent by:
@@ -30,7 +29,7 @@ class CoverPosMessage(Message):
         """
         self.needs_high_priority(priority)
         self.needs_no_rtr(rtr)
-        self.needs_data(data, 4)
+        self.needs_data(data, 2)
         self.set_attributes(priority, address, rtr)
         self.channel = self.byte_to_channel(data[0])
         self.position = data[1]

velbusaio/messages/cover_up.py

@@ -1,6 +1,7 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
 import struct
@@ -11,7 +12,7 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x05
 
 
-@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS"])
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverUpMessage(Message):
     """
     sent by:

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

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:

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,9 @@ from velbusaio.message import Message
 COMMAND_CODE = 0xA5
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(
+    COMMAND_CODE, ["VMBDALI", "VMBDALI-20", "VMB8DC-20", "VMB4LEDPWM-20", "VMB2DC-20"]
+)
 class DimValueStatus(Message):
     """
     send by: VMBDALI

velbusaio/messages/dimmer_channel_status.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 import struct
@@ -21,7 +22,10 @@ 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", "VMB4LEDPWM-20", "VMB2DC-20"],
+)
 class DimmerChannelStatusMessage(Message):
     """
     sent by: VMB4DC

velbusaio/messages/dimmer_status.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 import struct
@@ -24,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/edge_set_color.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from enum import IntEnum
+
 from velbusaio.command_registry import register
 from velbusaio.message import Message
 

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

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

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

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

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

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

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

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

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

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

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

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

velbusaio/messages/module_status.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -75,6 +76,18 @@ class ModuleStatusMessage(Message):
         "VMBGPOD-2",
         "VMBELO",
         "VMB7IN",
+        "VMB6PB-20",
+        "VMBEL1-20",
+        "VMBEL2-20",
+        "VMBEL4-20",
+        "VMBELO-20",
+        "VMBGP1-20",
+        "VMBGP2-20",
+        "VMBGP4-20",
+        "VMBGPO-20",
+        "VMBEL4PIR-20",
+        "VMBGP4PIR-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ModuleStatusMessage2(Message):

velbusaio/messages/module_status_request.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -18,7 +19,7 @@ class ModuleStatusRequestMessage(Message):
 
     def __init__(self, address=None):
         Message.__init__(self)
-        self.channels = []
+        self.channels: list | str = []
         self.wait_after_send = 500
         self.set_defaults(address)
 
@@ -36,4 +37,6 @@ class ModuleStatusRequestMessage(Message):
         """
         :return: bytes
         """
-        return bytes([COMMAND_CODE, self.channels_to_byte(self.channels)])
+        if isinstance(self.channels, list):
+            return bytes([COMMAND_CODE, self.channels_to_byte(self.channels)])
+        return bytes([COMMAND_CODE, int(self.channels, 16)])

velbusaio/messages/module_subtype.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 import struct
@@ -24,7 +25,7 @@ class ModuleSubTypeMessage(Message):
 
     # pylint: disable-msg=R0902
 
-    def __init__(self, address=None, sub_address_offset: int = 0):
+    def __init__(self, address=None, sub_address_offset: int = 0) -> None:
         Message.__init__(self)
         self.module_type = 0x00
         self.sub_address_1 = 0xFF
@@ -35,13 +36,13 @@ class ModuleSubTypeMessage(Message):
         self.serial = 0
         self.sub_address_offset = sub_address_offset
 
-    def module_name(self):
+    def module_name(self) -> str:
         """
         :return: str
         """
         return "Unknown"
 
-    def populate(self, priority, address, rtr, data):
+    def populate(self, priority, address, rtr, data) -> None:
         """
         :return: None
         """

velbusaio/messages/module_type.py

@@ -1,11 +1,12 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 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
@@ -97,7 +98,7 @@ class ModuleTypeMessage(Message):
 
     # pylint: disable-msg=R0902
 
-    def __init__(self, address=None):
+    def __init__(self, address=None) -> None:
         Message.__init__(self)
         self.module_type = 0x00
         self.led_on = []
@@ -109,13 +110,18 @@ class ModuleTypeMessage(Message):
         self.build_week = 0
         self.set_defaults(address)
 
-    def module_name(self):
+    def module_type_name(self) -> str:
         """
         :return: str
         """
-        return "Unknown"
 
-    def populate(self, priority, address, rtr, data):
+        return (
+            MODULE_DIRECTORY[self.module_type]
+            if self.module_type in MODULE_DIRECTORY
+            else "Unknown"
+        )
+
+    def populate(self, priority, address, rtr, data) -> None:
         """
         :return: None
         """
@@ -147,10 +153,14 @@ class ModuleTypeMessage(Message):
         "VMBGPO-20",
         "VMBEL4PIR-20",
         "VMBGP4PIR-20",
+        "VMB4LEDPWM-20",
+        "VMB8IN-20",
+        "VMB8DC-20",
+        "VMB2DC-20",
     ],
 )
 class ModuleType2Message(Message):
-    def __init__(self, address=None):
+    def __init__(self, address=None) -> None:
         Message.__init__(self)
         self.module_type = 0x00
         self.led_on = []
@@ -163,7 +173,7 @@ class ModuleType2Message(Message):
         self.term = 0
         self.set_defaults(address)
 
-    def module_name(self):
+    def module_name(self) -> str:
         """
         :return: str
         """

velbusaio/messages/module_type_request.py

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