Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix raspihats callbacks (#64122)" (#66517) 

Co-authored-by: epenet <epenet@users.noreply.github.com>
pull/66624/head
epenet 2022-02-15 01:12:34 +01:00 committed by Paulus Schoutsen
parent 5cccac7a19
commit 6472cb8721
2 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/raspihats/binary_sensor.py
View File

@ -2,7 +2,6 @@
from __future__ import annotations
import logging
from typing import TYPE_CHECKING
import voluptuous as vol
@ -109,20 +108,12 @@ class I2CHatBinarySensor(BinarySensorEntity):
self._device_class = device_class
self._state = self.I2C_HATS_MANAGER.read_di(self._address, self._channel)
async def async_added_to_hass(self) -> None:
"""Register callbacks."""
if TYPE_CHECKING:
assert self.I2C_HATS_MANAGER
def online_callback():
"""Call fired when board is online."""
self.schedule_update_ha_state()
await self.hass.async_add_executor_job(
self.I2C_HATS_MANAGER.register_online_callback,
self._address,
self._channel,
online_callback,
self.I2C_HATS_MANAGER.register_online_callback(
self._address, self._channel, online_callback
)
def edge_callback(state):
@ -130,11 +121,8 @@ class I2CHatBinarySensor(BinarySensorEntity):
self._state = state
self.schedule_update_ha_state()
await self.hass.async_add_executor_job(
self.I2C_HATS_MANAGER.register_di_callback,
self._address,
self._channel,
edge_callback,
self.I2C_HATS_MANAGER.register_di_callback(
self._address, self._channel, edge_callback
)
@property

32
homeassistant/components/raspihats/switch.py
View File

@ -2,7 +2,6 @@
from __future__ import annotations
import logging
from typing import TYPE_CHECKING
import voluptuous as vol
@ -101,7 +100,6 @@ class I2CHatSwitch(SwitchEntity):
self._channel = channel
self._name = name or DEVICE_DEFAULT_NAME
self._invert_logic = invert_logic
self._state = initial_state
if initial_state is not None:
if self._invert_logic:
state = not initial_state
@ -109,27 +107,14 @@ class I2CHatSwitch(SwitchEntity):
state = initial_state
self.I2C_HATS_MANAGER.write_dq(self._address, self._channel, state)
async def async_added_to_hass(self) -> None:
"""Register callbacks."""
if TYPE_CHECKING:
assert self.I2C_HATS_MANAGER
def online_callback():
"""Call fired when board is online."""
self.schedule_update_ha_state()
await self.hass.async_add_executor_job(
self.I2C_HATS_MANAGER.register_online_callback,
self._address,
self._channel,
self.online_callback,
self.I2C_HATS_MANAGER.register_online_callback(
self._address, self._channel, online_callback
)
def online_callback(self):
"""Call fired when board is online."""
try:
self._state = self.I2C_HATS_MANAGER.read_dq(self._address, self._channel)
except I2CHatsException as ex:
_LOGGER.error(self._log_message(f"Is ON check failed, {ex!s}"))
self._state = False
self.schedule_update_ha_state()
def _log_message(self, message):
"""Create log message."""
string = f"{self._name} "
@ -150,7 +135,12 @@ class I2CHatSwitch(SwitchEntity):
@property
def is_on(self):
"""Return true if device is on."""
return self._state != self._invert_logic
try:
state = self.I2C_HATS_MANAGER.read_dq(self._address, self._channel)
return state != self._invert_logic
except I2CHatsException as ex:
_LOGGER.error(self._log_message(f"Is ON check failed, {ex!s}"))
return False
def turn_on(self, **kwargs):
"""Turn the device on."""