boneIO 0.8.3__tar.gz → 0.9.0.dev4__tar.gz

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.8.3
+Version: 0.9.0.dev4
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>

boneIO-0.9.0.dev4/boneio/boards/0.7/output_32_10.yaml

@@ -0,0 +1,17 @@
+mcp23017:
+  - id: mcp1
+    address: 0x20
+  - id: mcp2
+    address: 0x21
+
+output_mapping:
+  out_01:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 7
+    output_type: light
+  out_02:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 6
+    output_type: light

boneIO-0.9.0.dev4/boneio/boards/0.8/input.yaml

@@ -0,0 +1,110 @@
+input_mapping:
+  in_01:
+    pin: P8_37
+    gpio_mode: gpio_pu
+  in_02:
+    pin: P8_38
+    gpio_mode: gpio_pu
+  in_03:
+    pin: P8_39
+  in_04:
+    pin: P8_40
+  in_05:
+    pin: P8_41
+  in_06:
+    pin: P8_42
+  in_07:
+    pin: P8_43
+  in_08:
+    pin: P8_44
+  in_09:
+    pin: P8_45
+  in_10:
+    pin: P8_46
+    gpio_mode: gpio_pu
+  in_11:
+    pin: P9_42
+  in_12:
+    pin: P9_31
+  in_13:
+    pin: P9_30
+  in_14:
+    pin: P9_29
+  in_15:
+    pin: P9_28
+  in_16:
+    pin: P9_27
+  in_17:
+    pin: P9_25
+  in_18:
+    pin: P9_23
+  in_19:
+    pin: P9_22
+    gpio_mode: gpio_pu
+  in_20:
+    pin: P9_21
+    gpio_mode: gpio_pu
+  in_21:
+    pin: P9_18
+  in_22:
+    pin: P9_17
+  in_23:
+    pin: P9_16
+  in_24:
+    pin: P9_15
+  in_25:
+    pin: P9_14
+  in_26:
+    pin: P8_7
+  in_27:
+    pin: P8_8
+  in_28:
+    pin: P8_9
+  in_29:
+    pin: P8_36
+    gpio_mode: gpio_pu
+  in_30:
+    pin: P8_35
+    gpio_mode: gpio_pu
+  in_31:
+    pin: P8_34
+    gpio_mode: gpio_pu
+  in_32:
+    pin: P8_33
+    gpio_mode: gpio_pu
+  in_33:
+    pin: P8_32
+    gpio_mode: gpio_pu
+  in_34:
+    pin: P8_31
+    gpio_mode: gpio_pu
+  in_35:
+    pin: P8_30
+  in_36:
+    pin: P8_29
+  in_37:
+    pin: P8_28
+  in_38:
+    pin: P8_27
+  in_39:
+    pin: P8_26
+  in_40:
+    pin: P8_19
+  in_41:
+    pin: P8_18
+  in_42:
+    pin: P8_17
+  in_43:
+    pin: P8_16
+  in_44:
+    pin: P8_15
+  in_45:
+    pin: P8_14
+  in_46:
+    pin: P8_13
+  in_47:
+    pin: P8_12
+  in_48:
+    pin: P8_11
+  in_49:
+    pin: P8_10

boneIO-0.9.0.dev4/boneio/boards/0.8/output_32_10.yaml

@@ -0,0 +1,137 @@
+mcp23017:
+  - id: mcp1
+    address: 0x23
+  - id: mcp2
+    address: 0x24
+
+output_mapping:
+  out_01:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 7
+  out_02:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 6
+  out_03:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 5
+  out_04:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 4
+  out_05:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 3
+  out_06:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 2
+  out_07:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 1
+  out_08:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 0
+  out_09:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 7
+  out_10:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 6
+  out_11:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 5
+  out_12:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 4
+  out_13:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 3
+  out_14:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 2
+  out_15:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 1
+  out_16:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 0
+  out_17:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 8
+  out_18:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 9
+  out_19:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 10
+  out_20:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 11
+  out_21:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 12
+  out_22:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 13
+  out_23:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 14
+  out_24:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 15
+  out_25:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 8
+  out_26:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 9
+  out_27:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 10
+  out_28:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 11
+  out_29:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 12
+  out_30:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 13
+  out_31:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 14
+  out_32:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 15
+
+

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/boneio/bonecli.py

@@ -2,57 +2,40 @@
 
 from __future__ import annotations
 
