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

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

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

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

@@ -1,7 +1,7 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
-boneio/bonecli.py,sha256=VhY1BMt6OaZz-752UjhEexdn8fDJkJaDWcGQNhCmgN0,3341
-boneio/const.py,sha256=NwdWZaL2Jjk7eizYhjXcaPGB5PjEeg9TJGhKBbj2bkg,3049
-boneio/cover.py,sha256=nr76ft5smAPdBB8Jytk-uFd6RWuqtcZiG6EE129OUjw,8454
+boneio/bonecli.py,sha256=o2DWcsKqw4IJklPmbdq7bwgcISOWPZfYVAUuMltNUP0,3435
+boneio/const.py,sha256=Drge50hdQpxW7gYbYIC6DPVHHibFOKH0OAV3lWzhH-Q,3256
+boneio/cover.py,sha256=EfO1DAOGTPQykfgJHzg1WqPs0U8b1AnD2NMI-sLZccM,8444
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boneio/example_config/adc_v0_4.yaml,sha256=GKNpl2t7ebsH57UhJlJioXNuBflsL6eO4JMnyYwZrFs,168
 boneio/example_config/binary_sensor.yaml,sha256=0-KfPuACU6Q8krtNLQ_Bu8135xLEeCrs8UhGXR7kCxU,238
@@ -13,50 +13,53 @@ boneio/example_config/output24x16A.yaml,sha256=BTtHToRgz-U_rMMDbmHkM4wQxHakdzInb
 boneio/example_config/output24x16A_v0.3.yaml,sha256=XkI4rHn_XdX37xG02-wHieZzSHKiKN5mtnyfRE24NII,1713
 boneio/example_config/output32x5A.yaml,sha256=G2Pb6qL8mXs6MliIM1roAanPag9ozRe3McYYuFsiBc0,2403
 boneio/fonts/danube__.ttf,sha256=KBRPUcGvmroCjrWC8zK4MulUb9lV8R0lXkOY7lNnQWc,19372
+boneio/group/__init__.py,sha256=eUN51J6nU1MdQfcl6JQ2AQwkP6K91mR9caDZyZ18rig,80
+boneio/group/output.py,sha256=byaYz1etz2LWFpRnvLMH0EpzeP5JMF_PH2W2pGDTnEY,2005
 boneio/helper/__init__.py,sha256=zizPsGPbEtcqUsFWOxhs8s4H6PeJvJq8tP0OvCVJ_C4,2039
-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=i-5FLyVwcAO3m3TpctxtbTcb7SCyQv8lX04mLHHhYk8,7592
+boneio/helper/async_updater.py,sha256=K1xXpVAFeTOKfcmTGBnBgOvwZHfZQQKOWVEOnEMm0BY,993
+boneio/helper/click_timer.py,sha256=yZ2nfnreSCBfJkkWDE_RhDfV7YHgwfoehMLh3ia2BEI,1184
+boneio/helper/config.py,sha256=5cDnJ7usJDlUvXv8K2rSWEx30OFcU2k1U1vUEjO69WY,2431
+boneio/helper/events.py,sha256=mK6boHpgMf3mMudnrUOesHL28udX8E2BGNwHFuEN2XA,8059
 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=6t9q3ns0EamuI0hn7_pCydAIWhOab5LoJ1AxPSHetZE,14687
+boneio/helper/gpio.py,sha256=GKSg6Ke9FSnx8P3dAr48JYrJygrez9N8Ej1W5H3WdPc,3557
+boneio/helper/ha_discovery.py,sha256=_2ADUnqo4a2FOaTR4LDJblF2z18sioaOOnVxX5R9aQE,6437
+boneio/helper/loader.py,sha256=a22t1Bu4I_M9Z7k_tVcABgSUBheV9cx7UtPQvfeEjjA,17577
 boneio/helper/logger.py,sha256=zyF_Vk3o2eSHuXypJhNzK99eZgkWDWybuB5KcJgurDs,1801
