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

velbusaio/messages/restore_dimmer.py

@@ -1,16 +1,29 @@
 """
 :author: Frank van Breugel
 """
-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 = 0x11
 
 
+@register(
+    COMMAND_CODE,
+    [
+        "VMB1DM",
+        "VMBDME",
+        "VMBDMI-R",
+        "VMBDMI",
+        "VMB1LED",
+        "VMB4DC",
+        "VMB8DC-20",
+        "VMB2DC-20",
+        "VMB4LEDPWM-20",
+    ],
+)
 class RestoreDimmerMessage(Message):
     """
     send by:
@@ -38,32 +51,28 @@ class RestoreDimmerMessage(Message):
         self.set_attributes(priority, address, rtr)
         self.dimmer_channels = self.byte_to_channels(data[0])
         self.dimmer_transitiontime = int.from_bytes(
-            data[[2, 3]], byteorder="big", signed=False
+            data[2:3], byteorder="big", signed=False
         )
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channels"] = self.dimmer_channels
-        json_dict["transitiontime"] = self.dimmer_transitiontime
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
-        return (
-            bytes(
-                [
-                    COMMAND_CODE,
-                    self.channels_to_byte(self.dimmer_channels),
-                    0,
-                ]
-            )
-            + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
-        )
+        return bytes(
+            [
+                COMMAND_CODE,
+                self.channels_to_byte(self.dimmer_channels),
+                0,
+            ]
+        ) + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
+
 
+@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20"])
+class RestoreDimmerMessage2(RestoreDimmerMessage):
+    def byte_to_channels(self, byte: int) -> list[int]:
+        return [byte]
 
-register_command(COMMAND_CODE, RestoreDimmerMessage)
+    def channels_to_byte(self, channels: list[int]) -> int:
+        if len(channels) != 1:
+            raise ValueError("We should have exact one channel")
+        return channels[0]

velbusaio/messages/select_program.py

@@ -0,0 +1,35 @@
+"""
+:author: Danny De Gaspari
+"""
+
+from __future__ import annotations
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xB3
+
+
+@register(COMMAND_CODE)
+class SelectProgramMessage(Message):
+    def __init__(self, address=None, program=0):
+        Message.__init__(self)
+        self.select_program = program
+        self.set_defaults(address)
+
+    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.select_program = data[0] & 0x03
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return bytes([COMMAND_CODE, self.select_program])

velbusaio/messages/sensor_settings_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 = 0xE7
 
 
+@register(COMMAND_CODE)
 class SensorSettingsRequestMessage(Message):
     """
     send by:
@@ -34,6 +36,3 @@ class SensorSettingsRequestMessage(Message):
         :return: bytes
         """
         return bytes([])
-
-
-register_command(COMMAND_CODE, SensorSettingsRequestMessage)

velbusaio/messages/sensor_temp_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 = 0xE5
 
 
+@register(COMMAND_CODE)
 class SensorTempRequest(Message):
     def populate(self, priority, address, rtr, data):
         """
@@ -23,6 +25,3 @@ class SensorTempRequest(Message):
         :return: bytes
         """
         return bytes([COMMAND_CODE])
-
-
-register_command(COMMAND_CODE, SensorTempRequest)

velbusaio/messages/sensor_temperature.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 = 0xE6
 
 
+@register(COMMAND_CODE)
 class SensorTemperatureMessage(Message):
     """
     send by: VMBTS, vmbg*pd, ...
@@ -43,19 +43,15 @@ class SensorTemperatureMessage(Message):
         self.needs_no_rtr(rtr)
         self.needs_data(data, 6)
         self.set_attributes(priority, address, rtr)
-        self.cur = (((data[0] << 8) | data[1]) / 32) * 0.0625
-        self.min = (((data[2] << 8) | data[3]) / 32) * 0.0625
-        self.max = (((data[4] << 8) | data[5]) / 32) * 0.0625
-
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["cur"] = self.cur
-        json_dict["min"] = self.min
-        json_dict["max"] = self.max
-        return json.dumps(json_dict)
-
-
-register_command(COMMAND_CODE, SensorTemperatureMessage)
+        if ((data[0] << 8) | data[1]) >> 15:
+            self.cur = -127 + (((data[0] << 8) | data[1]) / 32 * 0.0625)
+        else:
+            self.cur = (((data[0] << 8) | data[1]) / 32) * 0.0625
+        if ((data[2] << 8) | data[3]) >> 15:
+            self.min = -127 + (((data[2] << 8) | data[3]) / 32 * 0.0625)
+        else:
+            self.min = (((data[2] << 8) | data[3]) / 32) * 0.0625
+        if ((data[4] << 8) | data[5]) >> 15:
+            self.max = -127 + (((data[4] << 8) | data[5]) / 32 * 0.0625)
+        else:
+            self.max = (((data[4] << 8) | data[5]) / 32) * 0.0625

