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

velbusaio/messages/dimmer_status.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 import struct
@@ -24,7 +25,7 @@ LED_FAST_BLINKING = 1 << 5
 LED_VERY_FAST_BLINKING = 1 << 4
 
 
-@register(COMMAND_CODE, ["VMBDME", "VMB1LED"])
+@register(COMMAND_CODE, ["VMB1DM", "VMBDME", "VMB1LED"])
 class DimmerStatusMessage(Message):
     """
     sent by: VMBDME

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,17 @@ 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",
     ],
 )
 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

velbusaio/messages/module_subtype.py

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

velbusaio/messages/module_type.py

@@ -1,6 +1,7 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 import struct
@@ -25,7 +26,70 @@ MODULES_WITHOUT_SERIAL = {
 }
 
 
-@register(COMMAND_CODE)
+@register(
+    COMMAND_CODE,
+    [
+        "VMB1BL",
+        "VMB6IN",
+        "VMB1DM",
+        "VMB4RY",
+        "VMB2BL",
+        "VMB8IR",
+        "VMB4PD",
+        "VMB1TS",
+        "VMB1TH",
+        "VMB1TC",
+        "VMB1LED",
+        "VMB4RYLD",
+        "VMB4RYNO",
+        "VMB4DC",
+        "VMBLCDWB",
+        "VMBDME",
+        "VMBDMI",
+        "VMB8PBU",
+        "VMB6PBN",
+        "VMB2PBN",
+        "VMB6PBB",
+        "VMB4RF",
+        "VMB1RYNO",
+        "VMB1BLE",
+        "VMB2BLE",
+        "VMBGP1",
+        "VMBGP2",
+        "VMBGP4",
+        "VMBGPO",
+        "VMB7IN",
+        "VMBGPOD",
+        "VMB1RYNOS",
+        "VMBPIRM",
+        "VMBPIRC",
+        "VMBPIRO",
+        "VMBGP4PIR",
+        "VMB1BLS",
+        "VMBDMI-R",
+        "VMBMETEO",
+        "VMB4AN",
+        "VMBVP01",
+        "VMBEL1",
+        "VMBEL2",
+        "VMBEL4",
+        "VMBELO",
+        "VMBELPIR",
+        "VMBSIG",
+        "VMBGP1-2",
+        "VMBGP2-2",
+        "VMBGP4-2",
+        "VMBGPOD-2",
+        "VMBGP4PIR-2",
+        "VMCM3",
+        "VMBUSBIP",
+        "VMB1RYS",
+        "VMBKP",
+        "VMBIN",
+        "VMB4PB",
+        "VMBDALI",
+    ],
+)
 class ModuleTypeMessage(Message):
     """
     send by: VMB6IN, VMB4RYLD
@@ -66,18 +130,57 @@ class ModuleTypeMessage(Message):
         self.build_year = data[-2]
         self.build_week = data[-1]
 
-    def data_to_binary(self):
+
+@register(
+    COMMAND_CODE,
+    [
+        "VMB4RYLD-10",
+        "VMB4RYNO-10",
+        "VMB2BLE-10",
+        "VMB6PB-20",
+        "VMBEL1-20",
+        "VMBEL2-20",
+        "VMBEL4-20",
+        "VMBELO-20",
+        "VMBGP1-20",
+        "VMBGP2-20",
+        "VMBGP4-20",
+        "VMBGPO-20",
+        "VMBEL4PIR-20",
+        "VMBGP4PIR-20",
+    ],
+)
+class ModuleType2Message(Message):
+    def __init__(self, address=None):
+        Message.__init__(self)
+        self.module_type = 0x00
+        self.led_on = []
+        self.led_slow_blinking = []
+        self.led_fast_blinking = []
+        self.serial = 0
+        self.memory_map_version = 0
+        self.build_year = 0
+        self.build_week = 0
+        self.term = 0
+        self.set_defaults(address)
+
+    def module_name(self):
         """
-        :return: bytes
+        :return: str
+        """
+        return "Unknown"
+
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
         """
-        return bytes(
-            [
-                COMMAND_CODE,
-                self.module_type,
-                self.channels_to_byte(self.led_on),
-                self.channels_to_byte(self.led_slow_blinking),
-                self.channels_to_byte(self.led_fast_blinking),
-                self.build_year,
-                self.build_week,
-            ]
-        )
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.set_attributes(priority, address, rtr)
+        self.module_type = data[0]
+        if data[0] not in MODULES_WITHOUT_SERIAL:
+            (self.serial,) = struct.unpack(">L", bytes([0, 0, data[1], data[2]]))
+            self.memory_map_version = data[3]
+        self.build_year = data[-3]
+        self.build_week = data[-2]
+        self.term = data[-1]

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

velbusaio/messages/push_button_status.py

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

velbusaio/messages/raw.py

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

velbusaio/messages/read_data_block_from_memory.py

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

velbusaio/messages/read_data_from_memory.py

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

velbusaio/messages/realtime_clock_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/receive_buffer_full.py

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

velbusaio/messages/receive_ready.py

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

velbusaio/messages/relay_status.py

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

velbusaio/messages/restore_dimmer.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -9,7 +10,10 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x11
 
 
-@register(COMMAND_CODE)
+@register(
+    COMMAND_CODE,
+    ["VMB1DM", "VMBDME", "VMBDMI-R", "VMBDMI", "VMB1LED", "VMB4DC", "VMB8DC-20"],
+)
 class RestoreDimmerMessage(Message):
     """
     send by:
