boneIO 0.1.0.dev8__tar.gz → 0.1.0.dev11__tar.gz

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev8
+Version: 0.1.0.dev11
 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.dev8.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev11.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/bonecli.py

@@ -138,6 +138,7 @@ async def run(ctx, debug: int, config: str, mqttpassword: str = ""):
         ha_discovery=_config[MQTT][HA_DISCOVERY][ENABLED],
         ha_discovery_prefix=_config[MQTT][HA_DISCOVERY][TOPIC_PREFIX],
         mcp23017=_config[MCP23017],
+        lm75=_config.get("lm75"),
         oled=_config.get(OLED),
     )
     tasks = set()

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/const.py

@@ -57,3 +57,6 @@ OLED = "oled"
 FONTS = "fonts"
 OledDataTypes = Literal[UPTIME, NETWORK, CPU, DISK, MEMORY, SWAP, OUTPUT]
 INIT_SLEEP = "init_sleep"
+INPUT = "input"
+TEMPERATURE = "temperature"
+SENSOR = "sensor"

boneio-0.1.0.dev11/boneio/helper/__init__.py

@@ -0,0 +1,23 @@
+"""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 (
+    ha_relay_availibilty_message,
+    ha_sensor_availibilty_message,
+    ha_sensor_temp_availibilty_message,
+)
+
+__all__ = [
+    "CustomValidator",
+    "load_yaml_file",
+    "HostData",
+    "host_stats",
+    "setup_input",
+    "edge_detect",
+    "make_font",
+    "ha_relay_availibilty_message",
+    "ha_sensor_availibilty_message",
+    "ha_sensor_temp_availibilty_message",
+]

boneio-0.1.0.dev11/boneio/helper/ha_discovery.py

@@ -0,0 +1,64 @@
+from ..version import __version__
+
+
+from ..const import INPUT, OFF, ON, RELAY, STATE, SENSOR
+
+
+def ha_relay_availibilty_message(id: str, name: str, topic: str = "boneio"):
+    """Create availability topic for HA."""
+    return {
+        "availability": [{"topic": f"{topic}/{STATE}"}],
+        "command_topic": f"{topic}/relay/{id}/set",
+        "device": {
+            "identifiers": [topic],
+            "manufacturer": "BoneIO",
+            "model": "BoneIO Relay Board",
+            "name": f"BoneIO {topic}",
+            "sw_version": __version__,
+        },
+        "name": name,
+        "payload_off": OFF,
+        "payload_on": ON,
+        "state_topic": f"{topic}/{RELAY}/{id}",
+        "unique_id": f"{topic}{RELAY}{id}",
+        "value_template": "{{ value_json.state }}",
+    }
+
+
+def ha_sensor_availibilty_message(id: str, name: str, topic: str = "boneio"):
+    """Create availability topic for HA."""
+    return {
+        "availability": [{"topic": f"{topic}/{STATE}"}],
+        "device": {
+            "identifiers": [topic],
+            "manufacturer": "BoneIO",
+            "model": "BoneIO Relay Board",
+            "name": f"BoneIO {topic}",
+            "sw_version": __version__,
+        },
+        "icon": "mdi:gesture-double-tap",
+        "name": name,
+        "state_topic": f"{topic}/{INPUT}/{id}",
+        "unique_id": f"{topic}{INPUT}{id}",
+    }
+
+
+def ha_sensor_temp_availibilty_message(id: str, name: str, topic: str = "boneio"):
+    """Create availability topic for HA."""
+    return {
+        "availability": [{"topic": f"{topic}/{STATE}"}],
+        "device": {
+            "identifiers": [topic],
+            "manufacturer": "BoneIO",
+            "model": "BoneIO Relay Board",
+            "name": f"BoneIO {topic}",
+            "sw_version": __version__,
+        },
+        "name": name,
+        "state_topic": f"{topic}/{SENSOR}/{id}",
+        "unique_id": f"{topic}{SENSOR}{id}",
+        "device_class": "temperature",
+        "state_class": "measurement",
+        "unit_of_measurement": "°C",
+        "value_template": "{{ value_json.state }}",
+    }

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/helper/stats.py

@@ -7,7 +7,19 @@ from typing import Callable
 
 import psutil
 
-from ..const import CPU, DISK, GIGABYTE, HOST, MEGABYTE, MEMORY, NETWORK, SWAP, UPTIME
+from ..const import (
+    CPU,
+    DISK,
+    GIGABYTE,
+    HOST,
+    MEGABYTE,
+    MEMORY,
+    NETWORK,
+    SWAP,
+    TEMPERATURE,
+    UPTIME,
+)
+from ..sensor.lm75 import LM75
 
 intervals = (("d", 86400), ("h", 3600), ("m", 60))
 
@@ -120,10 +132,11 @@ class HostData:
 
     data = {UPTIME: {}, NETWORK: {}, CPU: {}, DISK: {}, MEMORY: {}, SWAP: {}}
 
-    def __init__(self, output: dict, callback: Callable) -> None:
+    def __init__(self, output: dict, callback: Callable, lm75: LM75) -> None:
         """Initialize HostData."""
         self._hostname = socket.gethostname()
         self.data[UPTIME] = {HOST: self._hostname, UPTIME: 0}
+        self._lm75 = lm75
         self._output = output
         self._callback = callback
         self._loop = asyncio.get_running_loop()
@@ -136,6 +149,8 @@ class HostData:
     def write_uptime(self, uptime: str) -> None:
         """Write uptime."""
         self.data[UPTIME][UPTIME] = uptime
+        if self._lm75:
+            self.data[UPTIME][self._lm75.name] = self._lm75.state
         self._loop.call_soon_threadsafe(partial(self._callback, UPTIME))
 
     def get(self, type: str) -> dict:

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/input/gpio.py

@@ -4,7 +4,7 @@ import logging
 import subprocess
 from datetime import datetime
 from functools import partial
-from typing import Any, Callable
+from typing import Callable
 
 from ..const import (
     CONFIG_PIN,
@@ -37,7 +37,7 @@ class GpioInputButton:
     """Represent Gpio input switch."""
 
     def __init__(
-        self, pin: str, press_callback: Callable[[ClickTypes, str], None], rest_pin: Any
+        self, pin: str, press_callback: Callable[[ClickTypes, str], None], **kwargs
     ) -> None:
         """Setup GPIO Input Button"""
         self._pin = pin

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/manager.py

@@ -16,6 +16,7 @@ from .const import (
     HOMEASSISTANT,
     ID,
     INIT_SLEEP,
+    INPUT,
     KIND,
     MCP,
     MCP_ID,
@@ -28,7 +29,13 @@ from .const import (
     STATE,
     ClickTypes,
 )
-from .helper.stats import HostData, host_stats
+from .helper import (
+    HostData,
+    ha_relay_availibilty_message,
+    ha_sensor_availibilty_message,
+    ha_sensor_temp_availibilty_message,
+    host_stats,
+)
 from .input import GpioInputButton
 from .oled import Oled
 from .relay import GpioRelay, MCPRelay
@@ -36,27 +43,6 @@ from .relay import GpioRelay, MCPRelay
 _LOGGER = logging.getLogger(__name__)
 
 
-def ha_availibilty_message(topic, relay_id):
-    """Create availability topic for HA."""
-    return {
-        "availability": [{"topic": f"{topic}/{STATE}"}],
-        "command_topic": f"{topic}/relay/{relay_id}/set",
-        "device": {
-            "identifiers": [topic],
-            "manufacturer": "BoneIO",
-            "model": "BoneIO Relay Board",
-            "name": f"BoneIO {topic}",
-            "sw_version": "0.0.1",
-        },
-        "name": f"Relay {relay_id}",
-        "payload_off": OFF,
-        "payload_on": ON,
-        "state_topic": f"{topic}/{RELAY}/{relay_id}",
-        "unique_id": f"{topic}{RELAY}{relay_id}",
-        "value_template": "{{ value_json.state }}",
-    }
-
-
 class Manager:
     """Manager to communicate MQTT with GPIO inputs and outputs."""
 
@@ -66,15 +52,15 @@ class Manager:
         topic_prefix: str,
         relay_pins: List,
         input_pins: List,
+        lm75: dict = None,
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
         mcp23017: Optional[List] = None,
         oled: bool = False,
-        web: bool = True,
     ) -> None:
         """Initialize the manager."""
         _LOGGER.info("Initializing manager module.")
-        loop = asyncio.get_event_loop()
+        self._loop = asyncio.get_event_loop()
         self._host_data = None
 
         self.send_message = send_message
@@ -86,8 +72,33 @@ class Manager:
         self._grouped_outputs = {}
         self._oled = None
         self._tasks: List[asyncio.Task] = []
+        self._lm75 = None
+
+        def create_lm75_sensor():
+            """Create LM sensor in manager."""
+            from .sensor.lm75 import LM75
+
+            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()))
 
-        if mcp23017:
+        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])
@@ -98,18 +109,24 @@ class Manager:
                 time.sleep(sleep_time)
                 self._grouped_outputs[id] = {}
 
+        if lm75:
+            create_lm75_sensor()
+
+        if mcp23017:
+            create_mcp23017()
+
         def configure_relay(gpio: dict) -> Any:
             """Configure kind of relay. Most common MCP."""
+            relay_id = gpio[ID].replace(" ", "")
             if gpio[KIND] == MCP:
                 mcp_id = gpio.get(MCP_ID, "")
                 mcp = self._mcp.get(mcp_id)
                 if not mcp:
                     _LOGGER.error("No such MCP configured!")
                     return
-                relay_id = gpio[ID]
                 mcp_relay = MCPRelay(
                     pin=int(gpio[PIN]),
-                    id=relay_id,
+                    id=gpio[ID],
                     send_message=self.send_message,
                     topic_prefix=topic_prefix,
                     mcp=mcp,
@@ -129,40 +146,54 @@ class Manager:
                     topic_prefix=topic_prefix,
                     callback=lambda: self._host_data_callback(GPIO),
                 )
-                self._grouped_outputs[GPIO][gpio[ID]] = gpio_relay
+                self._grouped_outputs[GPIO][relay_id] = gpio_relay
                 return gpio_relay
 
-        self.output = {gpio[ID]: configure_relay(gpio) for gpio in relay_pins}
+        self.output = {
+            gpio[ID].replace(" ", ""): configure_relay(gpio) for gpio in relay_pins
+        }
         for out in self.output.values():
             if ha_discovery:
-                _LOGGER.debug("Sending HA discovery.")
                 self.send_ha_autodiscovery(
-                    relay=out.id, ha_type=out.ha_type, prefix=ha_discovery_prefix
+                    id=out.id,
+                    name=out.name,
+                    ha_type=out.ha_type,
+                    prefix=ha_discovery_prefix,
+                    availibilty_msg_func=ha_relay_availibilty_message,
                 )
-            loop.call_soon_threadsafe(
-                loop.call_later,
+            self._loop.call_soon_threadsafe(
+                self._loop.call_later,
                 0.5,
                 out.send_state,
             )
 
-        self.buttons = [
-            GpioInputButton(
-                pin=gpio[PIN],
+        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,
             )
-            for gpio in self._input_pins
-        ]
+            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
+
+        self.buttons = [configure_button(gpio=gpio) for gpio in self._input_pins]
 
-        if oled or web:
+        if oled:
             self._host_data = HostData(
-                output=self._grouped_outputs, callback=self._host_data_callback
+                output=self._grouped_outputs,
+                lm75=self._lm75,
+                callback=self._host_data_callback,
             )
             for f in host_stats.values():
                 self._tasks.append(asyncio.create_task(f(self._host_data)))
             _LOGGER.debug("Gathering host data enabled.")
-
-        if oled:
             self._oled = Oled(
                 host_data=self._host_data, output_groups=list(self._grouped_outputs)
             )
@@ -180,7 +211,8 @@ class Manager:
     def press_callback(self, x: ClickTypes, inpin: str, actions: dict) -> None:
         """Press callback to use in input gpio.
         If relay input map is provided also toggle action on relay."""
-        self.send_message(topic=f"{self._topic_prefix}/input/{inpin}", payload=x)
+        topic = f"{self._topic_prefix}/{INPUT}/{inpin}"
+        self.send_message(topic=topic, payload=x)
         action = actions.get(x)
         if action:
             if action[ACTION] == OUTPUT:
@@ -188,13 +220,21 @@ class Manager:
                 output_gpio = self.output.get(action[PIN])
                 if output_gpio:
                     output_gpio.toggle()
+        # This is similar how Z2M is clearing click sensor.
+        # self._loop.call_later(1, self.send_message, topic, "")
 
     def send_ha_autodiscovery(
-        self, relay: str, prefix: str, ha_type: str = "switch"
+        self,
+        id: str,
+        name: str,
+        prefix: str,
+        availibilty_msg_func: Callable,
+        ha_type: str = "switch",
     ) -> None:
         """Send HA autodiscovery information for each relay."""
-        msg = ha_availibilty_message(self._topic_prefix, relay_id=relay)
-        topic = f"{prefix}/{ha_type}/{self._topic_prefix}/{ha_type}/config"
+        msg = availibilty_msg_func(topic=self._topic_prefix, id=id, name=name)
+        topic = f"{prefix}/{ha_type}/{self._topic_prefix}/{id}/config"
+        _LOGGER.debug("Sending HA discovery for %s, %s.", ha_type, name)
         self.send_message(topic=topic, payload=msg)
 
     def receive_message(self, topic: str, message: str) -> None:

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/oled.py

@@ -22,7 +22,7 @@ danube = make_font("danube__.ttf", 15, local=True)
 screen_order = [UPTIME, NETWORK, CPU, DISK, MEMORY, SWAP]
 
 STANDARD_ROWS = [17, 32, 47]
-UPTIME_ROWS = list(range(25, 40, 10))
+UPTIME_ROWS = list(range(25, 50, 10))
 OUTPUT_ROWS = list(range(14, 60, 6))
 OUTPUT_COLS = range(0, 101, 50)
 

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/relay/basic.py

@@ -21,7 +21,8 @@ class BasicRelay:
         ha_type=SWITCH,
     ) -> None:
         """Initialize Basic relay."""
-        self._id = id
+        self._id = id.replace(" ", "")
+        self._name = id
         self._ha_type = ha_type
         self._send_message = send_message
         self._relay_topic = f"{topic_prefix}/{RELAY}/"
@@ -37,9 +38,15 @@ class BasicRelay:
 
     @property
     def id(self) -> bool:
-        """Id of the relay."""
+        """Id of the relay.
+        Has to be trimmed out of spaces because of MQTT handling in HA."""
         return self._id or self._pin
 
+    @property
+    def name(self) -> bool:
+        """Not trimmed id."""
+        return self._name or self._pin
+
     @property
     def state(self) -> bool:
         """Is relay active."""

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio/schema.yaml

@@ -52,6 +52,22 @@ oled:
   type: boolean
   coerce: to_bool
 
+lm75:
+  type: dict
+  required: False
+  schema:
+    id:
+      type: string
+      required: False
+      meta:
+        label: Id of I2C to use in pin config
+    address:
+      type: string
+      required: True
+      default: 0x48
+      meta:
+        label: GPIO of I2C SDA
+
 mcp23017:
   type: list
   required: False
@@ -62,7 +78,8 @@ mcp23017:
     schema:
       id:
         type: string
-        required: False
+        required: True
+        default: lm75
         meta:
           label: Id of I2C to use in pin config
       address:

boneio-0.1.0.dev11/boneio/version.py

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

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev8
+Version: 0.1.0.dev11
 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.dev8.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev11.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio.egg-info/SOURCES.txt

@@ -4,8 +4,6 @@ requirements.txt
 setup.py
 boneio/__init__.py
 boneio/bonecli.py
-boneio/config.example.yaml
-boneio/config.yaml
 boneio/const.py
 boneio/manager.py
 boneio/mqtt_client.py
@@ -21,6 +19,7 @@ boneio.egg-info/top_level.txt
 boneio/fonts/danube__.ttf
 boneio/helper/__init__.py
 boneio/helper/gpio.py
+boneio/helper/ha_discovery.py
 boneio/helper/oled.py
 boneio/helper/stats.py
 boneio/helper/yaml.py

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/boneio.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Adafruit-BBIO==1.2.0
 Adafruit-Blinka==6.15.0
 adafruit-circuitpython-mcp230xx==2.5.1
-Adafruit-PlatformDetect==3.17.2
+adafruit-circuitpython-pct2075==1.1.11Adafruit-PlatformDetect==3.17.2
 Adafruit-PureIO==1.1.9
 asyncio-mqtt==0.10.0
 Cerberus==1.3.4

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/requirements.txt

@@ -3,6 +3,7 @@ Adafruit-Blinka==6.15.0
 adafruit-circuitpython-busdevice==5.1.1
 adafruit-circuitpython-framebuf==1.4.8
 adafruit-circuitpython-mcp230xx==2.5.1
+adafruit-circuitpython-pct2075==1.1.11
 Adafruit-PlatformDetect==3.17.2
 Adafruit-PureIO==1.1.9
 asyncio-mqtt==0.10.0

{boneio-0.1.0.dev8 → boneio-0.1.0.dev11}/setup.py

@@ -32,7 +32,7 @@ setup(
         "Adafruit-BBIO==1.2.0",
         "Adafruit-Blinka==6.15.0",
         "adafruit-circuitpython-mcp230xx==2.5.1",
-        "Adafruit-PlatformDetect==3.17.2",
+        "adafruit-circuitpython-pct2075==1.1.11" "Adafruit-PlatformDetect==3.17.2",
         "Adafruit-PureIO==1.1.9",
         "asyncio-mqtt==0.10.0",
         "Cerberus==1.3.4",

boneio-0.1.0.dev8/boneio/config.example.yaml

@@ -1,38 +0,0 @@
-mqtt:
-  host: mqtt.hass
-  username: mqtt
-  password: pass
-  topic_prefix: boneiohome
-  ha_discovery:
-    enabled: yes
-
-i2c:
-  id: myb
-  sda: P9_18
-  scl: P9_17
-
-oled:
-
-mcp23017:
-  - id: mcp1
-    address: 0x20
-
-gpio_input:
-  - id: "one"
-    pin: P8_12
-  - id: "two"
-    pin: P8_7
-    actions:
-      single:
-        action: output
-        pin: myoutput
-
-output: !include output.yaml
-
-
-##OUTPUT.YAML
-- id: myoutput
-  kind: mcp
-  mcp_id: mcp1
-  pin: 0
-  ha_type: light

boneio-0.1.0.dev8/boneio/config.yaml

@@ -1,20 +0,0 @@
-mqtt:
-  host: mqtt.hass
-  username: mqtt
-  password: pass
-  # ha_discovery:
-  #   enabled: True
-
-# i2c:
-#   - id: myb
-#     sda: "P9_18"
-#     scl: "P9_17"
-
-gpio_input:
-  - id: "one"
-    pin: "P8_3"
-
-output:
-  - id: myinput
-    kind: gpio
-    pin: P9_17

boneio-0.1.0.dev8/boneio/helper/__init__.py

@@ -1,14 +0,0 @@
-"""Helper dir for BoneIO."""
-from .gpio import edge_detect, setup_input
-from .oled import make_font
-from .stats import HostData
-from .yaml import CustomValidator, load_yaml_file
-
-__all__ = [
-    "CustomValidator",
-    "load_yaml_file",
-    "HostData",
-    "setup_input",
-    "edge_detect",
-    "make_font",
-]

boneio-0.1.0.dev8/boneio/version.py

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