+import logging
 import os
 
 os.environ["W1THERMSENSOR_NO_KERNEL_MODULE"] = "1"
 
 import argparse
 import asyncio
-import logging
 import sys
-from colorlog import ColoredFormatter
-from yaml import MarkedYAMLError
-
-from boneio.modbus.modbuscli import (
-    async_run_modbus_set,
-    async_run_modbus_get,
-    async_run_modbus_search,
-)
-from boneio.modbus.client import VALUE_TYPES
 
+from yaml import MarkedYAMLError
 
 from boneio.const import ACTION
 from boneio.helper import load_config_from_file
+from boneio.helper.events import GracefulExit
 from boneio.helper.exceptions import (
     ConfigurationException,
     RestartRequestException,
 )
-from boneio.helper.events import GracefulExit
-from boneio.helper.logger import configure_logger
+from boneio.helper.logger import configure_logger, setup_logging
+from boneio.modbus.client import VALUE_TYPES
+from boneio.modbus.modbuscli import (
+    async_run_modbus_get,
+    async_run_modbus_search,
+    async_run_modbus_set,
+)
 from boneio.runner import async_run
 from boneio.version import __version__
 
 TASK_CANCELATION_TIMEOUT = 1
 
 _LOGGER = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
-fmt = "%(asctime)s %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
-datefmt = "%Y-%m-%d %H:%M:%S"
-colorfmt = f"%(log_color)s{fmt}%(reset)s"
-logging.getLogger().handlers[0].setFormatter(
-    ColoredFormatter(
-        colorfmt,
-        datefmt=datefmt,
-        reset=True,
-        log_colors={
-            "DEBUG": "cyan",
-            "INFO": "green",
-            "WARNING": "yellow",
-            "ERROR": "red",
-            "CRITICAL": "red",
-        },
-    )
-)
+
+
+
 
 
 def get_arguments() -> argparse.Namespace:
@@ -110,7 +93,7 @@ def get_arguments() -> argparse.Namespace:
     modbus_parser.add_argument(
         "--baudrate",
         type=int,
-        choices=[2400, 4800, 9600, 14400, 19200],
+        choices=[1200, 2400, 4800, 9600, 14400, 19200],
         required=True,
         help="Current baudrate",
     )
@@ -157,7 +140,7 @@ def get_arguments() -> argparse.Namespace:
     set_modbus_parser.add_argument(
         "--device",
         type=str,
-        choices=["cwt", "r4dcb08", "liquid-sensor", "sht20", "custom"],
+        choices=["cwt", "r4dcb08", "liquid-sensor", "sht20", "sht30", "custom"],
         help="Choose device to set modbus address/baudrate. For custom you must provide --custom-value and --custom-register-address",
         required=True,
     )
@@ -176,11 +159,16 @@ def get_arguments() -> argparse.Namespace:
     )
 
     get_modbus_parser = modbus_sub_parser.add_parser("get")
