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

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

velbusaio/messages/start_relay_blinking_timer.py

@@ -1,16 +1,18 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 import struct
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0x0D
 
 
+@register(COMMAND_CODE)
 class StartRelayBlinkingTimerMessage(Message):
     """
     send by:
@@ -48,6 +50,3 @@ class StartRelayBlinkingTimerMessage(Message):
             bytes([COMMAND_CODE, self.channels_to_byte(self.relay_channels)])
             + struct.pack(">L", self.delay_time)[-3:]
         )
-
-
-register_command(COMMAND_CODE, StartRelayBlinkingTimerMessage)

velbusaio/messages/start_relay_timer.py

@@ -1,16 +1,18 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
+
 from __future__ import annotations
 
 import struct
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0x03
 
 
+@register(COMMAND_CODE)
 class StartRelayTimerMessage(Message):
     """
     send by:
@@ -48,6 +50,3 @@ class StartRelayTimerMessage(Message):
             bytes([COMMAND_CODE, self.channels_to_byte(self.relay_channels)])
             + struct.pack(">L", self.delay_time)[-3:]
         )
-
-
-register_command(COMMAND_CODE, StartRelayTimerMessage)

velbusaio/messages/switch_relay_off.py

@@ -1,17 +1,16 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
-from __future__ import annotations
 
-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 = 0x01
 
 
+@register(COMMAND_CODE)
 class SwitchRelayOffMessage(Message):
     """
     send by:
@@ -21,7 +20,6 @@ class SwitchRelayOffMessage(Message):
     def __init__(self, address=None):
         Message.__init__(self)
         self.relay_channels = []
-        self.logger = logging.getLogger("velbus")
         self.set_defaults(address)
 
     def populate(self, priority, address, rtr, data):
@@ -34,14 +32,6 @@ class SwitchRelayOffMessage(Message):
         self.set_attributes(priority, address, rtr)
         self.relay_channels = self.byte_to_channels(data[0])
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channels"] = self.relay_channels
-        return json.dumps(json_dict)
-
     def set_defaults(self, address):
         if address is not None:
             self.set_address(address)
@@ -53,6 +43,3 @@ class SwitchRelayOffMessage(Message):
         :return: bytes
         """
         return bytes([COMMAND_CODE, self.channels_to_byte(self.relay_channels)])
-
-
-register_command(COMMAND_CODE, SwitchRelayOffMessage)

velbusaio/messages/switch_relay_on.py

@@ -1,17 +1,16 @@
 """
 :author: Thomas Delaet <thomas@delaet.org>
 """
-from __future__ import annotations
 
-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 = 0x02
 
 
+@register(COMMAND_CODE)
 class SwitchRelayOnMessage(Message):
     """
     send by:
@@ -21,7 +20,6 @@ class SwitchRelayOnMessage(Message):
     def __init__(self, address=None):
         Message.__init__(self)
         self.relay_channels = []
-        self.logger = logging.getLogger("velbus")
         self.set_defaults(address)
 
     def set_defaults(self, address):
@@ -40,19 +38,8 @@ class SwitchRelayOnMessage(Message):
         self.set_attributes(priority, address, rtr)
         self.relay_channels = self.byte_to_channels(data[0])
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["channels"] = self.relay_channels
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
         return bytes([COMMAND_CODE, self.channels_to_byte(self.relay_channels)])
-
-
-register_command(COMMAND_CODE, SwitchRelayOnMessage)

velbusaio/messages/switch_to_comfort.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 = 0xDB
 
 
+@register(COMMAND_CODE)
 class SwitchToComfortMessage(Message):
     """
     send by:
@@ -29,19 +29,8 @@ class SwitchToComfortMessage(Message):
         self.needs_no_rtr(rtr)
         self.set_attributes(priority, address, rtr)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["sleep_time"] = self.sleep
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
-        return bytes([COMMAND_CODE, 0x00, 0x00])
-
-
-register_command(COMMAND_CODE, SwitchToComfortMessage)
+        return bytes([COMMAND_CODE, self.sleep >> 8, self.sleep & 0xFF])

velbusaio/messages/switch_to_day.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 = 0xDC
 
 
+@register(COMMAND_CODE)
 class SwitchToDayMessage(Message):
     """
     send by:
@@ -29,19 +29,8 @@ class SwitchToDayMessage(Message):
         self.needs_no_rtr(rtr)
         self.set_attributes(priority, address, rtr)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["sleep_time"] = self.sleep
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
-        return bytes([COMMAND_CODE, 0x00, 0x00])
-
-
-register_command(COMMAND_CODE, SwitchToDayMessage)
+        return bytes([COMMAND_CODE, self.sleep >> 8, self.sleep & 0xFF])

velbusaio/messages/switch_to_night.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 = 0xDD
 
 
+@register(COMMAND_CODE)
 class SwitchToNightMessage(Message):
     """
     send by:
