velbus-aio 2025.3.1__tar.gz → 2025.4.2__tar.gz

{velbus_aio-2025.3.1/velbus_aio.egg-info → velbus_aio-2025.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: velbus-aio
-Version: 2025.3.1
+Version: 2025.4.2
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -29,6 +29,7 @@ Requires-Dist: pyserial>=3.5.0
 Requires-Dist: pyserial-asyncio_fast>=0.11
 Requires-Dist: backoff>=1.10.0
 Requires-Dist: aiofile
+Dynamic: license-file
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"]
 [project]
 name = "velbus-aio"
 license = {text = "MIT"}
-version = "2025.3.1"
+version = "2025.4.2"
 description = "Open-source home automation platform running on Python 3."
 readme = "README.md"
 authors = [
@@ -52,7 +52,7 @@ exclude_dirs = ["tests"]
 skips = ["B301", "B403", "B323", "B104", "B110"]
 
 [tool.bumpver]
-current_version = "2025.3.1"
+current_version = "2025.4.2"
 version_pattern = "YYYY.MM.INC0"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2/velbus_aio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: velbus-aio
-Version: 2025.3.1
+Version: 2025.4.2
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -29,6 +29,7 @@ Requires-Dist: pyserial>=3.5.0
 Requires-Dist: pyserial-asyncio_fast>=0.11
 Requires-Dist: backoff>=1.10.0
 Requires-Dist: aiofile
+Dynamic: license-file
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbus_aio.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ velbusaio/protocol.py
 velbusaio/py.typed
 velbusaio/raw_message.py
 velbusaio/util.py
+velbusaio/vlp_reader.py
 velbusaio/messages/__init__.py
 velbusaio/messages/blind_status.py
 velbusaio/messages/bus_active.py
@@ -38,6 +39,7 @@ velbusaio/messages/channel_name_request.py
 velbusaio/messages/clear_led.py
 velbusaio/messages/counter_status.py
 velbusaio/messages/counter_status_request.py
+velbusaio/messages/counter_value.py
 velbusaio/messages/cover_down.py
 velbusaio/messages/cover_off.py
 velbusaio/messages/cover_position.py
@@ -65,6 +67,8 @@ velbusaio/messages/module_status_request.py
 velbusaio/messages/module_subtype.py
 velbusaio/messages/module_type.py
 velbusaio/messages/module_type_request.py
+velbusaio/messages/psu_load.py
+velbusaio/messages/psu_values.py
 velbusaio/messages/push_button_status.py
 velbusaio/messages/raw.py
 velbusaio/messages/read_data_block_from_memory.py
@@ -110,6 +114,7 @@ velbusaio/messages/write_module_address_and_serial_number.py
 velbusaio/module_spec/01.json
 velbusaio/module_spec/02.json
 velbusaio/module_spec/03.json
+velbusaio/module_spec/04.json
 velbusaio/module_spec/05.json
 velbusaio/module_spec/06.json
 velbusaio/module_spec/07.json

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/channels.py

@@ -379,6 +379,8 @@ class ButtonCounter(Button):
     _pulses = None
     _counter = None
     _delay = None
+    _power = None
+    _energy = None
 
     def get_categories(self) -> list[str]:
         if self._counter:
@@ -391,11 +393,13 @@ class ButtonCounter(Button):
         return False
 
     def get_state(self) -> int:
-        val = 0
+        if self._energy:
+            return self._energy
         # if we don't know the delay
         # or we don't know the unit
         # or the delay is the max value
         #   we always return 0
+        val = 0
         if not self._delay or not self._Unit or self._delay == 0xFFFF:
             return round(0, 2)
         if self._Unit == VOLUME_LITERS_HOUR:
@@ -418,6 +422,8 @@ class ButtonCounter(Button):
         return None
 
     def get_counter_state(self) -> int:
+        if self._power:
+            return self._power
         return round((self._counter / self._pulses), 2)
 
     def get_counter_unit(self) -> str:

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/command_registry.py

@@ -9,6 +9,7 @@ MODULE_DIRECTORY = {
     0x01: "VMB8PB",
     0x02: "VMB1RY",
     0x03: "VMB1BL",
+    0x04: "VMBPSUMNGR-20",
     0x05: "VMB6IN",
     0x06: "VMB4LEDPWM-20",
     0x07: "VMB1DM",
@@ -39,6 +40,8 @@ MODULE_DIRECTORY = {
     0x20: "VMBGP4",
     0x21: "VMBGPO",
     0x22: "VMB7IN",
+    0x23: "VMBPIRO-10",
+    0x24: "VMBGPTC",
     0x28: "VMBGPOD",
     0x29: "VMB1RYNOS",
     0x2A: "VMBPIRM",
@@ -47,6 +50,7 @@ MODULE_DIRECTORY = {
     0x2D: "VMBGP4PIR",
     0x2E: "VMB1BLS",
     0x2F: "VMBDMI-R",
+    0x30: "VMBRFR8S",
     0x31: "VMBMETEO",
     0x32: "VMB4AN",
     0x33: "VMBVP01",

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/__init__.py

@@ -33,6 +33,7 @@ from velbusaio.messages.channel_name_request import (
 from velbusaio.messages.clear_led import ClearLedMessage
 from velbusaio.messages.counter_status import CounterStatusMessage
 from velbusaio.messages.counter_status_request import CounterStatusRequestMessage
+from velbusaio.messages.counter_value import CounterValueMessage
 from velbusaio.messages.cover_down import CoverDownMessage, CoverDownMessage2
 from velbusaio.messages.cover_off import CoverOffMessage, CoverOffMessage2
 from velbusaio.messages.cover_position import CoverPosMessage
@@ -56,6 +57,8 @@ from velbusaio.messages.module_status_request import ModuleStatusRequestMessage
 from velbusaio.messages.module_subtype import ModuleSubTypeMessage
 from velbusaio.messages.module_type import ModuleType2Message, ModuleTypeMessage
 from velbusaio.messages.module_type_request import ModuleTypeRequestMessage
+from velbusaio.messages.psu_load import PsuLoadMessage
+from velbusaio.messages.psu_values import PsuValuesMessage
 from velbusaio.messages.push_button_status import PushButtonStatusMessage
 from velbusaio.messages.raw import MeteoRawMessage, SensorRawMessage
 from velbusaio.messages.read_data_block_from_memory import (

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/channel_name_part1.py

@@ -85,6 +85,7 @@ class ChannelNamePart1Message(Message):
         "VMB4LEDPWM-20",
         "VMB8DC-20",
         "VMB8IN-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ChannelNamePart1Message2(ChannelNamePart1Message):

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/channel_name_part2.py

@@ -85,6 +85,7 @@ class ChannelNamePart2Message(Message):
         "VMB8DC-20",
         "VMB8IN-20",
         "VMB4LEDPWM-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ChannelNamePart2Message2(ChannelNamePart2Message):

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/channel_name_part3.py

@@ -85,6 +85,7 @@ class ChannelNamePart3Message(Message):
         "VMB8DC-20",
         "VMB8IN-20",
         "VMB4LEDPWM-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ChannelNamePart3Message2(ChannelNamePart3Message):

velbus_aio-2025.4.2/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

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/dimmer_channel_status.py

@@ -22,7 +22,7 @@ LED_FAST_BLINKING = 1 << 5
 LED_VERY_FAST_BLINKING = 1 << 4
 
 
-@register(COMMAND_CODE, ["VMB4DC", "VMBDMI", "VMBDMI-R", "VMB8DC-20"])
+@register(COMMAND_CODE, ["VMB4DC", "VMBDMI", "VMBDMI-R", "VMB8DC-20", "VMB4LEDPWM-20"])
 class DimmerChannelStatusMessage(Message):
     """
     sent by: VMB4DC

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/module_status.py

@@ -87,6 +87,7 @@ class ModuleStatusMessage(Message):
         "VMBGPO-20",
         "VMBEL4PIR-20",
         "VMBGP4PIR-20",
+        "VMBPSUMNGR-20",
     ],
 )
 class ModuleStatusMessage2(Message):

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/module_type.py

@@ -148,6 +148,9 @@ class ModuleTypeMessage(Message):
         "VMBGPO-20",
         "VMBEL4PIR-20",
         "VMBGP4PIR-20",
+        "VMB4LEDPWM-20",
+        "VMB8IN-20",
+        "VMB8DC-20",
     ],
 )
 class ModuleType2Message(Message):

velbus_aio-2025.4.2/velbusaio/messages/psu_load.py

@@ -0,0 +1,56 @@
+"""
+:author: Maikel Punie
+"""
+
+from __future__ import annotations
+
+import struct
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xA2
+BALANCED = 0x01
+BOOST = 0x02
+BACKUP = 0x03
+
+
+@register(COMMAND_CODE, ["VMBPSUMNGR-20"])
+class PsuLoadMessage(Message):
+
+    def __init__(self, address=None):
+        Message.__init__(self)
+        self.mode = 0
+        self.load_1 = 0
+        self.load_2 = 0
+        self.out = 0
+
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.needs_data(data, 3)
+        self.set_attributes(priority, address, rtr)
+        self.mode = data[0]
+        self.load_1 = data[1]
+        self.load_2 = data[2]
+        self.out = data[3]
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return (
+            bytes(
+                [
+                    COMMAND_CODE,
+                    self.mode,
+                    self.load_1,
+                    self.load_2,
+                    self.out,
+                ]
+            )
+            + struct.pack(">L", self.delay_time)[-3:]
+        )

velbus_aio-2025.4.2/velbusaio/messages/psu_values.py

@@ -0,0 +1,53 @@
+"""
+:author: Maikel Punie
+"""
+
+from __future__ import annotations
+
+import struct
+
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xA3
+
+
+@register(COMMAND_CODE, ["VMBPSUMNGR-20"])
+class PsuValuesMessage(Message):
+
+    def __init__(self, address=None):
+        Message.__init__(self)
+        self.channel = 0
+        self.watt = 0
+        self.volt = 0
+        self.amp = 0
+
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_low_priority(priority)
+        self.needs_no_rtr(rtr)
+        self.needs_data(data, 3)
+        self.set_attributes(priority, address, rtr)
+        self.channel = (data[0] & 0xF0) >> 4
+        self.watt = ((data[0] & 0x0F) << 16 | data[1] << 8 | data[2]) / 1000
+        self.volt = (data[3] << 8 | data[4]) / 1000
+        self.amp = (data[5] << 8 | data[6]) / 1000
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+        return (
+            bytes(
+                [
+                    COMMAND_CODE,
+                    self.mode,
+                    self.load_1,
+                    self.load_2,
+                    self.out,
+                ]
+            )
+            + struct.pack(">L", self.delay_time)[-3:]
+        )

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/restore_dimmer.py

@@ -12,7 +12,16 @@ COMMAND_CODE = 0x11
 
 @register(
     COMMAND_CODE,
-    ["VMB1DM", "VMBDME", "VMBDMI-R", "VMBDMI", "VMB1LED", "VMB4DC", "VMB8DC-20"],
+    [
+        "VMB1DM",
+        "VMBDME",
+        "VMBDMI-R",
+        "VMBDMI",
+        "VMB1LED",
+        "VMB4DC",
+        "VMB8DC-20",
+        "VMB4LEDPWM-20",
+    ],
 )
 class RestoreDimmerMessage(Message):
     """

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/set_dimmer.py

@@ -54,7 +54,10 @@ class SetDimmerMessage(Message):
         ) + self.dimmer_transitiontime.to_bytes(2, byteorder="big", signed=False)
 
 
-@register(COMMAND_CODE, ["VMBDALI", "VMBDALI-20", "VMBDMI", "VMBDMI-R", "VMB8DC-20"])
+@register(
+    COMMAND_CODE,
+    ["VMBDALI", "VMBDALI-20", "VMBDMI", "VMBDMI-R", "VMB8DC-20", "VMB4LEDPWM-20"],
+)
 class SetDimmerMessage2(SetDimmerMessage):
     """This with this message the channel numbering is an integer
     send by:

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/messages/slider_status.py

@@ -12,7 +12,16 @@ COMMAND_CODE = 0x0F
 
 @register(
     COMMAND_CODE,
-    ["VMB1DM", "VMBDME", "VMB4DC", "VMBDMI", "VMBDMI-R", "VMB1LED", "VMB8DC-20"],
+    [
+        "VMB1DM",
+        "VMBDME",
+        "VMB4DC",
+        "VMBDMI",
+        "VMBDMI-R",
+        "VMB1LED",
+        "VMB8DC-20",
+        "VMB4LEDPWM-20",
+    ],
 )
 class SliderStatusMessage(Message):
     """

{velbus_aio-2025.3.1 → velbus_aio-2025.4.2}/velbusaio/module.py

@@ -69,6 +69,7 @@ from velbusaio.messages.channel_name_request import (
 from velbusaio.messages.clear_led import ClearLedMessage
 from velbusaio.messages.counter_status import CounterStatusMessage
 from velbusaio.messages.counter_status_request import CounterStatusRequestMessage
+from velbusaio.messages.counter_value import CounterValueMessage
 from velbusaio.messages.dali_device_settings import DaliDeviceSettingMsg
 from velbusaio.messages.dali_device_settings import DeviceType as DaliDeviceType
 from velbusaio.messages.dali_device_settings import DeviceTypeMsg as DaliDeviceTypeMsg
@@ -545,6 +546,10 @@ class Module:
             await self._update_channel(
                 message.sensor, {"cur": message.value, "unit": message.unit}
             )
+        elif isinstance(message, CounterValueMessage):
+            await self._update_channel(
+                message.channel, {"power": message.power, "energy": message.energy}
+            )
 
     async def _update_channel(self, channel: int, updates: dict):
         try:
@@ -785,6 +790,8 @@ class Module:
                     "ThermostatAddr" in self._data and self._data["ThermostatAddr"] != 0
                 ):
                     await self._update_channel(int(chan), {"thermostat": True})
+            if chan_data["Type"] == "Dimmer" and "sliderScale" in self._data:
+                self._channels[int(chan)].slider_scale = self._data["sliderScale"]
 
 
 class VmbDali(Module):