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

velbusaio/messages/channel_name_part2.py

@@ -1,16 +1,16 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
-from __future__ import annotations
 
-import json
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xF1
 
 
+@register(COMMAND_CODE)
 class ChannelNamePart2Message(Message):
     """
     send by: VMB6IN, VMB4RYLD
@@ -44,18 +44,54 @@ class ChannelNamePart2Message(Message):
             self.name, "ascii", "ignore"
         )
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        return json.dumps(json_dict)
-
 
+@register(
+    COMMAND_CODE,
+    [
+        "VMBGP1",
+        "VMBEL1",
+        "VMBGP1-2",
+        "VMBGP2",
+        "VMBEL2",
+        "VMBGP2-2",
+        "VMBGP4",
+        "VMBEL4",
+        "VMBGP4-2",
+        "VMBGPO",
+        "VMBGPOD",
+        "VMBGPOD-2",
+        "VMBELO",
+        "VMBGP4PIR",
+        "VMBGP4PIR-2",
+        "VMBDMI",
+        "VMBDMI-R",
+        "VMBIN",
+        "VMBKP",
+        "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):
     """
-    send by: VMBGP*
+    send by: VMBGP*, VMBDALI
     received by:
     """
 
@@ -71,6 +107,7 @@ class ChannelNamePart2Message2(ChannelNamePart2Message):
         self.name = "".join([chr(x) for x in data[1:]])
 
 
+@register(COMMAND_CODE, ["VMB1BL", "VMB2BL"])
 class ChannelNamePart2Message3(ChannelNamePart2Message):
     """
     send by: VMBGP*
@@ -87,24 +124,3 @@ class ChannelNamePart2Message3(ChannelNamePart2Message):
         self.set_attributes(priority, address, rtr)
         self.channel = (data[0] >> 1) & 0x03
         self.name = "".join([chr(x) for x in data[1:]])
-
-
-register_command(COMMAND_CODE, ChannelNamePart2Message)
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP1")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBEL1")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP1-2")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP2")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBEL2")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP2-2")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP4")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBEL4")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP4-2")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGPO")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGPOD")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGPOD-2")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBELO")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBGP4PIR")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBDMI")
-register_command(COMMAND_CODE, ChannelNamePart2Message2, "VMBDMI-R")
-register_command(COMMAND_CODE, ChannelNamePart2Message3, "VMB1BL")
-register_command(COMMAND_CODE, ChannelNamePart2Message3, "VMB2BL")

velbusaio/messages/channel_name_part3.py

@@ -1,16 +1,16 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
-from __future__ import annotations
 
-import json
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xF2
 
 
+@register(COMMAND_CODE)
 class ChannelNamePart3Message(Message):
     """
     send by: VMB6IN, VMB4RYLD
@@ -44,18 +44,54 @@ class ChannelNamePart3Message(Message):
             self.name, "ascii", "ignore"
         )
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        return json.dumps(json_dict)
-
 
+@register(
+    COMMAND_CODE,
+    [
+        "VMBGP1",
+        "VMBEL1",
+        "VMBGP1-2",
+        "VMBGP2",
+        "VMBEL2",
+        "VMBGP2-2",
+        "VMBGP4",
+        "VMBEL4",
+        "VMBGP4-2",
+        "VMBGPO",
+        "VMBGPOD",
+        "VMBGPOD-2",
+        "VMBELO",
+        "VMBGP4PIR",
+        "VMBGP4PIR-2",
+        "VMBDMI",
+        "VMBDMI-R",
+        "VMBIN",
+        "VMBKP",
+        "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):
     """
-    send by: VMBGP*
+    send by: VMBGP*, VMBDALI
     received by:
     """
 
@@ -71,6 +107,7 @@ class ChannelNamePart3Message2(ChannelNamePart3Message):
         self.name = "".join([chr(x) for x in data[1:]])
 
 
+@register(COMMAND_CODE, ["VMB1BL", "VMB2BL"])
 class ChannelNamePart3Message3(ChannelNamePart3Message):
     """
     send by: VMBGP*
@@ -87,24 +124,3 @@ class ChannelNamePart3Message3(ChannelNamePart3Message):
         self.set_attributes(priority, address, rtr)
         self.channel = (data[0] >> 1) & 0x03
         self.name = "".join([chr(x) for x in data[1:]])
