boneIO 0.3.0.dev5__tar.gz → 0.3.0.dev7__tar.gz

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

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

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/const.py

@@ -2,12 +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
 
@@ -50,12 +51,6 @@ UARTS = {
     "uart4": {ID: "/dev/ttyS4", TX: "P9.13", RX: "P9.11"},
 }
 
-# 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"
 HA_DISCOVERY = "ha_discovery"
@@ -113,6 +108,8 @@ BINARY_SENSOR = "binary_sensor"
 LM75 = "lm75"
 MCP_TEMP_9808 = "mcp9808"
 INPUT_SENSOR = "inputsensor"
+DS2482 = "ds2482"
+DALLAS = "dallas"
 
 BASE = "base"
 LENGTH = "length"

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/cover.py

@@ -1,10 +1,9 @@
 """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.exceptions import CoverRelayException
 from boneio.helper.mqtt import BasicMqtt
 from boneio.helper.timeperiod import TimePeriod
 from boneio.relay import MCPRelay

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/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.3.0.dev5 → boneio-0.3.0.dev7}/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.3.0.dev5 → boneio-0.3.0.dev7}/boneio/helper/__init__.py

@@ -1,5 +1,4 @@
 """Helper dir for BoneIO."""
-from typing import Callable, TypeVar, Any
 
 from boneio.helper.gpio import (
     edge_detect,
@@ -35,20 +34,6 @@ from boneio.helper.exceptions import GPIOInputException, I2CError
 from boneio.helper.queue import UniqueQueue
 from boneio.helper.timeperiod import TimePeriod
 
-CALLABLE_T = TypeVar("CALLABLE_T", bound=Callable[..., Any])
-CALLBACK_TYPE = Callable[[], None]
-
-
-def callback(func: CALLABLE_T) -> CALLABLE_T:
-    """Annotation to mark method as safe to call from within the event loop."""
-    setattr(func, "_boneio_callback", True)
-    return func
-
-
-def is_callback(func: Callable[..., Any]) -> bool:
-    """Check if function is safe to be called in the event loop."""
-    return getattr(func, "_boneio_callback", False) is True
-
 
 __all__ = [
     "CustomValidator",
@@ -80,4 +65,6 @@ __all__ = [
     "load_config_from_string",
     "load_config_from_file",
     "TimePeriod",
+    "callback",
+    "is_callback",
 ]

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/helper/config.py

@@ -2,6 +2,7 @@
 Module to provide basic config options.
 """
 from boneio.const import BONEIO, HOMEASSISTANT
+from _collections_abc import dict_values
 
 
 class ConfigHelper:
@@ -14,6 +15,7 @@ class ConfigHelper:
         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:
@@ -34,3 +36,12 @@ class ConfigHelper:
     @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.dev7/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.dev7/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

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

@@ -0,0 +1,44 @@
+"""OneWire base class for DS2482.
+Module by https://github.com/fgervais/ds2482
+"""
+import adafruit_onewire.bus
+import busio
+
+
+class OneWire(busio.OneWire):
+    def __init__(self, ds2482):
+        self.ds2482 = ds2482
+
+    def deinit(self):
+        """
+        Deinitialize the OneWire bus and release any hardware resources for reuse.
+        """
+        self.ds2482.device_reset()
+
+    def reset(self):
+        """
+        Reset the OneWire bus and read presence
+
+        :return: False when at least one device is present
+        """
+        return self.ds2482.reset()
+
+    def read_bit(self):
+        """
+        Read in a bit
+        """
+        return self.ds2482.single_bit()
+
+    def write_bit(self, value):
+        """
+        Write out a bit based on value.
+        """
+        self.ds2482.single_bit(value)
+
+
+class OneWireBus(adafruit_onewire.bus.OneWireBus):
+    def __init__(self, ds2482):
+        self._ow = OneWire(ds2482)
+        self._readbit = self._ow.read_bit
+        self._writebit = self._ow.write_bit
+        self._maximum_devices = adafruit_onewire.bus._MAX_DEV

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/helper/events.py