@@ -29,19 +29,8 @@ class SwitchToNightMessage(Message):
         self.needs_no_rtr(rtr)
         self.set_attributes(priority, address, rtr)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["sleep_time"] = self.sleep
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
-        return bytes([COMMAND_CODE, 0x00, 0x00])
-
-
-register_command(COMMAND_CODE, SwitchToNightMessage)
+        return bytes([COMMAND_CODE, self.sleep >> 8, self.sleep & 0xFF])

velbusaio/messages/switch_to_safe.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 = 0xDE
 
 
+@register(COMMAND_CODE)
 class SwitchToSafeMessage(Message):
     """
     send by:
@@ -29,19 +29,8 @@ class SwitchToSafeMessage(Message):
         self.needs_no_rtr(rtr)
         self.set_attributes(priority, address, rtr)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        json_dict["sleep_time"] = self.sleep
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
-        return bytes([COMMAND_CODE, 0x00, 0x00])
-
-
-register_command(COMMAND_CODE, SwitchToSafeMessage)
+        return bytes([COMMAND_CODE, self.sleep >> 8, self.sleep & 0xFF])

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

velbusaio/messages/temp_sensor_settings_part2.py

@@ -0,0 +1,27 @@
+"""
+:author: Danny De Gaspari
+"""
+
+from __future__ import annotations
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xE9
+
+
+@register(COMMAND_CODE)
+class TempSensorSettingsPart2(Message):
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.set_attributes(priority, address, rtr)
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return bytes([COMMAND_CODE])

velbusaio/messages/temp_sensor_settings_part3.py

@@ -0,0 +1,27 @@
+"""
+:author: Danny De Gaspari
+"""
+
+from __future__ import annotations
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xC6
+
+
+@register(COMMAND_CODE)
+class TempSensorSettingsPart3(Message):
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.set_attributes(priority, address, rtr)
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return bytes([COMMAND_CODE])

velbusaio/messages/temp_sensor_settings_part4.py

@@ -0,0 +1,27 @@
+"""
+:author: Danny De Gaspari
+"""
+
+from __future__ import annotations
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xB9
+
+
+@register(COMMAND_CODE)
+class TempSensorSettingsPart4(Message):
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.set_attributes(priority, address, rtr)
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return bytes([COMMAND_CODE])

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

velbusaio/messages/temp_sensor_status.py

@@ -1,18 +1,20 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
+
 from __future__ import annotations
 
 import json
 
-from velbusaio.command_registry import register_command
+from velbusaio.command_registry import register
 from velbusaio.message import Message
 
 COMMAND_CODE = 0xEA
-DSTATUS = {0: "run", 1: "manual", 2: "sleep", 4: "disable"}
+DSTATUS = {0: "run", 2: "manual", 4: "sleep", 6: "disable"}
 DMODE = {0: "safe", 16: "night", 32: "day", 64: "comfort"}
 
 
+@register(COMMAND_CODE)
 class TempSensorStatusMessage(Message):
     """
     send by: VMBGPOD
@@ -22,23 +24,23 @@ class TempSensorStatusMessage(Message):
     def __init__(self, address=None):
         Message.__init__(self)
         self.local_control = 0  # 0=unlocked, 1 =locked
-        self.status_mode = 0  # 0=run, 1=manual, 2=sleep timer, 3=disable
+        self.status_mode = 0  # DSTATUS
         self.status_str = "run"
-        self.auto_send = 0  # 0=disabled, 1=enabled
-        self.mode = 0  # 0=safe, 1=night, 2=day, 4=comfort
+        self.auto_send = 0  # 0=disabled
+        self.mode = 0  # DMODE
         self.mode_str = "safe"
-        self.cool = 0  # 0=cool, 1=heat
-        self.heater = 0  # 0=pff, 1=on
-        self.boost = 0  # 0=off, 1 = on
-        self.pump = 0  # 0=on, 1=off
-        self.cool = 0  # 0=off, 1=on
-        self.alarm1 = 0  # 0=off, 1=on
-        self.alarm2 = 0  # 0=off, 1=on
-        self.alarm3 = 0  # 0=off, 1=on
-        self.alarm4 = 0  # 0=off, 1=on
-        self.current_temp = None  # current temp
-        self.target_temp = None  # current temp
-        self.sleep_timer = None  # current sleepTimer
+        self.cool_mode = False
+        self.heater = False
+        self.boost = False
+        self.pump = False
+        self.cooler = False
+        self.alarm1 = False
+        self.alarm2 = False
+        self.alarm3 = False
+        self.alarm4 = False
+        self.current_temp = None
+        self.target_temp = None
+        self.sleep_timer = None
 
     def getCurTemp(self):
         return self.current_temp