-boneio/helper/mqtt.py,sha256=UVa4KaxvVif6By_sVMdSMiYI_doZjiXF4LS9RFltxJk,765
+boneio/helper/mqtt.py,sha256=dXH87TYyDTd1MJz5zHBEJDVmrqFoL38N7uyBeyiieyY,771
 boneio/helper/oled.py,sha256=f0XYbaFstUbJ6ISmFe1vQCnmNVMctQWtnStNdROrblc,351
 boneio/helper/onewire/W1ThermSensor.py,sha256=Pu5Fp29pKbxjJqDbFs05Mjg3Vy-9z_DTVoBpSWM_byA,2430
 boneio/helper/onewire/__init__.py,sha256=4djH-uxiq5XhAiFTOxyqjvWVoJe0c8U8iN0BfmH8nSU,448
 boneio/helper/onewire/ds2482.py,sha256=c2t_hdAMtFsHw4Vw41QzO_hEDDNMeb3J71mEwEMUBhM,5169
 boneio/helper/onewire/onewire.py,sha256=tHofTu1l0qG7hH2XoSf-lj8gW7wVKe27j57qQWpVMPg,2497
+boneio/helper/pcf8575.py,sha256=qeNYLqV5foDEQCyAz1WRQRi1CYYxtbPIha06Z5TyZVQ,311
 boneio/helper/queue.py,sha256=7fE7d344-BEW8sljN40wmqsbBr4kPLvz4ShBjkT04p8,1066
-boneio/helper/state_manager.py,sha256=LsMQRrD7WXu5jXFoltYXvzHDeiNDDEx6UWYebFw18gc,1994
+boneio/helper/state_manager.py,sha256=PiNCL_uHElVH34ztIXBgVgKnpN0Mje2pspCLBiRIsgk,2145
 boneio/helper/stats.py,sha256=XNQDU-ixIobKQ2batzZno2UOMzNGWHSFQ-EXChNBJzM,5853
 boneio/helper/timeperiod.py,sha256=xpg9oe30Z5WiLDQPq3EBKKScejOnN47NhcpeFvDd3bY,5806
 boneio/helper/util.py,sha256=QfSoT3H3WnOQAKO5bFRIBCy62HT5NMa9Ek-FmfTW_rw,508
 boneio/helper/yaml_util.py,sha256=gAX7hCaHUlPgkhGCIQ4zjv0Vj9JmLzQsSyF51ZmSb9g,11304
 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=YwTm-5Loi9deUFokXFNW-FDQDtnrZUlpW9xreyW6Vlw,22339
+boneio/input/gpio.py,sha256=j6tiZmUC934Yc_Lu8FjSNQIdRb0iJLiucJu0UuU_cAQ,2709
+boneio/input/gpio_beta.py,sha256=ZsiY5oeSsqo-JuZ9uglwfsmJ_MySQqxuGU6PbWcO1Hw,3231
+boneio/manager.py,sha256=rITALbKkdzkaNLdza2lw9DvtlrhrS-ydLv3W2KKTNWw,27086
 boneio/modbus.py,sha256=eA_sGnmdcIneXX75ZcXOI223-UkKN1UYmWFqiJBAhJo,4176
-boneio/mqtt_client.py,sha256=OakqsF5q6JSOMR___EldxuG_Xg9YVDPYAV6CSwyJAjs,8645
+boneio/mqtt_client.py,sha256=5_ilaYqsCIIdKjsspQxPoNkSpSuCjrwD16HTcfH0Lxk,8551
 boneio/oled.py,sha256=d_ofDQHc7zr3j0qOR0B_L3C8TJhvRH85nnb9Le-88nk,5244
-boneio/relay/__init__.py,sha256=iLEUL8kxnEndCQtgDIJfHqUZOfyWfWmuOrqSYAUxb2w,181
-boneio/relay/basic.py,sha256=uMQWSgcCVH-ieGKirW_Faj1rVEivt0kmCE9XCDCu47s,2798
+boneio/relay/__init__.py,sha256=Cz6D37GKHxm8DiuPuxE2EMaey2wdUdJYVet_hfR0lzA,231
+boneio/relay/basic.py,sha256=BeA4v4eq2uyMDnIvZFHBl7EIs5scJ0efJQbvZqwMstc,3276
 boneio/relay/gpio.py,sha256=s64FBf6zlxciF57xJ6nrvy0t5Rie0uiXlwos0HL3RKM,1163