-
-
-register_command(COMMAND_CODE, ChannelNamePart3Message)
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP1")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBEL1")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP1-2")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP2")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBEL2")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP2-2")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP4")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBEL4")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP4-2")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGPO")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGPOD")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGPOD-2")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBELO")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBGP4PIR")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBDMI")
-register_command(COMMAND_CODE, ChannelNamePart3Message2, "VMBDMI-R")
-register_command(COMMAND_CODE, ChannelNamePart3Message3, "VMB1BL")
-register_command(COMMAND_CODE, ChannelNamePart3Message3, "VMB2BL")

velbusaio/messages/channel_name_request.py

@@ -1,16 +1,16 @@
 """
 :author: Thomas Delaet <thomas@delaet.org> and Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import json
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xEF
 
 
+@register(COMMAND_CODE)
 class ChannelNameRequestMessage(Message):
     """
     send by:
@@ -40,15 +40,8 @@ class ChannelNameRequestMessage(Message):
             return bytes([0xEF, self.channels_to_byte(self.channels)])
         return bytes([0xEF, 0xFF])
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channels"] = self.channels
-        return json.dumps(json_dict)
-
 
+@register(COMMAND_CODE, ["VMB2BL"])
 class ChannelNameRequestMessage2(ChannelNameRequestMessage):
     """
     send by:
@@ -78,4 +71,25 @@ class ChannelNameRequestMessage2(ChannelNameRequestMessage):
         return bytes([COMMAND_CODE, tmp])
 
 
-register_command(COMMAND_CODE, ChannelNameRequestMessage)
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
+class ChannelNameRequestMessage3(ChannelNameRequestMessage):
+    """
+    send by:
+    received by: VMBDALI
+    """
+
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.needs_data(data, 1)
+        self.set_attributes(priority, address, rtr)
+        self.channels = data[0]
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return bytes([COMMAND_CODE, self.channels])

velbusaio/messages/clear_led.py

@@ -1,14 +1,16 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xF5
 
 
+@register(COMMAND_CODE)
 class ClearLedMessage(Message):
     """
     send by: VMB4RYLD
@@ -35,6 +37,3 @@ class ClearLedMessage(Message):
         :return: bytes
         """
         return bytes([COMMAND_CODE, self.channels_to_byte(self.leds)])
-
-
-register_command(COMMAND_CODE, ClearLedMessage)

velbusaio/messages/counter_status.py

@@ -1,16 +1,16 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import json
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xBE
 
 
+@register(COMMAND_CODE, ["VMB7IN"])
 class CounterStatusMessage(Message):
     """
     send by: VMB7IN
@@ -42,22 +42,8 @@ class CounterStatusMessage(Message):
         self.counter = (data[1] << 24) + (data[2] << 16) + (data[3] << 8) + data[4]
         self.delay = (data[5] << 8) + data[6]
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["pulses"] = self.pulses
-        json_dict["counter"] = self.counter
-        json_dict["delay"] = self.delay
-        json_dict["channel"] = self.channel
-        return json.dumps(json_dict)
-
     def get_channels(self):
         """
         :return: list
         """
         return self.channel
-
-
-register_command(COMMAND_CODE, CounterStatusMessage, "VMB7IN")

velbusaio/messages/counter_status_request.py

@@ -1,14 +1,16 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xBD
 
 
+@register(COMMAND_CODE, ["VMB7IN"])
 class CounterStatusRequestMessage(Message):
     """
     send by:
@@ -17,6 +19,7 @@ class CounterStatusRequestMessage(Message):
 
     def __init__(self, address=None):
         Message.__init__(self)
+        self.channels = []
         self.wait_after_send = 500
         self.set_defaults(address)
 
@@ -26,14 +29,11 @@ class CounterStatusRequestMessage(Message):
         """
         self.needs_low_priority(priority)
         self.needs_no_rtr(rtr)
-        self.needs_data(data, 1)
+        self.needs_data(data, 2)
         self.set_attributes(priority, address, rtr)
 
     def data_to_binary(self):
         """
         :return: bytes
         """
-        return bytes([COMMAND_CODE, 0x0F, 0x00])
-
-
-register_command(COMMAND_CODE, CounterStatusRequestMessage, "VMB7IN")
+        return bytes([COMMAND_CODE, self.channels_to_byte(self.channels), 0x00])

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,18 +1,18 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
+
 from __future__ import annotations
 
-import json
-import logging
 import struct
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0x06
 
 
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverDownMessage(Message):
     """
     sent by:
@@ -36,15 +36,6 @@ class CoverDownMessage(Message):
         self.channel = self.byte_to_channel(data[0])
         (self.delay_time,) = struct.unpack(">L", bytes([0]) + data[1:])
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        json_dict["delay_time"] = self.delay_time
-        return json.dumps(json_dict)
-
     def set_defaults(self, address):
         if address is not None:
             self.set_address(address)
@@ -61,6 +52,7 @@ class CoverDownMessage(Message):
         )
 
 
+@register(COMMAND_CODE, ["VMB1BL", "VMB2BL"])
 class CoverDownMessage2(Message):
     """
     sent by:
@@ -71,7 +63,6 @@ class CoverDownMessage2(Message):
         Message.__init__(self)
         self.channel = 0
         self.delay_time = 0
-        self.logger = logging.getLogger("velbus")
         self.set_defaults(address)
 
     def populate(self, priority, address, rtr, data):
@@ -89,15 +80,6 @@ class CoverDownMessage2(Message):
         self.channel = self.byte_to_channel(tmp)
         (self.delay_time,) = struct.unpack(">L", bytes([0]) + data[1:])
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        json_dict["delay_time"] = self.delay_time
-        return json.dumps(json_dict)
-
     def set_defaults(self, address):
         if address is not None:
             self.set_address(address)
@@ -114,10 +96,3 @@ class CoverDownMessage2(Message):
             tmp = 0x0C
 
         return bytes([COMMAND_CODE, tmp]) + struct.pack(">L", self.delay_time)[-3:]
-
-
-register_command(COMMAND_CODE, CoverDownMessage, "VMB1BLE")
-register_command(COMMAND_CODE, CoverDownMessage, "VMB2BLE")
-register_command(COMMAND_CODE, CoverDownMessage, "VMB1BLS")
-register_command(COMMAND_CODE, CoverDownMessage2, "VMB1BL")
-register_command(COMMAND_CODE, CoverDownMessage2, "VMB2BL")

velbusaio/messages/cover_off.py

@@ -1,17 +1,16 @@
 """
 :author: Tom Dupré <gitd8400@gmail.com>
 """
-from __future__ import annotations
 
-import json
-import struct
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0x04
 
 
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverOffMessage(Message):
     """
     sent by:
@@ -33,14 +32,6 @@ class CoverOffMessage(Message):
         self.set_attributes(priority, address, rtr)
         self.channel = self.byte_to_channel(data[0])
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        return json.dumps(json_dict)
-
     def set_defaults(self, address):
         if address is not None:
             self.set_address(address)
@@ -54,6 +45,7 @@ class CoverOffMessage(Message):
         return bytes([COMMAND_CODE, self.channels_to_byte([self.channel])])
 
 
+@register(COMMAND_CODE, ["VMB1BL", "VMB2BL"])
 class CoverOffMessage2(Message):
     """
     sent by:
@@ -80,15 +72,6 @@ class CoverOffMessage2(Message):
         tmp = (data[0] >> 1) & 0x03
         self.channel = self.byte_to_channel(tmp)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        json_dict["delay_time"] = self.delay_time
-        return json.dumps(json_dict)
-
     def set_defaults(self, address):
         if address is not None:
             self.set_address(address)
@@ -104,11 +87,4 @@ class CoverOffMessage2(Message):
         else:
             tmp = 0x0C
 
-        return bytes([COMMAND_CODE, tmp]) + struct.pack(">L", self.delay_time)[-3:]
-
-
-register_command(COMMAND_CODE, CoverOffMessage2, "VMB1BL")
-register_command(COMMAND_CODE, CoverOffMessage2, "VMB2BL")
-register_command(COMMAND_CODE, CoverOffMessage, "VMB1BLE")
-register_command(COMMAND_CODE, CoverOffMessage, "VMB2BLE")
-register_command(COMMAND_CODE, CoverOffMessage, "VMB1BLS")
+        return bytes([COMMAND_CODE, tmp])

velbusaio/messages/cover_position.py

@@ -1,17 +1,16 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import json
-import struct
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0x1C
 
 
+@register(COMMAND_CODE, ["VMB1BLE", "VMB2BLE", "VMB1BLS", "VMB2BLE-10"])
 class CoverPosMessage(Message):
     """
     sent by:
@@ -30,20 +29,11 @@ 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]
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        json_dict["position"] = self.position
-        return json.dumps(json_dict)
-
     def set_defaults(self, address):
         if address is not None:
             self.set_address(address)
@@ -61,8 +51,3 @@ class CoverPosMessage(Message):
                 self.position,
             ]
         )
-
-
-register_command(COMMAND_CODE, CoverPosMessage, "VMB1BLE")
-register_command(COMMAND_CODE, CoverPosMessage, "VMB2BLE")
-register_command(COMMAND_CODE, CoverPosMessage, "VMB1BLS")