velbusaio/messages/set_date.py

@@ -1,42 +1,35 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import json
-import logging
-import time
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xB7
 
 
+@register(COMMAND_CODE)
 class SetDate(Message):
     """
     received by all modules
     """
 
-    def __init__(self, address=0x00):
+    def __init__(self, address=0x00, day=None, mon=None, year=None) -> None:
         Message.__init__(self)
-        self.logger = logging.getLogger("velbus")
-        self._day = None
-        self._mon = None
-        self._year = None
+        self._day = day
+        self._mon = mon
+        self._year = year
         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()
         self.set_no_rtr()
-        lclt = time.localtime()
-        self._day = lclt[2]
-        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
         """
@@ -48,17 +41,7 @@ class SetDate(Message):
         self._mon = data[1]
         self._year = (data[2] << 8) + data[3]
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["day"] = self._day
-        json_dict["mon"] = self._mon
-        json_dict["year"] = self._year
-        return json.dumps(json_dict)
-
-    def data_to_binary(self):
+    def data_to_binary(self) -> bytes:
         """
         :return: bytes
         """
@@ -71,6 +54,3 @@ class SetDate(Message):
                 (self._year & 0x00FF),
             ]
         )
-
-
-register_command(COMMAND_CODE, SetDate)

velbusaio/messages/set_daylight_saving.py

@@ -1,38 +1,33 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import json
-import logging
-import time
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xAF
 
 
+@register(COMMAND_CODE)
 class SetDaylightSaving(Message):
     """
     received by all modules
     """
 
-    def __init__(self, address=0x00):
+    def __init__(self, address=0x00, ds=None) -> None:
         Message.__init__(self)
-        self.logger = logging.getLogger("velbus")
-        self._ds = None
+        self._ds = ds
         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()
         self.set_no_rtr()
-        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
         """
@@ -42,19 +37,8 @@ class SetDaylightSaving(Message):
         self.set_attributes(priority, address, rtr)
         self._ds = data[0]
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["ds"] = self._ds
-        return json.dumps(json_dict)
-
-    def data_to_binary(self):
+    def data_to_binary(self) -> bytes:
         """
         :return: bytes
         """
         return bytes([COMMAND_CODE, self._ds])
-
-
-register_command(COMMAND_CODE, SetDaylightSaving)

velbusaio/messages/set_dimmer.py

@@ -1,19 +1,19 @@
-"""
-:author: Frank van Breugel
-"""
-from __future__ import annotations
+""":author: Frank van Breugel"""
 
-import json
-import logging
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0x07
 
 
+@register(
+    COMMAND_CODE,
+    ["VMB1DM", "VMBDME", "VMB4DC", "VMB1LED"],
+)
 class SetDimmerMessage(Message):
-    """
+    """with this message the channel numbering is a bitnumber
     send by:
     received by: VMBDME, VMB4DC
     """
@@ -21,7 +21,6 @@ class SetDimmerMessage(Message):
     def __init__(self, address=None):
         Message.__init__(self)
         self.dimmer_channels = []
-        self.logger = logging.getLogger("velbus")
         self.dimmer_state = 0
         self.dimmer_transitiontime = 0
         self.set_defaults(address)
@@ -33,9 +32,7 @@ class SetDimmerMessage(Message):
         self.set_no_rtr()
 
     def populate(self, priority, address, rtr, data):
-        """
-        :return: None
-        """
+        """:return: None"""
         self.needs_high_priority(priority)
         self.needs_no_rtr(rtr)
         self.needs_data(data, 4)
@@ -43,37 +40,42 @@ class SetDimmerMessage(Message):
         self.dimmer_channels = self.byte_to_channels(data[0])
         self.dimmer_state = data[1]
         self.dimmer_transitiontime = int.from_bytes(
-            data[[2, 3]], byteorder="big", signed=False
+            data[2:3], byteorder="big", signed=False
         )
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channels"] = self.dimmer_channels
-        json_dict["state"] = self.dimmer_state
-        json_dict["transitiontime"] = self.dimmer_transitiontime
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
-        """
-        :return: bytes
-        """
-        return (
-            bytes(
-                [
-                    COMMAND_CODE,
-                    self.channels_to_byte(self.dimmer_channels),
-                    self.dimmer_state,
-                ]
-            )
-            + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
-        )
+        """:return: bytes"""
+        return bytes(
+            [
+                COMMAND_CODE,
+                self.channels_to_byte(self.dimmer_channels),
+                self.dimmer_state,
+            ]
+        ) + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
+
+
+@register(
+    COMMAND_CODE,
+    [
+        "VMBDALI",
+        "VMBDALI-20",
+        "VMBDMI",
+        "VMBDMI-R",
+        "VMB8DC-20",
+        "VMB4LEDPWM-20",
+        "VMB2DC-20",
+    ],
+)
+class SetDimmerMessage2(SetDimmerMessage):
+    """This with this message the channel numbering is an integer
+    send by:
+    received by: VMBDALI
+    """
 
+    def byte_to_channels(self, byte: int) -> list[int]:
+        return [byte]
 
-register_command(COMMAND_CODE, SetDimmerMessage, "VMBDME")
-register_command(COMMAND_CODE, SetDimmerMessage, "VMB4DC")
-register_command(COMMAND_CODE, SetDimmerMessage, "VMBDMI")
-register_command(COMMAND_CODE, SetDimmerMessage, "VMBDMI-R")
-register_command(COMMAND_CODE, SetDimmerMessage, "VMB1LED")
+    def channels_to_byte(self, channels) -> int:
+        if len(channels) != 1:
+            raise ValueError("We should have exact one channel")
+        return channels[0]

velbusaio/messages/set_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 = 0xF6
 
 
+@register(COMMAND_CODE)
 class SetLedMessage(Message):
     """
     send by: VMB4RYLD