-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/relay/mcp.py,sha256=4NZJLVtR_f-vuwGA1vbTLqzPoEZO2_in-RJSORfwC60,2508
+boneio/relay/pca.py,sha256=YBrClCM_dvPF92gdDmyjfGumhan0UdHWQBDv-J7DrzA,4594
+boneio/relay/pcf.py,sha256=15uw3i3n06AfILcd6fWRgHjibKDkvRbiAntoTrlwHx4,2635
+boneio/runner.py,sha256=wHi1R3sI6OSBdjQ5-G44r8WGiTiTqv5n7x5aB-_GIrw,2789
+boneio/schema/actions.yaml,sha256=kaJZ9B6SOl4Wbujtnr5k-g5JcAi2NSC1oGc0wZy8fnQ,1039
 boneio/schema/actions_sensor.yaml,sha256=U_VfdjqdorQZHYD6dZOzhlRKnOGwsnTJ3CDGiqrKxW8,124
 boneio/schema/actions_switch.yaml,sha256=sdqhwz0LrcfaiAN3-RfAR_xApxo5dh9RxXQubuKcsjk,129
 boneio/schema/filters.yaml,sha256=WopX1SmCZsSZXNiGccLoi7uMCsUpdbs0eVfsAjmbay4,286
 boneio/schema/filters_adc.yaml,sha256=3e0ts92MoFKOnfGOOn6WYIHxu0-tnZe9OjAjN9m7hiI,304
 boneio/schema/id.yaml,sha256=vHI_6dxkJwoiGp5ien_pPpyaWA1F06eirTgfWMyWa1E,75
-boneio/schema/schema.yaml,sha256=NxG-4i3Sak27sOWk_nf8Bmbwgt5Ldye4ZYnRIvR_79g,15072
+boneio/schema/schema.yaml,sha256=4udNBm8dlUUuZtZat1D-9fUua-gCekPEaZTpqIxPYx4,16585
 boneio/schema/temp_unit.yaml,sha256=m32VGz9RTW92Lz08l9n6RftkcVNZquOGPPr5mc3eZVc,65
 boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD1oOIo,133
 boneio/sensor/__init__.py,sha256=u-fSBKy1gcXTNclra5KzLYDxpHeo9G0vuNiMexIZSDw,538
@@ -74,9 +77,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=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/version.py,sha256=rJDui3QaSbG5XAefsT7-R72wn-eEkq3cia9pkFCPBBU,41
+boneIO-0.7.0.dev6.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.7.0.dev6.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneIO-0.7.0.dev6.dist-info/METADATA,sha256=kZrIdKcI9WKh2t8Pj8KmoETz47_wUhZ-ywRm-ycOfN4,1749
+boneIO-0.7.0.dev6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.7.0.dev6.dist-info/RECORD,,

boneio/bonecli.py

@@ -15,6 +15,7 @@ from yaml import MarkedYAMLError
 from boneio.const import ACTION
 from boneio.helper import load_config_from_file
 from boneio.helper.exceptions import ConfigurationException, RestartRequestException
+from boneio.helper.events import GracefulExit
 from boneio.helper.logger import configure_logger
 from boneio.runner import async_run
 from boneio.version import __version__
@@ -89,8 +90,9 @@ def run(config: str, debug: int, mqttusername: str = "", mqttpassword: str = "")
             ),
         )
         return 0
-    except RestartRequestException as err:
-        _LOGGER.info(err)
+    except (RestartRequestException, GracefulExit) as err:
+        if err is not None:
+            _LOGGER.info(err)
         return 0
     except (ConfigurationException, MarkedYAMLError) as err:
         _LOGGER.error("Failed to load config. %s Exiting.", err)

boneio/const.py

@@ -112,6 +112,7 @@ MCP_ID = "mcp_id"
 PCA_ID = "pca_id"
 PCF_ID = "pcf_id"
 INIT_SLEEP = "init_sleep"
+OUTPUT_GROUP = "output_group"
 
 # SENSOR CONST
 TEMPERATURE = "temperature"
@@ -148,3 +149,12 @@ ExpanderTypes = Literal[MCP23017, PCA9685, PCF8575]
 DEVICE_CLASS = "device_class"
 DallasBusTypes = Literal[DS2482, DALLAS]
 FILTERS = "filters"
+
+cover_actions = {
+    "OPEN": "open",
+    "CLOSE": "close",
+    "TOGGLE": "toggle",
+    "STOP": "stop",
+    "TOGGLE_OPEN": "toggle_open",
+    "TOGGLE_CLOSE": "toggle_close",
+}