@@ -49,12 +51,12 @@ class TempSensorStatusMessage(Message):
         -DB1    bit 2+3         = status_mode
         -DB1    bit 4           = auto send
         -DB1    bit 5+6+7       = mode
-        -DB1    bit 8           = cool
+        -DB1    bit 8           = cool/heat
         -DB2                    = program (not used)
         -DB3    last bit        = heater
         -DB3    bit 2           = boost
         -DB3    bit 3           = pump
-        -DB3    bit 4           = pump
+        -DB3    bit 4           = cooler
         -DB4    bit 5           = alarm 1
         -DB4    bit 6           = alarm 2
         -DB4    bit 7           = alarm 3
@@ -69,21 +71,21 @@ class TempSensorStatusMessage(Message):
         self.set_attributes(priority, address, rtr)
 
         self.local_control = data[0] & 0x01
-        self.status_mode = data[0] & 0x206
-        self._status_str = DSTATUS[self.status_mode]
+        self.status_mode = data[0] & 0x06
+        self.status_str = DSTATUS[self.status_mode]
         self.auto_send = data[0] & 0x08
         self.mode = data[0] & 0x70
         self.mode_str = DMODE[self.mode]
-        self.cool = data[0] & 0x80
+        self.cool_mode = (data[0] & 0x80) == 0x80
 
-        self.heater = data[2] & 0x01
-        self.boost = data[2] & 0x02
-        self.pump = data[2] & 0x04
-        self.cool = data[2] & 0x08
-        self.alarm1 = data[2] & 0x10
-        self.alarm2 = data[2] & 0x20
-        self.alarm3 = data[2] & 0x40
-        self.alarm4 = data[2] & 0x80
+        self.heater = (data[2] & 0x01) == 0x01
+        self.boost = (data[2] & 0x02) == 0x02
+        self.pump = (data[2] & 0x04) == 0x04
+        self.cooler = (data[2] & 0x08) == 0x08
+        self.alarm1 = (data[2] & 0x10) == 0x10
+        self.alarm2 = (data[2] & 0x20) == 0x20
+        self.alarm3 = (data[2] & 0x40) == 0x40
+        self.alarm4 = (data[2] & 0x80) == 0x80
 
         self.current_temp = data[3] / 2
         self.target_temp = data[4] / 2
@@ -99,11 +101,11 @@ class TempSensorStatusMessage(Message):
         json_dict["status_mode"] = DSTATUS[self.status_mode]
         json_dict["auto_send"] = self.auto_send
         json_dict["mode"] = DMODE[self.mode]
-        json_dict["cool"] = self.cool
+        json_dict["cool_mode"] = self.cool_mode
         json_dict["heater"] = self.heater
         json_dict["boost"] = self.boost
         json_dict["pump"] = self.pump
-        json_dict["cool"] = self.cool
+        json_dict["cooler"] = self.cooler
         json_dict["alarm1"] = self.alarm1
         json_dict["alarm2"] = self.alarm2
         json_dict["alarm3"] = self.alarm3
@@ -112,6 +114,3 @@ class TempSensorStatusMessage(Message):
         json_dict["target_temp"] = self.target_temp
         json_dict["sleep_timer"] = self.sleep_timer
         return json.dumps(json_dict)
-
-
-register_command(COMMAND_CODE, TempSensorStatusMessage)

velbusaio/messages/temp_set_cooling.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 = 0xDF
 
 
+@register(COMMAND_CODE)
 class TempSetCoolingMessage(Message):
     """
     send by:
@@ -28,18 +28,8 @@ class TempSetCoolingMessage(Message):
         self.needs_no_rtr(rtr)
         self.set_attributes(priority, address, rtr)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
         return bytes([COMMAND_CODE, 0xAA])
-
-
-register_command(COMMAND_CODE, TempSetCoolingMessage)

velbusaio/messages/temp_set_heating.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 = 0xE0
 
 
+@register(COMMAND_CODE)
 class TempSetHeatingMessage(Message):
     """
     send by:
@@ -28,18 +28,8 @@ class TempSetHeatingMessage(Message):
         self.needs_no_rtr(rtr)
         self.set_attributes(priority, address, rtr)
 
-    def to_json(self):
-        """
-        :return: str
-        """
-        json_dict = self.to_json_basic()
-        return json.dumps(json_dict)
-
     def data_to_binary(self):
         """
         :return: bytes
         """
         return bytes([COMMAND_CODE, 0xAA])
-
-
-register_command(COMMAND_CODE, TempSetHeatingMessage)