boneIO 0.2.2__tar.gz → 0.3.0__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.2.2
+Version: 0.3.0
 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.2.2.zip
+Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

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

@@ -8,9 +8,11 @@ from colorlog import ColoredFormatter
 
 from boneio.const import ACTION
 from boneio.helper import load_config_from_file
+from boneio.helper.exceptions import ConfigurationException
 from boneio.helper.logger import configure_logger
 from boneio.runner import async_run
 from boneio.version import __version__
+from yaml import MarkedYAMLError
 
 TASK_CANCELATION_TIMEOUT = 1
 
@@ -66,19 +68,24 @@ def get_arguments() -> argparse.Namespace:
 
 def run(config: str, debug: int, mqttusername: str = "", mqttpassword: str = ""):
     """Run BoneIO."""
-    _LOGGER.info("BoneIO starting.")
-    _config = load_config_from_file(config_file=config)
-    if not _config:
-        return
-    configure_logger(log_config=_config.get("logger"), debug=debug)
-    return asyncio.run(
-        async_run(
-            config=_config,
-            config_file=config,
-            mqttusername=mqttusername,
-            mqttpassword=mqttpassword,
-        ),
-    )
+    _LOGGER.info("BoneIO %s starting.", __version__)
+    try:
+        _config = load_config_from_file(config_file=config)
+        if not _config:
+            _LOGGER.error("Config not loaded. Exiting.")
+            return 1
+        configure_logger(log_config=_config.get("logger"), debug=debug)
+        return asyncio.run(
+            async_run(
+                config=_config,
+                config_file=config,
+                mqttusername=mqttusername,
+                mqttpassword=mqttpassword,
+            ),
+        )
+    except (ConfigurationException, MarkedYAMLError) as err:
+        _LOGGER.error("Failed to load config. %s Exiting.", err)
+        return 1
 
 
 def main() -> int:

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

@@ -2,8 +2,13 @@
 from datetime import timedelta
 
 try:
-    from Adafruit_BBIO.GPIO import HIGH, LOW, BOTH, FALLING
+    from Adafruit_BBIO.GPIO import HIGH, LOW, BOTH, FALLING, RISING
 except ModuleNotFoundError:
+    HIGH = "high"
+    LOW = "low"
+    BOTH = "both"
+    FALLING = "falling"
+    RISING = "rising"
     pass
 from typing_extensions import Literal
 
@@ -43,14 +48,12 @@ 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"
@@ -109,6 +112,8 @@ BINARY_SENSOR = "binary_sensor"
 LM75 = "lm75"
 MCP_TEMP_9808 = "mcp9808"
 INPUT_SENSOR = "inputsensor"
+DS2482 = "ds2482"
+DALLAS = "dallas"
 
 BASE = "base"
 LENGTH = "length"

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

@@ -1,10 +1,11 @@
 """Cover module."""
 import asyncio
 import logging