-    get_modbus_parser.add_argument(
+    register_group = get_modbus_parser.add_mutually_exclusive_group(required=True)
+    register_group.add_argument(
         "--register-address",
         type=int,
-        help="Register address",
-        required=True,
+        help="Single register address to read",
+    )
+    register_group.add_argument(
+        "--register-range",
+        type=str,
+        help="Register address range in format 'start-stop' (e.g., '1-230')",
     )
     get_modbus_parser.add_argument(
         "--register-type",
@@ -196,7 +184,6 @@ def get_arguments() -> argparse.Namespace:
         help="Value types",
         required=True,
     )
-    parser.add_argument("--version", action="version", version=__version__)
     search_modbus_parser = modbus_sub_parser.add_parser(
         name="search",
         help="Search for device. Iterate over every address 1-253 with provided register address",
@@ -214,6 +201,7 @@ def get_arguments() -> argparse.Namespace:
         help="Register type",
         required=True,
     )
+    parser.add_argument("--version", action="version", version=__version__)
     arguments = parser.parse_args()
 
     return arguments
@@ -223,6 +211,7 @@ def run(
     config: str, debug: int, mqttusername: str = "", mqttpassword: str = ""
 ) -> int:
     """Run BoneIO."""
+    setup_logging(debug_level=debug)
     _LOGGER.info("BoneIO %s starting.", __version__)
     try:
         _config = load_config_from_file(config_file=config)
@@ -230,18 +219,22 @@ def run(
             _LOGGER.error("Config not loaded. Exiting.")
             return 1
         configure_logger(log_config=_config.get("logger"), debug=debug)
-        asyncio.run(
+        ret = asyncio.run(
             async_run(
                 config=_config,
                 config_file=config,
                 mqttusername=mqttusername,
                 mqttpassword=mqttpassword,
+                debug=debug,
             ),
         )
+        _LOGGER.info("BoneIO %s exiting.", __version__)
+        return ret
+    except KeyboardInterrupt:
         return 0
-    except (RestartRequestException, GracefulExit) as err:
+    except GracefulExit as err:
         if err is not None:
-            _LOGGER.info(err)
+            _LOGGER.info("Message: %s", err)
         return 0
     except (ConfigurationException, MarkedYAMLError) as err:
         _LOGGER.error("Failed to load config. %s Exiting.", err)
@@ -252,6 +245,7 @@ def run_modbus_command(
     args: argparse.Namespace,
 ) -> int:
     """Run BoneIO."""
+    setup_logging(debug_level=args.debug)
     _LOGGER.info("BoneIO %s starting.", __version__)
     try:
         configure_logger(log_config={}, debug=args.debug)
@@ -284,6 +278,7 @@ def run_modbus_command(
                     bytesize=args.bytesize,
                     stopbits=args.stopbits,
                     value_type=args.value_type,
+                    register_range=args.register_range,
                 ),
             )
         else:
@@ -293,9 +288,9 @@ def run_modbus_command(
                     baudrate=args.baudrate,
                     register_address=args.register_address,
                     register_type=args.register_type,
-                    parity=args.parity,
-                    bytesize=args.bytesize,
                     stopbits=args.stopbits,
+                    bytesize=args.bytesize,
+                    parity=args.parity,
                 ),
             )
         return ret

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/boneio/const.py

@@ -10,7 +10,7 @@ except ModuleNotFoundError:
     pass
 from typing_extensions import Literal
 
-BONEIO = "boneIO"
+BONEIO = "boneio"
 NONE = "none"
 
 # MISCELLANEOUS CONSTS
@@ -43,6 +43,7 @@ MASK = "mask"
 MAC = "mac"
 NONE = "none"
 MODBUS = "modbus"
+MODBUS_SENSOR  = "modbus_sensor"
 UART = "uart"
 RX = "rx"
 TX = "tx"

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/boneio/cover.py

@@ -1,6 +1,7 @@
 """Cover module."""
 
 from __future__ import annotations
+
 import asyncio
 import logging
 from typing import Callable
@@ -109,7 +110,7 @@ class Cover(BasicMqtt):
         async with self._lock:
             if inverted_relay.is_active:
                 inverted_relay.turn_off()
-            self._timer_handle = self._event_bus.add_listener(
+            self._timer_handle = self._event_bus.add_every_second_listener(
                 f"{COVER}{self.id}", self.listen_cover
             )
             relay.turn_on()
@@ -143,7 +144,7 @@ class Cover(BasicMqtt):
         self._open.relay.turn_off()
         self._close.relay.turn_off()
         if self._timer_handle is not None:
-            self._event_bus.remove_listener(f"{COVER}{self.id}")
+            self._event_bus.remove_every_second_listener(f"{COVER}{self.id}")
             self._timer_handle = None
             self._set_position = None
             if not on_exit:

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/boneio/group/output.py

@@ -1,9 +1,12 @@
 """Group output module."""
 
 from __future__ import annotations
+
 import asyncio
 from typing import List
-from boneio.const import COVER, SWITCH, ON, OFF
+
+from boneio.const import COVER, OFF, ON, SWITCH
+from boneio.models import OutputState
 from boneio.relay.basic import BasicRelay
 
 
@@ -34,7 +37,7 @@ class OutputGroup(BasicRelay):
         for member in self._group_members:
             self._event_bus.add_output_listener(
                 output_id=member.id,
-                group_id=self.id,
+                listener_id=self.id,
                 target=self.event_listener,
             )
 
@@ -44,7 +47,7 @@ class OutputGroup(BasicRelay):
                 self._state = ON
                 return
 
-    async def event_listener(self, relay_id=None) -> None:
+    async def event_listener(self, event: OutputState = None) -> None:
         """Listen for events called by children relays."""
         if self._all_on_behaviour:
             state = (
@@ -54,34 +57,26 @@ class OutputGroup(BasicRelay):
             state = (
                 ON if any(x.state == ON for x in self._group_members) else OFF
             )
-        if state != self._state or not relay_id:
+        if state != self._state or not event:
             self._state = state
-            self._loop.call_soon_threadsafe(self.send_state)
+            self._loop.create_task(self.async_send_state())
 
     async def async_turn_on(self) -> None:
         """Call turn on action."""
-        await asyncio.gather(
-            *[
-                self._loop.run_in_executor(self.executor, x.turn_on)
-                for x in self._group_members
-            ]
-        )
+        for x in self._group_members:
+            self._loop.create_task(x.async_turn_on())
 
     async def async_turn_off(self) -> None:
         """Call turn off action."""
-        await asyncio.gather(
-            *[
-                self._loop.run_in_executor(self.executor, x.turn_off)
-                for x in self._group_members
-            ]
-        )
+        for x in self._group_members:
+            self._loop.create_task(x.async_turn_off())
 
     @property
     def is_active(self) -> bool:
         """Is relay active."""
         return self._state == ON
 
-    def send_state(self) -> None:
+    async def async_send_state(self) -> None:
         """Send state to Mqtt on action."""
         self._send_message(
             topic=self._send_topic, payload=self.payload(), retain=True

boneIO-0.9.0.dev4/boneio/helper/async_updater.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+import asyncio
+import time
+
+# Typing imports that create a circular dependency
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ..manager import Manager
+from boneio.helper.timeperiod import TimePeriod
+
+
+class AsyncUpdater:
+    def __init__(self, manager: Manager, update_interval: TimePeriod, **kwargs):
+        self.manager = manager
+        self._update_interval = update_interval or TimePeriod(seconds=60)
+        self.manager.append_task(coro=self._refresh, name=self.id)
+        self._timestamp = time.time()
+
+
+    async def _refresh(self) -> None:
+        try:
+            while True:
+                if hasattr(self, "async_update"):
+                    update_interval = (
+                        await self.async_update(timestamp=time.time())
+                        or self._update_interval.total_in_seconds
+                    )
+                else:
+                    update_interval = (
+                    self.update(timestamp=time.time()) or self._update_interval.total_in_seconds
+                )
+                await asyncio.sleep(update_interval)
+        except asyncio.CancelledError:
+            raise
+    @property
+    def last_timestamp(self) -> float:
+        return self._timestamp

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/boneio/helper/click_timer.py

@@ -31,12 +31,10 @@ class ClickTimer:
             self._remove_listener.cancel()
             self._remove_listener = None
 
-    async def _start_async_timer(self) -> None:
-        start = time.time()
-        await asyncio.sleep(self._delay)
+    def _start_action(self, start: float) -> None:
         self._remove_listener = None
         self._action(round(time.time() - start, 2))
 
     def start_timer(self) -> None:
         """Start timer."""
-        self._remove_listener = self._loop.create_task(self._start_async_timer())
+        self._remove_listener = self._loop.call_later(self._delay, self._start_action, time.time())

{boneIO-0.8.3 → boneIO-0.9.0.dev4}/boneio/helper/config.py

@@ -2,19 +2,33 @@
 Module to provide basic config options.
 """
 from __future__ import annotations
+
 from _collections_abc import dict_values
 from typing import Union
-from boneio.const import BONEIO, HOMEASSISTANT, LIGHT, SENSOR, COVER, BUTTON, SWITCH, BINARY_SENSOR, EVENT_ENTITY
+
+from boneio.const import (
+    BINARY_SENSOR,
+    BONEIO,
+    BUTTON,
+    COVER,
+    EVENT_ENTITY,
+    HOMEASSISTANT,
+    LIGHT,
+    SENSOR,
+    SWITCH,
+)
 
 
 class ConfigHelper:
     def __init__(
         self,
-        topic_prefix: str = BONEIO,
+        topic_prefix: str,
+        name: str = BONEIO,
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
     ):
-        self._topic_prefix = topic_prefix
+        self._name = name
+        self._topic_prefix = topic_prefix if topic_prefix else name
         self._ha_discovery = ha_discovery
         self._ha_discovery_prefix = ha_discovery_prefix
         self._fetch_old_discovery = None
@@ -33,6 +47,10 @@ class ConfigHelper:
     def topic_prefix(self) -> str:
         return self._topic_prefix
 
+    @property
+    def name(self) -> str:
+        return self._name
+
     @property
     def ha_discovery(self) -> bool:
         return self._ha_discovery