@@ -3,9 +3,9 @@ import datetime as dt
 import signal
 import logging
 import time
-from typing import Callable
+from typing import Callable, Optional
 from datetime import datetime
-from boneio.helper import callback
+from boneio.helper.util import callback
 
 _LOGGER = logging.getLogger(__name__)
 UTC = dt.timezone.utc
@@ -139,9 +139,9 @@ def async_track_point_in_time(
     # Ensure point_in_time is UTC
     utc_point_in_time = as_utc(point_in_time)
 
-    # Since this is called once, we accept a HassJob so we can avoid
+    # Since this is called once, we accept a so we can avoid
     # having to figure out how to call the action every time its called.
-    cancel_callback: asyncio.TimerHandle | None = None
+    cancel_callback: Optional[asyncio.TimerHandle] = None
 
     @callback
     def run_action(job) -> None:

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/helper/exceptions.py

@@ -13,6 +13,10 @@ class I2CError(BoneIOException):
     """I2C Exception."""
 
 
+class OneWireError(BoneIOException):
+    """One Wire Exception."""
+
+
 class ConfigurationException(BoneIOException):
     """Configuration yaml exception."""
 

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

@@ -97,7 +97,7 @@ class GpioBaseClass:
         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=25))
+        self._bounce_time = gpio.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.3.0.dev5 → boneio-0.3.0.dev7}/boneio/helper/loader.py

@@ -43,10 +43,13 @@ from boneio.helper import (
     ha_input_availabilty_message,
     ha_sensor_temp_availabilty_message,
 )
+from adafruit_onewire.bus import OneWireAddress
+from boneio.helper.ds2482 import DS2482, OneWireBus, ds_address, DS2482_ADDRESS
 from boneio.helper.ha_discovery import ha_cover_availabilty_message
 from boneio.helper.timeperiod import TimePeriod
 from boneio.input.gpio import GpioInputButton
 from boneio.helper.config import ConfigHelper
+from boneio.sensor import DallasSensor
 
 # Typing imports that create a circular dependency
 if TYPE_CHECKING:
@@ -116,6 +119,7 @@ def create_temp_sensor(
             address=temp_def[ADDRESS],
             send_message=manager.send_message,
             topic_prefix=topic_prefix,
+            update_interval=temp_def.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
         )
         manager.send_ha_autodiscovery(
             id=id,
@@ -343,3 +347,47 @@ def configure_cover(
             availability_msg_func=ha_cover_availabilty_message,
         )
     return cover
+
+
+def configure_ds2482(i2cbusio: I2C, address: str = DS2482_ADDRESS) -> OneWireBus:
+    ds2482 = DS2482(i2c=i2cbusio, address=address)
+    ow_bus = OneWireBus(ds2482=ds2482)
+    return ow_bus
+
+
+def find_onewire_devices(ow_bus: OneWireBus):
+    devices = ow_bus.scan()
+    out = {}
+    for device in devices:
+        _addr: int = ds_address(device.rom)
+        _LOGGER.debug("Found device with address %s", hex(_addr))
+        out[_addr] = device
+    return out
+
+
+def create_ds2482_dallas_sensor(
+    manager: Manager,
+    ds2482_bus: OneWireBus,
+    address: OneWireAddress,
+    config: dict,
+    **kwargs,
+):
+    name = config.get(ID) or hex(address)
+    id = name.replace(" ", "")
+    sensor = DallasSensor(
+        bus=ds2482_bus,
+        address=address,
+        id=id,
+        name=name,
+        update_interval=config.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
+        send_message=manager.send_message,
+        **kwargs,
+    )
+    if config.get(SHOW_HA, True):
+        manager.send_ha_autodiscovery(
+            id=sensor.id,
+            name=sensor.name,
+            ha_type=SENSOR,
+            availability_msg_func=ha_sensor_temp_availabilty_message,
+        )
+    return sensor

boneio-0.3.0.dev7/boneio/helper/util.py

@@ -0,0 +1,15 @@
+from typing import Callable, TypeVar, Any
+
+CALLABLE_T = TypeVar("CALLABLE_T", bound=Callable[..., Any])
+CALLBACK_TYPE = Callable[[], None]
+
+
+def callback(func: CALLABLE_T) -> CALLABLE_T:
+    """Annotation to mark method as safe to call from within the event loop."""
+    setattr(func, "_boneio_callback", True)
+    return func
+
+
+def is_callback(func: Callable[..., Any]) -> bool:
+    """Check if function is safe to be called in the event loop."""
+    return getattr(func, "_boneio_callback", False) is True

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/input/gpio.py

@@ -1,19 +1,21 @@
 """GPIOInputButton to receive signals."""
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta
 from functools import partial
 
 from boneio.const import (
-    DEBOUNCE_DURATION,
-    DELAY_DURATION,
     DOUBLE,
     LONG,
-    LONG_PRESS_DURATION,
-    SECOND_DELAY_DURATION,
     SINGLE,
 )
 from boneio.helper import edge_detect, GpioBaseClass
 
+# TIMINGS FOR BUTTONS
+DEBOUNCE_DURATION = timedelta(microseconds=150000)
+LONG_PRESS_DURATION = timedelta(microseconds=700000)
+DELAY_DURATION = 0.08
+SECOND_DELAY_DURATION = 0.14
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -54,7 +56,6 @@ class GpioInputButton(GpioBaseClass):
             and now - self._second_press_timestamp < DEBOUNCE_DURATION
         ):
             return