boneio/cover.py

@@ -109,7 +109,7 @@ class Cover(BasicMqtt):
         self._stop_cover(on_exit=True)
 
     @property
-    def cover_state(self) -> CLOSED | OPEN:
+    def cover_state(self) -> str:
         """Current state of cover."""
         return CLOSED if self._closed else OPEN
 

boneio/group/__init__.py

@@ -0,0 +1,4 @@
+"""Group classes."""
+from .output import OutputGroup
+
+__all__ = ["OutputGroup"]

boneio/group/output.py

@@ -0,0 +1,64 @@
+"""Cover module."""
+from __future__ import annotations
+import logging
+import asyncio
+from typing import List
+
+from boneio.const import COVER, SWITCH, ON, OFF
+from boneio.relay.basic import BasicRelay
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class OutputGroup(BasicRelay):
+    """Cover class of boneIO"""
+
+    def __init__(
+        self,
+        members: List[BasicRelay],
+        output_type: str = SWITCH,
+        restored_state: bool = True,
+        **kwargs,
+    ) -> None:
+        """Initialize cover class."""
+        self._loop = asyncio.get_event_loop()
+        super().__init__(
+            **kwargs, output_type=output_type, restored_state=restored_state, topic_type="group"
+        )
+        self._group_members = [x for x in members if x.output_type != COVER]
+        self._timer_handle = None
+        for member in self._group_members:
+            self._event_bus.add_output_listener(member.id, self.event_listener)
+
+    async def event_listener(self, relay_id=None) -> None:
+        """Listen for events called by children relays."""
+        state = OFF
+        for x in self._group_members:
+            if x.state == ON:
+                state = ON
+                break
+        if state != self._state or not relay_id:
+            self._state = state
+            self._loop.call_soon_threadsafe(self.send_state)
+
+    def turn_on(self) -> None:
+        """Call turn on action."""
+        for x in self._group_members:
+            asyncio.create_task(x.async_turn_on())
+
+    def turn_off(self) -> None:
+        """Call turn off action."""
+        for x in self._group_members:
+            asyncio.create_task(x.async_turn_off())
+
+    def toggle(self) -> None:
+        """Toggle group."""
+        _LOGGER.debug("Toggle relay.")
+        if self._state == ON:
+            self.turn_off()
+        else:
+            self.turn_on()
+
+    def send_state(self) -> None:
+        """Send state to Mqtt on action."""
+        self._send_message(topic=self._send_topic, payload=self.payload(), retain=True)

boneio/helper/async_updater.py

@@ -15,7 +15,7 @@ class AsyncUpdater:
         self._update_interval = update_interval or TimePeriod(seconds=60)
         self.manager.append_task(coro=self._refresh, name=self.id)
 
-    async def _refresh(self):
+    async def _refresh(self) -> None:
         while True:
             if hasattr(self, "async_update"):
                 update_interval = (

boneio/helper/click_timer.py

@@ -24,9 +24,10 @@ class ClickTimer:
             self._remove_listener = None
 
     async def _start_async_timer(self) -> None:
+        start = time.time()
         await asyncio.sleep(self._delay)
         self._remove_listener = None
-        self._action(time.time())
+        self._action(round(time.time() - start, 2))
 
     def start_timer(self) -> None:
         """Start timer."""

boneio/helper/config.py

@@ -64,6 +64,9 @@ class ConfigHelper:
             if topic in self._autodiscovery_messages[ha_type]:
                 return True
         return False
+    
+    def clear_autodiscovery_type(self, ha_type: str):
+        self._autodiscovery_messages[ha_type] = {}
 
 
 

boneio/helper/events.py

@@ -77,19 +77,18 @@ class ListenerJob:
 class EventBus:
     """Simple event bus which ticks every second."""
 
-    def __init__(self, last_will_mqtt = Callable) -> None:
+    def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
         """Initialize handler"""
-        self._loop = asyncio.get_event_loop()
-        self._last_will = last_will_mqtt
-
+        self._loop = loop or asyncio.get_event_loop()
         self._listeners = {}
+        self._output_listeners = {}
         self._sigterm_listeners = []
         self._haonline_listeners = []
         self._timer_handle = _async_create_timer(self._loop, self._run_second_event)
         for signame in {"SIGINT", "SIGTERM"}:
             self._loop.add_signal_handler(
                 getattr(signal, signame),
-                lambda: asyncio.create_task(self.ask_exit()),
+                self.ask_exit,
             )
 
     def _run_second_event(self, time):
@@ -100,15 +99,15 @@ class EventBus:
                     self._loop.call_soon(listener.target, time)
                 )
 
