diff --git a/custom_components/rpi_gpio/binary_sensor.py b/custom_components/rpi_gpio/binary_sensor.py index e183b46..ab33e49 100644 --- a/custom_components/rpi_gpio/binary_sensor.py +++ b/custom_components/rpi_gpio/binary_sensor.py @@ -5,7 +5,6 @@ import asyncio import voluptuous as vol -from homeassistant.components import rpi_gpio from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensorEntity from homeassistant.const import DEVICE_DEFAULT_NAME from homeassistant.core import HomeAssistant @@ -14,7 +13,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.reload import setup_reload_service from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType -from . import DOMAIN, PLATFORMS +from . import DOMAIN, PLATFORMS, edge_detect, read_input, setup_input CONF_BOUNCETIME = "bouncetime" CONF_INVERT_LOGIC = "invert_logic" @@ -67,9 +66,7 @@ class RPiGPIOBinarySensor(BinarySensorEntity): async def async_read_gpio(self): """Read state from GPIO.""" await asyncio.sleep(float(self._bouncetime) / 1000) - self._state = await self.hass.async_add_executor_job( - rpi_gpio.read_input, self._port - ) + self._state = await self.hass.async_add_executor_job(read_input, self._port) self.async_write_ha_state() def __init__(self, name, port, pull_mode, bouncetime, invert_logic): @@ -81,13 +78,13 @@ class RPiGPIOBinarySensor(BinarySensorEntity): self._invert_logic = invert_logic self._state = None - rpi_gpio.setup_input(self._port, self._pull_mode) + setup_input(self._port, self._pull_mode) def edge_detected(port): """Edge detection handler.""" self.hass.add_job(self.async_read_gpio) - rpi_gpio.edge_detect(self._port, edge_detected, self._bouncetime) + edge_detect(self._port, edge_detected, self._bouncetime) @property def should_poll(self): @@ -106,4 +103,4 @@ class RPiGPIOBinarySensor(BinarySensorEntity): def update(self): """Update the GPIO state.""" - self._state = rpi_gpio.read_input(self._port) + self._state = read_input(self._port) diff --git a/custom_components/rpi_gpio/cover.py b/custom_components/rpi_gpio/cover.py index e4b07d3..ccaef13 100644 --- a/custom_components/rpi_gpio/cover.py +++ b/custom_components/rpi_gpio/cover.py @@ -5,7 +5,6 @@ from time import sleep import voluptuous as vol -from homeassistant.components import rpi_gpio from homeassistant.components.cover import PLATFORM_SCHEMA, CoverEntity from homeassistant.const import CONF_COVERS, CONF_NAME from homeassistant.core import HomeAssistant @@ -14,7 +13,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.reload import setup_reload_service from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType -from . import DOMAIN, PLATFORMS +from . import DOMAIN, PLATFORMS, read_input, setup_input, setup_output, write_output CONF_RELAY_PIN = "relay_pin" CONF_RELAY_TIME = "relay_time" @@ -104,9 +103,9 @@ class RPiGPIOCover(CoverEntity): self._relay_time = relay_time self._invert_state = invert_state self._invert_relay = invert_relay - rpi_gpio.setup_output(self._relay_pin) - rpi_gpio.setup_input(self._state_pin, self._state_pull_mode) - rpi_gpio.write_output(self._relay_pin, 0 if self._invert_relay else 1) + setup_output(self._relay_pin) + setup_input(self._state_pin, self._state_pull_mode) + write_output(self._relay_pin, 0 if self._invert_relay else 1) @property def name(self): @@ -115,7 +114,7 @@ class RPiGPIOCover(CoverEntity): def update(self): """Update the state of the cover.""" - self._state = rpi_gpio.read_input(self._state_pin) + self._state = read_input(self._state_pin) @property def is_closed(self): @@ -124,9 +123,9 @@ class RPiGPIOCover(CoverEntity): def _trigger(self): """Trigger the cover.""" - rpi_gpio.write_output(self._relay_pin, 1 if self._invert_relay else 0) + write_output(self._relay_pin, 1 if self._invert_relay else 0) sleep(self._relay_time) - rpi_gpio.write_output(self._relay_pin, 0 if self._invert_relay else 1) + write_output(self._relay_pin, 0 if self._invert_relay else 1) def close_cover(self, **kwargs): """Close the cover.""" diff --git a/custom_components/rpi_gpio/switch.py b/custom_components/rpi_gpio/switch.py index 040edd9..c980be7 100644 --- a/custom_components/rpi_gpio/switch.py +++ b/custom_components/rpi_gpio/switch.py @@ -3,7 +3,6 @@ from __future__ import annotations import voluptuous as vol -from homeassistant.components import rpi_gpio from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity from homeassistant.const import DEVICE_DEFAULT_NAME from homeassistant.core import HomeAssistant @@ -12,7 +11,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.reload import setup_reload_service from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType -from . import DOMAIN, PLATFORMS +from . import DOMAIN, PLATFORMS, setup_output, write_output CONF_PULL_MODE = "pull_mode" CONF_PORTS = "ports" @@ -57,8 +56,8 @@ class RPiGPIOSwitch(SwitchEntity): self._port = port self._invert_logic = invert_logic self._state = False - rpi_gpio.setup_output(self._port) - rpi_gpio.write_output(self._port, 1 if self._invert_logic else 0) + setup_output(self._port) + write_output(self._port, 1 if self._invert_logic else 0) @property def name(self): @@ -77,12 +76,12 @@ class RPiGPIOSwitch(SwitchEntity): def turn_on(self, **kwargs): """Turn the device on.""" - rpi_gpio.write_output(self._port, 0 if self._invert_logic else 1) + write_output(self._port, 0 if self._invert_logic else 1) self._state = True self.schedule_update_ha_state() def turn_off(self, **kwargs): """Turn the device off.""" - rpi_gpio.write_output(self._port, 1 if self._invert_logic else 0) + write_output(self._port, 1 if self._invert_logic else 0) self._state = False self.schedule_update_ha_state()