-
         if not self._first_press_timestamp:
             self._first_press_timestamp = now
         elif not self._second_press_timestamp:
@@ -105,7 +106,7 @@ class GpioInputButton(GpioBaseClass):
             if self._second_check:
                 if self._second_press_timestamp:
                     _LOGGER.debug(
-                        "Double click event on pin %s, roznica %s",
+                        "Double click event on pin %s, diff %s",
                         self._pin,
                         self._second_press_timestamp - self._first_press_timestamp,
                     )

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/manager.py

@@ -7,6 +7,7 @@ from busio import I2C
 
 from boneio.const import (
     ACTION,
+    ADDRESS,
     BUTTON,
     CLOSE,
     COVER,
@@ -51,6 +52,7 @@ from boneio.helper.loader import (
     configure_relay,
     create_mcp23017,
     create_temp_sensor,
+    create_ds2482_dallas_sensor,
 )
 from boneio.helper.yaml_util import load_config_from_file
 from boneio.modbus import Modbus
@@ -75,6 +77,8 @@ class Manager:
         sensors: dict = {},
         modbus: dict = None,
         mcp23017: Optional[List] = None,
+        ds2482: Optional[dict] = None,
+        dallas: Optional[List] = None,
         oled: dict = {},
         adc_list: Optional[List] = None,
         covers: Optional[List] = [],
@@ -98,6 +102,8 @@ class Manager:
         self._oled = None
         self._tasks: List[asyncio.Task] = []
         self._covers = {}
+        self._ds_onewire = {}
+        self._ds_onewire_bus = {}
         self._temp_sensors = []
         self._modbus = None
         if modbus and modbus.get(UART) in UARTS:
@@ -130,6 +136,33 @@ class Manager:
             manager=self, mcp23017=mcp23017, i2cbusio=self._i2cbusio
         )
 
+        if ds2482:
+            _LOGGER.debug("Preparing DS2482 bus.")
+            from boneio.helper.loader import configure_ds2482, find_onewire_devices
+
+            self._ds_onewire_bus[ds2482[ID]] = configure_ds2482(
+                i2cbusio=self._i2cbusio, address=ds2482[ADDRESS]
+            )
+            self._ds_onewire = find_onewire_devices(
+                ow_bus=self._ds_onewire_bus[ds2482[ID]]
+            )
+        for sensor in dallas:
+            ds2482_bus_id = sensor.get("ds2482_id")
+            if ds2482_bus_id and ds2482_bus_id in self._ds_onewire_bus:
+                address = self._ds_onewire.get(sensor[ADDRESS])
+                if not address:
+                    continue
+
+                self._temp_sensors.append(
+                    create_ds2482_dallas_sensor(
+                        manager=self,
+                        ds2482_bus=self._ds_onewire_bus[ds2482_bus_id],
+                        address=address,
+                        topic_prefix=self._config_helper.topic_prefix,
+                        config=sensor,
+                    )
+                )
+
         if adc_list:
             from boneio.helper.loader import create_adc
 