-    async def ask_exit(self):
+    def ask_exit(self):
         """Function to call on exit. Should invoke all sigterm listeners."""
         _LOGGER.debug("Exiting process started.")
         self._listeners = {}
+        self._output_listeners = {}
         for target in self._sigterm_listeners:
             target()
         self._timer_handle()
 
-        await self._last_will()
         _LOGGER.info("Shutdown gracefully.")
         raise GracefulExit(code=0)
 
@@ -121,6 +120,19 @@ class EventBus:
         """Add sigterm listener."""
         self._sigterm_listeners.append(target)
 
+    def add_output_listener(self, name, target):
+        """Add output listener."""
+        self._output_listeners[name] = ListenerJob(target=target)
+        return self._output_listeners[name]
+    
+    def trigger_output_event(self, event):
+        asyncio.create_task(self.async_trigger_output_event(event=event))
+    
+    async def async_trigger_output_event(self, event):
+        listener = self._output_listeners.get(event)
+        if listener:
+            await listener.target(event)
+
     def add_haonline_listener(self, target):
         """Add HA Online listener."""
         self._haonline_listeners.append(target)

boneio/helper/gpio.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import asyncio
 import logging
 
@@ -104,7 +105,7 @@ class GpioBaseClass:
     """Base class for initialize GPIO"""
 
     def __init__(
-        self, pin: str, press_callback: Callable[[ClickTypes, str], None], **kwargs
+        self, pin: str, press_callback: Callable[[ClickTypes, str, bool | None], None], **kwargs
     ) -> None:
         """Setup GPIO Input Button"""
         self._pin = pin
@@ -114,7 +115,15 @@ class GpioBaseClass:
         self._press_callback = press_callback
         setup_input(pin=self._pin, pull_mode=gpio_mode)
 
+    def set_press_callback(self, press_callback: Callable[[ClickTypes, str, bool | None], None]) -> None:
+        self._press_callback = press_callback
+
     @property
     def is_pressed(self) -> bool:
         """Is button pressed."""
         return read_input(self._pin)
+    
+    @property
+    def pin(self) -> str:
+        """Return configured pin."""
+        return self._pin

boneio/helper/ha_discovery.py

@@ -45,10 +45,10 @@ def ha_availabilty_message(
     }
 
 
-def ha_light_availabilty_message(id: str, topic: str = "boneIO", **kwargs):
+def ha_light_availabilty_message(id: str, topic: str = "boneIO", device_type: str = RELAY, **kwargs):
     """Create LIGHT availability topic for HA."""
-    msg = ha_availabilty_message(device_type=RELAY, topic=topic, id=id, **kwargs)
-    msg["command_topic"] = f"{topic}/cmd/{RELAY}/{id}/set"
+    msg = ha_availabilty_message(device_type=device_type, topic=topic, id=id, **kwargs)
+    msg["command_topic"] = f"{topic}/cmd/{device_type}/{id}/set"
     msg["payload_off"] = OFF
     msg["payload_on"] = ON
     msg["state_value_template"] = "{{ value_json.state }}"
@@ -79,10 +79,10 @@ def ha_button_availabilty_message(
     return msg
 
 
-def ha_switch_availabilty_message(id: str, topic: str = "boneIO", **kwargs):
+def ha_switch_availabilty_message(id: str, topic: str = "boneIO", device_type: str = RELAY, **kwargs):
     """Create SWITCH availability topic for HA."""
-    msg = ha_availabilty_message(device_type=RELAY, topic=topic, id=id, **kwargs)
-    msg["command_topic"] = f"{topic}/cmd/relay/{id}/set"
+    msg = ha_availabilty_message(device_type=device_type, topic=topic, id=id, **kwargs)
+    msg["command_topic"] = f"{topic}/cmd/{device_type}/{id}/set"
     msg["payload_off"] = OFF
     msg["payload_on"] = ON
     msg["value_template"] = "{{ value_json.state }}"