-
- ${this._cameras === undefined
- ? until(
- (async () => {
- await this._loadCameras();
- // Don't reset messages as errors may have been generated
- // during the camera load.
- this._changeView({ resetMessage: false });
- return this._render();
- })(),
- renderProgressIndicator(),
- )
- : // Always want to call render even if there's a message, to
- // ensure live preload is always present (even if not displayed).
- this._render()}
- ${this._getConfig().elements
- ? // Always show elements to allow for custom menu items (etc.) to
- // be present even if a particular view has an error. Elements
- // need to render after the main views so it can render 'on top'.
- html` {
- this._addDynamicMenuButton(e.detail);
- }}
- @frigate-card:menu-remove=${(e) => {
- this._removeDynamicMenuButton(e.detail);
- }}
- @frigate-card:condition-state-request=${(ev) => {
- conditionStateRequestHandler(ev, this._conditionState);
- }}
- >
- `
- : ``}
- ${
- // Keep message rendering to last to show messages that may have
- // been generated during the render.
- this._message ? renderMessage(this._message) : ''
- }
-
+
+ ${this._cameras === undefined
+ ? until(
+ (async () => {
+ await this._loadCameras();
+ // Don't reset messages as errors may have been generated
+ // during the camera load.
+ this._changeView({ resetMessage: false });
+ return this._render();
+ })(),
+ renderProgressIndicator(),
+ )
+ : // Always want to call render even if there's a message, to
+ // ensure live preload is always present (even if not displayed).
+ this._render()}
+ ${this._getConfig().elements
+ ? // Always show elements to allow for custom menu items (etc.) to
+ // be present even if a particular view has an error. Elements
+ // need to render after the main views so it can render 'on top'.
+ html` {
+ this._addDynamicMenuButton(e.detail);
+ }}
+ @frigate-card:menu-remove=${(e) => {
+ this._removeDynamicMenuButton(e.detail);
+ }}
+ @frigate-card:condition-state-request=${(ev) => {
+ conditionStateRequestHandler(ev, this._conditionState);
+ }}
+ >
+ `
+ : ``}
+ ${
+ // Keep message rendering to last to show messages that may have
+ // been generated during the render.
+ this._message ? renderMessage(this._message) : ''
+ }
${!renderMenuAbove ? this._renderMenu() : ''}
`;
diff --git a/src/components/image.ts b/src/components/image.ts
index 0ba8f042..98e6e10b 100644
--- a/src/components/image.ts
+++ b/src/components/image.ts
@@ -1,11 +1,11 @@
import { HomeAssistant } from 'custom-card-helpers';
import {
- CSSResultGroup,
- html,
- LitElement,
- PropertyValues,
- TemplateResult,
- unsafeCSS
+ CSSResultGroup,
+ html,
+ LitElement,
+ PropertyValues,
+ TemplateResult,
+ unsafeCSS
} from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
import { createRef, ref, Ref } from 'lit/directives/ref.js';
@@ -14,7 +14,7 @@ import defaultImage from '../images/frigate-bird-in-sky.jpg';
import { localize } from '../localize/localize.js';
import imageStyle from '../scss/image.scss';
import { CameraConfig, ImageViewConfig } from '../types.js';
-import { shouldUpdateBasedOnHass } from '../utils/ha';
+import { isHassDifferent } from '../utils/ha';
import { dispatchMediaShowEvent } from '../utils/media-info.js';
import { View } from '../view.js';
import { dispatchErrorMessageEvent } from './message.js';
@@ -96,7 +96,7 @@ export class FrigateCardImage extends LitElement {
this._imageConfig?.mode === 'camera' &&
cameraEntity
) {
- if (shouldUpdateBasedOnHass(this.hass, changedProps.get('hass'), [cameraEntity])) {
+ if (isHassDifferent(this.hass, changedProps.get('hass'), [cameraEntity])) {
// If the state of the camera entity has changed, remove the cached
// value (will be re-calculated in willUpdate). This is important to
// ensure a changed access token is immediately used.
diff --git a/src/components/live.ts b/src/components/live.ts
index 83ad8627..8cf3c6f0 100644
--- a/src/components/live.ts
+++ b/src/components/live.ts
@@ -1090,7 +1090,8 @@ export class FrigateCardLiveJSMPEG extends LitElement {
if (!this.cameraConfig?.camera_name) {
return dispatchErrorMessageEvent(
this,
- localize('error.no_camera_name') + `: ${JSON.stringify(this.cameraConfig)}`,
+ localize('error.no_camera_name'),
+ this.cameraConfig,
);
}
diff --git a/src/components/submenu.ts b/src/components/submenu.ts
index f7a77562..270bfb76 100644
--- a/src/components/submenu.ts
+++ b/src/components/submenu.ts
@@ -1,12 +1,12 @@
import type { Corner } from '@material/mwc-menu';
import { HomeAssistant } from 'custom-card-helpers';
import {
- CSSResultGroup,
- html,
- LitElement,
- PropertyValues,
- TemplateResult,
- unsafeCSS
+ CSSResultGroup,
+ html,
+ LitElement,
+ PropertyValues,
+ TemplateResult,
+ unsafeCSS
} from 'lit';
import { customElement, property } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
@@ -15,10 +15,10 @@ import { actionHandler } from '../action-handler-directive.js';
import submenuStyle from '../scss/submenu.scss';
import { MenuSubmenu, MenuSubmenuItem, MenuSubmenuSelect } from '../types.js';
import {
- frigateCardHasAction,
- stopEventFromActivatingCardWideActions
+ frigateCardHasAction,
+ stopEventFromActivatingCardWideActions
} from '../utils/action.js';
-import { refreshDynamicStateParameters, shouldUpdateBasedOnHass } from '../utils/ha';
+import { isHassDifferent, refreshDynamicStateParameters } from '../utils/ha';
import { domainIcon } from '../utils/icons/domain-icon.js';
@customElement('frigate-card-submenu')
@@ -139,7 +139,7 @@ export class FrigateCardSubmenuSelect extends LitElement {
changedProps.size != 1 ||
!this.submenuSelect ||
(!!oldHass &&
- shouldUpdateBasedOnHass(this.hass, oldHass, [this.submenuSelect.entity]))
+ isHassDifferent(this.hass, oldHass, [this.submenuSelect.entity]))
);
}
diff --git a/src/components/viewer.ts b/src/components/viewer.ts
index 0819b960..f48975c6 100644
--- a/src/components/viewer.ts
+++ b/src/components/viewer.ts
@@ -37,7 +37,7 @@ import {
overrideMultiBrowseMediaQueryParameters
} from '../utils/ha/browse-media.js';
import { createMediaShowInfo } from '../utils/media-info.js';
-import { ResolvedMediaCache, resolveMedia } from '../utils/resolved-media.js';
+import { ResolvedMediaCache, resolveMedia } from '../utils/ha/resolved-media.js';
import { View } from '../view.js';
import { AutoMediaPlugin } from './embla-plugins/automedia.js';
import { Lazyload, LazyloadType } from './embla-plugins/lazyload.js';
diff --git a/src/const.ts b/src/const.ts
index e61138ac..717e82f4 100644
--- a/src/const.ts
+++ b/src/const.ts
@@ -23,6 +23,12 @@ export const CONF_CAMERAS_ARRAY_LIVE_PROVIDER =
`${CONF_CAMERAS}.#.live_provider` as const;
export const CONF_CAMERAS_ARRAY_DEPENDENT_CAMERAS =
`${CONF_CAMERAS}.#.dependent_cameras` as const;
+export const CONF_CAMERAS_ARRAY_TRIGGER_BY_MOTION =
+ `${CONF_CAMERAS}.#.trigger_by_motion` as const;
+export const CONF_CAMERAS_ARRAY_TRIGGER_BY_OCCUPANCY =
+ `${CONF_CAMERAS}.#.trigger_by_occupancy` as const;
+export const CONF_CAMERAS_ARRAY_TRIGGER_BY_ENTITIES =
+ `${CONF_CAMERAS}.#.trigger_by_entities` as const;
export const CONF_VIEW = 'view' as const;
export const CONF_VIEW_CAMERA_SELECT = `${CONF_VIEW}.camera_select` as const;
@@ -33,6 +39,10 @@ export const CONF_VIEW_UPDATE_CYCLE_CAMERA = `${CONF_VIEW}.update_cycle_camera`
export const CONF_VIEW_UPDATE_FORCE = `${CONF_VIEW}.update_force` as const;
export const CONF_VIEW_UPDATE_ENTITIES = `${CONF_VIEW}.update_entities` as const;
export const CONF_VIEW_UPDATE_SECONDS = `${CONF_VIEW}.update_seconds` as const;
+export const CONF_VIEW_SCAN = `${CONF_VIEW}.scan` as const;
+export const CONF_VIEW_SCAN_ENABLED = `${CONF_VIEW_SCAN}.enabled` as const;
+export const CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS =
+ `${CONF_VIEW_SCAN}.show_trigger_status` as const;
export const CONF_EVENT_GALLERY = 'event_gallery' as const;
export const CONF_EVENT_GALLERY_CONTROLS_THUMBNAILS_SHOW_DETAILS =
@@ -142,4 +152,4 @@ export const CONF_DIMENSIONS_ASPECT_RATIO_MODE =
export const CONF_OVERRIDES = 'overrides' as const;
// Taken from https://github.dev/home-assistant/frontend/blob/b5861869e39290fd2e15737e89571dfc543b3ad3/src/data/media-player.ts#L93
-export const MEDIA_PLAYER_SUPPORT_BROWSE_MEDIA = 131072;
\ No newline at end of file
+export const MEDIA_PLAYER_SUPPORT_BROWSE_MEDIA = 131072;
diff --git a/src/editor.ts b/src/editor.ts
index df36a05b..f0bf24b7 100644
--- a/src/editor.ts
+++ b/src/editor.ts
@@ -21,6 +21,9 @@ import {
CONF_CAMERAS_ARRAY_LABEL,
CONF_CAMERAS_ARRAY_LIVE_PROVIDER,
CONF_CAMERAS_ARRAY_TITLE,
+ CONF_CAMERAS_ARRAY_TRIGGER_BY_ENTITIES,
+ CONF_CAMERAS_ARRAY_TRIGGER_BY_MOTION,
+ CONF_CAMERAS_ARRAY_TRIGGER_BY_OCCUPANCY,
CONF_CAMERAS_ARRAY_URL,
CONF_CAMERAS_ARRAY_WEBRTC_CARD_ENTITY,
CONF_CAMERAS_ARRAY_WEBRTC_CARD_URL,
@@ -81,6 +84,9 @@ import {
CONF_VIEW_CAMERA_SELECT,
CONF_VIEW_DARK_MODE,
CONF_VIEW_DEFAULT,
+ CONF_VIEW_SCAN,
+ CONF_VIEW_SCAN_ENABLED,
+ CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS,
CONF_VIEW_TIMEOUT_SECONDS,
CONF_VIEW_UPDATE_CYCLE_CAMERA,
CONF_VIEW_UPDATE_FORCE,
@@ -99,11 +105,12 @@ import {
} from './types.js';
import { arrayMove } from './utils/basic.js';
import { getCameraID, getCameraTitle } from './utils/camera.js';
-import { sideLoadHomeAssistantElements } from './utils/ha';
+import { getEntitiesFromHASS, sideLoadHomeAssistantElements } from './utils/ha';
const MENU_BUTTONS = 'buttons';
const MENU_CAMERAS = 'cameras';
const MENU_OPTIONS = 'options';
+const MENU_VIEW_SCAN = 'scan';
interface EditorOptionsSet {
icon: string;
@@ -398,20 +405,6 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
}
}
- protected _getEntities(domain: string): string[] {
- if (!this.hass) {
- return [];
- }
- const entities = Object.keys(this.hass.states).filter(
- (eid) => eid.substr(0, eid.indexOf('.')) === domain,
- );
- entities.sort();
-
- // Add a blank entry to unset a selection.
- entities.unshift('');
- return entities;
- }
-
/**
* Render an option set header
* @param optionSetName The name of the EditorOptionsSet.
@@ -601,6 +594,38 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
);
}
+ protected _renderViewScanMenu(): TemplateResult {
+ return html`
+
+ ${this._expandedMenus[MENU_VIEW_SCAN]
+ ? html`
+ ${this._renderSwitch(
+ CONF_VIEW_SCAN_ENABLED,
+ frigateCardConfigDefaults.view.scan.enabled ?? true,
+ {
+ label: localize(`config.${CONF_VIEW_SCAN_ENABLED}`),
+ },
+ )}
+ ${this._renderSwitch(
+ CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS,
+ frigateCardConfigDefaults.view.scan.show_trigger_status ?? true,
+ {
+ label: localize(`config.${CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS}`),
+ },
+ )}
+
`
+ : ''}
+ `;
+ }
+
/**
* Render an editor menu for the card menu buttons.
* @param button The name of the button.
@@ -700,6 +725,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
protected _renderCamera(
cameras: RawFrigateCardConfigArray,
cameraIndex: number,
+ entities: string[],
addNewCamera?: boolean,
): TemplateResult | void {
const liveProviders: EditorSelectOption[] = [
@@ -848,6 +874,21 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
multiple: true,
},
)}
+ ${this._renderSwitch(
+ getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_OCCUPANCY, cameraIndex),
+ frigateCardConfigDefaults.cameras.trigger_by_occupancy,
+ )}
+ ${this._renderSwitch(
+ getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_MOTION, cameraIndex),
+ frigateCardConfigDefaults.cameras.trigger_by_motion,
+ )}
+ ${this._renderOptionSelector(
+ getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_ENTITIES, cameraIndex),
+ entities,
+ {
+ multiple: true,
+ },
+ )}
+### Select Entity Submenus
+
+Automatically generate submenus from `select` entities.
+
+
+
+### Cast media from the card
+
+Cast media from the card to a local player.
+
+
+
+### Scan Mode
+
+Automatically choose the camera with the action!
+
+
+
+### Thumbnail Drawers
+
+View thumbnails in side-drawers.
+
+
+
+### Event Timeline
+
+View events in the timeline.
+
+
+
+
+
+### Card Casting
+
+A dashboard with the card can be cast onto a suitable device (such as the Nest Hub shown below).
+
+
+
## Examples
### Illustrative Expanded Configuration Reference
@@ -921,6 +984,10 @@ cameras:
# Show events for camera-2 when this camera is viewed.
dependent_cameras:
- camera-2
+ trigger_by_motion: false
+ trigger_by_occupancy: true
+ trigger_by_entities:
+ - binary_sensor.front_door_sensor
- frigate_url: http://my-other.frigate.local
client_id: frigate-other
camera_name: entrance
@@ -935,6 +1002,10 @@ cameras:
webrtc_card:
entity: camera.entrance_rtsp
url: 'rtsp://username:password@camera:554/av_stream/ch0'
+ trigger_by_motion: false
+ trigger_by_occupancy: true
+ trigger_by_entities:
+ - binary_sensor.entrance_sensor
```
@@ -958,6 +1029,9 @@ view:
render_entities:
- switch.render_card
dark_mode: 'off'
+ scan:
+ enabled: false
+ show_trigger_status: true
actions:
entity: light.office_main_lights
tap_action:
@@ -2234,7 +2308,7 @@ the card to trigger a card update based on that entity -- which causes it to use
the new overriden default immediately. Alternatives to trigger the card to
change view but without `update_entities` would just be having an
`update_seconds` parameter which reloads the default view that many seconds
-after user interaction stops.
+after user interaction stops or through the use of the `trigger_by_entities` option for a given camera.
```yaml
view:
@@ -2365,6 +2439,30 @@ cameras:
```
+### Using Scan Mode
+
+Have your card follow the action with Scan Mode.
+
+