Add LogBook support to HomeKit (#17180)
This commit is contained in:
1 parent
71ab8a9b1a
commit
fee87cd6ed
22 files changed
+327
-66
No files matched your search
@@ -9,7 +9,8 @@ from pyhap.accessory_driver import AccessoryDriver
|
||||
from pyhap.const import CATEGORY_OTHER
|
||||
|
||||
from homeassistant.const import (
|
||||
__version__, ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL)
|
||||
__version__, ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID,
|
||||
ATTR_SERVICE)
|
||||
from homeassistant.core import callback as ha_callback
|
||||
from homeassistant.core import split_entity_id
|
||||
from homeassistant.helpers.event import (
|
||||
@@ -17,9 +18,10 @@ from homeassistant.helpers.event import (
|
||||
from homeassistant.util import dt as dt_util
|
||||
|
||||
from .const import (
|
||||
BRIDGE_MODEL, BRIDGE_SERIAL_NUMBER, CHAR_BATTERY_LEVEL,
|
||||
CHAR_CHARGING_STATE, CHAR_STATUS_LOW_BATTERY, DEBOUNCE_TIMEOUT,
|
||||
MANUFACTURER, SERV_BATTERY_SERVICE)
|
||||
ATTR_DISPLAY_NAME, ATTR_VALUE, BRIDGE_MODEL, BRIDGE_SERIAL_NUMBER,
|
||||
CHAR_BATTERY_LEVEL, CHAR_CHARGING_STATE, CHAR_STATUS_LOW_BATTERY,
|
||||
DEBOUNCE_TIMEOUT, EVENT_HOMEKIT_CHANGED, MANUFACTURER,
|
||||
SERV_BATTERY_SERVICE)
|
||||
from .util import (
|
||||
convert_to_float, show_setup_message, dismiss_setup_message)
|
||||
|
||||
@@ -137,6 +139,27 @@ class HomeAccessory(Accessory):
|
||||
"""
|
||||
raise NotImplementedError()
|
||||
|
||||
def call_service(self, domain, service, service_data, value=None):
|
||||
"""Fire event and call service for changes from HomeKit."""
|
||||
self.hass.add_job(
|
||||
self.async_call_service, domain, service, service_data, value)
|
||||
|
||||
async def async_call_service(self, domain, service, service_data,
|
||||
value=None):
|
||||
"""Fire event and call service for changes from HomeKit.
|
||||
|
||||
This method must be run in the event loop.
|
||||
"""
|
||||
event_data = {
|
||||
ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_DISPLAY_NAME: self.display_name,
|
||||
ATTR_SERVICE: service,
|
||||
ATTR_VALUE: value
|
||||
}
|
||||
|
||||
self.hass.bus.async_fire(EVENT_HOMEKIT_CHANGED, event_data)
|
||||
await self.hass.services.async_call(domain, service, service_data)
|
||||
|
||||
|
||||
class HomeBridge(Bridge):
|
||||
"""Adapter class for Bridge."""
|
||||
|
||||
@@ -5,6 +5,10 @@ DOMAIN = 'homekit'
|
||||
HOMEKIT_FILE = '.homekit.state'
|
||||
HOMEKIT_NOTIFY_ID = 4663548
|
||||
|
||||
# #### Attributes ####
|
||||
ATTR_DISPLAY_NAME = 'display_name'
|
||||
ATTR_VALUE = 'value'
|
||||
|
||||
# #### Config ####
|
||||
CONF_AUTO_START = 'auto_start'
|
||||
CONF_ENTITY_CONFIG = 'entity_config'
|
||||
@@ -22,6 +26,9 @@ FEATURE_PLAY_PAUSE = 'play_pause'
|
||||
FEATURE_PLAY_STOP = 'play_stop'
|
||||
FEATURE_TOGGLE_MUTE = 'toggle_mute'
|
||||
|
||||
# #### HomeKit Component Event ####
|
||||
EVENT_HOMEKIT_CHANGED = 'homekit_state_change'
|
||||
|
||||
# #### HomeKit Component Services ####
|
||||
SERVICE_HOMEKIT_START = 'start'
|
||||
|
||||
|
||||
@@ -47,10 +47,10 @@ class GarageDoorOpener(HomeAccessory):
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
if value == 0:
|
||||
self.char_current_state.set_value(3)
|
||||
self.hass.services.call(DOMAIN, SERVICE_OPEN_COVER, params)
|
||||
self.call_service(DOMAIN, SERVICE_OPEN_COVER, params)
|
||||
elif value == 1:
|
||||
self.char_current_state.set_value(2)
|
||||
self.hass.services.call(DOMAIN, SERVICE_CLOSE_COVER, params)
|
||||
self.call_service(DOMAIN, SERVICE_CLOSE_COVER, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update cover state after state changed."""
|
||||
@@ -88,7 +88,7 @@ class WindowCovering(HomeAccessory):
|
||||
self.homekit_target = value
|
||||
|
||||
params = {ATTR_ENTITY_ID: self.entity_id, ATTR_POSITION: value}
|
||||
self.hass.services.call(DOMAIN, SERVICE_SET_COVER_POSITION, params)
|
||||
self.call_service(DOMAIN, SERVICE_SET_COVER_POSITION, params, value)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update cover position after state changed."""
|
||||
@@ -143,7 +143,7 @@ class WindowCoveringBasic(HomeAccessory):
|
||||
service, position = (SERVICE_CLOSE_COVER, 0)
|
||||
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
# Snap the current/target position to the expected final position.
|
||||
self.char_current_position.set_value(position)
|
||||
|
||||
@@ -61,7 +61,7 @@ class Fan(HomeAccessory):
|
||||
self._flag[CHAR_ACTIVE] = True
|
||||
service = SERVICE_TURN_ON if value == 1 else SERVICE_TURN_OFF
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def set_direction(self, value):
|
||||
"""Set state if call came from HomeKit."""
|
||||
@@ -69,7 +69,7 @@ class Fan(HomeAccessory):
|
||||
self._flag[CHAR_ROTATION_DIRECTION] = True
|
||||
direction = DIRECTION_REVERSE if value == 1 else DIRECTION_FORWARD
|
||||
params = {ATTR_ENTITY_ID: self.entity_id, ATTR_DIRECTION: direction}
|
||||
self.hass.services.call(DOMAIN, SERVICE_SET_DIRECTION, params)
|
||||
self.call_service(DOMAIN, SERVICE_SET_DIRECTION, params, direction)
|
||||
|
||||
def set_oscillating(self, value):
|
||||
"""Set state if call came from HomeKit."""
|
||||
@@ -78,7 +78,7 @@ class Fan(HomeAccessory):
|
||||
oscillating = True if value == 1 else False
|
||||
params = {ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_OSCILLATING: oscillating}
|
||||
self.hass.services.call(DOMAIN, SERVICE_OSCILLATE, params)
|
||||
self.call_service(DOMAIN, SERVICE_OSCILLATE, params, oscillating)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update fan after state change."""
|
||||
|
||||
@@ -83,7 +83,7 @@ class Light(HomeAccessory):
|
||||
self._flag[CHAR_ON] = True
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
service = SERVICE_TURN_ON if value == 1 else SERVICE_TURN_OFF
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
@debounce
|
||||
def set_brightness(self, value):
|
||||
@@ -94,14 +94,16 @@ class Light(HomeAccessory):
|
||||
self.set_state(0) # Turn off light
|
||||
return
|
||||
params = {ATTR_ENTITY_ID: self.entity_id, ATTR_BRIGHTNESS_PCT: value}
|
||||
self.hass.services.call(DOMAIN, SERVICE_TURN_ON, params)
|
||||
self.call_service(DOMAIN, SERVICE_TURN_ON, params,
|
||||
"brightness at {}%".format(value))
|
||||
|
||||
def set_color_temperature(self, value):
|
||||
"""Set color temperature if call came from HomeKit."""
|
||||
_LOGGER.debug('%s: Set color temp to %s', self.entity_id, value)
|
||||
self._flag[CHAR_COLOR_TEMPERATURE] = True
|
||||
params = {ATTR_ENTITY_ID: self.entity_id, ATTR_COLOR_TEMP: value}
|
||||
self.hass.services.call(DOMAIN, SERVICE_TURN_ON, params)
|
||||
self.call_service(DOMAIN, SERVICE_TURN_ON, params,
|
||||
"color temperature at {}".format(value))
|
||||
|
||||
def set_saturation(self, value):
|
||||
"""Set saturation if call came from HomeKit."""
|
||||
@@ -126,7 +128,8 @@ class Light(HomeAccessory):
|
||||
self._flag.update({
|
||||
CHAR_HUE: False, CHAR_SATURATION: False, RGB_COLOR: True})
|
||||
params = {ATTR_ENTITY_ID: self.entity_id, ATTR_HS_COLOR: color}
|
||||
self.hass.services.call(DOMAIN, SERVICE_TURN_ON, params)
|
||||
self.call_service(DOMAIN, SERVICE_TURN_ON, params,
|
||||
"set color at {}".format(color))
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update light after state change."""
|
||||
|
||||
@@ -54,7 +54,7 @@ class Lock(HomeAccessory):
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
if self._code:
|
||||
params[ATTR_CODE] = self._code
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update lock after state changed."""
|
||||
|
||||
@@ -76,7 +76,7 @@ class MediaPlayer(HomeAccessory):
|
||||
self._flag[FEATURE_ON_OFF] = True
|
||||
service = SERVICE_TURN_ON if value else SERVICE_TURN_OFF
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def set_play_pause(self, value):
|
||||
"""Move switch state to value if call came from HomeKit."""
|
||||
@@ -85,7 +85,7 @@ class MediaPlayer(HomeAccessory):
|
||||
self._flag[FEATURE_PLAY_PAUSE] = True
|
||||
service = SERVICE_MEDIA_PLAY if value else SERVICE_MEDIA_PAUSE
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def set_play_stop(self, value):
|
||||
"""Move switch state to value if call came from HomeKit."""
|
||||
@@ -94,7 +94,7 @@ class MediaPlayer(HomeAccessory):
|
||||
self._flag[FEATURE_PLAY_STOP] = True
|
||||
service = SERVICE_MEDIA_PLAY if value else SERVICE_MEDIA_STOP
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def set_toggle_mute(self, value):
|
||||
"""Move switch state to value if call came from HomeKit."""
|
||||
@@ -103,7 +103,7 @@ class MediaPlayer(HomeAccessory):
|
||||
self._flag[FEATURE_TOGGLE_MUTE] = True
|
||||
params = {ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_MEDIA_VOLUME_MUTED: value}
|
||||
self.hass.services.call(DOMAIN, SERVICE_VOLUME_MUTE, params)
|
||||
self.call_service(DOMAIN, SERVICE_VOLUME_MUTE, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update switch state after state changed."""
|
||||
|
||||
@@ -59,7 +59,7 @@ class SecuritySystem(HomeAccessory):
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
if self._alarm_code:
|
||||
params[ATTR_CODE] = self._alarm_code
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update security state after state changed."""
|
||||
|
||||
@@ -51,7 +51,7 @@ class Outlet(HomeAccessory):
|
||||
self.flag_target_state = True
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
service = SERVICE_TURN_ON if value else SERVICE_TURN_OFF
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update switch state after state changed."""
|
||||
@@ -84,7 +84,7 @@ class Switch(HomeAccessory):
|
||||
self.flag_target_state = True
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
service = SERVICE_TURN_ON if value else SERVICE_TURN_OFF
|
||||
self.hass.services.call(self._domain, service, params)
|
||||
self.call_service(self._domain, service, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update switch state after state changed."""
|
||||
@@ -123,7 +123,7 @@ class Valve(HomeAccessory):
|
||||
self.char_in_use.set_value(value)
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
service = SERVICE_TURN_ON if value else SERVICE_TURN_OFF
|
||||
self.hass.services.call(DOMAIN, service, params)
|
||||
self.call_service(DOMAIN, service, params)
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update switch state after state changed."""
|
||||
|
||||
@@ -122,12 +122,13 @@ class Thermostat(HomeAccessory):
|
||||
if self.support_power_state is True:
|
||||
params = {ATTR_ENTITY_ID: self.entity_id}
|
||||
if hass_value == STATE_OFF:
|
||||
self.hass.services.call(DOMAIN, SERVICE_TURN_OFF, params)
|
||||
self.call_service(DOMAIN, SERVICE_TURN_OFF, params)
|
||||
return
|
||||
self.hass.services.call(DOMAIN, SERVICE_TURN_ON, params)
|
||||
params = {ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_OPERATION_MODE: hass_value}
|
||||
self.hass.services.call(DOMAIN, SERVICE_SET_OPERATION_MODE, params)
|
||||
self.call_service(
|
||||
DOMAIN, SERVICE_SET_OPERATION_MODE, params, hass_value)
|
||||
|
||||
@debounce
|
||||
def set_cooling_threshold(self, value):
|
||||
@@ -136,11 +137,14 @@ class Thermostat(HomeAccessory):
|
||||
self.entity_id, value)
|
||||
self.coolingthresh_flag_target_state = True
|
||||
low = self.char_heating_thresh_temp.value
|
||||
temperature = temperature_to_states(value, self._unit)
|
||||
params = {
|
||||
ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_TARGET_TEMP_HIGH: temperature_to_states(value, self._unit),
|
||||
ATTR_TARGET_TEMP_HIGH: temperature,
|
||||
ATTR_TARGET_TEMP_LOW: temperature_to_states(low, self._unit)}
|
||||
self.hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, params)
|
||||
self.call_service(DOMAIN, SERVICE_SET_TEMPERATURE, params,
|
||||
"cooling threshold {}{}".format(temperature,
|
||||
self._unit))
|
||||
|
||||
@debounce
|
||||
def set_heating_threshold(self, value):
|
||||
@@ -149,11 +153,14 @@ class Thermostat(HomeAccessory):
|
||||
self.entity_id, value)
|
||||
self.heatingthresh_flag_target_state = True
|
||||
high = self.char_cooling_thresh_temp.value
|
||||
temperature = temperature_to_states(value, self._unit)
|
||||
params = {
|
||||
ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_TARGET_TEMP_HIGH: temperature_to_states(high, self._unit),
|
||||
ATTR_TARGET_TEMP_LOW: temperature_to_states(value, self._unit)}
|
||||
self.hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, params)
|
||||
ATTR_TARGET_TEMP_LOW: temperature}
|
||||
self.call_service(DOMAIN, SERVICE_SET_TEMPERATURE, params,
|
||||
"heating threshold {}{}".format(temperature,
|
||||
self._unit))
|
||||
|
||||
@debounce
|
||||
def set_target_temperature(self, value):
|
||||
@@ -161,10 +168,13 @@ class Thermostat(HomeAccessory):
|
||||
_LOGGER.debug('%s: Set target temperature to %.2f°C',
|
||||
self.entity_id, value)
|
||||
self.temperature_flag_target_state = True
|
||||
temperature = temperature_to_states(value, self._unit)
|
||||
params = {
|
||||
ATTR_ENTITY_ID: self.entity_id,
|
||||
ATTR_TEMPERATURE: temperature_to_states(value, self._unit)}
|
||||
self.hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, params)
|
||||
ATTR_TEMPERATURE: temperature}
|
||||
self.call_service(DOMAIN, SERVICE_SET_TEMPERATURE, params,
|
||||
"target {}{}".format(temperature,
|
||||
self._unit))
|
||||
|
||||
def update_state(self, new_state):
|
||||
"""Update security state after state changed."""
|
||||
|
||||
@@ -14,13 +14,16 @@ from homeassistant.loader import bind_hass
|
||||
from homeassistant.components import sun
|
||||
from homeassistant.components.http import HomeAssistantView
|
||||
from homeassistant.const import (
|
||||
ATTR_DOMAIN, ATTR_ENTITY_ID, ATTR_HIDDEN, ATTR_NAME, CONF_EXCLUDE,
|
||||
CONF_INCLUDE, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
|
||||
EVENT_LOGBOOK_ENTRY, EVENT_STATE_CHANGED, HTTP_BAD_REQUEST, STATE_NOT_HOME,
|
||||
STATE_OFF, STATE_ON)
|
||||
ATTR_DOMAIN, ATTR_ENTITY_ID, ATTR_HIDDEN, ATTR_NAME, ATTR_SERVICE,
|
||||
CONF_EXCLUDE, CONF_INCLUDE, EVENT_HOMEASSISTANT_START,
|
||||
EVENT_HOMEASSISTANT_STOP, EVENT_LOGBOOK_ENTRY, EVENT_STATE_CHANGED,
|
||||
HTTP_BAD_REQUEST, STATE_NOT_HOME, STATE_OFF, STATE_ON)
|
||||
from homeassistant.core import (
|
||||
DOMAIN as HA_DOMAIN, State, callback, split_entity_id)
|
||||
from homeassistant.components.alexa.smart_home import EVENT_ALEXA_SMART_HOME
|
||||
from homeassistant.components.homekit.const import (
|
||||
ATTR_DISPLAY_NAME, ATTR_VALUE, DOMAIN as DOMAIN_HOMEKIT,
|
||||
EVENT_HOMEKIT_CHANGED)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
import homeassistant.util.dt as dt_util
|
||||
|
||||
@@ -56,7 +59,7 @@ CONFIG_SCHEMA = vol.Schema({
|
||||
ALL_EVENT_TYPES = [
|
||||
EVENT_STATE_CHANGED, EVENT_LOGBOOK_ENTRY,
|
||||
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
|
||||
EVENT_ALEXA_SMART_HOME
|
||||
EVENT_ALEXA_SMART_HOME, EVENT_HOMEKIT_CHANGED
|
||||
]
|
||||
|
||||
LOG_MESSAGE_SCHEMA = vol.Schema({
|
||||
@@ -294,6 +297,25 @@ def humanify(hass, events):
|
||||
'context_user_id': event.context.user_id
|
||||
}
|
||||
|
||||
elif event.event_type == EVENT_HOMEKIT_CHANGED:
|
||||
data = event.data
|
||||
entity_id = data.get(ATTR_ENTITY_ID)
|
||||
value = data.get(ATTR_VALUE)
|
||||
|
||||
value_msg = " to {}".format(value) if value else ''
|
||||
message = "send command {}{} for {}".format(
|
||||
data[ATTR_SERVICE], value_msg, data[ATTR_DISPLAY_NAME])
|
||||
|
||||
yield {
|
||||
'when': event.time_fired,
|
||||
'name': 'HomeKit',
|
||||
'message': message,
|
||||
'domain': DOMAIN_HOMEKIT,
|
||||
'entity_id': entity_id,
|
||||
'context_id': event.context.id,
|
||||
'context_user_id': event.context.user_id
|
||||
}
|
||||
|
||||
|
||||
def _get_events(hass, config, start_day, end_day, entity_id=None):
|
||||
"""Get events for a period of time."""
|
||||
|
||||
Reference in new issue
Block a user