Add support for homekit camera motion notification (#35994)
* Add support for homekit camera motion notification A motion sensor can now be linked to the cameras. * Increase coverage
This commit is contained in:
1 parent
15539536ad
commit
8cbee76929
6 files changed
+253
-14
No files matched your search
@@ -9,8 +9,14 @@ import voluptuous as vol
|
||||
from zeroconf import InterfaceChoice
|
||||
|
||||
from homeassistant.components import zeroconf
|
||||
from homeassistant.components.binary_sensor import DEVICE_CLASS_BATTERY_CHARGING
|
||||
from homeassistant.components.binary_sensor import (
|
||||
DEVICE_CLASS_BATTERY_CHARGING,
|
||||
DEVICE_CLASS_MOTION,
|
||||
DOMAIN as BINARY_SENSOR_DOMAIN,
|
||||
)
|
||||
from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
|
||||
from homeassistant.components.http import HomeAssistantView
|
||||
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
|
||||
from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
|
||||
from homeassistant.const import (
|
||||
ATTR_BATTERY_CHARGING,
|
||||
@@ -58,6 +64,7 @@ from .const import (
|
||||
CONF_FILTER,
|
||||
CONF_LINKED_BATTERY_CHARGING_SENSOR,
|
||||
CONF_LINKED_BATTERY_SENSOR,
|
||||
CONF_LINKED_MOTION_SENSOR,
|
||||
CONF_SAFE_MODE,
|
||||
CONF_ZEROCONF_DEFAULT_INTERFACE,
|
||||
CONFIG_OPTIONS,
|
||||
@@ -522,8 +529,9 @@ class HomeKit:
|
||||
|
||||
device_lookup = ent_reg.async_get_device_class_lookup(
|
||||
{
|
||||
("binary_sensor", DEVICE_CLASS_BATTERY_CHARGING),
|
||||
("sensor", DEVICE_CLASS_BATTERY),
|
||||
(BINARY_SENSOR_DOMAIN, DEVICE_CLASS_BATTERY_CHARGING),
|
||||
(BINARY_SENSOR_DOMAIN, DEVICE_CLASS_MOTION),
|
||||
(SENSOR_DOMAIN, DEVICE_CLASS_BATTERY),
|
||||
}
|
||||
)
|
||||
|
||||
@@ -537,9 +545,7 @@ class HomeKit:
|
||||
await self._async_set_device_info_attributes(
|
||||
ent_reg_ent, dev_reg, state.entity_id
|
||||
)
|
||||
self._async_configure_linked_battery_sensors(
|
||||
ent_reg_ent, device_lookup, state
|
||||
)
|
||||
self._async_configure_linked_sensors(ent_reg_ent, device_lookup, state)
|
||||
|
||||
bridged_states.append(state)
|
||||
|
||||
@@ -629,9 +635,7 @@ class HomeKit:
|
||||
self.hass.add_job(self.driver.stop)
|
||||
|
||||
@callback
|
||||
def _async_configure_linked_battery_sensors(
|
||||
self, ent_reg_ent, device_lookup, state
|
||||
):
|
||||
def _async_configure_linked_sensors(self, ent_reg_ent, device_lookup, state):
|
||||
if (
|
||||
ent_reg_ent is None
|
||||
or ent_reg_ent.device_id is None
|
||||
@@ -644,7 +648,7 @@ class HomeKit:
|
||||
if ATTR_BATTERY_CHARGING not in state.attributes:
|
||||
battery_charging_binary_sensor_entity_id = device_lookup[
|
||||
ent_reg_ent.device_id
|
||||
].get(("binary_sensor", DEVICE_CLASS_BATTERY_CHARGING))
|
||||
].get((BINARY_SENSOR_DOMAIN, DEVICE_CLASS_BATTERY_CHARGING))
|
||||
if battery_charging_binary_sensor_entity_id:
|
||||
self._config.setdefault(state.entity_id, {}).setdefault(
|
||||
CONF_LINKED_BATTERY_CHARGING_SENSOR,
|
||||
@@ -653,13 +657,22 @@ class HomeKit:
|
||||
|
||||
if ATTR_BATTERY_LEVEL not in state.attributes:
|
||||
battery_sensor_entity_id = device_lookup[ent_reg_ent.device_id].get(
|
||||
("sensor", DEVICE_CLASS_BATTERY)
|
||||
(SENSOR_DOMAIN, DEVICE_CLASS_BATTERY)
|
||||
)
|
||||
if battery_sensor_entity_id:
|
||||
self._config.setdefault(state.entity_id, {}).setdefault(
|
||||
CONF_LINKED_BATTERY_SENSOR, battery_sensor_entity_id
|
||||
)
|
||||
|
||||
if state.entity_id.startswith(f"{CAMERA_DOMAIN}."):
|
||||
motion_binary_sensor_entity_id = device_lookup[ent_reg_ent.device_id].get(
|
||||
(BINARY_SENSOR_DOMAIN, DEVICE_CLASS_MOTION)
|
||||
)
|
||||
if motion_binary_sensor_entity_id:
|
||||
self._config.setdefault(state.entity_id, {}).setdefault(
|
||||
CONF_LINKED_MOTION_SENSOR, motion_binary_sensor_entity_id,
|
||||
)
|
||||
|
||||
async def _async_set_device_info_attributes(self, ent_reg_ent, dev_reg, entity_id):
|
||||
"""Set attributes that will be used for homekit device info."""
|
||||
ent_cfg = self._config.setdefault(entity_id, {})
|
||||
|
||||
@@ -41,6 +41,7 @@ CONF_FEATURE_LIST = "feature_list"
|
||||
CONF_FILTER = "filter"
|
||||
CONF_LINKED_BATTERY_SENSOR = "linked_battery_sensor"
|
||||
CONF_LINKED_BATTERY_CHARGING_SENSOR = "linked_battery_charging_sensor"
|
||||
CONF_LINKED_MOTION_SENSOR = "linked_motion_sensor"
|
||||
CONF_LOW_BATTERY_THRESHOLD = "low_battery_threshold"
|
||||
CONF_MAX_FPS = "max_fps"
|
||||
CONF_MAX_HEIGHT = "max_height"
|
||||
|
||||
@@ -13,16 +13,22 @@ from pyhap.camera import (
|
||||
from pyhap.const import CATEGORY_CAMERA
|
||||
|
||||
from homeassistant.components.ffmpeg import DATA_FFMPEG
|
||||
from homeassistant.const import STATE_ON
|
||||
from homeassistant.core import callback
|
||||
from homeassistant.helpers.event import async_track_time_interval
|
||||
from homeassistant.helpers.event import (
|
||||
async_track_state_change,
|
||||
async_track_time_interval,
|
||||
)
|
||||
from homeassistant.util import get_local_ip
|
||||
|
||||
from .accessories import TYPES, HomeAccessory
|
||||
from .const import (
|
||||
CHAR_MOTION_DETECTED,
|
||||
CHAR_STREAMING_STRATUS,
|
||||
CONF_AUDIO_CODEC,
|
||||
CONF_AUDIO_MAP,
|
||||
CONF_AUDIO_PACKET_SIZE,
|
||||
CONF_LINKED_MOTION_SENSOR,
|
||||
CONF_MAX_FPS,
|
||||
CONF_MAX_HEIGHT,
|
||||
CONF_MAX_WIDTH,
|
||||
@@ -43,6 +49,7 @@ from .const import (
|
||||
DEFAULT_VIDEO_MAP,
|
||||
DEFAULT_VIDEO_PACKET_SIZE,
|
||||
SERV_CAMERA_RTP_STREAM_MANAGEMENT,
|
||||
SERV_MOTION_SENSOR,
|
||||
)
|
||||
from .img_util import scale_jpeg_camera_image
|
||||
from .util import pid_is_alive
|
||||
@@ -178,6 +185,47 @@ class Camera(HomeAccessory, PyhapCamera):
|
||||
category=CATEGORY_CAMERA,
|
||||
options=options,
|
||||
)
|
||||
self._char_motion_detected = None
|
||||
self.linked_motion_sensor = self.config.get(CONF_LINKED_MOTION_SENSOR)
|
||||
if not self.linked_motion_sensor:
|
||||
return
|
||||
state = self.hass.states.get(self.linked_motion_sensor)
|
||||
if not state:
|
||||
return
|
||||
serv_motion = self.add_preload_service(SERV_MOTION_SENSOR)
|
||||
self._char_motion_detected = serv_motion.configure_char(
|
||||
CHAR_MOTION_DETECTED, value=False
|
||||
)
|
||||
self._async_update_motion_state(None, None, state)
|
||||
|
||||
async def run_handler(self):
|
||||
"""Handle accessory driver started event.
|
||||
|
||||
Run inside the Home Assistant event loop.
|
||||
"""
|
||||
if self._char_motion_detected:
|
||||
async_track_state_change(
|
||||
self.hass, self.linked_motion_sensor, self._async_update_motion_state
|
||||
)
|
||||
|
||||
await super().run_handler()
|
||||
|
||||
@callback
|
||||
def _async_update_motion_state(
|
||||
self, entity_id=None, old_state=None, new_state=None
|
||||
):
|
||||
"""Handle link motion sensor state change to update HomeKit value."""
|
||||
detected = new_state.state == STATE_ON
|
||||
if self._char_motion_detected.value == detected:
|
||||
return
|
||||
|
||||
self._char_motion_detected.set_value(detected)
|
||||
_LOGGER.debug(
|
||||
"%s: Set linked motion %s sensor to %d",
|
||||
self.entity_id,
|
||||
self.linked_motion_sensor,
|
||||
detected,
|
||||
)
|
||||
|
||||
@callback
|
||||
def async_update_state(self, new_state):
|
||||
|
||||
@@ -11,7 +11,7 @@ import socket
|
||||
import pyqrcode
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components import fan, media_player, sensor
|
||||
from homeassistant.components import binary_sensor, fan, media_player, sensor
|
||||
from homeassistant.const import (
|
||||
ATTR_CODE,
|
||||
ATTR_SUPPORTED_FEATURES,
|
||||
@@ -32,7 +32,9 @@ from .const import (
|
||||
CONF_AUDIO_PACKET_SIZE,
|
||||
CONF_FEATURE,
|
||||
CONF_FEATURE_LIST,
|
||||
CONF_LINKED_BATTERY_CHARGING_SENSOR,
|
||||
CONF_LINKED_BATTERY_SENSOR,
|
||||
CONF_LINKED_MOTION_SENSOR,
|
||||
CONF_LOW_BATTERY_THRESHOLD,
|
||||
CONF_MAX_FPS,
|
||||
CONF_MAX_HEIGHT,
|
||||
@@ -83,6 +85,9 @@ BASIC_INFO_SCHEMA = vol.Schema(
|
||||
{
|
||||
vol.Optional(CONF_NAME): cv.string,
|
||||
vol.Optional(CONF_LINKED_BATTERY_SENSOR): cv.entity_domain(sensor.DOMAIN),
|
||||
vol.Optional(CONF_LINKED_BATTERY_CHARGING_SENSOR): cv.entity_domain(
|
||||
binary_sensor.DOMAIN
|
||||
),
|
||||
vol.Optional(
|
||||
CONF_LOW_BATTERY_THRESHOLD, default=DEFAULT_LOW_BATTERY_THRESHOLD
|
||||
): cv.positive_int,
|
||||
@@ -115,6 +120,7 @@ CAMERA_SCHEMA = BASIC_INFO_SCHEMA.extend(
|
||||
vol.Optional(
|
||||
CONF_VIDEO_PACKET_SIZE, default=DEFAULT_VIDEO_PACKET_SIZE
|
||||
): cv.positive_int,
|
||||
vol.Optional(CONF_LINKED_MOTION_SENSOR): cv.entity_domain(binary_sensor.DOMAIN),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user