boneIO 0.3.0__tar.gz → 0.3.0.dev2__tar.gz

{boneio-0.3.0/boneio.egg-info → boneio-0.3.0.dev2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0
+Version: 0.3.0.dev2
 Summary: Python App for BoneIO
 Home-page: https://github.com/boneIO-eu/app_bbb
-Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.zip
+Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.dev2.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/bonecli.py

@@ -68,7 +68,7 @@ def get_arguments() -> argparse.Namespace:
 
 def run(config: str, debug: int, mqttusername: str = "", mqttpassword: str = ""):
     """Run BoneIO."""
-    _LOGGER.info("BoneIO %s starting.", __version__)
+    _LOGGER.info("BoneIO starting.")
     try:
         _config = load_config_from_file(config_file=config)
         if not _config:

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/const.py

@@ -2,13 +2,12 @@
 from datetime import timedelta
 
 try:
-    from Adafruit_BBIO.GPIO import HIGH, LOW, BOTH, FALLING, RISING
+    from Adafruit_BBIO.GPIO import HIGH, LOW, BOTH, FALLING
 except ModuleNotFoundError:
     HIGH = "high"
     LOW = "low"
     BOTH = "both"
     FALLING = "falling"
-    RISING = "rising"
     pass
 from typing_extensions import Literal
 
@@ -48,12 +47,14 @@ RESTORE_STATE = "restore_state"
 MODEL = "model"
 UARTS = {
     "uart1": {ID: "/dev/ttyS1", TX: "P9.24", RX: "P9.26"},
-    "uart2": {ID: "/dev/ttyS2", TX: "P9.21", RX: "P9.22"},
-    "uart3": {ID: "/dev/ttyS3", TX: "P9.42", RX: None},
     "uart4": {ID: "/dev/ttyS4", TX: "P9.13", RX: "P9.11"},
-    "uart5": {ID: "/dev/ttyS5", TX: "P8.37", RX: "P8.38"},
 }
 
+# TIMINGS FOR BUTTONS
+DEBOUNCE_DURATION = timedelta(seconds=0.2)
+LONG_PRESS_DURATION = timedelta(seconds=0.7)
+DELAY_DURATION = 0.1
+SECOND_DELAY_DURATION = 0.3
 
 # HA CONSTS
 HOMEASSISTANT = "homeassistant"
@@ -112,8 +113,6 @@ BINARY_SENSOR = "binary_sensor"
 LM75 = "lm75"
 MCP_TEMP_9808 = "mcp9808"
 INPUT_SENSOR = "inputsensor"
-DS2482 = "ds2482"
-DALLAS = "dallas"
 
 BASE = "base"
 LENGTH = "length"

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/cover.py

@@ -1,7 +1,7 @@
 """Cover module."""
 import asyncio
 import logging
-from typing import Callable
+from typing import Any, Callable
 from boneio.const import CLOSE, COVER, IDLE, OPEN, OPENING, CLOSING, CLOSED, STOP
 from boneio.helper.events import EventBus
 from boneio.helper.mqtt import BasicMqtt
@@ -44,7 +44,7 @@ class Cover(BasicMqtt):
     def __init__(
         self,
         id: str,
-        open_relay: MCPRelay,
+        open_relay: Any,
         close_relay: MCPRelay,
         state_save: Callable,
         open_time: TimePeriod,

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/example_config/config.yaml

@@ -9,8 +9,8 @@ mqtt:
 oled:
 
 lm75:
-  - id: temp
-    address: 0x48
+  id: temp
+  address: 0x48
 
 mcp23017:
   - id: mcp1

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/example_config/cover.yaml

@@ -2,7 +2,7 @@ cover:
   - id: kitchen
     open_relay: test1
     close_relay: test2
-    open_time: 20s
-    close_time: 22s
+    open_time: 20
+    close_time: 22
     show_in_ha: yes
     restore_state: yes

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/example_config/output32x5A.yaml

@@ -1,198 +1,160 @@
-# mcp1 - upper left 8 relays
-- id: OUT_01
+- id: light 1
   kind: mcp
   mcp_id: mcp1
   pin: 0
   output_type: light
-  
-- id: OUT_02
+- id: light 2
   kind: mcp
   mcp_id: mcp1
   pin: 1
   output_type: light
-  
-- id: OUT_03
+- id: light 3
   kind: mcp
   mcp_id: mcp1
   pin: 2
   output_type: light
-  
-- id: OUT_04
+- id: light 4
   kind: mcp
   mcp_id: mcp1
   pin: 3
   output_type: light
-  
-- id: OUT_05
+- id: light 5
   kind: mcp
   mcp_id: mcp1
   pin: 4
   output_type: light
-  
-- id: OUT_06
+- id: light 6
   kind: mcp
   mcp_id: mcp1
   pin: 5
   output_type: light
-  
-- id: OUT_07
+- id: light 7
   kind: mcp
   mcp_id: mcp1
   pin: 6
   output_type: light
-  
-- id: OUT_08
+- id: light 8
   kind: mcp
   mcp_id: mcp1
   pin: 7
   output_type: light
-  
-  
-# mcp2 - upper right 8 relays
-- id: OUT_09
-  kind: mcp
-  mcp_id: mcp2
-  pin: 0
-  output_type: light
-  
-- id: OUT_10
-  kind: mcp
-  mcp_id: mcp2
-  pin: 1
-  output_type: light
-  
-- id: OUT_11
-  kind: mcp
-  mcp_id: mcp2
-  pin: 2
-  output_type: light
-  
-- id: OUT_12
-  kind: mcp
-  mcp_id: mcp2
-  pin: 3
-  output_type: light
-  
-- id: OUT_13
-  kind: mcp
-  mcp_id: mcp2
-  pin: 4
-  output_type: light
-  
-- id: OUT_14
-  kind: mcp
-  mcp_id: mcp2
-  pin: 5
-  output_type: light
-  
-- id: OUT_15
-  kind: mcp
-  mcp_id: mcp2
-  pin: 6
-  output_type: light
-  
-- id: OUT_16
-  kind: mcp
-  mcp_id: mcp2
-  pin: 7
-  output_type: light
-  
-  
-# mcp1 - lower left 8 relays
-- id: OUT_17
+- id: light 9
   kind: mcp
   mcp_id: mcp1
   pin: 8
   output_type: light
-  
-- id: OUT_18
+- id: light 10
   kind: mcp
   mcp_id: mcp1
   pin: 9
   output_type: light
-  
-- id: OUT_19
+- id: light 11
   kind: mcp
   mcp_id: mcp1
   pin: 10
   output_type: light
-  
-- id: OUT_20
+- id: light 12
   kind: mcp
   mcp_id: mcp1
   pin: 11
   output_type: light
-  
-- id: OUT_21
+- id: light 13
   kind: mcp
   mcp_id: mcp1
   pin: 12
   output_type: light
-  
-- id: OUT_22
+- id: light 14
   kind: mcp
   mcp_id: mcp1
   pin: 13
   output_type: light
-  
-- id: OUT_23
+- id: light 15
   kind: mcp
   mcp_id: mcp1
   pin: 14
   output_type: light
-  
-- id: OUT_24
+- id: light 16
   kind: mcp
   mcp_id: mcp1
   pin: 15
   output_type: light
-  
-  
-# mcp2 - lower right 8 relays
-- id: OUT_25
+- id: switch 1
+  kind: mcp
+  mcp_id: mcp2
+  pin: 0
+  output_type: switch
+- id: switch 2
+  kind: mcp
+  mcp_id: mcp2
+  pin: 1
+  output_type: switch
+- id: switch 3
+  kind: mcp
+  mcp_id: mcp2
+  pin: 2
+  output_type: switch
+- id: switch 4
+  kind: mcp
+  mcp_id: mcp2
+  pin: 3
+  output_type: switch
+- id: switch 5
+  kind: mcp
+  mcp_id: mcp2
+  pin: 4
+  output_type: switch
+- id: switch 6
+  kind: mcp
+  mcp_id: mcp2
+  pin: 5
+  output_type: switch
+- id: switch 7
+  kind: mcp
+  mcp_id: mcp2
+  pin: 6
+  output_type: switch
+- id: switch 8
+  kind: mcp
+  mcp_id: mcp2
+  pin: 7
+  output_type: switch
+- id: switch 9
   kind: mcp
   mcp_id: mcp2
   pin: 8
-  output_type: light
-  
-- id: OUT_26
+  output_type: switch
+- id: switch 10
   kind: mcp
   mcp_id: mcp2
   pin: 9
-  output_type: light
-  
-- id: OUT_27
+  output_type: switch
+- id: switch 11
   kind: mcp
   mcp_id: mcp2
   pin: 10
-  output_type: light
-  
-- id: OUT_28
+  output_type: switch
+- id: switch 12
   kind: mcp
   mcp_id: mcp2
   pin: 11
-  output_type: light
-  
-- id: OUT_29
+  output_type: switch
+- id: switch 13
   kind: mcp
   mcp_id: mcp2
   pin: 12
-  output_type: light
-  
-- id: OUT_30
+  output_type: switch
+- id: switch 14
   kind: mcp
   mcp_id: mcp2
   pin: 13
-  output_type: light
-  
-- id: OUT_31
+  output_type: switch
+- id: switch 15
   kind: mcp
   mcp_id: mcp2
   pin: 14
-  output_type: light
-  
-- id: OUT_32
+  output_type: switch
+- id: switch 16
   kind: mcp
   mcp_id: mcp2
   pin: 15
-  output_type: light
+  output_type: switch

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/helper/__init__.py

@@ -1,4 +1,5 @@
 """Helper dir for BoneIO."""
+from typing import Callable, TypeVar, Any
 
 from boneio.helper.gpio import (
     edge_detect,
@@ -34,6 +35,20 @@ from boneio.helper.exceptions import GPIOInputException, I2CError
 from boneio.helper.queue import UniqueQueue
 from boneio.helper.timeperiod import TimePeriod
 
+CALLABLE_T = TypeVar("CALLABLE_T", bound=Callable[..., Any])
+CALLBACK_TYPE = Callable[[], None]
+
+
+def callback(func: CALLABLE_T) -> CALLABLE_T:
+    """Annotation to mark method as safe to call from within the event loop."""
+    setattr(func, "_boneio_callback", True)
+    return func
+
+
+def is_callback(func: Callable[..., Any]) -> bool:
+    """Check if function is safe to be called in the event loop."""
+    return getattr(func, "_boneio_callback", False) is True
+
 
 __all__ = [
     "CustomValidator",
@@ -65,6 +80,4 @@ __all__ = [
     "load_config_from_string",
     "load_config_from_file",
     "TimePeriod",
-    "callback",
-    "is_callback",
 ]

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/helper/events.py

@@ -3,9 +3,9 @@ import datetime as dt
 import signal
 import logging
 import time
-from typing import Callable, Optional
+from typing import Callable
 from datetime import datetime
-from boneio.helper.util import callback
+from boneio.helper import callback
 
 _LOGGER = logging.getLogger(__name__)
 UTC = dt.timezone.utc
@@ -79,7 +79,6 @@ class EventBus:
         self._loop = loop or asyncio.get_event_loop()
         self._listeners = {}
         self._sigterm_listeners = []
-        self._haonline_listeners = []
         self._timer_handle = _async_create_timer(self._loop, self._run_second_event)
         for signame in {"SIGINT", "SIGTERM"}:
             self._loop.add_signal_handler(
@@ -114,15 +113,6 @@ class EventBus:
         """Add sigterm listener."""
         self._sigterm_listeners.append(target)
 
-    def add_haonline_listener(self, target):
-        """Add HA Online listener."""
-        self._haonline_listeners.append(target)
-
-    def signal_ha_online(self):
-        """Call events if HA goes online."""
-        for target in self._haonline_listeners:
-            target()
-
     def remove_listener(self, name):
         """Remove regular listener."""
         if name in self._listeners:
@@ -149,9 +139,9 @@ def async_track_point_in_time(
     # Ensure point_in_time is UTC
     utc_point_in_time = as_utc(point_in_time)
 
-    # Since this is called once, we accept a so we can avoid
+    # Since this is called once, we accept a HassJob so we can avoid
     # having to figure out how to call the action every time its called.
-    cancel_callback: Optional[asyncio.TimerHandle] = None
+    cancel_callback: asyncio.TimerHandle | None = None
 
     @callback
     def run_action(job) -> None:

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/helper/exceptions.py

@@ -13,17 +13,5 @@ class I2CError(BoneIOException):
     """I2C Exception."""
 
 
-class OneWireError(BoneIOException):
-    """One Wire Exception."""
-
-
 class ConfigurationException(BoneIOException):
     """Configuration yaml exception."""
-
-
-class CoverRelayException(BoneIOException):
-    """Cover configuration exception."""
-
-
-class ModbusUartException(BoneIOException):
-    """Cover configuration exception."""

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/helper/gpio.py

@@ -97,7 +97,7 @@ class GpioBaseClass:
         self._pin = pin
         gpio = kwargs.get("rest_pin", {GPIO_MODE: GPIO_STR})
         gpio_mode = gpio.get(GPIO_MODE, GPIO_STR)
-        self._bounce_time = gpio.get("bounce_time", TimePeriod(milliseconds=10))
+        self._bounce_time = gpio.get("bounce_time", TimePeriod(milliseconds=25))
         self._loop = asyncio.get_running_loop()
         self._press_callback = press_callback
         setup_input(pin=self._pin, pull_mode=gpio_mode)

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/helper/loader.py

@@ -43,13 +43,9 @@ from boneio.helper import (
     ha_input_availabilty_message,
     ha_sensor_temp_availabilty_message,
 )
-from adafruit_onewire.bus import OneWireAddress
-from boneio.helper.ds2482 import DS2482, OneWireBus, ds_address, DS2482_ADDRESS
 from boneio.helper.ha_discovery import ha_cover_availabilty_message
 from boneio.helper.timeperiod import TimePeriod
 from boneio.input.gpio import GpioInputButton
-from boneio.helper.config import ConfigHelper
-from boneio.sensor import DallasSensor
 
 # Typing imports that create a circular dependency
 if TYPE_CHECKING:
@@ -63,7 +59,9 @@ from busio import I2C
 _LOGGER = logging.getLogger(__name__)
 
 
-def create_adc(manager: Manager, topic_prefix: str, adc_list: list = []):
+def create_adc(
+    manager: Manager, topic_prefix: str, ha_discovery_prefix: str, adc_list: list = []
+):
     """Create ADC sensor."""
 
     initialize_adc()
@@ -80,13 +78,14 @@ def create_adc(manager: Manager, topic_prefix: str, adc_list: list = []):
                 name=name,
                 send_message=manager.send_message,
                 topic_prefix=topic_prefix,
-                update_interval=gpio.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
+                update_interval=gpio.get(UPDATE_INTERVAL, 60),
             )
             if gpio.get(SHOW_HA, True):
                 manager.send_ha_autodiscovery(
                     id=id,
                     name=name,
                     ha_type=SENSOR,
+                    ha_discovery_prefix=ha_discovery_prefix,
                     availability_msg_func=ha_adc_sensor_availabilty_message,
                 )
             manager.append_task(asyncio.create_task(adc.send_state()))
@@ -98,9 +97,11 @@ def create_adc(manager: Manager, topic_prefix: str, adc_list: list = []):
 def create_temp_sensor(
     manager: Manager,
     topic_prefix: str,
+    ha_discovery_prefix: str,
     sensor_type: str,
     i2cbusio: I2C,
     temp_def: dict = {},
+    temp_sensors: list = [],
 ):
     """Create LM sensor in manager."""
     if sensor_type == LM75:
@@ -119,15 +120,16 @@ def create_temp_sensor(
             address=temp_def[ADDRESS],
             send_message=manager.send_message,
             topic_prefix=topic_prefix,
-            update_interval=temp_def.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
         )
         manager.send_ha_autodiscovery(
             id=id,
             name=name,
             ha_type=SENSOR,
+            ha_discovery_prefix=ha_discovery_prefix,
             availability_msg_func=ha_sensor_temp_availabilty_message,
         )
-        return temp_sensor
+        manager.append_task(asyncio.create_task(temp_sensor.send_state()))
+        temp_sensors.append(temp_sensor)
     except I2CError as err:
         _LOGGER.error("Can't configure Temp sensor. %s", err)
         pass
@@ -156,7 +158,14 @@ def create_mcp23017(
     return grouped_outputs
 
 
-def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
+def create_modbus_sensors(
+    manager: Manager,
+    topic_prefix: str,
+    ha_discovery: bool,
+    ha_discovery_prefix: str,
+    modbus: Modbus,
+    sensors,
+) -> None:
     """Create Modbus sensor for each device."""
     from boneio.sensor.modbus import ModbusSensor
 
@@ -165,13 +174,16 @@ def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
         id = name.replace(" ", "")
         try:
             sdm = ModbusSensor(
+                modbus=modbus,
                 address=sensor[ADDRESS],
                 id=id,
                 name=name,
                 model=sensor[MODEL],
                 send_message=manager.send_message,
-                update_interval=sensor.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
-                **kwargs,
+                topic_prefix=topic_prefix,
+                ha_discovery=ha_discovery,
+                ha_discovery_prefix=ha_discovery_prefix,
+                update_interval=sensor.get(UPDATE_INTERVAL, 30),
             )
             manager.append_task(asyncio.create_task(sdm.send_state()))
         except FileNotFoundError as err:
@@ -277,6 +289,7 @@ def configure_input(
     pin: str,
     press_callback: Callable,
     send_ha_autodiscovery: Callable,
+    ha_discovery_prefix: str,
 ) -> str:
     """Configure input sensor or button."""
     try:
@@ -296,6 +309,7 @@ def configure_input(
                 id=pin,
                 name=gpio.get(ID, pin),
                 ha_type=getattr(input, "ha_type"),
+                ha_discovery_prefix=ha_discovery_prefix,
                 availability_msg_func=getattr(input, "availability_msg_f"),
             )
         return pin
@@ -308,6 +322,7 @@ def configure_cover(
     manager: Manager,
     cover_id: str,
     state_manager: StateManager,
+    ha_discovery_prefix: str,
     send_ha_autodiscovery: Callable,
     config: dict,
     **kwargs,
@@ -337,50 +352,7 @@ def configure_cover(
             name=cover.name,
             ha_type=COVER,
             device_class=config.get(DEVICE_CLASS),
+            ha_discovery_prefix=ha_discovery_prefix,
             availability_msg_func=ha_cover_availabilty_message,
         )
     return cover
-
-
-def configure_ds2482(i2cbusio: I2C, address: str = DS2482_ADDRESS) -> OneWireBus:
-    ds2482 = DS2482(i2c=i2cbusio, address=address)
-    ow_bus = OneWireBus(ds2482=ds2482)
-    return ow_bus
-
-
-def find_onewire_devices(ow_bus: OneWireBus):
-    devices = ow_bus.scan()
-    out = {}
-    for device in devices:
-        _addr: int = ds_address(device.rom)
-        _LOGGER.debug("Found device with address %s", hex(_addr))
-        out[_addr] = device
-    return out
-
-
-def create_ds2482_dallas_sensor(
-    manager: Manager,
-    ds2482_bus: OneWireBus,
-    address: OneWireAddress,
-    config: dict,
-    **kwargs,
-):
-    name = config.get(ID) or hex(address)
-    id = name.replace(" ", "")
-    sensor = DallasSensor(
-        bus=ds2482_bus,
-        address=address,
-        id=id,
-        name=name,
-        update_interval=config.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
-        send_message=manager.send_message,
-        **kwargs,
-    )
-    if config.get(SHOW_HA, True):
-        manager.send_ha_autodiscovery(
-            id=sensor.id,
-            name=sensor.name,
-            ha_type=SENSOR,
-            availability_msg_func=ha_sensor_temp_availabilty_message,
-        )
-    return sensor

{boneio-0.3.0 → boneio-0.3.0.dev2}/boneio/helper/yaml_util.py

@@ -263,7 +263,6 @@ class CustomValidator(Validator):
             "milliseconds": "milliseconds",
             "s": "seconds",
             "sec": "seconds",
-            "secs": "seconds",
             "seconds": "seconds",
             "min": "minutes",
             "minutes": "minutes",