@@ -341,14 +374,14 @@ class Manager:
         if not self._config_helper.ha_discovery:
             return
         topic_prefix = topic_prefix or self._config_helper.topic_prefix
-        msg = availability_msg_func(topic=topic_prefix, id=id, name=name, **kwargs)
+        payload = availability_msg_func(topic=topic_prefix, id=id, name=name, **kwargs)
         topic = f"{self._config_helper.ha_discovery_prefix}/{ha_type}/{topic_prefix}/{id}/config"
         _LOGGER.debug("Sending HA discovery for %s, %s.", ha_type, name)
-        self._autodiscovery_messages.append({"topic": topic, "payload": msg})
-        self.send_message(topic=topic, payload=msg, retain=True)
+        self._config_helper.add_autodiscovery_msg(topic=topic, payload=payload)
+        self.send_message(topic=topic, payload=payload, retain=True)
 
     def resend_autodiscovery(self):
-        for msg in self._autodiscovery_messages:
+        for msg in self._config_helper.autodiscovery_msgs:
             self.send_message(**msg, retain=True)
 
     async def receive_message(self, topic: str, message: str) -> None:

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/relay/mcp.py

@@ -2,7 +2,7 @@
 
 import logging
 from adafruit_mcp230xx.mcp23017 import MCP23017, DigitalInOut
-from boneio.helper import callback
+from boneio.helper.util import callback
 from boneio.relay.basic import BasicRelay
 from boneio.const import SWITCH, NONE
 from boneio.helper.events import async_track_point_in_time, utcnow

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/runner.py

