boneIO 0.5.0dev4__py3-none-any.whl → 0.5.0dev6__py3-none-any.whl

{boneIO-0.5.0.dev4.dist-info → boneIO-0.5.0.dev6.dist-info}/METADATA

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

{boneIO-0.5.0.dev4.dist-info → boneIO-0.5.0.dev6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
-boneio/bonecli.py,sha256=-X_oGhitJklBpNDiVjYvqR9NEb3sdDTJ10axJRMYluk,3093
+boneio/bonecli.py,sha256=Wg3Wc2xZ9FjF_23PK6Ja3YzXUkYanzYyQ_QdtQbKESw,3155
 boneio/const.py,sha256=4dFxiBtj7QCJ7t2AIOuJA3JfEC6xrkmB2Y_93bGXmUY,2799
 boneio/cover.py,sha256=nr76ft5smAPdBB8Jytk-uFd6RWuqtcZiG6EE129OUjw,8454
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,8 +16,8 @@ boneio/helper/config.py,sha256=XeHG7OSMCMmEL43rCbWy6Ij0RcTNlrIpevWZ0UJyrlo,1311
 boneio/helper/events.py,sha256=63FEM5bKIDmMHncJG0NLcVHJZ7gIZBEb0TP7xtfyKvs,5579
 boneio/helper/exceptions.py,sha256=scepzfjzg-Jq6dBmuCDq79R5aUWohK3yDF8tyKi_sM8,561
 boneio/helper/filter.py,sha256=_GFIbtK0sUCo0u_ovKXHetHNc2V6uzR8Moyrg96Z7Fc,745
-boneio/helper/gpio.py,sha256=uTFSHI6Gg1VZX2agEPd980s5pk3EW0bApGICI3nGVHs,2767
-boneio/helper/ha_discovery.py,sha256=dWV7s_r3fun4JgKPY0Jrvk8DLatczW-zLoINU36vfLU,5478
+boneio/helper/gpio.py,sha256=Z-P76CcvFL7msoSopXooaTUi3Lx0WQYeWoRXeO64K7Y,2710
+boneio/helper/ha_discovery.py,sha256=qDXtIUVup0A3IDGHHhJXwRnhgwU1QtsCYELnYKKu9Qs,5492
 boneio/helper/loader.py,sha256=tioZM5y0EJGOyIhsHSErRR3jHHoXJkp6JRFn6SSAhnY,11736
 boneio/helper/logger.py,sha256=zyF_Vk3o2eSHuXypJhNzK99eZgkWDWybuB5KcJgurDs,1801
 boneio/helper/mqtt.py,sha256=Aqf6Sx4-3GQsK5GjgJ5QxVMyCTdRcL5Zq_GTIDu7ne0,759
@@ -34,8 +34,8 @@ boneio/helper/util.py,sha256=QfSoT3H3WnOQAKO5bFRIBCy62HT5NMa9Ek-FmfTW_rw,508
 boneio/helper/yaml_util.py,sha256=LFT5abDVcC7DYmauIK52PV4icnHS9V5Io4LhGbcUPJU,10696
 boneio/input/__init__.py,sha256=u9wuehuC_TNizL4tyn7EygZW5LaTFjSnFaZeZr3zZ1U,99
 boneio/input/gpio.py,sha256=2WK3DR3kGAxHvmsNHZhN-oq8dF75oROxwm_mOZzYYh8,4391
-boneio/manager.py,sha256=U2IaEkfIo3dhj_lPOLzPFPxzngQiBWd4bPdduveCJ6c,18410
-boneio/modbus.py,sha256=5hambvcQ8XBRzw65OgcUlUV3xsVdq0Lx9jRj3bEF3SE,4156
+boneio/manager.py,sha256=OAvfyB41Fkk_MRlGn12N7JOvjkacPSenAQ-XMrUXa4A,19000
+boneio/modbus.py,sha256=eA_sGnmdcIneXX75ZcXOI223-UkKN1UYmWFqiJBAhJo,4176
 boneio/mqtt_client.py,sha256=ioOBEmnbjpZjYrD5u8W5CrVsrNFRHDJ93fyk6XcWkeE,6983
 boneio/oled.py,sha256=STzzznpQ1cJEE2WuBSoEbE387wULNGaCzxf0AR689gY,5278
 boneio/relay/__init__.py,sha256=L_Peoep10-DdeMrEe-5YnnNCS-mxHtavCqtAesTPWFQ,135
@@ -48,12 +48,12 @@ boneio/schema/actions_sensor.yaml,sha256=LhXEsYsg6qs7iHqgQE6n-2jj-o-ZZRusDW_9nWI
 boneio/schema/actions_switch.yaml,sha256=qyooX0izkgl4wBEh8xUsYFEKMrvhbIAQYxOGTB5AROY,124
 boneio/schema/filters.yaml,sha256=WopX1SmCZsSZXNiGccLoi7uMCsUpdbs0eVfsAjmbay4,286
 boneio/schema/filters_adc.yaml,sha256=3e0ts92MoFKOnfGOOn6WYIHxu0-tnZe9OjAjN9m7hiI,304
-boneio/schema/schema.yaml,sha256=c8Zbj_OGgPXAPt5yeSJeuR0d_YBvk0kpARSl-bpYkWE,11409
+boneio/schema/schema.yaml,sha256=1N4-rcuEQ1WH6NSrjYxczmy6pY6y5IA0v9wSimbu41M,11590
 boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD1oOIo,133
 boneio/sensor/__init__.py,sha256=VjFBEQQv_U0T2ENkzefuBdzmqNvBTEv4M-gQKScc8o0,431
 boneio/sensor/adc.py,sha256=Yf5F8JcZJt0K4ijpPqI8do0BqDfLvfja_LE8_Zu3u7U,1281
-boneio/sensor/gpio.py,sha256=7IOYxO7F89DaNw6FpD8hk7f543hZeqljyrBRuy2z1yw,1230
-boneio/sensor/modbus/__init__.py,sha256=mChzuWicavaMybA8DkJZCu6BRjSI4hvaJX6_B1Fu_1g,8435
+boneio/sensor/gpio.py,sha256=2dQ5exT38hgHrR1qOzFkrpTcmzZ1yHklu8CHpYxt-ho,1229
+boneio/sensor/modbus/__init__.py,sha256=cvmjSXgAb-5T7R2Ze84_WrJ8-U-pAhGFW5BT7ikFDAQ,8467
 boneio/sensor/modbus/sdm120.json,sha256=4sueFfSw7G6a77gdIUhbfJvE-MNVJFOeVbRvHDw5Rvk,4145
 boneio/sensor/modbus/sdm630.json,sha256=6LbIfXWk_PVRW-OuJwrsFEnRGLVEmEqqGIbj-1FDaiI,10969
 boneio/sensor/modbus/sofar.json,sha256=A_YztQN_ctyItIm2LH1tfcs-pSyG18I530qleLd2tOw,5592
@@ -61,9 +61,9 @@ boneio/sensor/temp/__init__.py,sha256=v4h9l00zmL63pTNW7HAAgQvoXXzXLn_EmmfWQ2zuQI
 boneio/sensor/temp/dallas.py,sha256=uw5gjYe6KSMEt6ayghdEvvHHoubQ-JgMmRMOPtnxGnA,2380
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=P0_P-YFLhlKeyjrtau1rEwcnZ89L5TC06Cmzk2Yvy3Q,41
-boneIO-0.5.0.dev4.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.5.0.dev4.dist-info/WHEEL,sha256=g_UdFZqm-k6b0W64OcndB0YT_D2mFFPAYBj7-_YsSPA,87
-boneIO-0.5.0.dev4.dist-info/METADATA,sha256=nRwtkQHkKy5IgASlVFj8LACr4yIYCub6vBYBlnA-1Xg,1620
-boneIO-0.5.0.dev4.dist-info/license_files/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.5.0.dev4.dist-info/RECORD,,
+boneio/version.py,sha256=KlxQZ88vy3LqLH_-jdAb7Juk5XkJ43rxOnC31sMRjhY,41
+boneIO-0.5.0.dev6.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.5.0.dev6.dist-info/WHEEL,sha256=g_UdFZqm-k6b0W64OcndB0YT_D2mFFPAYBj7-_YsSPA,87
+boneIO-0.5.0.dev6.dist-info/METADATA,sha256=uZvL0fpHaJXCgUaRW3dEW3kDuppL2MMR1McKsK4C_jk,1620
+boneIO-0.5.0.dev6.dist-info/license_files/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.5.0.dev6.dist-info/RECORD,,

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/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/helper/ha_discovery.py

@@ -152,7 +152,7 @@ def modbus_sensor_availabilty_message(
         },
         "name": sensor_id,
         "state_topic": f"{topic}/{device_type}/{id}/{state_topic_base}",
-        "unique_id": f"{topic}{sensor_id.replace('_', '').lower()}",
+        "unique_id": f"{topic}{sensor_id.replace('_', '').lower()}{name.lower()}",
         **kwargs,
     }
 

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/modbus.py

@@ -77,7 +77,7 @@ class Modbus:
         """Call sync. pymodbus."""
         async with self._lock:
             if not self._pymodbus_connect():
-                _LOGGER.error("Can't connect to Modbus.")
+                _LOGGER.error("Can't connect to Modbus address %s.", address)
                 return None
             kwargs = {"unit": unit, "count": count} if unit else {}
             try:

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/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/sensor/modbus/__init__.py

@@ -219,7 +219,8 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
                         payload=self._payload_online,
                     )
                 _LOGGER.warn(
-                    "Can't fetch data from modbus device. Will sleep for %s seconds",
+                    "Can't fetch data from modbus device %s. Will sleep for %s seconds",
+                    self.id,
                     update_interval,
                 )
                 self._discovery_sent = False

boneio/version.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.5.0dev4"
+__version__ = "0.5.0dev6"