velbus-aio 2023.12.0__py3-none-any.whl → 2024.4.1__py3-none-any.whl

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,9 +1,8 @@
 """
 :author: Maikel Punie <maikel.punie@gmail.com>
 """
-from __future__ import annotations
 
-import time
+from __future__ import annotations
 
 from velbusaio.command_registry import register
 from velbusaio.message import Message
@@ -17,11 +16,11 @@ class SetRealtimeClock(Message):
     received by all modules
     """
 
-    def __init__(self, address=0x00) -> None:
+    def __init__(self, address=0x00, wday=None, hour=None, min=None) -> None:
         Message.__init__(self)
-        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) -> None:
@@ -29,10 +28,6 @@ class SetRealtimeClock(Message):
             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) -> None:
         """

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, ["VMB1DM", "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

velbusaio/messages/start_relay_blinking_timer.py

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

velbusaio/messages/start_relay_timer.py

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

velbusaio/messages/switch_relay_off.py

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

velbusaio/messages/switch_relay_on.py

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

velbusaio/messages/switch_to_comfort.py

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

velbusaio/messages/switch_to_day.py

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

velbusaio/messages/switch_to_night.py

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

velbusaio/messages/switch_to_safe.py

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

velbusaio/messages/temp_sensor_settings_part1.py

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

velbusaio/messages/temp_sensor_settings_part2.py

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

velbusaio/messages/temp_sensor_settings_part3.py

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

velbusaio/messages/temp_sensor_settings_part4.py

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

velbusaio/messages/temp_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/temp_sensor_status.py

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

velbusaio/messages/temp_set_cooling.py

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

velbusaio/messages/temp_set_heating.py

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

velbusaio/messages/update_led_status.py

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

velbusaio/messages/very_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/write_data_to_memory.py

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

velbusaio/messages/write_memory_block.py

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

velbusaio/messages/write_module_address_and_serial_number.py

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

velbusaio/module.py

@@ -1,14 +1,14 @@
 """
 This represents a velbus module
 """
+
 from __future__ import annotations
 
 import logging
-import os
 import pathlib
-import pickle
 import struct
 import sys
+import json
 from typing import Awaitable, Callable
 
 from velbusaio.channels import (
@@ -36,7 +36,7 @@ from velbusaio.const import (
 )
 from velbusaio.helpers import handle_match, keys_exists
 from velbusaio.message import Message
-from velbusaio.messages import DaliDeviceSettingMsg
+from velbusaio.messages.dali_device_settings import DaliDeviceSettingMsg
 from velbusaio.messages.blind_status import BlindStatusMessage, BlindStatusNgMessage
 from velbusaio.messages.channel_name_part1 import (
     ChannelNamePart1Message,
@@ -80,8 +80,6 @@ from velbusaio.messages.module_status import (
     ModuleStatusPirMessage,
 )
 from velbusaio.messages.module_status_request import ModuleStatusRequestMessage
-from velbusaio.messages.module_subtype import ModuleSubTypeMessage
-from velbusaio.messages.module_type import ModuleTypeMessage, ModuleType2Message
 from velbusaio.messages.push_button_status import PushButtonStatusMessage
 from velbusaio.messages.read_data_from_memory import ReadDataFromMemoryMessage
 from velbusaio.messages.relay_status import RelayStatusMessage, RelayStatusMessage2
@@ -111,7 +109,7 @@ class Module:
         build_week: int | None = None,
         cache_dir: str | None = None,
     ) -> Module:
-        if module_type == 0x45:
+        if module_type == 0x45 or module_type == 0x5A:
             return VmbDali(
                 module_address,
                 module_type,
@@ -187,9 +185,9 @@ class Module:
                         del self._channels[i]
 
     def _cache(self) -> None:
-        cfile = pathlib.Path(f"{self._cache_dir}/{self._address}.p")
-        with cfile.open("wb") as fl:
-            pickle.dump(self, fl)
+        cfile = pathlib.Path(f"{self._cache_dir}/{self._address}.json")
+        with cfile.open("w") as fl:
+            json.dump(self.to_cache(), fl, indent=4)
 
     def __getstate__(self) -> dict:
         d = self.__dict__
@@ -200,20 +198,17 @@ class Module:
         self.__dict__ = state
 
     def __repr__(self) -> str:
-        return (
-            "<{}: {{{}}} @ {{{}}} loaded:{{{}}} loading:{{{}}} channels{{:{}}}>".format(
-                self._name,
-                self._type,
-                self._address,
-                self.loaded,
-                self._is_loading,
-                self._channels,
-            )
-        )
+        return f"<{self._name} type:{self._type} address:{self._address} loaded:{self.loaded} loading:{self._is_loading} channels: {self._channels}>"
 
     def __str__(self) -> str:
         return self.__repr__()
 
+    def to_cache(self) -> dict:
+        d = {"name": self._name, "channels": {}}
+        for num, chan in self._channels.items():
+            d["channels"][num] = chan.to_cache()
+        return d
+
     def get_addresses(self) -> list:
         """
         Get all addresses for this module
@@ -231,7 +226,9 @@ class Module:
         return self._type
 
     def get_type_name(self) -> str:
-        return self._data["Type"]
+        if "Type" in self._data:
+            return self._data["Type"]
+        return "UNKNOWN"
 
     def get_serial(self) -> str | None:
         return self.serial
@@ -240,12 +237,7 @@ class Module:
         return self._name
 
     def get_sw_version(self) -> str:
-        return "{}-{}.{}.{}".format(
-            self.serial,
-            self.memory_map_version,
-            self.build_year,
-            self.build_week,
-        )
+        return f"{self.serial}-{self.memory_map_version}.{self.build_year}.{self.build_week}"
 
     def calc_channel_offset(self, address: int) -> int:
         _channel_offset = 0
@@ -548,14 +540,29 @@ class Module:
         self._log.info("Load Module")
         # start the loading
         self._is_loading = True
+        # see if we have a cache
+        try:
+            cfile = pathlib.Path(f"{self._cache_dir}/{self._address}.json")
+            with cfile.open("r") as fl:
+                cache = json.load(fl)
+        except OSError:
+            cache = {}
         # load default channels
         await self.__load_default_channels()
         # load the data from memory ( the stuff that we need)
-        await self.__load_memory()
+        if "name" in cache and cache["name"] != "":
+            self._name = cache["name"]
+        else:
+            await self.__load_memory()
         # load the module status
         await self._request_module_status()
         # load the channel names
-        await self._request_channel_name()
+        if "channels" in cache:
+            for num, chan in cache["channels"].items():
+                self._channels[int(num)]._name = chan["name"]
+                self._channels[int(num)]._is_loaded = True
+        else:
+            await self._request_channel_name()
         # load the module specific stuff
         self._load()
         # stop the loading
@@ -586,7 +593,11 @@ class Module:
         addr = "{high:02X}{low:02X}".format(
             high=message.high_address, low=message.low_address
         )
-        mdata = self._data["Memory"]["1"]["Address"][addr]
+        if "Memory" not in self._data:
+            return
+        if "Address" not in self._data["Memory"]:
+            return
+        mdata = self._data["Memory"]["Address"][addr]
         if "ModuleName" in mdata and isinstance(self._name, dict):
             # if self._name is a dict we are still loading
             # if its a string it was already complete
@@ -702,9 +713,10 @@ class Module:
             self._name = None
             return
 
-        for _memory_key, memory_part in self._data["Memory"].items():
-            if "Address" in memory_part:
-                for addr_int in memory_part["Address"].keys():
+        for memory_key, memory_part in self._data["Memory"].items():
+
+            if memory_key == "Address":
+                for addr_int in memory_part.keys():
                     addr = struct.unpack(
                         ">BB", struct.pack(">h", int("0x" + addr_int, 0))
                     )
@@ -731,17 +743,6 @@ class Module:
                     "ThermostatAddr" in self._data and self._data["ThermostatAddr"] != 0
                 ):
                     await self._update_channel(int(chan), {"thermostat": True})
-        # add extra channel for program selection which is not in the channel list of the protocol.json file,
-        # but is available in the messages list of the corresponding module.
-        if keys_exists(self._data, "Messages", "B3"):
-            self._channels[CHANNEL_SELECTED_PROGRAM] = SelectedProgram(
-                self,
-                CHANNEL_SELECTED_PROGRAM,
-                "Selected Program",
-                False,
-                self._writer,
-                self._address,
-            )
 
 
 class VmbDali(Module):