@@ -5,6 +5,7 @@ import os
 from boneio.const import (
     ADC,
     COVER,
+    DALLAS,
     ENABLED,
     HA_DISCOVERY,
     HOST,
@@ -20,6 +21,7 @@ from boneio.const import (
     PORT,
     TOPIC_PREFIX,
     USERNAME,
+    DS2482,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -66,6 +68,8 @@ async def async_run(
             MODBUS: config.get("modbus_sensors"),
         },
         mcp23017=config.get(MCP23017, []),
+        ds2482=config.get(DS2482),
+        dallas=config.get(DALLAS, []),
         modbus=config.get(MODBUS),
         oled=config.get(OLED),
         adc_list=config.get(ADC, []),

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/schema/schema.yaml

@@ -146,6 +146,17 @@ lm75:
       default: 0x48
       meta:
         label: Address of I2C
+    update_interval:
+      type:
+        - string
+        - timeperiod
+      coerce:
+        - str
+        - positive_time_period
+      required: True
+      default: 60s
+      meta:
+        label: Update interval.
 
 
 mcp9808:
@@ -162,7 +173,18 @@ mcp9808:
       required: True
       default: 0x18
       meta:
-        label: GPIO of I2C SDA
+        label: Address of I2C device
+    update_interval:
+      type:
+        - string
+        - timeperiod
+      coerce:
+        - str
+        - positive_time_period
+      required: True
+      default: 60s
+      meta:
+        label: Update interval.
 
 mcp23017:
   type: list
@@ -356,6 +378,7 @@ adc:
           label: If you want you can disable discovering this input in HA.
 cover:
   type: list
+  required: False
   meta:
     label: Cover section
   schema:
@@ -414,3 +437,60 @@ cover:
         default: True
         meta:
           label: If you want you can disable discovering this input in HA.
+
+ds2482:
+  type: dict
+  required: False
+  schema:
+    id:
+      type: string
+      required: True
+      meta:
+        label: Id of I2C to use in pin config
+    address:
+      type: string
+      required: True
+      default: 0x18
+      meta:
+        label: GPIO of I2C SDA
+
+dallas:
+  type: list
+  required: False
+  meta:
+    label: Dallas DS18B20 section
+  schema:
+    type: dict
+    schema:
+      id:
+        type: string
+        required: False
+        meta:
+          label: Id to use in HA if needed. Default to address.
+      address:
+        type: integer
+        required: True
+        meta:
+          label: Address of Dallas device
+      ds2482_id:
+        type: string
+        required: False
+        meta:
+          label: Put DS2482 defined id if you want to add DS18B20 connected via DS2482.
+      show_in_ha:
+        type: boolean
+        required: True
+        default: True
+        meta:
+          label: If you want you can disable discovering this input in HA.
+      update_interval:
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
+        required: True
+        default: 60s
+        meta:
+          label: Update interval.

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio/sensor/__init__.py

@@ -1,9 +1,12 @@
 """Sensor module."""
-from boneio.sensor.temp import LM75Sensor, MCP9808Sensor
+from boneio.sensor.temp.lm75 import LM75Sensor
+from boneio.sensor.temp.mcp9808 import MCP9808Sensor
+from boneio.sensor.temp.dallas import DallasSensor
 from boneio.sensor.gpio import GpioInputSensor
 from boneio.sensor.adc import initialize_adc, GpioADCSensor
 
 __all__ = [
+    "DallasSensor",
     "LM75Sensor",
     "MCP9808Sensor",
     "GpioInputSensor",

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

@@ -122,20 +122,20 @@ class ModbusSensor(BasicMqtt):
     ) -> None:
         """Send HA autodiscovery information for each Modbus sensor."""
         _LOGGER.debug("Sending HA discovery for sensor %s %s.", sdm_name, sensor_id)
-        self._send_message(
-            topic=(
-                f"{self._config_helper.ha_discovery_prefix}/{SENSOR}/{self._config_helper.topic_prefix}{id}"
-                f"/{id}{sensor_id.replace('_', '').replace(' ', '').lower()}/config"
-            ),
-            payload=modbus_sensor_availabilty_message(
-                topic=self._config_helper.topic_prefix,
-                id=id,
-                name=sdm_name,
-                model=self._model,
-                sensor_id=sensor_id,
-                **kwargs,
-            ),
+        topic = (
+            f"{self._config_helper.ha_discovery_prefix}/{SENSOR}/{self._config_helper.topic_prefix}{id}"
+            f"/{id}{sensor_id.replace('_', '').replace(' ', '').lower()}/config"
         )
+        payload = modbus_sensor_availabilty_message(
+            topic=self._config_helper.topic_prefix,
+            id=id,
+            name=sdm_name,
+            model=self._model,
+            sensor_id=sensor_id,
+            **kwargs,
+        )
+        self._config_helper.add_autodiscovery_msg(topic=topic, payload=payload)
+        self._send_message(topic=topic, payload=payload)
 
     def _send_discovery_for_all_registers(self, register: int = 0) -> bool:
         """Send discovery message to HA for each register."""

boneio-0.3.0.dev7/boneio/sensor/temp/__init__.py

@@ -0,0 +1,76 @@
+"""Manage BoneIO onboard temp sensors."""
+
+import asyncio
+from datetime import datetime, timedelta
+from typing import Optional
+
+from boneio.const import STATE, SENSOR, TEMPERATURE
+
+
+from boneio.helper.exceptions import I2CError
+from boneio.helper import BasicMqtt
+
+from boneio.helper.util import callback
+from boneio.helper.events import async_track_point_in_time, utcnow
+
+
+from boneio.helper.timeperiod import TimePeriod
+
+
+class TempSensor(BasicMqtt):
+    """Represent Temp sensor in BoneIO."""
+
+    SensorClass = None
+    DefaultName = TEMPERATURE
+
+    def __init__(
+        self,
+        i2c,
+        address: str,
+        id: str = DefaultName,
+        update_interval: int = TimePeriod(seconds=60),
+        **kwargs
+    ):
+        """Initialize Temp class."""
+        super().__init__(id=id, topic_type=SENSOR, **kwargs)
+        self._update_interval = update_interval
+        self._loop = asyncio.get_event_loop()
+        try:
+            self._pct = self.SensorClass(i2c_bus=i2c, address=address)
+            self._unsub_refresh = None
+            self._schedule_refresh(utcnow() + timedelta(seconds=2))
+        except ValueError as err:
+            raise I2CError(err)
+
+    @property
+    def state(self):
+        """Give rounded value of temperature."""
+        return round(self._pct.temperature, 2)
+
+    def _schedule_refresh(self, update_time: Optional[datetime] = None):
+        if self._unsub_refresh:
+            self._unsub_refresh()
+            self._unsub_refresh = None
+        if not update_time:
+            update_time = utcnow() + self._update_interval.as_timedelta
+        self._unsub_refresh = async_track_point_in_time(
+            loop=self._loop,
+            action=self._refresh,
+            point_in_time=update_time,
+        )
+
+    @callback
+    def _refresh(self, time: datetime):
+        if self._unsub_refresh:
+            self._unsub_refresh()
+            self._unsub_refresh = None
+
+        self.send_state()
+        self._schedule_refresh()
+
+    def send_state(self):
+        """Fetch temperature periodically and send to MQTT."""
+        self._send_message(
+            topic=self._send_topic,
+            payload={STATE: self.state},
+        )

boneio-0.3.0.dev7/boneio/sensor/temp/dallas.py

@@ -0,0 +1,43 @@
+"""Dallas temp sensor."""
+
+import asyncio
+from datetime import timedelta
+
+# from datetime import timedelta
+from adafruit_ds18x20 import DS18X20
+from adafruit_onewire.bus import OneWireAddress
+from boneio.const import SENSOR, TEMPERATURE
+
+
+from boneio.helper.exceptions import OneWireError
+from boneio.helper import BasicMqtt
+
+from boneio.helper.events import utcnow
+
+
+from boneio.helper.timeperiod import TimePeriod
+from . import TempSensor
+
+
+class DallasSensor(TempSensor):
+    DefaultName = TEMPERATURE
+    SensorClass = DS18X20
+
+    def __init__(
+        self,
+        bus,
+        address: OneWireAddress,
+        id: str = DefaultName,
+        update_interval: int = TimePeriod(seconds=60),
+        **kwargs
+    ):
+        """Initialize Temp class."""
+        self._update_interval = update_interval
+        self._loop = asyncio.get_event_loop()
+        BasicMqtt.__init__(self, id=id, topic_type=SENSOR, **kwargs)
+        try:
+            self._pct = DS18X20(bus=bus, address=address)
+            self._unsub_refresh = None
+            self._schedule_refresh(utcnow() + timedelta(seconds=2))
+        except ValueError as err:
+            raise OneWireError(err)

boneio-0.3.0.dev7/boneio/sensor/temp/lm75.py

@@ -0,0 +1,11 @@
+"""LM75 temp sensor."""
+from . import TempSensor
+from adafruit_pct2075 import PCT2075
+from boneio.const import LM75
+
+
+class LM75Sensor(TempSensor):
+    """Represent LM75 sensor in BoneIO."""
+
+    SensorClass = PCT2075
+    DefaultName = LM75

boneio-0.3.0.dev7/boneio/sensor/temp/mcp9808.py

@@ -0,0 +1,12 @@
+"""MCP9808 temp sensor."""
+
+from . import TempSensor
+from adafruit_mcp9808 import MCP9808
+from boneio.const import MCP_TEMP_9808
+
+
+class MCP9808Sensor(TempSensor):
+    """Represent MCP9808 sensor in BoneIO."""
+
+    SensorClass = MCP9808
+    DefaultName = MCP_TEMP_9808

boneio-0.3.0.dev7/boneio/version.py

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

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

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

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio.egg-info/SOURCES.txt

@@ -41,7 +41,11 @@ boneio/helper/queue.py
 boneio/helper/state_manager.py
 boneio/helper/stats.py
 boneio/helper/timeperiod.py
+boneio/helper/util.py
 boneio/helper/yaml_util.py
+boneio/helper/ds2482/__init__.py
+boneio/helper/ds2482/ds2482.py
+boneio/helper/ds2482/onewire.py
 boneio/input/__init__.py
 boneio/input/gpio.py
 boneio/relay/__init__.py
@@ -59,4 +63,7 @@ boneio/sensor/modbus/__init__.py
 boneio/sensor/modbus/sdm120.json
 boneio/sensor/modbus/sdm630.json
 boneio/sensor/modbus/sofar.json
-boneio/sensor/temp/__init__.py
+boneio/sensor/temp/__init__.py
+boneio/sensor/temp/dallas.py
+boneio/sensor/temp/lm75.py
+boneio/sensor/temp/mcp9808.py

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/boneio.egg-info/requires.txt

@@ -1,5 +1,6 @@
 Adafruit-BBIO==1.2.0
 Adafruit-Blinka==6.20.4
+adafruit-circuitpython-ds18x20==1.3.10
 adafruit-circuitpython-mcp230xx==2.5.3
 adafruit-circuitpython-mcp9808==3.3.10
 adafruit-circuitpython-pct2075==1.1.12

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/requirements.txt

@@ -1,6 +1,7 @@
 Adafruit-BBIO==1.2.0
 Adafruit-Blinka==6.20.4
 adafruit-circuitpython-busdevice==5.1.4
+adafruit-circuitpython-ds18x20==1.3.10
 adafruit-circuitpython-mcp230xx==2.5.3
 adafruit-circuitpython-mcp9808==3.3.10
 adafruit-circuitpython-pct2075==1.1.12

{boneio-0.3.0.dev5 → boneio-0.3.0.dev7}/setup.py

@@ -31,6 +31,7 @@ setup(
     install_requires=[
         "Adafruit-BBIO==1.2.0",
         "Adafruit-Blinka==6.20.4",
+        "adafruit-circuitpython-ds18x20==1.3.10",
         "adafruit-circuitpython-mcp230xx==2.5.3",
         "adafruit-circuitpython-mcp9808==3.3.10",
         "adafruit-circuitpython-pct2075==1.1.12",

boneio-0.3.0.dev5/boneio/sensor/temp/__init__.py

@@ -1,52 +0,0 @@
-"""Manage BoneIO onboard temp sensors."""
-
-import asyncio
-from adafruit_pct2075 import PCT2075
-from adafruit_mcp9808 import MCP9808
-from boneio.const import STATE, SENSOR, LM75, MCP_TEMP_9808, TEMPERATURE
-
-from boneio.helper.exceptions import I2CError
-from boneio.helper import BasicMqtt
-
-
-class TempSensor(BasicMqtt):
-    """Represent Temp sensor in BoneIO."""
-
-    SensorClass = None
-    DefaultName = TEMPERATURE
-
-    def __init__(self, i2c, address, id: str = DefaultName, **kwargs):
-        """Initialize Temp class."""
-        super().__init__(id=id, topic_type=SENSOR, **kwargs)
-        try:
-            self._pct = self.SensorClass(i2c_bus=i2c, address=address)
-        except ValueError as err:
-            raise I2CError(err)
-
-    @property
-    def state(self):
-        """Give rounded value of temperature."""
-        return round(self._pct.temperature, 2)
-
-    async def send_state(self):
-        """Fetch temperature periodically and send to MQTT."""
-        while True:
-            self._send_message(
-                topic=self._send_topic,
-                payload={STATE: self.state},
-            )
-            await asyncio.sleep(60)
-
-
-class LM75Sensor(TempSensor):
-    """Represent LM75 sensor in BoneIO."""
-
-    SensorClass = PCT2075
-    DefaultName = LM75
-
-
-class MCP9808Sensor(TempSensor):
-    """Represent MCP9808 sensor in BoneIO."""
-
-    SensorClass = MCP9808
-    DefaultName = MCP_TEMP_9808

boneio-0.3.0.dev5/boneio/version.py

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