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

{boneIO-0.7.0.dev1.dist-info → boneIO-0.7.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.7.0dev1
+Version: 0.7.0dev2
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>
@@ -14,6 +14,7 @@ Requires-Dist: adafruit-circuitpython-mcp230xx>=2.5.11
 Requires-Dist: adafruit-circuitpython-mcp9808>=3.3.21
 Requires-Dist: adafruit-circuitpython-onewire>=2.0.5
 Requires-Dist: adafruit-circuitpython-pca9685>=3.4.10
+Requires-Dist: adafruit-circuitpython-pcf8575>=1.0.2
 Requires-Dist: adafruit-circuitpython-pct2075>=1.1.19
 Requires-Dist: aiomqtt>=1.1.0
 Requires-Dist: colorlog>=6.7.0

{boneIO-0.7.0.dev1.dist-info → boneIO-0.7.0.dev2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
 boneio/bonecli.py,sha256=VhY1BMt6OaZz-752UjhEexdn8fDJkJaDWcGQNhCmgN0,3341
-boneio/const.py,sha256=4HRCWvh1dslJ37vMUp_NL2weeQjEkzi-z4iAcmik4MU,2947
+boneio/const.py,sha256=NwdWZaL2Jjk7eizYhjXcaPGB5PjEeg9TJGhKBbj2bkg,3049
 boneio/cover.py,sha256=nr76ft5smAPdBB8Jytk-uFd6RWuqtcZiG6EE129OUjw,8454
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boneio/example_config/adc_v0_4.yaml,sha256=GKNpl2t7ebsH57UhJlJioXNuBflsL6eO4JMnyYwZrFs,168
@@ -17,12 +17,12 @@ boneio/helper/__init__.py,sha256=zizPsGPbEtcqUsFWOxhs8s4H6PeJvJq8tP0OvCVJ_C4,203
 boneio/helper/async_updater.py,sha256=BVh5mXFxgaZqoekjQbQSCTssfyVIdCQ80LCJny-rOo4,985
 boneio/helper/click_timer.py,sha256=dVYdX3VNpAEKHCIqWs3u0PCJLSPIGr0K2kMffc_kGdc,1138
 boneio/helper/config.py,sha256=HUl7iF7os1-YNfl1neJf2aDwiS2VE43biGefU5EhW3s,2321
-boneio/helper/events.py,sha256=EHYJy507RF1LikWQ2s4r990JRvR9rO4z7FkaJqt1Mrk,7494
+boneio/helper/events.py,sha256=i-5FLyVwcAO3m3TpctxtbTcb7SCyQv8lX04mLHHhYk8,7592
 boneio/helper/exceptions.py,sha256=vyYSUojwB7OttOPUjbxeHFM7C_o5ZQmRUcZ_vYpxYYI,717
 boneio/helper/filter.py,sha256=UcjifjaC5wHDW2He7wmwCX2IjSSeLVhXyhrXHeT8RmA,885
 boneio/helper/gpio.py,sha256=sxvkYtKVt5alGoXFBRzG8ONEo112fsKsX-zK2C-_YKg,3249
 boneio/helper/ha_discovery.py,sha256=ErAub0LK9y2fUieqUsHpixQATO1NQ_ZABGELVYDAZtE,6359
-boneio/helper/loader.py,sha256=qrTntQ_AhkY-8-kL54H65pqAfyMFEwoXPIll6q5EyXw,14895
+boneio/helper/loader.py,sha256=6t9q3ns0EamuI0hn7_pCydAIWhOab5LoJ1AxPSHetZE,14687
 boneio/helper/logger.py,sha256=zyF_Vk3o2eSHuXypJhNzK99eZgkWDWybuB5KcJgurDs,1801
 boneio/helper/mqtt.py,sha256=UVa4KaxvVif6By_sVMdSMiYI_doZjiXF4LS9RFltxJk,765
 boneio/helper/oled.py,sha256=f0XYbaFstUbJ6ISmFe1vQCnmNVMctQWtnStNdROrblc,351
@@ -39,16 +39,17 @@ boneio/helper/yaml_util.py,sha256=gAX7hCaHUlPgkhGCIQ4zjv0Vj9JmLzQsSyF51ZmSb9g,11
 boneio/input/__init__.py,sha256=ZM6G2XX621lQUy8Tk6S8zf_jBp_NxsK6OHMMrdsOsDo,178
 boneio/input/gpio.py,sha256=4YPzwtyWuEWdDQWte5YU-X_vaId2wFy_XWv7WkjzFoQ,2611
 boneio/input/gpio_beta.py,sha256=mBMIpVUEyH-CJpb2TtHDiiYaVFYdzjExcDGeOxx9PYQ,3133
-boneio/manager.py,sha256=RRKiKq26hNWf2MXaVWnh07_AFObajsMiAeerJxvN2uU,21785
+boneio/manager.py,sha256=YwTm-5Loi9deUFokXFNW-FDQDtnrZUlpW9xreyW6Vlw,22339
 boneio/modbus.py,sha256=eA_sGnmdcIneXX75ZcXOI223-UkKN1UYmWFqiJBAhJo,4176
-boneio/mqtt_client.py,sha256=xADbqvQQnSqGBFw294_DyDkgIomwCveY6e1RaJC0Igk,8302
+boneio/mqtt_client.py,sha256=OakqsF5q6JSOMR___EldxuG_Xg9YVDPYAV6CSwyJAjs,8645
 boneio/oled.py,sha256=d_ofDQHc7zr3j0qOR0B_L3C8TJhvRH85nnb9Le-88nk,5244
 boneio/relay/__init__.py,sha256=iLEUL8kxnEndCQtgDIJfHqUZOfyWfWmuOrqSYAUxb2w,181
-boneio/relay/basic.py,sha256=QEWG8HodBqEqLpQxcQm29hdPIxO7c6ep0uDgfo3pcco,2623
+boneio/relay/basic.py,sha256=uMQWSgcCVH-ieGKirW_Faj1rVEivt0kmCE9XCDCu47s,2798
 boneio/relay/gpio.py,sha256=s64FBf6zlxciF57xJ6nrvy0t5Rie0uiXlwos0HL3RKM,1163
-boneio/relay/mcp.py,sha256=DhgqZbFHB6TucL9hJaJiqdVAbkw4Rv5VPHm_khSBIFo,2669
-boneio/relay/pca.py,sha256=tCwXvMJcsxzFj48ZO2tPYyvElZfyIRTFmEMp7ENKvtk,4873
-boneio/runner.py,sha256=8cOWpFFf02IwC9vaCdexcCTN1kP0_yKMBPT35PEHwHM,2653
+boneio/relay/mcp.py,sha256=y23yvOsyBEs9d8A6QOgtmJpjd4cDx6DyW-cBz8Y-488,2506
+boneio/relay/pca.py,sha256=vYQbDoBQ6iRK0HN3M8gW402PEwM5utON1hmdw5E0cIE,4871
+boneio/relay/pcf.py,sha256=N_4d2u7nMUL-s5LwxsHGOKtGXneKFm-lCpezpKvrJvs,2504
+boneio/runner.py,sha256=VL0q7P4VeDhoQIqooE8gg8Q7wOYCGIcHSZk7g9SDZHU,2876
 boneio/schema/actions.yaml,sha256=WD0LR9SxVPgwU12x10RvFaTeyDiCjdRiicfkrCGLNvc,1030
 boneio/schema/actions_sensor.yaml,sha256=U_VfdjqdorQZHYD6dZOzhlRKnOGwsnTJ3CDGiqrKxW8,124
 boneio/schema/actions_switch.yaml,sha256=sdqhwz0LrcfaiAN3-RfAR_xApxo5dh9RxXQubuKcsjk,129
@@ -61,7 +62,7 @@ boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD
 boneio/sensor/__init__.py,sha256=u-fSBKy1gcXTNclra5KzLYDxpHeo9G0vuNiMexIZSDw,538
 boneio/sensor/adc.py,sha256=tCUdr3KN5uSbgXiwhNXbMjeNkO2CzPYhIOncHR5_LD0,1328
 boneio/sensor/gpio.py,sha256=a9HljBbXr5YdCImZ85dBlTgIZZBsL38UEmAmRcDMp0w,1296
-boneio/sensor/gpio_beta.py,sha256=K1sxxnRDWmhTcRjmWZ-tjDAza4rLDamsx_8_jK3TMxU,1284
+boneio/sensor/gpio_beta.py,sha256=Szl_5Q9jRCxTLJNwmry8tkrC2u1Pxelhe8DJa1C-27U,1291
 boneio/sensor/modbus/__init__.py,sha256=IUwGdGn_egqOcSZrt4tTu0n8APnc0M7uau7XUWDlhes,8520
 boneio/sensor/modbus/dts1964_3f.json,sha256=WABph_2X4OgMidSM28vw4dLd9ZByRoiUP-RqE0UMpR8,8810
 boneio/sensor/modbus/pt100.json,sha256=bzKNYDc3lMto94Ut8gutVIsHytQiMobwFCkonOiMegs,526
@@ -73,9 +74,9 @@ boneio/sensor/temp/__init__.py,sha256=OViqBb7DwVn_aFIy6V0iqkSUDjsDNLQ5sOS_4frYdw
 boneio/sensor/temp/dallas.py,sha256=xrvd1LNBh1fRcjz_yd_9S29Lv26ItVtLCmhZgVQWJos,2485
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=ig8n6Qd2PUEB4oYuBg_tNATNBQRkzy1TPKoHWipXRX0,41
-boneIO-0.7.0.dev1.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.7.0.dev1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-boneIO-0.7.0.dev1.dist-info/METADATA,sha256=6jXEUsPHVyv_Ym0uIFA0Wfrk130xp7059FuIjrkv7jY,1696
-boneIO-0.7.0.dev1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.7.0.dev1.dist-info/RECORD,,
+boneio/version.py,sha256=17EUCA3ZgMyhHFifjToUvLPBUn7Sc12qa42ebBpttH8,41
+boneIO-0.7.0.dev2.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.7.0.dev2.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneIO-0.7.0.dev2.dist-info/METADATA,sha256=F57mc0Y6T-8X1avMDVEnxuG80U7zMx5oLq7vtc-kOTA,1749
+boneIO-0.7.0.dev2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.7.0.dev2.dist-info/RECORD,,

boneio/const.py

@@ -104,10 +104,13 @@ TOPIC_PREFIX = "topic_prefix"
 # I2C, PCA and MCP CONST
 ADDRESS = "address"
 MCP23017 = "mcp23017"
+PCF8575 = "pcf8575"
 PCA9685 = "pca9685"
 MCP = "mcp"
+PCF = "pcf"
 MCP_ID = "mcp_id"
 PCA_ID = "pca_id"
+PCF_ID = "pcf_id"
 INIT_SLEEP = "init_sleep"
 
 # SENSOR CONST
@@ -141,6 +144,7 @@ OledDataTypes = Literal[UPTIME, NETWORK, CPU, DISK, MEMORY, SWAP, OUTPUT]
 Gpio_States = Literal[HIGH, LOW]
 Gpio_Edges = Literal[BOTH, FALLING]
 InputTypes = Literal[INPUT, INPUT_SENSOR]
+ExpanderTypes = Literal[MCP23017, PCA9685, PCF8575]
 DEVICE_CLASS = "device_class"
 DallasBusTypes = Literal[DS2482, DALLAS]
 FILTERS = "filters"

boneio/helper/events.py

@@ -77,9 +77,11 @@ class ListenerJob:
 class EventBus:
     """Simple event bus which ticks every second."""
 
-    def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
+    def __init__(self, last_will_mqtt = Callable) -> None:
         """Initialize handler"""
-        self._loop = loop or asyncio.get_event_loop()
+        self._loop = asyncio.get_event_loop()
+        self._last_will = last_will_mqtt
+
         self._listeners = {}
         self._sigterm_listeners = []
         self._haonline_listeners = []
@@ -87,7 +89,7 @@ class EventBus:
         for signame in {"SIGINT", "SIGTERM"}:
             self._loop.add_signal_handler(
                 getattr(signal, signame),
-                self.ask_exit,
+                lambda: asyncio.create_task(self.ask_exit()),
             )
 
     def _run_second_event(self, time):
@@ -98,13 +100,15 @@ class EventBus:
                     self._loop.call_soon(listener.target, time)
                 )
 
-    def ask_exit(self):
+    async def ask_exit(self):
         """Function to call on exit. Should invoke all sigterm listeners."""
         _LOGGER.debug("Exiting process started.")
         self._listeners = {}
         for target in self._sigterm_listeners:
             target()
         self._timer_handle()
+
+        await self._last_will()
         _LOGGER.info("Shutdown gracefully.")
         raise GracefulExit(code=0)
 

boneio/helper/loader.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Union
 
 from adafruit_mcp230xx.mcp23017 import MCP23017
 from adafruit_pca9685 import PCA9685
+from adafruit_pcf8575 import PCF8575
 
 from boneio.const import (
     ACTIONS,
@@ -37,7 +38,11 @@ from boneio.const import (
     SHOW_HA,
     UPDATE_INTERVAL,
     DallasBusTypes,
-    EVENT_ENTITY
+    EVENT_ENTITY,
+    ExpanderTypes,
+    PCF,
+    PCA,
+    PCF_ID
 )
 from boneio.cover import Cover
 from boneio.helper import (
@@ -148,53 +153,40 @@ def create_temp_sensor(
         _LOGGER.error("Can't configure Temp sensor. %s", err)
         pass
 
-
-def create_mcp23017(
-    manager: Manager,
-    mcp23017: list,
-    i2cbusio: I2C,
+expander_class = {
+    MCP: MCP23017,
+    PCA: PCA9685,
+    PCF: PCF8575
+}
+
+def create_expander(
+        expander_dict: dict,
+        expander_config: list,
+        exp_type: ExpanderTypes,
+        i2cbusio: I2C
 ) -> dict:
-    """Create MCP23017."""
     grouped_outputs = {}
-    for mcp in mcp23017:
-        id = mcp[ID] or mcp[ADDRESS]
+    for expander in expander_config:
+        id = expander[ID] or expander[ADDRESS]
         try:
-            manager._mcp[id] = MCP23017(i2c=i2cbusio, address=mcp[ADDRESS], reset=False)
-            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)
+            expander_dict[id] = expander_class[exp_type](i2c=i2cbusio, address=expander[ADDRESS], reset=False)
+            sleep_time = expander.get(INIT_SLEEP, TimePeriod(seconds=0))
+            if sleep_time.total_seconds > 0:
+                _LOGGER.debug(
+                    f"Sleeping for {sleep_time.total_seconds}s while {exp_type} {id} is initializing."
+                )
+                time.sleep(sleep_time.total_seconds)
+            else:
+                _LOGGER.debug(
+                    f"{exp_type} {id} is initializing."
+                )
             grouped_outputs[id] = {}
         except TimeoutError as err:
-            _LOGGER.error("Can't connect to MCP %s. %s", id, err)
+            _LOGGER.error("Can't connect to %s %s. %s", exp_type, id, err)
             pass
     return grouped_outputs
 
 
-def create_pca9685(
-    manager: Manager,
-    pca9685: list,
-    i2cbusio: I2C,
-) -> dict:
-    """Create MCP23017."""
-    grouped_outputs = {}
-    for pca in pca9685:
-        id = pca[ID] or pca[ADDRESS]
-        try:
-            manager._pca[id] = PCA9685(i2c_bus=i2cbusio, address=pca[ADDRESS])
-            manager._pca[id].frequency = 500
-            sleep_time = pca.get(INIT_SLEEP, TimePeriod(seconds=0))
-            _LOGGER.debug(
-                f"Sleeping for {sleep_time.total_seconds}s while PCA {id} is initializing."
-            )
-            time.sleep(sleep_time.total_seconds)
-            grouped_outputs[id] = {}
-        except TimeoutError as err:
-            _LOGGER.error("Can't connect to PCA %s. %s", id, err)
-            pass
-    return grouped_outputs
-
 
 def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
     """Create Modbus sensor for each device."""
@@ -236,6 +228,9 @@ def output_chooser(output_kind: str, config):
     elif output_kind == PCA:
         output_id = config.pop(PCA_ID, None)
         return OutputEntry(PWMPCA, PCA, output_id)
+    elif output_kind == PCF:
+        output_id = config.pop(PCF_ID, None)
+        return OutputEntry(PWMPCA, PCF, output_id)
     else:
         raise GPIOOutputException(f"""Output type {output_kind} dont exists""")
 
@@ -373,7 +368,7 @@ def configure_binary_sensor(
     """Configure input sensor or button."""
     try:
         GpioInputBinarySensorClass = GpioInputBinarySensor if gpio.get("detection_type", "stable") == "stable" else GpioInputBinarySensorBeta
-        GpioInputBinarySensor(
+        GpioInputBinarySensorClass(
             pin=pin,
             press_callback=lambda x, i: press_callback(
                 x=x,

boneio/manager.py

@@ -37,6 +37,9 @@ from boneio.const import (
     LIGHT,
     LED,
     SET_BRIGHTNESS,
+    MCP,
+    PCA,
+    PCF
 )
 from boneio.helper import (
     GPIOInputException,
@@ -57,8 +60,7 @@ from boneio.helper.loader import (
     configure_binary_sensor,
     configure_relay,
     create_dallas_sensor,
-    create_mcp23017,
-    create_pca9685,
+    create_expander,
     create_temp_sensor,
 )
 from boneio.helper.logger import configure_logger
@@ -84,6 +86,7 @@ class Manager:
         stop_client: Callable[[], Awaitable[None]],
         state_manager: StateManager,
         config_helper: ConfigHelper,
+        event_bus: EventBus,
         config_file_path: str,
         relay_pins: List = [],
         event_pins: List = [],
@@ -92,6 +95,7 @@ class Manager:
         modbus: dict = {},
         pca9685: list = [],
         mcp23017: list = [],
+        pcf8575: list = [],
         ds2482: Optional[List] = [],
         dallas: Optional[dict] = None,
         oled: dict = {},
@@ -107,7 +111,7 @@ class Manager:
         self._host_data = None
         self._config_file_path = config_file_path
         self._state_manager = state_manager
-        self._event_bus = EventBus(self._loop)
+        self._event_bus = event_bus
 
         self.send_message = send_message
         self.stop_client = stop_client
@@ -115,6 +119,7 @@ class Manager:
         self._binary_pins = binary_pins
         self._i2cbusio = I2C(SCL, SDA)
         self._mcp = {}
+        self._pcf = {}
         self._pca = {}
         self._output = {}
         self._oled = None
@@ -132,11 +137,27 @@ class Manager:
             dallas=dallas, ds2482=ds2482, sensors=sensors.get(ONEWIRE)
         )
 
-        self.grouped_outputs = create_mcp23017(
-            manager=self, mcp23017=mcp23017, i2cbusio=self._i2cbusio
+        self.grouped_outputs = create_expander(
+            expander_dict=self._mcp,
+            expander_config=mcp23017,
+            exp_type=MCP,
+            i2cbusio=self._i2cbusio
         )
         self.grouped_outputs.update(
-            create_pca9685(manager=self, pca9685=pca9685, i2cbusio=self._i2cbusio)
+            create_expander(
+            expander_dict=self._pcf,
+            expander_config=pcf8575,
+            exp_type=PCF,
+            i2cbusio=self._i2cbusio
+        )
+        )
+        self.grouped_outputs.update(
+            create_expander(
+            expander_dict=self._pca,
+            expander_config=pca9685,
+            exp_type=PCA,
+            i2cbusio=self._i2cbusio
+        )
         )
 
         self._configure_adc(adc_list=adc)
@@ -456,6 +477,11 @@ class Manager:
     def pca(self):
         """Get PCA by it's id."""
         return self._pca
+    
+    @property
+    def pcf(self):
+        """Get PCF by it's id."""
+        return self._pcf
 
     def press_callback(
         self, x: ClickTypes, inpin: str, actions: List, input_type: InputTypes = INPUT, empty_message_after: bool = False

boneio/mqtt_client.py

@@ -15,7 +15,7 @@ from aiomqtt import Client as AsyncioClient, MqttError, Will
 from paho.mqtt.properties import Properties
 from paho.mqtt.subscribeoptions import SubscribeOptions
 
-from boneio.const import ONLINE, PAHO, STATE
+from boneio.const import ONLINE, OFFLINE, PAHO, STATE
 from boneio.helper import UniqueQueue
 from boneio.helper.config import ConfigHelper
 from boneio.manager import Manager
@@ -128,7 +128,7 @@ class MQTTClient:
         await self.asyncio_client.unsubscribe(topic=topics, **params)
 
     def send_message(
-        self, topic: str, payload: Union[str, dict, None], retain: bool = False
+        self, topic: str, payload: Union[str, int, dict, None], retain: bool = False
     ) -> None:
         """Send a message from the manager options."""
         to_publish = (
@@ -161,12 +161,19 @@ class MQTTClient:
                 self._connection_established = False
                 await asyncio.sleep(self.reconnect_interval)
                 self.create_client()  # reset connect/reconnect futures
+            except asyncio.CancelledError:
+                _LOGGER.info("MQTT client task canceled.")
 
     async def stop_client(self) -> None:
         await self.unsubscribe(
             topics=self._topics
         )
         raise RestartRequestException("Restart requested.")
+    
+    async def last_will_mqtt(self) -> None:
+        _LOGGER.info("Sending offline state.")
+        topic = f"{self._config_helper.topic_prefix}/{STATE}"
+        self.send_message(topic=topic, payload=OFFLINE, retain=True)
 
     async def _subscribe_manager(self, manager: Manager) -> None:
         """Connect and subscribe to manager topics + host stats."""

boneio/relay/basic.py

@@ -3,7 +3,7 @@
 import asyncio
 import logging
 from typing import Callable
-
+from boneio.helper.util import callback
 from boneio.const import LIGHT, NONE, OFF, ON, RELAY, STATE, SWITCH
 from boneio.helper import BasicMqtt
 
@@ -82,6 +82,11 @@ class BasicRelay(BasicMqtt):
         else:
             self.turn_on()
 
+    @callback
+    def _momentary_callback(self, time, action):
+        _LOGGER.info("Momentary callback at %s", time)
+        action()
+
     @property
     def is_active(self) -> bool:
         """Is active check."""

boneio/relay/mcp.py

@@ -4,9 +4,8 @@ import logging
 
 from adafruit_mcp230xx.mcp23017 import MCP23017, DigitalInOut
 
-from boneio.const import NONE, SWITCH
+from boneio.const import NONE, SWITCH, MCP
 from boneio.helper.events import async_track_point_in_time, utcnow
-from boneio.helper.util import callback
 from boneio.relay.basic import BasicRelay
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,23 +33,23 @@ class MCPRelay(BasicRelay):
             **kwargs, output_type=output_type, restored_state=restored_state
         )
         self._pin_id = pin
-        self._mcp_id = mcp_id
+        self._expander_id = mcp_id
         _LOGGER.debug("Setup MCP with pin %s", self._pin_id)
 
     @property
-    def is_mcp_type(self) -> bool:
-        """Check if relay is mcp type."""
-        return True
+    def expander_type(self) -> str:
+        """Check expander type."""
+        return MCP
 
     @property
-    def pin_id(self) -> str:
+    def pin_id(self) -> int:
         """Return PIN id."""
         return self._pin_id
 
     @property
-    def mcp_id(self) -> str:
+    def expander_id(self) -> str:
         """Retrieve parent MCP ID."""
-        return self._mcp_id
+        return self._expander_id
 
     @property
     def is_active(self) -> bool:
@@ -62,11 +61,6 @@ class MCPRelay(BasicRelay):
         """PIN of the relay"""
         return self._pin
 
-    @callback
-    def _momentary_callback(self, time, action):
-        _LOGGER.info("Momentary callback at %s", time)
-        action()
-
     def turn_on(self) -> None:
         """Call turn on action."""
         self.pin.value = True

boneio/relay/pca.py

@@ -9,7 +9,7 @@ from adafruit_pca9685 import PCA9685, PCAChannels
 from boneio.helper.events import async_track_point_in_time, utcnow
 from boneio.helper.util import callback
 
-from boneio.const import LED, NONE, OFF, ON, STATE, SWITCH, BRIGHTNESS, RELAY
+from boneio.const import LED, NONE, OFF, ON, STATE, SWITCH, BRIGHTNESS, RELAY, PCA
 from boneio.helper import BasicMqtt
 
 _LOGGER = logging.getLogger(__name__)
@@ -58,9 +58,9 @@ class PWMPCA(BasicMqtt):
         _LOGGER.debug("Setup PCA with pin %s", self._pin_id)
 
     @property
-    def is_pca_type(self) -> bool:
-        """Check if relay is pca type."""
-        return True
+    def expander_type(self) -> str:
+        """Check expander type."""
+        return PCA
 
     @property
     def output_type(self) -> str:

boneio/relay/pcf.py

@@ -0,0 +1,84 @@
+"""PCF8575 Relay module."""
+
+import logging
+
+from adafruit_pcf8575 import PCF8575, DigitalInOut
+
+from boneio.const import NONE, SWITCH, PCF
+from boneio.helper.events import async_track_point_in_time, utcnow
+from boneio.relay.basic import BasicRelay
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class PCFRelay(BasicRelay):
+    """Represents PCF Relay output"""
+
+    def __init__(
+        self,
+        pin: int,
+        mcp: PCF8575,
+        expander_id: str,
+        output_type: str = SWITCH,
+        restored_state: bool = False,
+        **kwargs,
+    ) -> None:
+        """Initialize MCP relay."""
+        self._pin: DigitalInOut = mcp.get_pin(pin)
+        if output_type == NONE:
+            """Just in case to not restore state of covers etc."""
+            restored_state = False
+        self._pin.switch_to_output(value=restored_state)
+        super().__init__(
+            **kwargs, output_type=output_type, restored_state=restored_state
+        )
+        self._pin_id = pin
+        self._expander_id = expander_id
+        _LOGGER.debug("Setup PCF with pin %s", self._pin_id)
+
+    @property
+    def expander_type(self) -> str:
+        """Check expander type."""
+        return PCF
+
+    @property
+    def pin_id(self) -> int:
+        """Return PIN id."""
+        return self._pin_id
+
+    @property
+    def expander_id(self) -> str:
+        """Retrieve parent MCP ID."""
+        return self._expander_id
+
+    @property
+    def is_active(self) -> bool:
+        """Is relay active."""
+        return self.pin.value
+
+    @property
+    def pin(self) -> str:
+        """PIN of the relay"""
+        return self._pin
+
+    def turn_on(self) -> None:
+        """Call turn on action."""
+        self.pin.value = True
+        if self._momentary_turn_on:
+            async_track_point_in_time(
+                loop=self._loop,
+                action=lambda x: self._momentary_callback(time=x, action=self.turn_off),
+                point_in_time=utcnow() + self._momentary_turn_on.as_timedelta,
+            )
+        self._loop.call_soon_threadsafe(self.send_state)
+
+    def turn_off(self) -> None:
+        """Call turn off action."""
+        self.pin.value = False
+        if self._momentary_turn_off:
+            async_track_point_in_time(
+                loop=self._loop,
+                action=lambda x: self._momentary_callback(time=x, action=self.turn_on),
+                point_in_time=utcnow() + self._momentary_turn_off.as_timedelta,
+            )
+        self._loop.call_soon_threadsafe(self.send_state)

boneio/runner.py

@@ -17,6 +17,7 @@ from boneio.const import (
     EVENT_ENTITY,
     LM75,
     MCP23017,
+    PCF8575,
     PCA9685,
     MCP_TEMP_9808,
     MODBUS,
@@ -34,11 +35,13 @@ from boneio.helper import StateManager
 from boneio.helper.config import ConfigHelper
 from boneio.manager import Manager
 from boneio.mqtt_client import MQTTClient
+from boneio.helper.events import EventBus
 
 _LOGGER = logging.getLogger(__name__)
 
 config_modules = [
     {"name": MCP23017, "default": []},
+    {"name": PCF8575, "default": []},
     {"name": PCA9685, "default": []},
     {"name": DS2482, "default": []},
     {"name": ADC, "default": []},
@@ -56,6 +59,7 @@ async def async_run(
     mqttpassword: str = "",
 ) -> list[Any]:
     """Run BoneIO."""
+    _loop = asyncio.get_event_loop()
 
     _config_helper = ConfigHelper(
         topic_prefix=config[MQTT].pop(TOPIC_PREFIX),
@@ -70,6 +74,7 @@ async def async_run(
         port=config[MQTT].get(PORT, 1883),
         config_helper=_config_helper,
     )
+    event_bus =  EventBus(last_will_mqtt=client.last_will_mqtt)
     manager_kwargs = {
         item["name"]: config.get(item["name"], item["default"])
         for item in config_modules
@@ -78,6 +83,7 @@ async def async_run(
     manager = Manager(
         send_message=client.send_message,
         stop_client=client.stop_client,
+        event_bus=event_bus,
         relay_pins=config.get(OUTPUT, []),
         event_pins=config.get(EVENT_ENTITY, []),
         binary_pins=config.get(BINARY_SENSOR, []),

boneio/sensor/gpio_beta.py

@@ -1,9 +1,10 @@
 """GpioInputBinarySensor to receive signals."""
 import logging
 from functools import partial
-from boneio.const import PRESSED, RELEASED
+from boneio.const import PRESSED, RELEASED, BOTH
 from boneio.helper import GpioBaseClass
 from boneio.helper.gpio import add_event_callback, add_event_detect
+
 _LOGGER = logging.getLogger(__name__)
 
 

boneio/version.py

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