velbus-aio 2023.2.0__tar.gz → 2023.5.0__tar.gz

{velbus-aio-2023.2.0/velbus_aio.egg-info → velbus-aio-2023.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2023.2.0
+Version: 2023.5.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/pyproject.toml

@@ -3,8 +3,8 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name        = "velbus-aio"
-version     = "2023.2.0"
 license     = {text = "MIT"}
+version     = "2023.5.0"
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.md"
 authors     = [
@@ -43,4 +43,26 @@ zip-safe  = false
 include-package-data = true
 
 [tool.setuptools.packages.find]
-exclude = ["tests", "tests.*"]
+exclude = ["tests", "tests.*", "examples"]
+
+[tool.bumpver]
+current_version = "2023.5.0"
+version_pattern = "YYYY.MM.INC0"
+commit_message = "bump version {old_version} -> {new_version}"
+commit = true
+tag = true
+push = true
+
+[tool.bumpver.file_patterns]
+"pyproject.toml" = [
+    'version = "{version}"',
+    'current_version = "{version}"',
+]
+"setup.py" = [
+    "{version}",
+    "{pep440_version}",
+]
+"README.md" = [
+    "{version}",
+    "{pep440_version}",
+]

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0/velbus_aio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2023.2.0
+Version: 2023.5.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbus_aio.egg-info/SOURCES.txt

@@ -4,10 +4,6 @@ README.md
 pyproject.toml
 requirements.txt
 setup.py
-examples/discover.py
-examples/load_modules.py
-examples/read_bus.py
-examples/read_cache.py
 velbus_aio.egg-info/PKG-INFO
 velbus_aio.egg-info/SOURCES.txt
 velbus_aio.egg-info/dependency_links.txt
@@ -51,6 +47,7 @@ velbusaio/messages/dali_device_settings_request.py
 velbusaio/messages/dali_dim_value_status.py
 velbusaio/messages/dimmer_channel_status.py
 velbusaio/messages/dimmer_status.py
+velbusaio/messages/edge_set_color.py
 velbusaio/messages/edge_set_custom_color.py
 velbusaio/messages/fast_blinking_led.py
 velbusaio/messages/forced_off.py

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbus_aio.egg-info/top_level.txt

@@ -1,3 +1,2 @@
 dist
-examples
 velbusaio

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/channels.py

@@ -18,6 +18,7 @@ from velbusaio.const import (
     VOLUME_LITERS_HOUR,
 )
 from velbusaio.message import Message
+from velbusaio.messages.edge_set_color import SetEdgeColorMessage, CustomColorPriority
 from velbusaio.messages.module_status import PROGRAM_SELECTION
 
 if TYPE_CHECKING:
@@ -275,6 +276,7 @@ class Button(Channel):
     _enabled = True
     _closed = False
     _led_state = None
+    _long = False
 
     def get_categories(self) -> list[str]:
         if self._enabled:
@@ -702,8 +704,42 @@ class EdgeLit(Channel):
     An EdgeLit channel
     """
 
-    # def get_categories(self):
-    #    return ["light"]
+    async def reset_color(self, left=True, top=True, right=True, bottom=True):
+        msg = SetEdgeColorMessage(self._address)
+        msg.apply_background_color = True
+        msg.color_idx = 0
+        msg.apply_to_left_edge = left
+        msg.apply_to_top_edge = top
+        msg.apply_to_right_edge = right
+        msg.apply_to_bottom_edge = bottom
+        msg.apply_to_all_pages = True
+        await self._writer(msg)
+
+    async def set_color(
+        self,
+        color_idx: int,
+        left=True,
+        top=True,
+        right=True,
+        bottom=True,
+        blinking=False,
+        priority=CustomColorPriority.LOW_PRIORITY,
+    ) -> None:
+        """
+        Send the turn off message
+        """
+
+        msg = SetEdgeColorMessage(self._address)
+        msg.apply_background_color = True
+        msg.background_blinking = blinking
+        msg.color_idx = color_idx
+        msg.apply_to_left_edge = left
+        msg.apply_to_top_edge = top
+        msg.apply_to_right_edge = right
+        msg.apply_to_bottom_edge = bottom
+        msg.apply_to_all_pages = True
+        msg.custom_color_priority = priority
+        await self._writer(msg)
 
 
 class Memo(Channel):

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/handler.py

@@ -101,7 +101,7 @@ class PacketHandler:
                 msg.populate(priority, address, rtr, data)
                 self._log.debug(f"Received {msg}")
                 # send the message to the modules
-                await (self._velbus.get_module(msg.address)).on_message(msg)
+                await self._velbus.get_module(msg.address).on_message(msg)
             else:
                 self._log.warning(
                     "NOT FOUND IN command_registry: addr={} cmd={} packet={}".format(

velbus-aio-2023.5.0/velbusaio/messages/edge_set_color.py

@@ -0,0 +1,113 @@
+from __future__ import annotations
+
+from enum import IntEnum
+from velbusaio.command_registry import register
+from velbusaio.message import Message
+
+COMMAND_CODE = 0xD4
+
+
+class CustomColorPriority(IntEnum):
+    LOW_PRIORITY = 1
+    MID_PRIORITY = 2
+    HIGH_PRIORITY = 3
+
+
+@register(COMMAND_CODE, ["VMBEL1", "VMBEL2", "VMBEL4", "VMBELO"])
+class SetEdgeColorMessage(Message):
+    """
+    send by:
+    received by: VMBEL1, VMBEL2, VMBEL4, VMBELO
+    """
+
+    apply_background_color = False
+    apply_continuous_feedback_color = False
+    apply_slow_blinking_feedback_color = False
+    apply_fast_blinking_feedback_color = False
+    custom_color_palette = False
+
+    apply_to_left_edge = False
+    apply_to_top_edge = False
+    apply_to_right_edge = False
+    apply_to_bottom_edge = False
+
+    apply_to_page: int | None = None
+    apply_to_all_pages = False
+
+    background_blinking = False
+    custom_color_priority: CustomColorPriority | None = None
+
+    color_idx: int = 0
+
+    def populate(self, priority, address, rtr, data):
+        """
+        :return: None
+        """
+        self.needs_no_rtr(rtr)
+        self.set_attributes(priority, address, rtr)
+
+        self.apply_background_color = bool(data[0] & 0x01)
+        self.apply_continuous_feedback_color = bool(data[0] & 0x02)
+        self.apply_slow_blinking_feedback_color = bool(data[0] & 0x04)
+        self.apply_fast_blinking_feedback_color = bool(data[0] & 0x08)
+        self.custom_color_palette = bool(data[0] & 0x80)
+
+        self.apply_to_left_edge = bool(data[1] & 0x01)
+        self.apply_to_top_edge = bool(data[1] & 0x02)
+        self.apply_to_right_edge = bool(data[1] & 0x04)
+        self.apply_to_bottom_edge = bool(data[1] & 0x08)
+
+        page = (data[1] & 0b0111_0000) >> 4
+        if page > 0:
+            self.apply_to_page = page
+        self.apply_to_all_pages = bool(data[1] & 0x80)
+
+        self.background_blinking = bool(data[2] & 0x80)
+
+        custom_color_priority_value = data[2] & 0b0110_0000 >> 5
+        if custom_color_priority_value:
+            self.custom_color_priority = CustomColorPriority(
+                custom_color_priority_value
+            )
+
+        self.color_idx = data[2] & 0b0001_1111
+
+    def data_to_binary(self):
+        """
+        :return: bytes
+        """
+
+        byte_2 = (
+            self.apply_background_color * 0x01
+            + self.apply_continuous_feedback_color * 0x02
+            + self.apply_slow_blinking_feedback_color * 0x04
+            + self.apply_fast_blinking_feedback_color * 0x08
+            + self.custom_color_palette * 0x80
+        )
+
+        byte_3 = (
+            self.apply_to_left_edge * 0x01
+            + self.apply_to_top_edge * 0x02
+            + self.apply_to_right_edge * 0x04
+            + self.apply_to_bottom_edge * 0x08
+            + (((self.apply_to_page or 0) & 0xFFF) << 4)
+            + self.apply_to_all_pages * 0x80
+        )
+
+        byte_4 = (
+            (self.color_idx & 0xFFFF)
+            + (
+                (int(self.custom_color_priority) if self.custom_color_priority else 0)
+                << 5
+            )
+            + self.background_blinking * 0x80
+        )
+
+        return bytes(
+            [
+                COMMAND_CODE,
+                byte_2,
+                byte_3,
+                byte_4,
+            ]
+        )

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/messages/edge_set_custom_color.py

@@ -9,11 +9,11 @@ from velbusaio.message import Message
 COMMAND_CODE = 0xD4
 
 
-@register(COMMAND_CODE)
+@register(COMMAND_CODE, ["VMBEL1", "VMBEL2", "VMBEL4", "VMBELO"])
 class EdgeSetCustomColor(Message):
     """
     send by:
-    received by: VMB4RYLD
+    received by: VMBEL1, VMBEL2, VMBEL4, VMBELO
     """
 
     def __init__(self, address=None):

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/messages/restore_dimmer.py

@@ -59,5 +59,6 @@ class RestoreDimmerMessage2(RestoreDimmerMessage):
         return [byte]
 
     def channels_to_byte(self, channels: list[int]) -> int:
-        assert len(channels) == 1
+        if len(channels) != 1:
+            raise ValueError("We should have exact one channel")
         return channels[0]

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/messages/set_dimmer.py

@@ -67,5 +67,6 @@ class SetDimmerMessage2(SetDimmerMessage):
         return [byte]
 
     def channels_to_byte(self, channels) -> int:
-        assert len(channels) == 1
+        if len(channels) != 1:
+            raise ValueError("We should have exact one channel")
         return channels[0]

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/module.py

@@ -176,7 +176,7 @@ class Module:
         # The solution would be that this functions knows were the temperature channels are located
         # and/or what the max number of subaddresses are for each module.
         if self._sub_address == {}:
-            assert "No subaddresses defined"
+            raise Exception("No subaddresses defined")
         for sub in range(1, 4):
             if sub not in self._sub_address:
                 for i in range(((sub * 8) + 1), (((sub + 1) * 8) + 1)):
@@ -372,8 +372,12 @@ class Module:
                     channel = self._translate_channel_name(channel_id + _channel_offset)
                     if channel_id in message.closed:
                         await self._update_channel(channel, {"closed": True})
+                    if channel_id in message.closed_long:
+                        await self._update_channel(channel, {"long": True})
                     if channel_id in message.opened:
-                        await self._update_channel(channel, {"closed": False})
+                        await self._update_channel(
+                            channel, {"closed": False, "long": False}
+                        )
         elif isinstance(message, (ModuleStatusMessage)):
             for channel_id in range(1, 9):
                 channel = self._translate_channel_name(channel_id + _channel_offset)

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/raw_message.py

@@ -78,10 +78,10 @@ class ParseError(Exception):
 
 
 def _parse(rawmessage: bytearray) -> Tuple[Optional[RawMessage], bytearray]:
-    assert (
-        MINIMUM_MESSAGE_SIZE <= len(rawmessage) <= MAXIMUM_MESSAGE_SIZE
-    ), "Received a raw message with an illegal length"
-    assert rawmessage[0] == START_BYTE
+    if len(rawmessage) < MINIMUM_MESSAGE_SIZE or len(rawmessage) > MAXIMUM_MESSAGE_SIZE:
+        raise ValueError("Received a raw message with an illegal lemgth")
+    if rawmessage[0] != START_BYTE:
+        raise ValueError("Received a raw message with the wrong startbyte")
 
     priority = rawmessage[1]
     if priority not in PRIORITIES:

{velbus-aio-2023.2.0 → velbus-aio-2023.5.0}/velbusaio/util.py

@@ -6,8 +6,10 @@ from velbusaio.const import MAXIMUM_MESSAGE_SIZE, MINIMUM_MESSAGE_SIZE
 # Copyright (c) 2017 Thomas Delaet
 # Copied from python-velbus (https://github.com/thomasdelaet/python-velbus)
 def checksum(data: Union[bytes, bytearray]) -> int:
-    assert len(data) >= MINIMUM_MESSAGE_SIZE - 2
-    assert len(data) <= MAXIMUM_MESSAGE_SIZE - 2
+    if len(data) < MINIMUM_MESSAGE_SIZE - 2:
+        raise ValueError("The message is shorter then expected")
+    if len(data) > MAXIMUM_MESSAGE_SIZE - 2:
+        raise ValueError("The message is longer then expected")
     __checksum = 0
     for data_byte in data:
         __checksum += data_byte
@@ -35,12 +37,13 @@ class BitSet:
         self._value = value
 
     def __getitem__(self, idx: int) -> bool:
-        assert 0 <= idx < 8
+        if idx > 8 or idx <= 0:
+            raise ValueError("The bitSet id is not within expected range 0 < id < 8")
         return bool((1 << idx) & self._value)
 
     def __setitem__(self, idx: int, value: bool) -> None:
-        assert 0 <= idx < 8
-        assert isinstance(value, bool)
+        if idx > 8 or idx <= 0:
+            raise ValueError("The bitSet id is not within expected range 0 < id < 8")
         mask = (0xFF ^ (1 << idx)) & self._value
         self._value = mask & (value << idx)
 

velbus-aio-2023.2.0/examples/discover.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-import asyncio
-
-from velbusaio.discovery import VelbusDiscoveryProtocol
-
-loop = asyncio.get_event_loop()
-coro = loop.create_datagram_endpoint(
-    lambda: VelbusDiscoveryProtocol(("192.168.1.255", 32767)),
-    local_addr=("0.0.0.0", 1900),
-)
-loop.run_until_complete(coro)
-loop.run_forever()
-loop.close()

velbus-aio-2023.2.0/examples/load_modules.py

@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import asyncio
-import logging
-import sys
-
-from velbusaio.controller import Velbus
-
-parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-parser.add_argument("--connect", help="Connection string", default="192.168.1.254:8445")
-args = parser.parse_args()
-
-
-async def main(connect_str: str):
-    # SET THE connection params below
-    # example via signum:
-    #   velbus = Velbus("tls://192.168.1.9:27015")
-    # example via plain IP
-    #   velbus = Velbus("192.168.1.9:27015")
-    # example via serial device
-    #   velbus = Velbus("/dev/ttyAMA0")
-    velbus = Velbus(connect_str)
-    await velbus.connect()
-    for mod in (velbus.get_modules()).values():
-        print(mod)
-        print("")
-    await velbus.stop()
-
-
-logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
-logging.getLogger("asyncio").setLevel(logging.DEBUG)
-asyncio.run(main(args.connect), debug=False)

velbus-aio-2023.2.0/examples/read_bus.py

@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import asyncio
-import logging
-import sys
-
-from velbusaio.controller import Velbus
-
-parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-parser.add_argument(
-    "--connect", help="Connection string", default="tls://192.168.1.9:27015"
-)
-args = parser.parse_args()
-
-
-async def main(connect_str: str):
-    # SET THE connection params below
-    # example via signum:
-    #   velbus = Velbus("tls://192.168.1.9:27015")
-    # example via plain IP
-    #   velbus = Velbus("192.168.1.9:27015")
-    # example via serial device
-    #   velbus = Velbus("/dev/ttyAMA0")
-    velbus = Velbus(connect_str)
-    await velbus.connect()
-    for mod in (velbus.get_modules()).values():
-        print(mod)
-        print("")
-    await asyncio.sleep(6000000000)
-
-
-logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
-logging.getLogger("asyncio").setLevel(logging.DEBUG)
-asyncio.run(main(args.connect), debug=False)

velbus-aio-2023.2.0/examples/read_cache.py

@@ -1,12 +0,0 @@
-import pickle
-from os import listdir
-from os.path import isfile, join
-
-from velbusaio.const import CACHEDIR
-from velbusaio.helpers import get_cache_dir
-
-for fil in [f for f in listdir(get_cache_dir()) if isfile(join(get_cache_dir(), f))]:
-    print("")
-    print(fil)
-    fl = open(f"{get_cache_dir()}/{fil}", "rb")
-    print(pickle.load(fl))