@@ -35,6 +37,3 @@ class SetLedMessage(Message):
         :return: bytes
         """
         return bytes([COMMAND_CODE, self.channels_to_byte(self.leds)])
-
-
-register_command(COMMAND_CODE, SetLedMessage)

velbusaio/messages/set_realtime_clock.py

@@ -1,42 +1,35 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import json
-import logging
-import time
+from __future__ import annotations
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xD8
 
 
+@register(COMMAND_CODE)
 class SetRealtimeClock(Message):
     """
     received by all modules
     """
 
-    def __init__(self, address=0x00):
+    def __init__(self, address=0x00, wday=None, hour=None, min=None) -> None:
         Message.__init__(self)
-        self.logger = logging.getLogger("velbus")
-        self._wday = None
-        self._hour = None
-        self._min = None
+        self._wday = wday
+        self._hour = hour
+        self._min = min
         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()
         self.set_no_rtr()
-        lclt = time.localtime()
-        self._wday = lclt[6]
-        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
         """
@@ -48,21 +41,8 @@ class SetRealtimeClock(Message):
         self._hour = data[1]
         self._min = data[2]
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["wday"] = self._wday
-        json_dict["hour"] = self._hour
-        json_dict["min"] = self._min
-        return json.dumps(json_dict)
-
-    def data_to_binary(self):
+    def data_to_binary(self) -> bytes:
         """
         :return: bytes
         """
         return bytes([COMMAND_CODE, self._wday, self._hour, self._min])
-
-
-register_command(COMMAND_CODE, SetRealtimeClock)

velbusaio/messages/set_temperature.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 = 0xE4
 
 
+@register(COMMAND_CODE)
 class SetTemperatureMessage(Message):
     """
     send by: VMB4RYLD
@@ -38,6 +40,3 @@ class SetTemperatureMessage(Message):
         :return: bytes
         """
         return bytes([COMMAND_CODE, int(self.temp_type), int(self.temp)])
-
-
-register_command(COMMAND_CODE, SetTemperatureMessage)

velbusaio/messages/slider_status.py

@@ -1,16 +1,29 @@
 """
 :author: Frank van Breugel
 """
-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 = 0x0F
 
 
+@register(
+    COMMAND_CODE,
+    [
+        "VMB1DM",
+        "VMBDME",
+        "VMB4DC",
+        "VMBDMI",
+        "VMBDMI-R",
+        "VMB1LED",
+        "VMB8DC-20",
+        "VMB2DC-20",
+        "VMB4LEDPWM-20",
+    ],
+)
 class SliderStatusMessage(Message):
     """
     sent by: VMBDME
@@ -36,16 +49,6 @@ class SliderStatusMessage(Message):
         self.slider_state = int.from_bytes([data[1]], byteorder="big")
         self.slider_long_pressed = data[2]
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channel"] = self.channel
-        json_dict["slider_state"] = self.slider_state
-        json_dict["slider_long_pressed"] = self.slider_long_pressed
-        return json.dumps(json_dict)
-
     def cur_slider_state(self):
         """
         :return: int
@@ -64,10 +67,3 @@ class SliderStatusMessage(Message):
                 self.slider_long_pressed,
             ]
         )
-
-
-register_command(COMMAND_CODE, SliderStatusMessage, "VMBDME")
-register_command(COMMAND_CODE, SliderStatusMessage, "VMB4DC")
-register_command(COMMAND_CODE, SliderStatusMessage, "VMBDMI")
-register_command(COMMAND_CODE, SliderStatusMessage, "VMBDMI-R")
-register_command(COMMAND_CODE, SliderStatusMessage, "VMB1LED")