boneIO 0.3.0.dev1__tar.gz → 0.3.0.dev3__tar.gz

{boneio-0.3.0.dev1/boneio.egg-info → boneio-0.3.0.dev3}/PKG-INFO

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

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3}/boneio/cover.py

@@ -5,6 +5,7 @@ from typing import Any, Callable
 from boneio.const import CLOSE, COVER, IDLE, OPEN, OPENING, CLOSING, CLOSED, STOP
 from boneio.helper.events import EventBus
 from boneio.helper.mqtt import BasicMqtt
+from boneio.helper.timeperiod import TimePeriod
 from boneio.relay import MCPRelay
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,10 +22,10 @@ COVER_COMMANDS = {
 class RelayHelper:
     """Relay helper for cover either open/close."""
 
-    def __init__(self, relay: MCPRelay, time: int) -> None:
+    def __init__(self, relay: MCPRelay, time: TimePeriod) -> None:
         """Initialize helper."""
         self._relay = relay
-        self._steps = 100 / time
+        self._steps = 100 / time.total_seconds
 
     @property
     def relay(self) -> MCPRelay:
@@ -46,8 +47,8 @@ class Cover(BasicMqtt):
         open_relay: Any,
         close_relay: MCPRelay,
         state_save: Callable,
-        open_time: int,
-        close_time: int,
+        open_time: TimePeriod,
+        close_time: TimePeriod,
         event_bus: EventBus,
         restored_state: int = 100,
         **kwargs,

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3}/boneio/helper/gpio.py

@@ -98,7 +98,6 @@ class GpioBaseClass:
         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))
-        configure_pin(pin=pin, mode=gpio_mode)
         self._loop = asyncio.get_running_loop()
         self._press_callback = press_callback
         setup_input(pin=self._pin, pull_mode=gpio_mode)

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3}/boneio/helper/loader.py

@@ -44,6 +44,7 @@ from boneio.helper import (
     ha_sensor_temp_availabilty_message,
 )
 from boneio.helper.ha_discovery import ha_cover_availabilty_message
+from boneio.helper.timeperiod import TimePeriod
 from boneio.input.gpio import GpioInputButton
 
 # Typing imports that create a circular dependency
@@ -77,7 +78,7 @@ def create_adc(
                 name=name,
                 send_message=manager.send_message,
                 topic_prefix=topic_prefix,
-                update_interval=gpio.get(UPDATE_INTERVAL, 60),
+                update_interval=gpio.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
             )
             if gpio.get(SHOW_HA, True):
                 manager.send_ha_autodiscovery(
@@ -145,9 +146,11 @@ def create_mcp23017(
         id = mcp[ID] or mcp[ADDRESS]
         try:
             manager._mcp[id] = MCP23017(i2c=i2cbusio, address=mcp[ADDRESS], reset=False)
-            sleep_time = mcp.get(INIT_SLEEP, 0)
-            _LOGGER.debug(f"Sleeping for {sleep_time}s while MCP {id} is initializing.")
-            time.sleep(sleep_time)
+            sleep_time = mcp.get(INIT_SLEEP, TimePeriod(seconds=0))
+            _LOGGER.debug(
+                f"Sleeping for {sleep_time.total_seconds}s while MCP {id} is initializing."
+            )
+            time.sleep(sleep_time.total_seconds)
             grouped_outputs[id] = {}
         except TimeoutError as err:
             _LOGGER.error("Can't connect to MCP %s. %s", id, err)
@@ -180,7 +183,7 @@ def create_modbus_sensors(
                 topic_prefix=topic_prefix,
                 ha_discovery=ha_discovery,
                 ha_discovery_prefix=ha_discovery_prefix,
-                update_interval=sensor.get(UPDATE_INTERVAL, 30),
+                update_interval=sensor.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
             )
             manager.append_task(asyncio.create_task(sdm.send_state()))
         except FileNotFoundError as err:

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3}/boneio/schema/schema.yaml

@@ -121,11 +121,16 @@ modbus_sensors:
         meta:
           label: Model to load from database.
       update_interval:
-        type: integer
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
         required: True
-        default: 30
+        default: 30s
         meta:
-          label: Update interval in seconds.
+          label: Update interval.
 lm75:
   type: dict
   required: False
@@ -178,9 +183,14 @@ mcp23017:
         meta:
           label: GPIO of I2C SDA
       init_sleep:
-        type: integer
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
         required: True
-        default: 0
+        default: 0s
         meta:
           label: How long to sleep for MCP to initialize.
 
@@ -328,11 +338,16 @@ adc:
         meta:
           label: PIN to use.
       update_interval:
-        type: integer
         required: True
-        default: 60
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
+        default: 60s
         meta:
-          label: Update interval in seconds.
+          label: Update interval.
       show_in_ha:
         type: boolean
         required: True
@@ -368,15 +383,25 @@ cover:
         meta:
           label: ID of close relay of output.
       open_time:
-        type: integer
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
         required: True
         meta:
-          label: Time to open cover in seconds
+          label: Time to open cover. Example 30s. Minimum is 1s.
       close_time:
-        type: integer
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
         required: True
         meta:
-          label: Time to close cover in seconds
+          label: Time to close cover. Example 30s. Minimum is 1s.
       device_class:
         type: string
         required: False

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3}/boneio/sensor/adc.py

