boneIO 0.5.0.dev5__tar.gz → 0.5.0.dev7__tar.gz

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/PKG-INFO

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

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/boneio/bonecli.py

@@ -3,6 +3,9 @@ import argparse
 import asyncio
 import logging
 import sys
+import os
+
+os.environ["W1THERMSENSOR_NO_KERNEL_MODULE"] = "1"
 
 from colorlog import ColoredFormatter
 from yaml import MarkedYAMLError

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/boneio/helper/gpio.py

@@ -90,9 +90,8 @@ class GpioBaseClass:
     ) -> None:
         """Setup GPIO Input Button"""
         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))
+        gpio_mode = kwargs.get(GPIO_MODE, GPIO_STR)
+        self._bounce_time = kwargs.get("bounce_time", TimePeriod(milliseconds=10))
         self._loop = asyncio.get_running_loop()
         self._press_callback = press_callback
         setup_input(pin=self._pin, pull_mode=gpio_mode)

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/boneio/manager.py

@@ -2,7 +2,6 @@ import asyncio
 import logging
 from collections import deque
 from typing import Callable, Coroutine, List, Optional, Set, Union
-
 from board import SCL, SDA
 from busio import I2C
 
@@ -60,6 +59,8 @@ from boneio.helper.logger import configure_logger
 from boneio.helper.yaml_util import load_config_from_file
 from boneio.modbus import Modbus
 
+from w1thermsensor.errors import KernelModuleLoadError
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -253,6 +254,7 @@ class Manager:
             from boneio.helper.loader import (
                 configure_ds2482,
             )
+            from boneio.sensor import DallasSensorDS2482
 
             _ds_onewire_bus[_single_ds[ID]] = configure_ds2482(
                 i2cbusio=self._i2cbusio, address=_single_ds[ADDRESS]
@@ -268,22 +270,35 @@ class Manager:
             _LOGGER.debug("Preparing Dallas bus.")
             from boneio.helper.loader import configure_dallas
 
-            _one_wire_devices.update(
-                find_onewire_devices(
-                    ow_bus=configure_dallas(),
-                    bus_id=dallas[ID],
-                    bus_type=DALLAS,
+            try:
+                from w1thermsensor.kernel import load_kernel_modules
+
+                load_kernel_modules()
+                from boneio.sensor.temp.dallas_w1 import DallasSensorW1
+
+                _one_wire_devices.update(
+                    find_onewire_devices(
+                        ow_bus=configure_dallas(),
+                        bus_id=dallas[ID],
+                        bus_type=DALLAS,
+                    )
                 )
-            )
+            except KernelModuleLoadError as err:
+                _LOGGER.error("Can't configure Dallas W1 device %s", err)
+                pass
+
         for sensor in sensors:
             address = _one_wire_devices.get(sensor[ADDRESS])
             if not address:
                 continue
             ds2482_bus_id = sensor.get("bus_id")
             if ds2482_bus_id and ds2482_bus_id in _ds_onewire_bus:
-                kwargs = {"bus": _ds_onewire_bus[ds2482_bus_id]}
+                kwargs = {
+                    "bus": _ds_onewire_bus[ds2482_bus_id],
+                    "cls": DallasSensorDS2482,
+                }
             else:
-                kwargs = {}
+                kwargs = {"cls": DallasSensorW1}
             _LOGGER.debug("Configuring sensor %s for boneIO", address)
             self._temp_sensors.append(
                 create_dallas_sensor(

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/boneio/schema/schema.yaml

@@ -326,6 +326,12 @@ input:
         required: True
         meta:
           label: Either switch or sensor. If sensor then no clicks are detected, just simple on/off on gpio.
+      inverted:
+        type: boolean
+        default: False
+        required: True
+        meta:
+          label: Check if sensor type is inverted. Only aplicable for sensor kind.
       actions:
         required: False
         type: dict

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/boneio/sensor/gpio.py

@@ -14,6 +14,11 @@ class GpioInputSensor(GpioBaseClass):
     def __init__(self, **kwargs) -> None:
         """Setup GPIO Input Button"""
         super().__init__(**kwargs)
+        self._click_type = (
+            (PRESSED, RELEASED)
+            if kwargs.get("inverted", False)
+            else (PRESSED, RELEASED)
+        )
         edge_detect(
             self._pin,
             callback=self._handle_press,
@@ -25,13 +30,8 @@ class GpioInputSensor(GpioBaseClass):
     def _handle_press(self, pin: str) -> None:
         """Handle the button press callback"""
         # Ignore if we are in a long press
-        if self.is_pressed:
-            _LOGGER.debug("Pressed event on pin %s", self._pin)
-            self._loop.call_soon_threadsafe(
-                partial(self._press_callback, PRESSED, self._pin)
-            )
-        else:
-            _LOGGER.debug("Released event on pin %s", self._pin)
-            self._loop.call_soon_threadsafe(
-                partial(self._press_callback, RELEASED, self._pin)
-            )
+        click_type = self._click_type[0] if self.is_pressed else self._click_type[1]
+        _LOGGER.debug("%s event on pin %s", click_type, self._pin)
+        self._loop.call_soon_threadsafe(
+            partial(self._press_callback, click_type, self._pin)
+        )

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/boneio/sensor/modbus/__init__.py

@@ -123,7 +123,9 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
         self, id: str, sdm_name: str, sensor_id: str, **kwargs
     ) -> None:
         """Send HA autodiscovery information for each Modbus sensor."""
-        _LOGGER.debug("Sending HA discovery for sensor %s %s.", sdm_name, sensor_id)
+        _LOGGER.debug(
+            "Sending HA discovery for modbus sensor %s %s.", sdm_name, sensor_id
+        )
         topic = (
             f"{self._config_helper.ha_discovery_prefix}/{SENSOR}/{self._config_helper.topic_prefix}{id}"
             f"/{id}{sensor_id.replace('_', '').replace(' ', '').lower()}/config"
@@ -164,6 +166,9 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
                         **kwargs,
                     )
             return datetime.now()
+        _LOGGER.error(
+            "Discovery for %s not sent. First register not available.", self._id
+        )
         return False
 
     async def check_availability(self) -> None:
@@ -182,7 +187,7 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
                     address=first_register_base[REGISTERS][0][ADDRESS],
                     method=register_method,
                 )
-                if register:
+                if register is not None:
                     self._discovery_sent = self._send_discovery_for_all_registers(
                         register
                     )

boneIO-0.5.0.dev7/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.5.0dev7"

{boneIO-0.5.0.dev5 → boneIO-0.5.0.dev7}/pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
     "w1thermsensor[async]>=2.0.0",
 ]
 requires-python = ">=3.7"
-version = "0.5.0dev5"
+version = "0.5.0dev7"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneIO-0.5.0.dev5/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "0.5.0dev5"