From ad03f34254dff5f03b5005f5399ca0f8474fc39c Mon Sep 17 00:00:00 2001 From: CeeWeasel Date: Mon, 10 Feb 2025 15:08:18 -0500 Subject: [PATCH] A whole bunch of cleanup --- automations/cameras/frigate_cam04_detect.yaml | 2 + .../frigate/frigate_person_back_yard.yaml | 1 + .../frigate/frigate_person_front_porch.yaml | 1 + automations/people/Clint/Clint_home.yaml | 1 + .../people/Clint/set_clint_next_alarm.yaml | 2 +- automations/people/returned_home.yaml | 6 ++ automations/rooms/driveway_lights.yaml | 2 +- .../rooms/entryway/entryway_lights_to_on.yaml | 1 + automations/rooms/front_porch_lights.yaml | 57 +++++++++++----- automations/rooms/furnace_room_lights.yaml | 4 +- .../rooms/garage/garage_lights_to_off.yaml | 2 + .../rooms/garage/garage_lights_to_on.yaml | 4 ++ .../rooms/nursery/nursery_white_noise_on.yaml | 27 ++++---- automations/things/doorbell.yaml | 2 + .../rooms/entryway_occupied.yaml | 2 +- .../binary_sensors/rooms/garage_occupied.yaml | 8 +-- components/packages/camera_casting.yaml | 67 ++++++++++++++----- components/packages/ecobee.yaml | 2 - .../packages/temperature_management.yaml | 6 +- configuration.yaml | 2 +- groups.yaml | 6 +- lovelace/cameras/view-camera-01.yaml | 2 +- lovelace/cameras/view-camera-03.yaml | 2 +- lovelace/cameras/view-camera-04.yaml | 2 +- lovelace/cameras/view-camera-06.yaml | 2 +- lovelace/cameras/view-camera-07.yaml | 2 +- lovelace/cameras/view-camera-08.yaml | 2 +- lovelace/cameras/view-camera-12.yaml | 2 +- lovelace/cameras/view-camera-13.yaml | 2 +- lovelace/cameras/view-camera-14.yaml | 2 +- lovelace/cameras/view-camera-18.yaml | 2 +- lovelace/cameras/view-camera-19.yaml | 2 +- lovelace/details/view-people-frigate.yaml | 6 +- lovelace/frigate/view-ai-cam01.yaml | 4 +- lovelace/frigate/view-ai-cam03.yaml | 4 +- lovelace/frigate/view-ai-cam04.yaml | 8 +-- lovelace/frigate/view-ai-cam06.yaml | 4 +- lovelace/frigate/view-ai-cam07.yaml | 4 +- lovelace/frigate/view-ai-cam08.yaml | 2 +- lovelace/frigate/view-ai-cam12.yaml | 6 +- lovelace/frigate/view-ai-cam13.yaml | 6 +- lovelace/frigate/view-ai-cam14.yaml | 4 +- lovelace/frigate/view-ai-cam18.yaml | 6 +- lovelace/frigate/view-ai-cam19.yaml | 6 +- lovelace/phone/blue-room.yaml | 2 +- lovelace/phone/entryway.yaml | 2 +- lovelace/phone/garage.yaml | 4 +- lovelace/raw-cameras/back-yard-card.yaml | 2 +- lovelace/raw-cameras/blue-room-card.yaml | 2 +- lovelace/raw-cameras/computer-area-card.yaml | 2 +- lovelace/raw-cameras/front-porch-card.yaml | 2 +- lovelace/raw-cameras/front-room-card.yaml | 2 +- lovelace/raw-cameras/front-yard-card.yaml | 2 +- lovelace/raw-cameras/garage-card.yaml | 2 +- lovelace/raw-cameras/indoor-camera-card.yaml | 2 +- lovelace/raw-cameras/kitchen-card.yaml | 2 +- .../raw-cameras/master-bedroom-left-card.yaml | 2 +- .../master-bedroom-right-card.yaml | 2 +- lovelace/raw-cameras/nursery-card.yaml | 2 +- lovelace/raw-cameras/outdoor-camera-card.yaml | 2 +- lovelace/room_cards/blue_room.yaml | 2 +- lovelace/room_cards/entryway.yaml | 2 +- lovelace/room_cards/furnace_room.yaml | 2 +- lovelace/room_cards/garage.yaml | 4 +- lovelace/stretch-cameras/back-yard-card.yaml | 3 +- lovelace/stretch-cameras/blue-room-card.yaml | 3 +- .../stretch-cameras/computer-area-card.yaml | 3 +- .../stretch-cameras/front-porch-card.yaml | 3 +- lovelace/stretch-cameras/front-room-card.yaml | 3 +- lovelace/stretch-cameras/front-yard-card.yaml | 3 +- lovelace/stretch-cameras/garage-card.yaml | 3 +- lovelace/stretch-cameras/kitchen-card.yaml | 3 +- .../master-bedroom-left-card.yaml | 2 +- .../master-bedroom-right-card.yaml | 2 +- lovelace/stretch-cameras/nursery-card.yaml | 3 +- .../computer-area-frigate-camera.yaml | 2 +- lovelace/view-ha-floorplan.yaml | 3 + www/floorplan/fullsized_floorplan.svg | 12 ++-- 78 files changed, 230 insertions(+), 149 deletions(-) delete mode 100644 components/packages/ecobee.yaml diff --git a/automations/cameras/frigate_cam04_detect.yaml b/automations/cameras/frigate_cam04_detect.yaml index ea6c589..526f2b3 100644 --- a/automations/cameras/frigate_cam04_detect.yaml +++ b/automations/cameras/frigate_cam04_detect.yaml @@ -62,6 +62,8 @@ action: entity_id: switch.frigate_cam04_detect state: 'on' sequence: + - delay: + minutes: 5 - service: switch.turn_off data: {} target: diff --git a/automations/frigate/frigate_person_back_yard.yaml b/automations/frigate/frigate_person_back_yard.yaml index 3893be3..88a0869 100644 --- a/automations/frigate/frigate_person_back_yard.yaml +++ b/automations/frigate/frigate_person_back_yard.yaml @@ -35,6 +35,7 @@ condition: #- "{{ not presence_entity or not is_state(presence_entity, 'home') }}" - '{{ is_state("binary_sensor.garage_door","off") }}' - '{{ is_state("binary_sensor.outer_garage_door","off") }}' + - '{{ is_state("binary_sensor.outer_garage_door_contact","off")}}' - '{{ is_state("binary_sensor.front_door_contact","off") }}' - '{{ is_state("binary_sensor.patio_door_contact","off") }}' - "{{ is_state('input_boolean.outdoor_snapshots','on') }}" diff --git a/automations/frigate/frigate_person_front_porch.yaml b/automations/frigate/frigate_person_front_porch.yaml index b5b8b74..c7087b6 100644 --- a/automations/frigate/frigate_person_front_porch.yaml +++ b/automations/frigate/frigate_person_front_porch.yaml @@ -35,6 +35,7 @@ condition: #- "{{ not presence_entity or not is_state(presence_entity, 'home') }}" - '{{ is_state("binary_sensor.garage_door","off") }}' - '{{ is_state("binary_sensor.outer_garage_door","off") }}' + - '{{ is_state("binary_sensor.outer_garage_door_contact","off")}}' - '{{ is_state("binary_sensor.front_door_contact","off") }}' - '{{ is_state("binary_sensor.patio_door_contact","off") }}' - '{{ is_state("binary_sensor.front_porch_motion","off") }}' diff --git a/automations/people/Clint/Clint_home.yaml b/automations/people/Clint/Clint_home.yaml index e5dab1a..d4d20a7 100644 --- a/automations/people/Clint/Clint_home.yaml +++ b/automations/people/Clint/Clint_home.yaml @@ -17,6 +17,7 @@ trigger: entity_id: - binary_sensor.gray_suv_east_side - binary_sensor.gray_suv_west_side + - group.traverse from: 'off' to: 'on' diff --git a/automations/people/Clint/set_clint_next_alarm.yaml b/automations/people/Clint/set_clint_next_alarm.yaml index 5522d99..3894374 100644 --- a/automations/people/Clint/set_clint_next_alarm.yaml +++ b/automations/people/Clint/set_clint_next_alarm.yaml @@ -28,7 +28,7 @@ action: target: entity_id: input_datetime.clint_next_alarm data: - time: "09:00:00" + time: "06:00:00" - conditions: - condition: state diff --git a/automations/people/returned_home.yaml b/automations/people/returned_home.yaml index f1737f0..734d275 100644 --- a/automations/people/returned_home.yaml +++ b/automations/people/returned_home.yaml @@ -12,6 +12,9 @@ trigger: - platform: state entity_id: binary_sensor.outer_garage_door to: 'on' + - platform: state + entity_id: binary_sensor.outer_garage_door_contact + to: 'on' # People just got home - platform: state entity_id: @@ -50,6 +53,9 @@ condition: - condition: state entity_id: binary_sensor.outer_garage_door state: 'on' + - condition: state + entity_id: binary_sensor.outer_garage_door_contact + state: 'on' # Or somebody has just arrived - condition: template value_template: "{{ is_state('input_select.clint_status_dropdown','Just Arrived') }}" diff --git a/automations/rooms/driveway_lights.yaml b/automations/rooms/driveway_lights.yaml index 6612922..5c0da2d 100644 --- a/automations/rooms/driveway_lights.yaml +++ b/automations/rooms/driveway_lights.yaml @@ -24,7 +24,7 @@ trigger: - binary_sensor.garage_door from: "on" to: "off" - for: "00:01:00" + for: "00:05:00" - platform: state id: got_bright diff --git a/automations/rooms/entryway/entryway_lights_to_on.yaml b/automations/rooms/entryway/entryway_lights_to_on.yaml index a8c8b71..067938c 100644 --- a/automations/rooms/entryway/entryway_lights_to_on.yaml +++ b/automations/rooms/entryway/entryway_lights_to_on.yaml @@ -28,6 +28,7 @@ trigger: id: door entity_id: - binary_sensor.inner_garage_door + - binary_sensor.inner_garage_door_contact - binary_sensor.front_door_contact to: "on" diff --git a/automations/rooms/front_porch_lights.yaml b/automations/rooms/front_porch_lights.yaml index 7a0c00a..6784b60 100644 --- a/automations/rooms/front_porch_lights.yaml +++ b/automations/rooms/front_porch_lights.yaml @@ -15,16 +15,16 @@ trigger: entity_id: binary_sensor.front_porch_motion, binary_sensor.front_porch_person_occupancy to: "off" for: - minutes: 1 + minutes: 5 - platform: state id: door_open - entity_id: binary_sensor.outer_garage_door, binary_sensor.garage_door + entity_id: binary_sensor.outer_garage_door, binary_sensor.garage_door, binary_sensor.outer_garage_door_contact to: "on" - platform: state id: door_shut - entity_id: binary_sensor.outer_garage_door + entity_id: binary_sensor.outer_garage_door, binary_sensor.outer_garage_door_contact to: "off" for: minutes: 1 @@ -40,17 +40,17 @@ trigger: to: "on" condition: - - condition: or - conditions: - - alias: "Front porch not naturally lit" - condition: state - entity_id: binary_sensor.front_porch_naturally_lit - state: 'off' + # - condition: or + # conditions: + # - alias: "Front porch not naturally lit" + # condition: state + # entity_id: binary_sensor.front_porch_naturally_lit + # state: 'off' - - alias: "Light is already on" - condition: state - entity_id: light.front_porch_overhead - state: 'on' + # - alias: "Light is already off" + # condition: state + # entity_id: light.front_porch_overhead + # state: 'off' - alias: "It is not late evening" condition: state @@ -72,6 +72,11 @@ action: entity_id: light.front_porch_overhead state: 'off' + - alias: "Front porch not naturally lit" + condition: state + entity_id: binary_sensor.front_porch_naturally_lit + state: 'off' + sequence: - service: light.turn_on target: @@ -85,20 +90,42 @@ action: entity_id: light.front_porch_overhead state: 'off' + - alias: "Front porch not naturally lit" + condition: state + entity_id: binary_sensor.front_porch_naturally_lit + state: 'off' + sequence: - service: light.turn_on target: entity_id: light.front_porch_overhead + - conditions: + - condition: trigger + id: "too_bright" + + - condition: state + entity_id: light.front_porch_overhead + state: 'on' + + sequence: + - service: light.turn_off + target: + entity_id: light.front_porch_overhead + - conditions: - condition: state entity_id: binary_sensor.front_porch_motion state: "off" for: - minutes: 1 + minutes: 5 + + # - condition: state + # entity_id: binary_sensor.outer_garage_door + # state: 'off' - condition: state - entity_id: binary_sensor.outer_garage_door + entity_id: binary_sensor.outer_garage_door_contact state: 'off' - condition: state diff --git a/automations/rooms/furnace_room_lights.yaml b/automations/rooms/furnace_room_lights.yaml index 108fea3..897b87b 100644 --- a/automations/rooms/furnace_room_lights.yaml +++ b/automations/rooms/furnace_room_lights.yaml @@ -5,13 +5,13 @@ mode: queued trigger: - platform: state id: door_open - entity_id: binary_sensor.furnace_room_door + entity_id: binary_sensor.furnace_room_door, binary_sensor.furnace_room_door_contact from: "off" to: "on" - platform: state id: door_closed - entity_id: binary_sensor.furnace_room_door + entity_id: binary_sensor.furnace_room_door, binary_sensor.furnace_room_door_contact to: "off" for: "00:10:00" diff --git a/automations/rooms/garage/garage_lights_to_off.yaml b/automations/rooms/garage/garage_lights_to_off.yaml index 1f908ef..759d0b3 100644 --- a/automations/rooms/garage/garage_lights_to_off.yaml +++ b/automations/rooms/garage/garage_lights_to_off.yaml @@ -12,6 +12,8 @@ trigger: - binary_sensor.inner_garage_door - binary_sensor.outer_garage_door - binary_sensor.garage_door + - binary_sensor.outer_garage_door_contact + - binary_sensor.inner_garage_door_contact to: 'off' for: '00:10:00' diff --git a/automations/rooms/garage/garage_lights_to_on.yaml b/automations/rooms/garage/garage_lights_to_on.yaml index 15e58c5..949763a 100644 --- a/automations/rooms/garage/garage_lights_to_on.yaml +++ b/automations/rooms/garage/garage_lights_to_on.yaml @@ -38,7 +38,9 @@ trigger: id: "doors_open" entity_id: - binary_sensor.inner_garage_door + - binary_sensor.inner_garage_door_contact - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact from: "off" to: "on" @@ -46,7 +48,9 @@ trigger: id: "doors_closed" entity_id: - binary_sensor.inner_garage_door + - binary_sensor.inner_garage_door_contact - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact from: "on" to: "off" diff --git a/automations/rooms/nursery/nursery_white_noise_on.yaml b/automations/rooms/nursery/nursery_white_noise_on.yaml index 1d21074..a6d9e9f 100644 --- a/automations/rooms/nursery/nursery_white_noise_on.yaml +++ b/automations/rooms/nursery/nursery_white_noise_on.yaml @@ -25,17 +25,20 @@ action: # data: # entity_id: input_select.nursery_mode # option: 'Off' - - service: media_player.volume_set - data: - volume_level: 0.6 - target: - entity_id: media_player.nursery_hub - - - service: media_player.play_media - target: - entity_id: media_player.nursery_hub - data: - media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3 - media_content_type: audio/mpeg + + + # The kids can turn on their own sounds. Just stop the music + # - service: media_player.volume_set + # data: + # volume_level: 0.6 + # target: + # entity_id: media_player.nursery_hub + + # - service: media_player.play_media + # target: + # entity_id: media_player.nursery_hub + # data: + # media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3 + # media_content_type: audio/mpeg diff --git a/automations/things/doorbell.yaml b/automations/things/doorbell.yaml index 70253e5..c0e6b95 100644 --- a/automations/things/doorbell.yaml +++ b/automations/things/doorbell.yaml @@ -25,6 +25,7 @@ trigger: entity_id: - binary_sensor.front_door_contact - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact from: "off" to: "on" @@ -33,6 +34,7 @@ trigger: entity_id: - binary_sensor.front_door_contact - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact from: "on" to: "off" diff --git a/components/binary_sensors/rooms/entryway_occupied.yaml b/components/binary_sensors/rooms/entryway_occupied.yaml index 414e44c..c032d99 100644 --- a/components/binary_sensors/rooms/entryway_occupied.yaml +++ b/components/binary_sensors/rooms/entryway_occupied.yaml @@ -23,7 +23,7 @@ observations: platform: state to_state: 'on' - - entity_id: binary_sensor.inner_garage_door + - entity_id: binary_sensor.inner_garage_door_contact prob_given_true: 0.02 prob_given_false: 0.0 platform: state diff --git a/components/binary_sensors/rooms/garage_occupied.yaml b/components/binary_sensors/rooms/garage_occupied.yaml index 1812706..c38d462 100644 --- a/components/binary_sensors/rooms/garage_occupied.yaml +++ b/components/binary_sensors/rooms/garage_occupied.yaml @@ -30,25 +30,25 @@ observations: platform: state to_state: 'closed' - - entity_id: binary_sensor.inner_garage_door + - entity_id: binary_sensor.inner_garage_door_contact prob_given_true: .75 prob_given_false: 0.01 platform: state to_state: 'on' - - entity_id: binary_sensor.inner_garage_door + - entity_id: binary_sensor.inner_garage_door_contact prob_given_true: .5 prob_given_false: 0.5 platform: state to_state: 'off' - - entity_id: binary_sensor.outer_garage_door + - entity_id: binary_sensor.outer_garage_door_contact prob_given_true: .75 prob_given_false: 0.5 platform: state to_state: 'on' - - entity_id: binary_sensor.outer_garage_door + - entity_id: binary_sensor.outer_garage_door_contact prob_given_true: 0.5 prob_given_false: 0.5 platform: state diff --git a/components/packages/camera_casting.yaml b/components/packages/camera_casting.yaml index 83032ee..18d989a 100644 --- a/components/packages/camera_casting.yaml +++ b/components/packages/camera_casting.yaml @@ -70,7 +70,44 @@ script: {% endif %} volume_level: 0.100 - - service: webrtc.dash_cast + # - service: webrtc.dash_cast + # data: + # entity_id: > + # {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %} + # media_player.front_room_hub + # {% elif is_state('input_select.cast_to_screen_dropdown', 'Nursery Hub') %} + # media_player.nursery_hub + # {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %} + # media_player.computer_area_hub + # {% endif %} + # url: > + # {% if is_state('input_select.camera_dropdown', 'Blue Room') %} + # rtsp://192.168.1.11:8554/rtsp_cam01_sub + # {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} + # rtsp://192.168.1.11:8554/rtsp_cam12_sub + # {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} + # rtsp://192.168.1.11:8554/rtsp_cam03_sub + # {% elif is_state('input_select.camera_dropdown', 'Garage') %} + # rtsp://192.168.1.11:8554/rtsp_cam04_sub + # {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} + # rtsp://192.168.1.11:8554/rtsp_cam06_sub + # {% elif is_state('input_select.camera_dropdown', 'Nursery') %} + # rtsp://192.168.1.11:8554/rtsp_cam08_sub + # {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} + # rtsp://192.168.1.11:8554/rtsp_cam14_sub + # {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} + # rtsp://192.168.1.11:8554/rtsp_cam18_sub + # {% elif is_state('input_select.camera_dropdown', 'Front Door') %} + # rtsp://192.168.1.11:8554/rtsp_cam19_sub + # {% elif is_state('input_select.camera_dropdown', 'Front Room') %} + # rtsp://192.168.1.11:8554/rtsp_cam13_sub + # {% endif %} + # force: true + # extra: + # mode: webrtc + + + - action: cast.show_lovelace_view data: entity_id: > {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %} @@ -80,28 +117,26 @@ script: {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %} media_player.computer_area_hub {% endif %} - url: > + dashboard_path: camera-casting-yml + view_path: > {% if is_state('input_select.camera_dropdown', 'Blue Room') %} - rtsp://192.168.1.11:8554/rtsp_cam01_sub + blue-room-camera {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} - rtsp://192.168.1.11:8554/rtsp_cam12_sub + kitchen-camera {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} - rtsp://192.168.1.11:8554/rtsp_cam03_sub + computer-area-camera {% elif is_state('input_select.camera_dropdown', 'Garage') %} - rtsp://192.168.1.11:8554/rtsp_cam04_sub + garage-camera {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} - rtsp://192.168.1.11:8554/rtsp_cam06_sub + mbr-camera {% elif is_state('input_select.camera_dropdown', 'Nursery') %} - rtsp://192.168.1.11:8554/rtsp_cam08_sub + nursery-camera {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} - rtsp://192.168.1.11:8554/rtsp_cam14_sub + back-yard-camera {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} - rtsp://192.168.1.11:8554/rtsp_cam18_sub + front-yard-camera {% elif is_state('input_select.camera_dropdown', 'Front Door') %} - rtsp://192.168.1.11:8554/rtsp_cam19_sub + front-porch-camera {% elif is_state('input_select.camera_dropdown', 'Front Room') %} - rtsp://192.168.1.11:8554/rtsp_cam13_sub - {% endif %} - force: true - extra: - mode: webrtc + front-room-camera + {% endif %} \ No newline at end of file diff --git a/components/packages/ecobee.yaml b/components/packages/ecobee.yaml deleted file mode 100644 index dc09160..0000000 --- a/components/packages/ecobee.yaml +++ /dev/null @@ -1,2 +0,0 @@ -ecobee: - api_key: !secret ecobee_api_key \ No newline at end of file diff --git a/components/packages/temperature_management.yaml b/components/packages/temperature_management.yaml index 68762f9..1c6f37b 100644 --- a/components/packages/temperature_management.yaml +++ b/components/packages/temperature_management.yaml @@ -105,10 +105,10 @@ template: - name: Inner Garage Door Open to Outside unique_id: templatebinarysensor.inner_garage_door_open_to_outside device_class: door - availability: "{{ (states('binary_sensor.inner_garage_door') not in ['unknown', 'unavailable']) and (states('binary_sensor.garage_door') not in ['unknown', 'unavailable']) and (states('binary_sensor.outer_garage_door') not in ['unknown', 'unavailable']) }}" + availability: "{{ (states('binary_sensor.inner_garage_door_contact') not in ['unknown', 'unavailable']) and (states('binary_sensor.garage_door') not in ['unknown', 'unavailable']) and (states('binary_sensor.outer_garage_door_contact') not in ['unknown', 'unavailable']) }}" state: >- - {% if is_state('binary_sensor.inner_garage_door', 'on') %} - {% if is_state('binary_sensor.garage_door', 'on') or is_state('binary_sensor.outer_garage_door', 'on') %} + {% if is_state('binary_sensor.inner_garage_door_contact', 'on') %} + {% if is_state('binary_sensor.garage_door', 'on') or is_state('binary_sensor.outer_garage_door_contact', 'on') %} {{'true'}} {% else %} {{'false'}} diff --git a/configuration.yaml b/configuration.yaml index 5b7a8c1..d871a86 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -4,7 +4,7 @@ homeassistant: latitude: !secret home_lat longitude: !secret home_long elevation: 655 - unit_system: imperial + # unit_system: imperial time_zone: !secret home_time_zone name: Daddy's House currency: USD diff --git a/groups.yaml b/groups.yaml index 7b07995..0d0b514 100644 --- a/groups.yaml +++ b/groups.yaml @@ -228,7 +228,7 @@ traverse: entities: - binary_sensor.gray_suv_east_side - binary_sensor.gray_suv_west_side - #- binary_sensor.frigate_cam04_vehicle_occupancy + - binary_sensor.east_side_vehicle_occupancy person_tess: name: Tess @@ -258,8 +258,10 @@ my_exterior_doors: - binary_sensor.front_door_contact - binary_sensor.garage_door - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact - binary_sensor.patio_door_contact - binary_sensor.inner_garage_door + - binary_sensor.inner_garage_door_contact my_hvac_affecting_openings: name: My HVAC Affecting Openings @@ -281,7 +283,9 @@ my_garage_doors: entities: - binary_sensor.garage_door - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact - binary_sensor.inner_garage_door + - binary_sensor.inner_garage_door_contact my_exterior_windows: name: My Exterior Windows diff --git a/lovelace/cameras/view-camera-01.yaml b/lovelace/cameras/view-camera-01.yaml index 842016b..b1efa98 100644 --- a/lovelace/cameras/view-camera-01.yaml +++ b/lovelace/cameras/view-camera-01.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-03.yaml b/lovelace/cameras/view-camera-03.yaml index e611402..f28f6f2 100644 --- a/lovelace/cameras/view-camera-03.yaml +++ b/lovelace/cameras/view-camera-03.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-04.yaml b/lovelace/cameras/view-camera-04.yaml index 4622678..cdb8abd 100644 --- a/lovelace/cameras/view-camera-04.yaml +++ b/lovelace/cameras/view-camera-04.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-06.yaml b/lovelace/cameras/view-camera-06.yaml index e6bc263..371bf6e 100644 --- a/lovelace/cameras/view-camera-06.yaml +++ b/lovelace/cameras/view-camera-06.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-07.yaml b/lovelace/cameras/view-camera-07.yaml index 28eb44f..fb78d5f 100644 --- a/lovelace/cameras/view-camera-07.yaml +++ b/lovelace/cameras/view-camera-07.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-08.yaml b/lovelace/cameras/view-camera-08.yaml index ccc23fc..8d04710 100644 --- a/lovelace/cameras/view-camera-08.yaml +++ b/lovelace/cameras/view-camera-08.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-12.yaml b/lovelace/cameras/view-camera-12.yaml index cd25d2d..9f844d4 100644 --- a/lovelace/cameras/view-camera-12.yaml +++ b/lovelace/cameras/view-camera-12.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-13.yaml b/lovelace/cameras/view-camera-13.yaml index b6a79ae..80a562e 100644 --- a/lovelace/cameras/view-camera-13.yaml +++ b/lovelace/cameras/view-camera-13.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-14.yaml b/lovelace/cameras/view-camera-14.yaml index 7c48db6..8476bb1 100644 --- a/lovelace/cameras/view-camera-14.yaml +++ b/lovelace/cameras/view-camera-14.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-18.yaml b/lovelace/cameras/view-camera-18.yaml index 77d423d..226b66d 100644 --- a/lovelace/cameras/view-camera-18.yaml +++ b/lovelace/cameras/view-camera-18.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/cameras/view-camera-19.yaml b/lovelace/cameras/view-camera-19.yaml index 0ee527f..8e364e1 100644 --- a/lovelace/cameras/view-camera-19.yaml +++ b/lovelace/cameras/view-camera-19.yaml @@ -1,6 +1,6 @@ type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras_global: dimensions: layout: diff --git a/lovelace/details/view-people-frigate.yaml b/lovelace/details/view-people-frigate.yaml index 204ba26..f7f1a39 100644 --- a/lovelace/details/view-people-frigate.yaml +++ b/lovelace/details/view-people-frigate.yaml @@ -5,7 +5,7 @@ icon: mdi:account-multiple visible: - user: 24a4bd075e7f41a497dd0390a1dd4a9f cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam03 live_provider: webrtc-card @@ -19,7 +19,7 @@ cards: webrtc_card: ui: true - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 live_provider: frigate-jsmpeg @@ -30,7 +30,7 @@ cards: zone: dining_room image: {} - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam13 live_provider: frigate-jsmpeg diff --git a/lovelace/frigate/view-ai-cam01.yaml b/lovelace/frigate/view-ai-cam01.yaml index d6f58fa..0822a8c 100644 --- a/lovelace/frigate/view-ai-cam01.yaml +++ b/lovelace/frigate/view-ai-cam01.yaml @@ -41,7 +41,7 @@ cards: entity: sensor.frigate_cam01_person_count - name: Blue Room entity: binary_sensor.frigate_cam01_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam01 title: Blue Room @@ -84,7 +84,7 @@ cards: entity: sensor.furnace_room_person_count - name: Furnace Room entity: binary_sensor.furnace_room_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam01 title: Furnace Room diff --git a/lovelace/frigate/view-ai-cam03.yaml b/lovelace/frigate/view-ai-cam03.yaml index 5f76f9d..80df4d2 100644 --- a/lovelace/frigate/view-ai-cam03.yaml +++ b/lovelace/frigate/view-ai-cam03.yaml @@ -45,7 +45,7 @@ cards: entity: sensor.frigate_cam03_person_count - name: Computer Area entity: binary_sensor.frigate_cam03_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam03 title: Computer Area @@ -88,7 +88,7 @@ cards: entity: sensor.great_room_person_count - name: Great Room entity: binary_sensor.great_room_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam03 title: Great Room diff --git a/lovelace/frigate/view-ai-cam04.yaml b/lovelace/frigate/view-ai-cam04.yaml index 586d30b..a404090 100644 --- a/lovelace/frigate/view-ai-cam04.yaml +++ b/lovelace/frigate/view-ai-cam04.yaml @@ -42,7 +42,7 @@ cards: entity: sensor.frigate_cam04_person_count - name: Garage entity: binary_sensor.frigate_cam04_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 title: Walkway @@ -77,7 +77,7 @@ cards: controls: next_previous: style: chevrons - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 title: Workshop @@ -120,7 +120,7 @@ cards: entity: sensor.frigate_cam04_vehicle_count - name: Garage entity: binary_sensor.frigate_cam04_vehicle_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 title: East Side @@ -155,7 +155,7 @@ cards: controls: next_previous: style: chevrons - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 title: West Side diff --git a/lovelace/frigate/view-ai-cam06.yaml b/lovelace/frigate/view-ai-cam06.yaml index f6e0d42..b35ac7d 100644 --- a/lovelace/frigate/view-ai-cam06.yaml +++ b/lovelace/frigate/view-ai-cam06.yaml @@ -41,7 +41,7 @@ cards: entities: - entity: sensor.master_bedroom_person_count - entity: binary_sensor.master_bedroom_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam06 title: Master Bedroom Left @@ -76,7 +76,7 @@ cards: controls: next_previous: style: chevrons - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam06 title: Master Bed diff --git a/lovelace/frigate/view-ai-cam07.yaml b/lovelace/frigate/view-ai-cam07.yaml index 801983c..cf74ccc 100644 --- a/lovelace/frigate/view-ai-cam07.yaml +++ b/lovelace/frigate/view-ai-cam07.yaml @@ -41,7 +41,7 @@ cards: entities: - entity: sensor.master_bedroom_person_count - entity: binary_sensor.master_bedroom_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam07 title: Master Bedroom Right @@ -76,7 +76,7 @@ cards: controls: next_previous: style: chevrons - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam07 title: Master Bed diff --git a/lovelace/frigate/view-ai-cam08.yaml b/lovelace/frigate/view-ai-cam08.yaml index dcd5554..5607d3d 100644 --- a/lovelace/frigate/view-ai-cam08.yaml +++ b/lovelace/frigate/view-ai-cam08.yaml @@ -42,7 +42,7 @@ cards: entity: sensor.frigate_cam08_person_count - name: Person entity: binary_sensor.frigate_cam08_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam08 title: Person diff --git a/lovelace/frigate/view-ai-cam12.yaml b/lovelace/frigate/view-ai-cam12.yaml index 0bcd8f0..ece2eea 100644 --- a/lovelace/frigate/view-ai-cam12.yaml +++ b/lovelace/frigate/view-ai-cam12.yaml @@ -42,7 +42,7 @@ cards: entity: sensor.kitchen_person_count - name: Kitchen entity: binary_sensor.kitchen_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 title: Kitchen @@ -85,7 +85,7 @@ cards: entity: sensor.dining_room_person_count - name: Dining Room entity: binary_sensor.dining_room_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 title: Dining Room @@ -128,7 +128,7 @@ cards: entity: sensor.front_room_person_count - name: Front Room entity: binary_sensor.front_room_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 title: Front Room diff --git a/lovelace/frigate/view-ai-cam13.yaml b/lovelace/frigate/view-ai-cam13.yaml index b6f9362..9638cd9 100644 --- a/lovelace/frigate/view-ai-cam13.yaml +++ b/lovelace/frigate/view-ai-cam13.yaml @@ -42,7 +42,7 @@ cards: entity: sensor.kitchen_person_count - name: Kitchen entity: binary_sensor.kitchen_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 title: Kitchen @@ -85,7 +85,7 @@ cards: entity: sensor.dining_room_person_count - name: Dining Room entity: binary_sensor.dining_room_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 title: Dining Room @@ -128,7 +128,7 @@ cards: entity: sensor.front_room_person_count - name: Front Room entity: binary_sensor.front_room_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 title: Front Room diff --git a/lovelace/frigate/view-ai-cam14.yaml b/lovelace/frigate/view-ai-cam14.yaml index 0909834..99c138f 100644 --- a/lovelace/frigate/view-ai-cam14.yaml +++ b/lovelace/frigate/view-ai-cam14.yaml @@ -48,7 +48,7 @@ cards: entity: sensor.frigate_cam14_person_count - name: Occupancy entity: binary_sensor.frigate_cam14_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam14 title: Person @@ -93,7 +93,7 @@ cards: entity: sensor.frigate_cam14_animal_count - name: Occupancy entity: binary_sensor.frigate_cam14_animal_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam14 title: Back Yard diff --git a/lovelace/frigate/view-ai-cam18.yaml b/lovelace/frigate/view-ai-cam18.yaml index 4d6a86d..b7ab1e2 100644 --- a/lovelace/frigate/view-ai-cam18.yaml +++ b/lovelace/frigate/view-ai-cam18.yaml @@ -47,7 +47,7 @@ cards: entity: sensor.frigate_cam18_person_count - name: Occupancy entity: binary_sensor.frigate_cam18_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam18 title: Person @@ -92,7 +92,7 @@ cards: entity: sensor.frigate_cam18_vehicle_count - name: Occupancy entity: binary_sensor.frigate_cam18_vehicle_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam18 title: Vehicle @@ -137,7 +137,7 @@ cards: entity: sensor.frigate_cam18_animal_count - name: Occupancy entity: binary_sensor.frigate_cam18_animal_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam18 title: Front Porch diff --git a/lovelace/frigate/view-ai-cam19.yaml b/lovelace/frigate/view-ai-cam19.yaml index 782fadc..77d542c 100644 --- a/lovelace/frigate/view-ai-cam19.yaml +++ b/lovelace/frigate/view-ai-cam19.yaml @@ -47,7 +47,7 @@ cards: entity: sensor.frigate_cam19_person_count - name: Occupancy entity: binary_sensor.frigate_cam19_person_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam19 title: Person @@ -92,7 +92,7 @@ cards: entity: sensor.frigate_cam19_vehicle_count - name: Occupancy entity: binary_sensor.frigate_cam19_vehicle_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam19 title: Vehicle @@ -137,7 +137,7 @@ cards: entity: sensor.frigate_cam19_animal_count - name: Occupancy entity: binary_sensor.frigate_cam19_animal_occupancy - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam19 title: Front Porch diff --git a/lovelace/phone/blue-room.yaml b/lovelace/phone/blue-room.yaml index c3ec9eb..6676d7f 100644 --- a/lovelace/phone/blue-room.yaml +++ b/lovelace/phone/blue-room.yaml @@ -73,7 +73,7 @@ cards: layout: vertical secondary_info: none - type: custom:mushroom-entity-card - entity: binary_sensor.furnace_room_door + entity: binary_sensor.furnace_room_door_contact name: Furnace layout: vertical secondary_info: none diff --git a/lovelace/phone/entryway.yaml b/lovelace/phone/entryway.yaml index d86a3f6..038bde4 100644 --- a/lovelace/phone/entryway.yaml +++ b/lovelace/phone/entryway.yaml @@ -82,7 +82,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: binary_sensor.inner_garage_door + entity: binary_sensor.inner_garage_door_contact name: Garage layout: vertical secondary_info: none diff --git a/lovelace/phone/garage.yaml b/lovelace/phone/garage.yaml index 0449a80..3af821d 100644 --- a/lovelace/phone/garage.yaml +++ b/lovelace/phone/garage.yaml @@ -99,12 +99,12 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: binary_sensor.inner_garage_door + entity: binary_sensor.inner_garage_door_contact name: Entryway layout: vertical secondary_info: none - type: custom:mushroom-entity-card - entity: binary_sensor.outer_garage_door + entity: binary_sensor.outer_garage_door_contact name: Porch layout: vertical secondary_info: none diff --git a/lovelace/raw-cameras/back-yard-card.yaml b/lovelace/raw-cameras/back-yard-card.yaml index 4d5bd77..eada76d 100644 --- a/lovelace/raw-cameras/back-yard-card.yaml +++ b/lovelace/raw-cameras/back-yard-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam14 live_provider: go2rtc diff --git a/lovelace/raw-cameras/blue-room-card.yaml b/lovelace/raw-cameras/blue-room-card.yaml index 30dfac6..8e1c464 100644 --- a/lovelace/raw-cameras/blue-room-card.yaml +++ b/lovelace/raw-cameras/blue-room-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam01 live_provider: go2rtc diff --git a/lovelace/raw-cameras/computer-area-card.yaml b/lovelace/raw-cameras/computer-area-card.yaml index 8d5dd73..0bc9f7a 100644 --- a/lovelace/raw-cameras/computer-area-card.yaml +++ b/lovelace/raw-cameras/computer-area-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam03 live_provider: go2rtc diff --git a/lovelace/raw-cameras/front-porch-card.yaml b/lovelace/raw-cameras/front-porch-card.yaml index 366cf1e..bc4bd09 100644 --- a/lovelace/raw-cameras/front-porch-card.yaml +++ b/lovelace/raw-cameras/front-porch-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam19 live_provider: go2rtc diff --git a/lovelace/raw-cameras/front-room-card.yaml b/lovelace/raw-cameras/front-room-card.yaml index 1baed71..1af572c 100644 --- a/lovelace/raw-cameras/front-room-card.yaml +++ b/lovelace/raw-cameras/front-room-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam13 live_provider: go2rtc diff --git a/lovelace/raw-cameras/front-yard-card.yaml b/lovelace/raw-cameras/front-yard-card.yaml index 6950e05..8d2f26e 100644 --- a/lovelace/raw-cameras/front-yard-card.yaml +++ b/lovelace/raw-cameras/front-yard-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam18 live_provider: go2rtc diff --git a/lovelace/raw-cameras/garage-card.yaml b/lovelace/raw-cameras/garage-card.yaml index da42bf8..f1c7bab 100644 --- a/lovelace/raw-cameras/garage-card.yaml +++ b/lovelace/raw-cameras/garage-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 live_provider: go2rtc diff --git a/lovelace/raw-cameras/indoor-camera-card.yaml b/lovelace/raw-cameras/indoor-camera-card.yaml index 203d534..1350bd0 100644 --- a/lovelace/raw-cameras/indoor-camera-card.yaml +++ b/lovelace/raw-cameras/indoor-camera-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam08 title: Nursery diff --git a/lovelace/raw-cameras/kitchen-card.yaml b/lovelace/raw-cameras/kitchen-card.yaml index eff12a9..08bd175 100644 --- a/lovelace/raw-cameras/kitchen-card.yaml +++ b/lovelace/raw-cameras/kitchen-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 live_provider: go2rtc diff --git a/lovelace/raw-cameras/master-bedroom-left-card.yaml b/lovelace/raw-cameras/master-bedroom-left-card.yaml index d7fd6ba..3415d9a 100644 --- a/lovelace/raw-cameras/master-bedroom-left-card.yaml +++ b/lovelace/raw-cameras/master-bedroom-left-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam06 live_provider: go2rtc diff --git a/lovelace/raw-cameras/master-bedroom-right-card.yaml b/lovelace/raw-cameras/master-bedroom-right-card.yaml index 836e796..6aaf0c8 100644 --- a/lovelace/raw-cameras/master-bedroom-right-card.yaml +++ b/lovelace/raw-cameras/master-bedroom-right-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam07 live_provider: go2rtc diff --git a/lovelace/raw-cameras/nursery-card.yaml b/lovelace/raw-cameras/nursery-card.yaml index d039774..1845d3c 100644 --- a/lovelace/raw-cameras/nursery-card.yaml +++ b/lovelace/raw-cameras/nursery-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam08 live_provider: go2rtc diff --git a/lovelace/raw-cameras/outdoor-camera-card.yaml b/lovelace/raw-cameras/outdoor-camera-card.yaml index 54e1448..c6679b5 100644 --- a/lovelace/raw-cameras/outdoor-camera-card.yaml +++ b/lovelace/raw-cameras/outdoor-camera-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 title: Garage diff --git a/lovelace/room_cards/blue_room.yaml b/lovelace/room_cards/blue_room.yaml index 6b2ac5a..349b983 100644 --- a/lovelace/room_cards/blue_room.yaml +++ b/lovelace/room_cards/blue_room.yaml @@ -59,7 +59,7 @@ elements: top: 9% #top icon spot #1 - type: state-icon - entity: binary_sensor.furnace_room_door + entity: binary_sensor.furnace_room_door_contact style: left: 76% top: 9% diff --git a/lovelace/room_cards/entryway.yaml b/lovelace/room_cards/entryway.yaml index 4df20da..630a03a 100644 --- a/lovelace/room_cards/entryway.yaml +++ b/lovelace/room_cards/entryway.yaml @@ -64,7 +64,7 @@ elements: #top icon spot #2 - type: state-icon - entity: binary_sensor.inner_garage_door + entity: binary_sensor.inner_garage_door_contact style: left: 76% top: 9% diff --git a/lovelace/room_cards/furnace_room.yaml b/lovelace/room_cards/furnace_room.yaml index 9b4777d..208a212 100644 --- a/lovelace/room_cards/furnace_room.yaml +++ b/lovelace/room_cards/furnace_room.yaml @@ -35,7 +35,7 @@ elements: # left: 76% # top: 9% - type: state-icon - entity: binary_sensor.furnace_room_door + entity: binary_sensor.furnace_room_door_contact style: left: 84% top: 9% diff --git a/lovelace/room_cards/garage.yaml b/lovelace/room_cards/garage.yaml index 9d873fc..a445986 100644 --- a/lovelace/room_cards/garage.yaml +++ b/lovelace/room_cards/garage.yaml @@ -41,13 +41,13 @@ elements: top: 9% #top icon spot #1 - type: state-icon - entity: binary_sensor.outer_garage_door + entity: binary_sensor.outer_garage_door_contact style: left: 76% top: 9% #top icon spot #2 - type: state-icon - entity: binary_sensor.inner_garage_door + entity: binary_sensor.inner_garage_door_contact style: left: 84% top: 9% diff --git a/lovelace/stretch-cameras/back-yard-card.yaml b/lovelace/stretch-cameras/back-yard-card.yaml index 22afc21..c31f321 100644 --- a/lovelace/stretch-cameras/back-yard-card.yaml +++ b/lovelace/stretch-cameras/back-yard-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam14 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Back Yard id: back_yard live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/blue-room-card.yaml b/lovelace/stretch-cameras/blue-room-card.yaml index 62fba03..247cf51 100644 --- a/lovelace/stretch-cameras/blue-room-card.yaml +++ b/lovelace/stretch-cameras/blue-room-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam01 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Blue Room id: blue_room live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/computer-area-card.yaml b/lovelace/stretch-cameras/computer-area-card.yaml index 1cfca3c..924aace 100644 --- a/lovelace/stretch-cameras/computer-area-card.yaml +++ b/lovelace/stretch-cameras/computer-area-card.yaml @@ -11,7 +11,7 @@ # mode: webrtc #,mse,mp4,mjpeg -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam03 live_provider: go2rtc @@ -23,7 +23,6 @@ cameras: title: Computer Area id: computer_area live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/front-porch-card.yaml b/lovelace/stretch-cameras/front-porch-card.yaml index 82a773b..8ef4dc0 100644 --- a/lovelace/stretch-cameras/front-porch-card.yaml +++ b/lovelace/stretch-cameras/front-porch-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam19 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Front Porch id: front_porch live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/front-room-card.yaml b/lovelace/stretch-cameras/front-room-card.yaml index 062304d..3d25ad7 100644 --- a/lovelace/stretch-cameras/front-room-card.yaml +++ b/lovelace/stretch-cameras/front-room-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam13 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Front Room id: front_room live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/front-yard-card.yaml b/lovelace/stretch-cameras/front-yard-card.yaml index fe16a78..2de9f8a 100644 --- a/lovelace/stretch-cameras/front-yard-card.yaml +++ b/lovelace/stretch-cameras/front-yard-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam18 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Front Yard id: front_yard live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/garage-card.yaml b/lovelace/stretch-cameras/garage-card.yaml index 79c4f21..2b9f831 100644 --- a/lovelace/stretch-cameras/garage-card.yaml +++ b/lovelace/stretch-cameras/garage-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam04 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Garage id: garage live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/kitchen-card.yaml b/lovelace/stretch-cameras/kitchen-card.yaml index afce10a..fb50cb2 100644 --- a/lovelace/stretch-cameras/kitchen-card.yaml +++ b/lovelace/stretch-cameras/kitchen-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Kitchen id: kitchen live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/master-bedroom-left-card.yaml b/lovelace/stretch-cameras/master-bedroom-left-card.yaml index 38965ea..22c3c23 100644 --- a/lovelace/stretch-cameras/master-bedroom-left-card.yaml +++ b/lovelace/stretch-cameras/master-bedroom-left-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam06 live_provider: go2rtc diff --git a/lovelace/stretch-cameras/master-bedroom-right-card.yaml b/lovelace/stretch-cameras/master-bedroom-right-card.yaml index bf6169a..d0c184d 100644 --- a/lovelace/stretch-cameras/master-bedroom-right-card.yaml +++ b/lovelace/stretch-cameras/master-bedroom-right-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam07 live_provider: go2rtc diff --git a/lovelace/stretch-cameras/nursery-card.yaml b/lovelace/stretch-cameras/nursery-card.yaml index 6de9d59..f000f75 100644 --- a/lovelace/stretch-cameras/nursery-card.yaml +++ b/lovelace/stretch-cameras/nursery-card.yaml @@ -1,4 +1,4 @@ -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam08 live_provider: go2rtc @@ -10,7 +10,6 @@ cameras: title: Nursery id: nursery live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/templates/computer-area-frigate-camera.yaml b/lovelace/templates/computer-area-frigate-camera.yaml index d469fea..a2f5231 100644 --- a/lovelace/templates/computer-area-frigate-camera.yaml +++ b/lovelace/templates/computer-area-frigate-camera.yaml @@ -7,7 +7,7 @@ cards: cards: - type: vertical-stack cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam03 camera_name: frigate_cam03 diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index c511549..634a4b6 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -775,11 +775,13 @@ cards: - entities: - binary_sensor.inner_garage_door + - binary_sensor.inner_garage_door_contact - binary_sensor.garage_door - binary_sensor.patio_door_contact - binary_sensor.master_bedroom_door_contact - binary_sensor.front_door_contact - binary_sensor.outer_garage_door + - binary_sensor.outer_garage_door_contact - binary_sensor.nursery_door - binary_sensor.master_suite_door_contact - binary_sensor.master_bathroom_door_contact @@ -791,6 +793,7 @@ cards: - binary_sensor.mancave_door_contact - binary_sensor.blue_room_door_contact - binary_sensor.furnace_room_door + - binary_sensor.furnace_room_door_contact - binary_sensor.utility_room_door_contact states: - state: "off" diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg index a4a1d69..d8eaeec 100644 --- a/www/floorplan/fullsized_floorplan.svg +++ b/www/floorplan/fullsized_floorplan.svg @@ -1429,12 +1429,12 @@ inkscape:label="binary_sensor.front_door_contact" /> + inkscape:label="binary_sensor.inner_garage_door_contact" /> + inkscape:label="binary_sensor.furnace_room_door_contact" /> + inkscape:label="binary_sensor.outer_garage_door_contact" />