@@ -53,7 +57,7 @@ class RestoreDimmerMessage(Message):
         ) + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
 class RestoreDimmerMessage2(RestoreDimmerMessage):
     def byte_to_channels(self, byte: int) -> list[int]:
         return [byte]

velbusaio/messages/select_program.py

@@ -1,6 +1,7 @@
 """
 :author: Danny De Gaspari
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register

velbusaio/messages/sensor_settings_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/sensor_temp_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/sensor_temperature.py

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

velbusaio/messages/set_date.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import time
@@ -17,14 +18,14 @@ class SetDate(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00):
+    def __init__(self, address=0x00) -> None:
         Message.__init__(self)
         self._day = None
         self._mon = None
         self._year = None
         self.set_defaults(address)
 
-    def set_defaults(self, address):
+    def set_defaults(self, address) -> None:
         if address is not None:
             self.set_address(address)
         self.set_low_priority()
@@ -34,7 +35,7 @@ class SetDate(Message):
         self._mon = lclt[1]
         self._year = lclt[0]
 
-    def populate(self, priority, address, rtr, data):
+    def populate(self, priority, address, rtr, data) -> None:
         """
         :return: None
         """
@@ -46,7 +47,7 @@ class SetDate(Message):
         self._mon = data[1]
         self._year = (data[2] << 8) + data[3]
 
-    def data_to_binary(self):
+    def data_to_binary(self) -> bytes:
         """
         :return: bytes
         """

velbusaio/messages/set_daylight_saving.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import time
@@ -17,12 +18,12 @@ class SetDaylightSaving(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00):
+    def __init__(self, address=0x00) -> None:
         Message.__init__(self)
         self._ds = None
         self.set_defaults(address)
 
-    def set_defaults(self, address):
+    def set_defaults(self, address) -> None:
         if address is not None:
             self.set_address(address)
         self.set_low_priority()
@@ -30,7 +31,7 @@ class SetDaylightSaving(Message):
         lclt = time.localtime()
         self._ds = not lclt[8]
 
-    def populate(self, priority, address, rtr, data):
+    def populate(self, priority, address, rtr, data) -> None:
         """
         :return: None
         """
@@ -40,7 +41,7 @@ class SetDaylightSaving(Message):
         self.set_attributes(priority, address, rtr)
         self._ds = data[0]
 
-    def data_to_binary(self):
+    def data_to_binary(self) -> bytes:
         """
         :return: bytes
         """

velbusaio/messages/set_dimmer.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -9,7 +10,10 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x07
 
 
-@register(COMMAND_CODE, ["VMBDME", "VMB4DC", "VMBDMI", "VMBDMI-R", "VMB1LED"])
+@register(
+    COMMAND_CODE,
+    ["VMB1DM", "VMBDME", "VMB4DC", "VMBDMI", "VMBDMI-R", "VMB1LED", "VMB8DC-20"],
+)
 class SetDimmerMessage(Message):
     """
     send by:
@@ -56,7 +60,7 @@ class SetDimmerMessage(Message):
         ) + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
 
 
-@register(COMMAND_CODE, ["VMBDALI"])
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
 class SetDimmerMessage2(SetDimmerMessage):
     """
     send by:

velbusaio/messages/set_led.py

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

velbusaio/messages/set_realtime_clock.py

@@ -1,6 +1,7 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import time
@@ -17,14 +18,14 @@ class SetRealtimeClock(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00):
+    def __init__(self, address=0x00) -> None:
         Message.__init__(self)
         self._wday = None
         self._hour = None
         self._min = None
         self.set_defaults(address)
 
-    def set_defaults(self, address):
+    def set_defaults(self, address) -> None:
         if address is not None:
             self.set_address(address)
         self.set_low_priority()
@@ -34,7 +35,7 @@ class SetRealtimeClock(Message):
         self._hour = lclt[3]
         self._min = lclt[4]
 
-    def populate(self, priority, address, rtr, data):
+    def populate(self, priority, address, rtr, data) -> None:
         """
         :return: None
         """
@@ -46,7 +47,7 @@ class SetRealtimeClock(Message):
         self._hour = data[1]
         self._min = data[2]
 
-    def data_to_binary(self):
+    def data_to_binary(self) -> bytes:
         """
         :return: bytes
         """

velbusaio/messages/set_temperature.py

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

velbusaio/messages/slider_status.py

@@ -1,6 +1,7 @@
 """
 :author: Frank van Breugel
 """
+
 from __future__ import annotations
 
 from velbusaio.command_registry import register
@@ -9,7 +10,10 @@ from velbusaio.message import Message
 COMMAND_CODE = 0x0F
 
 
-@register(COMMAND_CODE, ["VMBDME", "VMB4DC", "VMBDMI", "VMBDMI-R", "VMB1LED"])
+@register(
+    COMMAND_CODE,
+    ["VMB1DM", "VMBDME", "VMB4DC", "VMBDMI", "VMBDMI-R", "VMB1LED", "VMB8DC-20"],
+)
 class SliderStatusMessage(Message):
     """
     sent by: VMBDME

velbusaio/messages/slow_blinking_led.py

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