boneIO 0.3.0.dev1__py3-none-any.whl → 0.3.0.dev2__py3-none-any.whl

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/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/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
@@ -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)

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/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/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,7 +216,7 @@ 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

boneio/version.py

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

{boneio-0.3.0.dev1.dist-info → boneio-0.3.0.dev2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0.dev1
+Version: 0.3.0.dev2
 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.dev2.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

{boneio-0.3.0.dev1.dist-info → boneio-0.3.0.dev2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
 boneio/bonecli.py,sha256=I6TO8YIHPwPkb9MPB1ZY_i_CtpiipJ6_U8TznOiME3k,3077
 boneio/const.py,sha256=eBU9YNvTHvTRLvQtug0uqmsMZnVVNNcsKMZSow67fLM,2600
-boneio/cover.py,sha256=IhqNQSm237LTfrN0QjOs8z8FCSlFHkMJ8y4wfhJXNn8,8215
+boneio/cover.py,sha256=wKrnhaRGjJmEutUbisvDmPjVAYeDi4lYzV_de4nXxtA,8298
 boneio/manager.py,sha256=3pBGQ4UmzwS7gOM3HQZnCPZ_CEQzd_Iud-difDMmk_c,14136
 boneio/modbus.py,sha256=FVo5QJkJ9-8SWKktKP2VLQ09zGp9A8jbQhuVgW8EO8o,3996
 boneio/mqtt_client.py,sha256=dxuVR4dTrLb0x7SZF8C_E_UI1u72g3n5n_XdSuRlFSg,6353
 boneio/oled.py,sha256=Be9QeTHX1mmCQOshYY1KNGvqt4nzEtJCD3gCE3gRSsc,4836
 boneio/runner.py,sha256=g0SinyJjFRPSWjiQ7kpilr5v_f3qctx6FOxEOJPkbNs,1880
-boneio/version.py,sha256=CtEtI3sZE2CkRooEJDafw_EikEa4f-r_ymZyrWn2g28,42
+boneio/version.py,sha256=ckUPqY-IKBojH6FaCQWqIHQt5Jjw0nfk9PB2REzERsc,42
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boneio/example_config/adc.yaml,sha256=KaNfPuZmrhpiKJVUKC6uQXQ0YRCp0DoXVxYtqsbiSGI,168
 boneio/example_config/config.yaml,sha256=_gNf0Yo6p10Ao_rcSmHA_gCGMtDsvAdso3jNt3r3gqE,322
@@ -19,9 +19,9 @@ boneio/fonts/danube__.ttf,sha256=KBRPUcGvmroCjrWC8zK4MulUb9lV8R0lXkOY7lNnQWc,193
 boneio/helper/__init__.py,sha256=wOr2NWtGamuaWVmmQQP4vcNaj1I6pXeT2rDf-FzXKYk,2289
 boneio/helper/events.py,sha256=oKXDpFXSmbfhnucSYTTCPlhaBBstcAYYg3bTIVS6D1w,5251
 boneio/helper/exceptions.py,sha256=4APZ9UrJtCWP-5hLqHUThJ9fLKOZr-LoulLy_1QAq-I,318
-boneio/helper/gpio.py,sha256=ToJ7dAQBZ1K5tGLcOw3NF9pLOaDSucbJo1VvOX2HqEU,2812
+boneio/helper/gpio.py,sha256=HOImpow_6rVOtgZ5FAZd-En61jNyigp2AVZMXYW0x3U,2765
 boneio/helper/ha_discovery.py,sha256=0Ab5xwplKoxArYTSwt5xyBtn5MaVbKlzdoRNw3tpRN8,5480
-boneio/helper/loader.py,sha256=gPG6uPQRHTZudj5DCLVFxJ07xof6rcsMfGtLcUvu_Qw,10304
+boneio/helper/loader.py,sha256=w8Q8-3DfnA-37ZxV3M0Sf9nrJBJNZp-wsVq0sJroUBI,10430
 boneio/helper/logger.py,sha256=8B0qeNPALGG5Dlz0cfujjknbf-TOPv4axLF3xj_Bzs8,1800
 boneio/helper/mqtt.py,sha256=q_0K5TOWNZNCvmhpHuFWloRSVyGxdklogx0jYxc5cpg,741
 boneio/helper/oled.py,sha256=f0XYbaFstUbJ6ISmFe1vQCnmNVMctQWtnStNdROrblc,351
@@ -39,18 +39,18 @@ boneio/relay/mcp.py,sha256=6Bd8ktQnP9yItxO7wkSNCVodMAMRqd8NrVm0TMwIkmk,2665
 boneio/schema/actions.yaml,sha256=HWBeyJLBVbJ_prSYj14ovP7f13QKXL3-9GRJgAOpHQ4,921
 boneio/schema/actions_sensor.yaml,sha256=LhXEsYsg6qs7iHqgQE6n-2jj-o-ZZRusDW_9nWIiZAY,129
 boneio/schema/actions_switch.yaml,sha256=qyooX0izkgl4wBEh8xUsYFEKMrvhbIAQYxOGTB5AROY,124
-boneio/schema/schema.yaml,sha256=5WwsnIV6wC2zkHvyzByJ6O0WXlm2JPD1dQueVFsv8bQ,8946
+boneio/schema/schema.yaml,sha256=pJHGIC92SlTLhCUqBUolIQOqsoIcevfgXRJhfPu9lpo,9458
 boneio/sensor/__init__.py,sha256=XJG-ktDfEPMs5RLt9hYT3gQmYhU_wMOR0Ud88-Q0KmM,305
-boneio/sensor/adc.py,sha256=vjl1ZsRv-_ispskCeYxzXrFrbgd7_0--YKYlJ7vfi4k,1149
+boneio/sensor/adc.py,sha256=mAxzgs0Eul1V6Fmye9V7TsJiPRnc59TQ-s7nb_PV7G8,1245
 boneio/sensor/gpio.py,sha256=9f_hNcCYvrEb7FvA00Xm-L5-fUXdH4SM-jZiOamOz2Q,1230
-boneio/sensor/modbus/__init__.py,sha256=HmiGIrpHVtfA22ur-FdyM3288PNzRqV2bIN8E2AcZo4,8194
+boneio/sensor/modbus/__init__.py,sha256=Etfbc81b265uj8cVltxx5p4zxv7pxbApgaocQy-af-4,8291
 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
 boneio/sensor/temp/__init__.py,sha256=lhvQqD76atQNyoxdeyskH8_fVOLCaHFoVnpzby6kqeE,1416
-boneio-0.3.0.dev1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneio-0.3.0.dev1.dist-info/METADATA,sha256=50wYGlA6FEqvKuvZjYEpAG5LjEFkqfF-SlozKGDRp8M,1887
-boneio-0.3.0.dev1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-boneio-0.3.0.dev1.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
-boneio-0.3.0.dev1.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
-boneio-0.3.0.dev1.dist-info/RECORD,,
+boneio-0.3.0.dev2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneio-0.3.0.dev2.dist-info/METADATA,sha256=IaurBg_gI6zf-NWjpfTrT_djAkFXxU85xXc535qyDOw,1887
+boneio-0.3.0.dev2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+boneio-0.3.0.dev2.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
+boneio-0.3.0.dev2.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
+boneio-0.3.0.dev2.dist-info/RECORD,,