boneIO 0.1.0.dev13__tar.gz → 0.1.0.dev14__tar.gz

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev13
+Version: 0.1.0.dev14
 Summary: Python Helper for BoneIO
 Home-page: https://github.com/maciejk1984/boneIO
 License: GNU General Public License v3.0
-Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev13.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev14.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/bonecli.py

@@ -6,7 +6,7 @@ from functools import wraps
 import click
 from colorlog import ColoredFormatter
 
-from .const import (
+from boneio.const import (
     ENABLED,
     GPIO_INPUT,
     HA_DISCOVERY,
@@ -19,11 +19,12 @@ from .const import (
     PASSWORD,
     TOPIC_PREFIX,
     USERNAME,
+    LM75,
 )
-from .helper import CustomValidator, load_yaml_file
-from .manager import Manager
-from .mqtt_client import MQTTClient
-from .version import __version__
+from boneio.helper import CustomValidator, load_yaml_file
+from boneio.manager import Manager
+from boneio.mqtt_client import MQTTClient
+from boneio.version import __version__
 
 _LOGGER = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
@@ -133,12 +134,12 @@ async def run(ctx, debug: int, config: str, mqttpassword: str = ""):
     manager = Manager(
         send_message=client.send_message,
         topic_prefix=_config[MQTT][TOPIC_PREFIX],
-        relay_pins=_config[OUTPUT],
-        input_pins=_config[GPIO_INPUT],
+        relay_pins=_config.get(OUTPUT, []),
+        input_pins=_config.get(GPIO_INPUT, []),
         ha_discovery=_config[MQTT][HA_DISCOVERY][ENABLED],
         ha_discovery_prefix=_config[MQTT][HA_DISCOVERY][TOPIC_PREFIX],
-        mcp23017=_config[MCP23017],
-        lm75=_config.get("lm75"),
+        mcp23017=_config.get(MCP23017, []),
+        lm75=_config.get(LM75),
         oled=_config.get(OLED),
     )
     tasks = set()

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/const.py

@@ -60,3 +60,4 @@ INIT_SLEEP = "init_sleep"
 INPUT = "input"
 TEMPERATURE = "temperature"
 SENSOR = "sensor"
+LM75="lm75"

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/helper/__init__.py

@@ -1,13 +1,14 @@
 """Helper dir for BoneIO."""
-from .gpio import edge_detect, setup_input
-from .oled import make_font
-from .stats import HostData, host_stats
-from .yaml import CustomValidator, load_yaml_file
-from .ha_discovery import (
+from boneio.helper.gpio import edge_detect, setup_input, read_input
+from boneio.helper.oled import make_font
+from boneio.helper.stats import HostData, host_stats
+from boneio.helper.yaml import CustomValidator, load_yaml_file
+from boneio.helper.ha_discovery import (
     ha_relay_availibilty_message,
     ha_sensor_availibilty_message,
     ha_sensor_temp_availibilty_message,
 )
+from boneio.helper.exceptions import GPIOInputException, I2CError
 
 __all__ = [
     "CustomValidator",
@@ -16,8 +17,11 @@ __all__ = [
     "host_stats",
     "setup_input",
     "edge_detect",
+    "read_input",
     "make_font",
     "ha_relay_availibilty_message",
     "ha_sensor_availibilty_message",
     "ha_sensor_temp_availibilty_message",
+    "GPIOInputException",
+    "I2CError",
 ]

boneio-0.1.0.dev14/boneio/helper/exceptions.py

@@ -0,0 +1,13 @@
+"""BoneIO Errors"""
+
+
+class BoneIOException(Exception):
+    """BoneIO standard exception."""
+
+
+class GPIOInputException(BoneIOException):
+    """GPIOInput Exception."""
+
+
+class I2CError(BoneIOException):
+    """I2C Exception."""

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/helper/gpio.py

@@ -1,6 +1,9 @@
+import logging
 from Adafruit_BBIO import GPIO
 from Adafruit_BBIO.GPIO import HIGH, LOW
 
+from boneio.helper.exceptions import GPIOInputException
+
 
 def setup_output(pin: str):
     """Set up a GPIO as output."""
@@ -10,7 +13,10 @@ def setup_output(pin: str):
 
 def setup_input(pin: str, pull_mode: str = "UP"):
     """Set up a GPIO as input."""
-    GPIO.setup(pin, GPIO.IN, GPIO.PUD_DOWN if pull_mode == "DOWN" else GPIO.PUD_UP)
+    try:
+        GPIO.setup(pin, GPIO.IN, GPIO.PUD_DOWN if pull_mode == "DOWN" else GPIO.PUD_UP)
+    except (ValueError, SystemError) as err:
+        raise GPIOInputException(err)
 
 
 def write_output(pin: str, value: str):
@@ -26,5 +32,7 @@ def read_input(pin: str, on_state=LOW):
 
 def edge_detect(pin, callback, bounce):
     """Add detection for RISING and FALLING events."""
-
-    GPIO.add_event_detect(pin, GPIO.FALLING, callback=callback, bouncetime=bounce)
+    try:
+        GPIO.add_event_detect(pin, GPIO.FALLING, callback=callback, bouncetime=bounce)
+    except RuntimeError as err:
+        raise GPIOInputException(err)

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/helper/ha_discovery.py

@@ -1,7 +1,7 @@
-from ..version import __version__
+from boneio.version import __version__
 
 
-from ..const import INPUT, OFF, ON, RELAY, STATE, SENSOR
+from boneio.const import INPUT, OFF, ON, RELAY, STATE, SENSOR
 
 
 def ha_relay_availibilty_message(id: str, name: str, topic: str = "boneio"):

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/helper/oled.py

@@ -2,7 +2,7 @@ import os
 
 from PIL import ImageFont
 
-from ..const import FONTS
+from boneio.const import FONTS
 
 
 def make_font(name: str, size: int, local: bool = False):

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/helper/stats.py

@@ -7,7 +7,7 @@ from typing import Callable
 
 import psutil
 
-from ..const import (
+from boneio.const import (
     CPU,
     DISK,
     GIGABYTE,
@@ -16,10 +16,9 @@ from ..const import (
     MEMORY,
     NETWORK,
     SWAP,
-    TEMPERATURE,
     UPTIME,
 )
-from ..sensor.lm75 import LM75
+from boneio.sensor import LM75Sensor
 
 intervals = (("d", 86400), ("h", 3600), ("m", 60))
 
@@ -132,7 +131,7 @@ class HostData:
 
     data = {UPTIME: {}, NETWORK: {}, CPU: {}, DISK: {}, MEMORY: {}, SWAP: {}}
 
-    def __init__(self, output: dict, callback: Callable, lm75: LM75) -> None:
+    def __init__(self, output: dict, callback: Callable, lm75: LM75Sensor) -> None:
         """Initialize HostData."""
         self._hostname = socket.gethostname()
         self.data[UPTIME] = {HOST: self._hostname, UPTIME: 0}

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/helper/yaml.py

@@ -1,7 +1,7 @@
 from typing import Any
 import os
 from cerberus import Validator
-from ..const import ID, OLED, OUTPUT
+from boneio.const import ID, OLED, OUTPUT
 from yaml import load, YAMLError, SafeLoader
 
 

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/input/__init__.py

@@ -1,5 +1,5 @@
 """Input classes."""
 
-from .gpio import GpioInputButton, configure_pin
+from boneio.input.gpio import GpioInputButton, configure_pin
 
 __all__ = ["GpioInputButton", "configure_pin"]

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/input/gpio.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from functools import partial
 from typing import Callable
 
-from ..const import (
+from boneio.const import (
     CONFIG_PIN,
     DEBOUNCE_DURATION,
     DELAY_DURATION,
@@ -18,7 +18,7 @@ from ..const import (
     SINGLE,
     ClickTypes,
 )
-from ..helper.gpio import edge_detect, read_input, setup_input
+from boneio.helper import edge_detect, read_input, setup_input
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,6 +30,7 @@ def configure_pin(pin: str) -> None:
         [CONFIG_PIN, pin, GPIO],
         stdout=subprocess.DEVNULL,
         stderr=subprocess.STDOUT,
+        timeout=1,
     )
 
 

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/manager.py

@@ -7,7 +7,7 @@ from adafruit_mcp230xx.mcp23017 import MCP23017
 from board import SCL, SDA
 from busio import I2C
 
-from .const import (
+from boneio.const import (
     ACTION,
     ACTIONS,
     ADDRESS,
@@ -29,16 +29,18 @@ from .const import (
     STATE,
     ClickTypes,
 )
-from .helper import (
+from boneio.helper import (
     HostData,
     ha_relay_availibilty_message,
     ha_sensor_availibilty_message,
     ha_sensor_temp_availibilty_message,
     host_stats,
+    GPIOInputException,
+    I2CError,
 )
-from .input import GpioInputButton
-from .oled import Oled
-from .relay import GpioRelay, MCPRelay
+from boneio.input import GpioInputButton
+from boneio.oled import Oled
+from boneio.relay import GpioRelay, MCPRelay
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -76,38 +78,46 @@ class Manager:
 
         def create_lm75_sensor():
             """Create LM sensor in manager."""
-            from .sensor.lm75 import LM75
+            from .sensor.lm75 import LM75Sensor
 
             name = lm75.get(ID)
             id = name.replace(" ", "")
-            self._lm75 = LM75(
-                id=id,
-                name=name,
-                i2c=self._i2cbusio,
-                address=lm75[ADDRESS],
-                send_message=self.send_message,
-                topic_prefix=topic_prefix,
-            )
-            self.send_ha_autodiscovery(
-                id=id,
-                name=name,
-                ha_type="sensor",
-                prefix=ha_discovery_prefix,
-                availibilty_msg_func=ha_sensor_temp_availibilty_message,
-            )
-            self._tasks.append(asyncio.create_task(self._lm75.send_state()))
+            try:
+                self._lm75 = LM75Sensor(
+                    id=id,
+                    name=name,
+                    i2c=self._i2cbusio,
+                    address=lm75[ADDRESS],
+                    send_message=self.send_message,
+                    topic_prefix=topic_prefix,
+                )
+                self.send_ha_autodiscovery(
+                    id=id,
+                    name=name,
+                    ha_type="sensor",
+                    prefix=ha_discovery_prefix,
+                    availibilty_msg_func=ha_sensor_temp_availibilty_message,
+                )
+                self._tasks.append(asyncio.create_task(self._lm75.send_state()))
+            except I2CError as err:
+                _LOGGER.error("Can't configure LM75 sensor. %s", err)
+                pass
 
         def create_mcp23017():
             """Create MCP23017."""
             for mcp in mcp23017:
                 id = mcp[ID] or mcp[ADDRESS]
-                self._mcp[id] = MCP23017(i2c=self._i2cbusio, address=mcp[ADDRESS])
-                sleep_time = mcp.get(INIT_SLEEP, 0)
-                _LOGGER.debug(
-                    f"Sleeping for {sleep_time}s while MCP {id} is initializing."
-                )
-                time.sleep(sleep_time)
-                self._grouped_outputs[id] = {}
+                try:
+                    self._mcp[id] = MCP23017(i2c=self._i2cbusio, address=mcp[ADDRESS])
+                    sleep_time = mcp.get(INIT_SLEEP, 0)
+                    _LOGGER.debug(
+                        f"Sleeping for {sleep_time}s while MCP {id} is initializing."
+                    )
+                    time.sleep(sleep_time)
+                    self._grouped_outputs[id] = {}
+                except TimeoutError as err:
+                    _LOGGER.error("Can't connect to MCP %s. %s", id, err)
+                    pass
 
         if lm75:
             create_lm75_sensor()
@@ -168,22 +178,28 @@ class Manager:
             )
 
         def configure_button(gpio):
-            pin = gpio[PIN]
-            button = GpioInputButton(
-                pin=pin,
-                press_callback=lambda x, i: self.press_callback(x, i, gpio[ACTIONS]),
-                rest_pin=gpio,
-            )
-            self.send_ha_autodiscovery(
-                id=pin,
-                name=gpio.get(ID, pin),
-                ha_type="sensor",
-                prefix=ha_discovery_prefix,
-                availibilty_msg_func=ha_sensor_availibilty_message,
-            )
-            return button
+            try:
+                pin = gpio[PIN]
+                GpioInputButton(
+                    pin=pin,
+                    press_callback=lambda x, i: self.press_callback(
+                        x, i, gpio.get(ACTIONS, {})
+                    ),
+                    rest_pin=gpio,
+                )
+                self.send_ha_autodiscovery(
+                    id=pin,
+                    name=gpio.get(ID, pin),
+                    ha_type="sensor",
+                    prefix=ha_discovery_prefix,
+                    availibilty_msg_func=ha_sensor_availibilty_message,
+                )
+            except GPIOInputException as err:
+                _LOGGER.error("This PIN %s can't be configured. %s", pin, err)
+                pass
 
-        self.buttons = [configure_button(gpio=gpio) for gpio in self._input_pins]
+        for gpio in self._input_pins:
+            configure_button(gpio=gpio)
 
         if oled:
             self._host_data = HostData(
@@ -194,9 +210,12 @@ class Manager:
             for f in host_stats.values():
                 self._tasks.append(asyncio.create_task(f(self._host_data)))
             _LOGGER.debug("Gathering host data enabled.")
-            self._oled = Oled(
-                host_data=self._host_data, output_groups=list(self._grouped_outputs)
-            )
+            try:
+                self._oled = Oled(
+                    host_data=self._host_data, output_groups=list(self._grouped_outputs)
+                )
+            except GPIOInputException as err:
+                _LOGGER.error("Can't configure OLED display. %s", err)
 
         self.send_message(topic=f"{topic_prefix}/{STATE}", payload=ONLINE)
         _LOGGER.info("BoneIO manager is ready.")
@@ -217,9 +236,9 @@ class Manager:
         if action:
             if action[ACTION] == OUTPUT:
                 """For now only output type is supported"""
-                output_gpio = self.output.get(action[PIN])
-                if output_gpio:
-                    output_gpio.toggle()
+                relay = self.output.get(action[PIN].replace(" ", ""))
+                if relay:
+                    relay.toggle()
         # This is similar how Z2M is clearing click sensor.
         # self._loop.call_later(1, self.send_message, topic, "")
 

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/mqtt_client.py

@@ -12,7 +12,7 @@ from asyncio_mqtt import MqttError
 from paho.mqtt.properties import Properties
 from paho.mqtt.subscribeoptions import SubscribeOptions
 
-from .const import PAHO
+from boneio.const import PAHO
 
 _LOGGER = logging.getLogger(__name__)
 

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/oled.py

@@ -7,9 +7,9 @@ from luma.core.render import canvas
 from luma.oled.device import sh1106
 from PIL import ImageDraw
 
-from .const import CPU, DISK, MEMORY, NETWORK, OLED_PIN, SWAP, UPTIME, WHITE
-from .helper import HostData, edge_detect, make_font, setup_input
-from .input import configure_pin
+from boneio.const import CPU, DISK, MEMORY, NETWORK, OLED_PIN, SWAP, UPTIME, WHITE
+from boneio.helper import HostData, edge_detect, make_font, setup_input
+from boneio.input import configure_pin
 
 _LOGGER = logging.getLogger(__name__)
 

boneio-0.1.0.dev14/boneio/relay/__init__.py

@@ -0,0 +1,5 @@
+"""Relay module."""
+from boneio.relay.gpio import GpioRelay
+from boneio.relay.mcp import MCPRelay
+
+__all__ = ["MCPRelay", "GpioRelay"]

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/relay/basic.py

@@ -4,7 +4,7 @@ import asyncio
 import logging
 from typing import Callable, Union
 
-from ..const import OFF, ON, RELAY, STATE, SWITCH
+from boneio.const import OFF, ON, RELAY, STATE, SWITCH
 
 _LOGGER = logging.getLogger(__name__)
 

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/relay/gpio.py

@@ -5,8 +5,8 @@ Created just in case.
 
 import logging
 
-from ..helper.gpio import HIGH, LOW, read_input, setup_output, write_output
-from .basic import BasicRelay
+from boneio.helper.gpio import HIGH, LOW, read_input, setup_output, write_output
+from boneio.relay.basic import BasicRelay
 
 _LOGGER = logging.getLogger(__name__)
 

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/relay/mcp.py

@@ -4,7 +4,7 @@ import logging
 
 from adafruit_mcp230xx.mcp23017 import MCP23017
 
-from .basic import BasicRelay
+from boneio.relay.basic import BasicRelay
 
 _LOGGER = logging.getLogger(__name__)
 

boneio-0.1.0.dev14/boneio/sensor/__init__.py

@@ -0,0 +1,4 @@
+"""Sensor module."""
+from boneio.sensor.lm75 import LM75Sensor
+
+__all__ = ["LM75Sensor"]

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio/sensor/lm75.py

@@ -3,10 +3,12 @@
 import asyncio
 from adafruit_pct2075 import PCT2075
 from typing import Callable, Union
-from ..const import STATE, SENSOR
+from boneio.const import STATE, SENSOR, LM75
 
+from boneio.helper.exceptions import I2CError
 
-class LM75:
+
+class LM75Sensor:
     """Represent LM75 sensor in BoneIO."""
 
     def __init__(
@@ -16,14 +18,17 @@ class LM75:
         topic_prefix: str,
         name: str,
         send_message: Callable[[str, Union[str, dict]], None],
-        id: str = "lm75",
+        id: str = LM75,
     ):
         """Initialize LM75 class."""
         self._id = id
         self._name = name
         self._send_message = send_message
         self._send_topic = f"{topic_prefix}/{SENSOR}/{self._id}"
-        self._pct = PCT2075(i2c_bus=i2c, address=address)
+        try:
+            self._pct = PCT2075(i2c_bus=i2c, address=address)
+        except ValueError as err:
+            raise I2CError(err)
 
     @property
     def name(self):

boneio-0.1.0.dev14/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.1.0.dev14"

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev13
+Version: 0.1.0.dev14
 Summary: Python Helper for BoneIO
 Home-page: https://github.com/maciejk1984/boneIO
 License: GNU General Public License v3.0
-Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev13.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev14.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev13 → boneio-0.1.0.dev14}/boneio.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ boneio.egg-info/requires.txt
 boneio.egg-info/top_level.txt
 boneio/fonts/danube__.ttf
 boneio/helper/__init__.py
+boneio/helper/exceptions.py
 boneio/helper/gpio.py
 boneio/helper/ha_discovery.py
 boneio/helper/oled.py

boneio-0.1.0.dev13/boneio/relay/__init__.py

@@ -1,5 +0,0 @@
-"""Relay module."""
-from .gpio import GpioRelay
-from .mcp import MCPRelay
-
-__all__ = ["MCPRelay", "GpioRelay"]

boneio-0.1.0.dev13/boneio/sensor/__init__.py

@@ -1,4 +0,0 @@
-"""Sensor module."""
-from .lm75 import LM75
-
-__all__ = ["LM75"]

boneio-0.1.0.dev13/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "0.1.0.dev13"