-from typing import Any, Callable
+from typing import 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
+from boneio.helper.timeperiod import TimePeriod
 from boneio.relay import MCPRelay
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,10 +22,10 @@ COVER_COMMANDS = {
 class RelayHelper:
     """Relay helper for cover either open/close."""
 
-    def __init__(self, relay: MCPRelay, time: int) -> None:
+    def __init__(self, relay: MCPRelay, time: TimePeriod) -> None:
         """Initialize helper."""
         self._relay = relay
-        self._steps = 100 / time
+        self._steps = 100 / time.total_seconds
 
     @property
     def relay(self) -> MCPRelay:
@@ -43,11 +44,11 @@ class Cover(BasicMqtt):
     def __init__(
         self,
         id: str,
-        open_relay: Any,
+        open_relay: MCPRelay,
         close_relay: MCPRelay,
         state_save: Callable,
-        open_time: int,
-        close_time: int,
+        open_time: TimePeriod,
+        close_time: TimePeriod,
         event_bus: EventBus,
         restored_state: int = 100,
         **kwargs,

{boneio-0.2.2 → boneio-0.3.0}/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.2.2 → boneio-0.3.0}/boneio/example_config/cover.yaml

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

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

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

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

@@ -1,4 +1,5 @@
 """Helper dir for BoneIO."""
+
 from boneio.helper.gpio import (
     edge_detect,
     setup_input,
@@ -11,7 +12,7 @@ from boneio.helper.gpio import (
 from boneio.helper.oled import make_font
 from boneio.helper.mqtt import BasicMqtt
 from boneio.helper.stats import HostData, host_stats
-from boneio.helper.yaml import (
+from boneio.helper.yaml_util import (
     CustomValidator,
     load_yaml_file,
     schema_file,
@@ -31,6 +32,7 @@ from boneio.helper.ha_discovery import (
 )
 from boneio.helper.exceptions import GPIOInputException, I2CError
 from boneio.helper.queue import UniqueQueue
+from boneio.helper.timeperiod import TimePeriod
 
 
 __all__ = [
@@ -62,4 +64,7 @@ __all__ = [
     "schema_file",
     "load_config_from_string",
     "load_config_from_file",
+    "TimePeriod",
+    "callback",
+    "is_callback",
 ]

boneio-0.3.0/boneio/helper/config.py

@@ -0,0 +1,47 @@
+"""
+Module to provide basic config options.
+"""
+from boneio.const import BONEIO, HOMEASSISTANT
+from _collections_abc import dict_values
+
+
+class ConfigHelper:
+    def __init__(
+        self,
+        topic_prefix: str = BONEIO,
+        ha_discovery: bool = True,
+        ha_discovery_prefix: str = HOMEASSISTANT,
+    ):
+        self._topic_prefix = topic_prefix
+        self._ha_discovery = ha_discovery
+        self._ha_discovery_prefix = ha_discovery_prefix
+        self._autodiscovery_messages = {}
+
+    @property
+    def topic_prefix(self) -> str:
+        return self._topic_prefix
+
+    @property
+    def ha_discovery(self) -> bool:
+        return self._ha_discovery
+
+    @property
+    def ha_discovery_prefix(self) -> str:
+        return self._ha_discovery_prefix
+
+    @property
+    def cmd_topic_prefix(self) -> str:
+        return f"{self.topic_prefix}/cmd/"
+
+    @property
+    def subscribe_topic(self) -> str:
+        return f"{self.cmd_topic_prefix}+/+/#"
+
+    def add_autodiscovery_msg(self, topic: str, payload: str):
+        """Add autodiscovery message."""
+        self._autodiscovery_messages[topic] = {"topic": topic, "payload": payload}
+
+    @property
+    def autodiscovery_msgs(self) -> dict_values:
+        """Get autodiscovery messages"""
+        return self._autodiscovery_messages.values()

boneio-0.3.0/boneio/helper/ds2482/__init__.py

@@ -0,0 +1,10 @@
+"""Helper dir for DS2482."""
+from boneio.helper.ds2482.ds2482 import DS2482, DS2482_ADDRESS
+from boneio.helper.ds2482.onewire import OneWire, OneWireBus
+
+
+def ds_address(rom: bytes) -> int:
+    return int.from_bytes(rom, "little")
+
+
+__all__ = ["DS2482", "OneWire", "OneWireBus", "ds_address", "DS2482_ADDRESS"]

boneio-0.3.0/boneio/helper/ds2482/ds2482.py

@@ -0,0 +1,163 @@
+"""DS2482 base class.
+Module by https://github.com/fgervais/ds2482
+"""
+import time
+
+import adafruit_bus_device.i2c_device as i2c_device
+
+# Default i2c address (AD0 = GND, AD1 = GND)
+DS2482_ADDRESS = 0x18
+
+# DS2482 device commands
+COMMAND_DEVICE_RESET = 0xF0
+COMMAND_SET_POINTER = 0xE1
+COMMAND_WRITE_CONFIG = 0xD2
+COMMAND_1W_RESET = 0xB4
+COMMAND_1W_SINGLE_BIT = 0x87
+COMMAND_1W_WRITE_BYTE = 0xA5
+COMMAND_1W_READ_BYTE = 0x96
+COMMAND_1W_TRIPLET = 0x78
+
+# DS2482 read pointer codes
+POINTER_STATUS = 0xF0
+POINTER_DATA = 0xE1
+POINTER_CONFIG = 0xC3
+
+# DS2482 configuration register
+CONFIG_ACTIVE_PULLUP = 0x01
+CONFIG_STRONG_PULLUP = 0x04
+CONFIG_1W_OVERDRIVE = 0x08
+
+CONFIG_MASK = 0x0F
+
+# DS2482 status register
+STATUS_1W_BUSY = 0x01
+STATUS_PRESENCE_PULSE = 0x02
+STATUT_SHORT_DETECTED = 0x04
+STATUS_LOGIC_LEVEL = 0x08
+STATUS_DEVICE_RESET = 0x10
+STATUS_SINGLE_BIT = 0x20
+STATUS_TRIPLET_BIT = 0x40
+STATUS_BRANCH_TAKEN = 0x80
+
+
+class DS2482:
+    def __init__(self, i2c, address=DS2482_ADDRESS, active_pullup=False):
+        self._i2c = i2c_device.I2CDevice(i2c, address)
+        self.device_reset()
+        if active_pullup:
+            self.device_config = CONFIG_ACTIVE_PULLUP
+
+        # 1-Wire bus busy with STRONG_PULLUP
+        self._bus_busy = time.monotonic()
+
+    def device_reset(self):
+        """Terminate any 1-wire communication and reset the DS2482"""
+        with self._i2c as i2c:
+            i2c.write(bytes([COMMAND_DEVICE_RESET]))
+
+    @property
+    def device_status(self):
+        with self._i2c as i2c:
+            buf = bytearray([COMMAND_SET_POINTER, POINTER_STATUS])
+            i2c.write_then_readinto(buf, buf, in_end=1)
+            return buf[0]
+
+    @property
+    def device_config(self):
+        with self._i2c as i2c:
+            buf = bytearray([COMMAND_SET_POINTER, POINTER_CONFIG])
+            i2c.write_then_readinto(buf, buf, in_end=1)
+            return buf[0] & 0x0F
+
+    @device_config.setter
+    def device_config(self, config):
+        with self._i2c as i2c:
+            i2c.write(
+                bytes([COMMAND_WRITE_CONFIG, (config & 0x0F) | ((~config << 4) & 0xF0)])
+            )
+
+    def reset(self):
+        with self._i2c as i2c:
+            buf = bytearray([COMMAND_1W_RESET])
+            i2c.write(buf)
+            while True:
+                i2c.readinto(buf)
+                if not buf[0] & STATUS_1W_BUSY:
+                    break
+                time.sleep(0.001)
+            return not buf[0] & STATUS_PRESENCE_PULSE
+
+    def single_bit(self, bit=1, strong_pullup=False, busy=None):
+        with self._i2c as i2c:
+            buf = bytearray(2)
+            if strong_pullup:
+                buf[0:2] = [COMMAND_SET_POINTER, POINTER_CONFIG]
+                i2c.write_then_readinto(buf, buf, in_start=1)
+                buf[0] = COMMAND_WRITE_CONFIG
+                buf[1] = buf[1] & CONFIG_MASK | CONFIG_STRONG_PULLUP
+                buf[1] |= (~buf[1] << 4) & 0xFF
+                i2c.write(buf)
+            buf[0:2] = [COMMAND_1W_SINGLE_BIT, 0x80 if bit else 0x00]
+            i2c.write(buf)
+            while True:
+                i2c.readinto(buf, end=1)
+                if not buf[0] & STATUS_1W_BUSY:
+                    break
+                time.sleep(0.001)
+            if busy:
+                self._bus_busy = time.monotonic() + busy
+            return buf[0] & STATUS_SINGLE_BIT != 0
+
+    def write_byte(self, data, strong_pullup=False, busy=None):
+        with self._i2c as i2c:
+            buf = bytearray(2)
+            if strong_pullup:
+                buf[0:2] = [COMMAND_SET_POINTER, POINTER_CONFIG]
+                i2c.write_then_readinto(buf, buf, in_start=1)
+                buf[0] = COMMAND_WRITE_CONFIG
+                buf[1] = buf[1] & CONFIG_MASK | CONFIG_STRONG_PULLUP
+                buf[1] |= (~buf[1] << 4) & 0xFF
+                i2c.write(buf)
+            buf[0:2] = [COMMAND_1W_WRITE_BYTE, data]
+            i2c.write(buf)
+            while True:
+                i2c.readinto(buf, end=1)
+                if buf[0] & STATUS_1W_BUSY == 0:
+                    break
+                time.sleep(0.001)
+            if busy:
+                self._bus_busy = time.monotonic() + busy
+
+    def read_byte(self):
+        with self._i2c as i2c:
+            buf = bytearray([COMMAND_1W_READ_BYTE, 0x00])
+            i2c.write(buf, end=1)
+            while True:
+                i2c.readinto(buf, end=1)
+                if not buf[0] & STATUS_1W_BUSY:
+                    break
+                time.sleep(0.001)
+            buf[0:2] = [COMMAND_SET_POINTER, POINTER_DATA]
+            i2c.write_then_readinto(buf, buf, in_end=1)
+            return buf[0]
+
+    def wait_ready(self):
+        while True:
+            t = self._bus_busy - time.monotonic()
+            if t > 0:
+                time.sleep(t)
+            else:
+                break
+        with self._i2c as i2c:
+            buf = bytearray([COMMAND_SET_POINTER, POINTER_STATUS])
+            i2c.write(buf)
+            while True:
+                i2c.readinto(buf, end=1)
+                if not buf[0] & STATUS_1W_BUSY:
+                    break
+                time.sleep(0.001)
+            return buf[0]
+
+    def triplet(self, dir):
+        pass