@@ -4,6 +4,7 @@ import asyncio
 
 from boneio.const import SENSOR
 from boneio.helper import BasicMqtt
+from boneio.helper.timeperiod import TimePeriod
 
 try:
     import Adafruit_BBIO.ADC as ADC
@@ -25,7 +26,9 @@ def initialize_adc():
 class GpioADCSensor(BasicMqtt):
     """Represent Gpio ADC sensor."""
 
-    def __init__(self, pin: str, update_interval: int = 60, **kwargs) -> None:
+    def __init__(
+        self, pin: str, update_interval: int = TimePeriod(seconds=60), **kwargs
+    ) -> None:
         """Setup GPIO ADC Sensor"""
         super().__init__(topic_type=SENSOR, **kwargs)
         self._pin = pin
@@ -44,4 +47,4 @@ class GpioADCSensor(BasicMqtt):
                 topic=self._send_topic,
                 payload=self.state,
             )
-            await asyncio.sleep(self._update_interval)
+            await asyncio.sleep(self._update_interval.total_seconds)

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3}/boneio/sensor/modbus/__init__.py

@@ -19,6 +19,7 @@ from boneio.const import (
 )
 from boneio.helper import BasicMqtt
 from boneio.helper.ha_discovery import modbus_sensor_availabilty_message
+from boneio.helper.timeperiod import TimePeriod
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -96,7 +97,7 @@ class ModbusSensor(BasicMqtt):
         topic_prefix: str,
         ha_discovery: bool = False,
         id: str = DefaultName,
-        update_interval: int = 60,
+        update_interval: TimePeriod = TimePeriod(seconds=60),
         **kwargs,
     ):
         """Initialize Modbus sensor class."""
@@ -185,7 +186,7 @@ class ModbusSensor(BasicMqtt):
 
     async def send_state(self) -> None:
         """Fetch state periodically and send to MQTT."""
-        update_interval = self._update_interval
+        update_interval = self._update_interval.total_seconds
         payload_online = OFFLINE
         while True:
             await self.check_availability()
@@ -215,13 +216,13 @@ class ModbusSensor(BasicMqtt):
                             payload=payload_online,
                         )
                     _LOGGER.warn(
-                        "Can't fetch data from modbus device. Will sleep for %s",
+                        "Can't fetch data from modbus device. Will sleep for %s seconds",
                         update_interval,
                     )
                     self._discovery_sent = False
                     continue
-                elif update_interval != self._update_interval:
-                    update_interval = self._update_interval
+                elif update_interval != self._update_interval.total_seconds:
+                    update_interval = self._update_interval.total_seconds
                 output = {}
                 for register in data["registers"]:
                     output[register.get("name").replace(" ", "")] = CONVERT_METHODS[

boneio-0.3.0.dev3/boneio/version.py

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

{boneio-0.3.0.dev1 → boneio-0.3.0.dev3/boneio.egg-info}/PKG-INFO

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

boneio-0.3.0.dev1/boneio/version.py

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