diff --git a/automations/people/Kristy/kristy_away.yaml b/automations/people/Kristy/kristy_away.yaml
index 72f6f86..861d1ee 100644
--- a/automations/people/Kristy/kristy_away.yaml
+++ b/automations/people/Kristy/kristy_away.yaml
@@ -5,23 +5,36 @@ mode: restart
trigger:
- platform: state
entity_id:
- - device_tracker.kristy_s_phone
+ - group.person_kristy
+ - device_tracker.nmap_tracker_d6_28_7a_58_b8_da
from: "home"
- platform: homeassistant
event: start
-condition:
- - condition: state
- entity_id: device_tracker.kristy_s_phone
- state: "not_home"
+ - platform: event
+ event_type: automation_reloaded
+condition:
+ - condition: not
+ conditions:
+ - condition: state
+ entity_id: device_tracker.kristy_s_phone
+ state: "home"
+ - condition: state
+ entity_id: device_tracker.nmap_tracker_d6_28_7a_58_b8_da
+ state: "home"
action:
- choose:
- conditions:
- - condition: state
- entity_id: device_tracker.kristy_s_phone
- state: "not_home"
+ - condition: not
+ conditions:
+ - condition: state
+ entity_id: device_tracker.kristy_s_phone
+ state: "home"
+ - condition: state
+ entity_id: device_tracker.nmap_tracker_d6_28_7a_58_b8_da
+ state: "home"
sequence:
- action: input_boolean.turn_off
entity_id: input_boolean.kristy_home
diff --git a/automations/rooms/girls_room/girls_room_lights_to_on.yaml b/automations/rooms/girls_room/girls_room_lights_to_on.yaml
index a8e6e46..217c169 100644
--- a/automations/rooms/girls_room/girls_room_lights_to_on.yaml
+++ b/automations/rooms/girls_room/girls_room_lights_to_on.yaml
@@ -17,13 +17,11 @@ trigger:
from: "on"
to: "off"
- - platform: state
- entity_id: input_boolean.nursery_occupied
- to: "on"
-
- platform: state
id: occupied
- entity_id: binary_sensor.nursery_occupied
+ entity_id:
+ - input_boolean.nursery_occupied
+ - binary_sensor.nursery_occupied
to: "on"
# - platform: state
diff --git a/components/binary_sensors/template.yaml b/components/binary_sensors/template.yaml
index b5590f6..35c17a4 100644
--- a/components/binary_sensors/template.yaml
+++ b/components/binary_sensors/template.yaml
@@ -577,7 +577,7 @@ sensors:
boys_room_light_left_on:
unique_id: templatebinarysensor.boys_room_light_left_on
friendly_name: Boys Room Light Left On
- value_template: "{{ is_state('light.boys_room_hue','on') }}"
+ value_template: "{{ is_state('light.boys_room_hue','on') and is_state('input_boolean.boys_room_occupied','off') }}"
delay_on:
seconds: 30
diff --git a/components/input_booleans/kids_asleep.yaml b/components/input_booleans/kids_asleep.yaml
index 5c6e277..c9c6fa8 100644
--- a/components/input_booleans/kids_asleep.yaml
+++ b/components/input_booleans/kids_asleep.yaml
@@ -1,2 +1,2 @@
name: Kids Asleep
-icon: mdi:bunk-bed
\ No newline at end of file
+icon: mdi:teddy-bear
diff --git a/components/input_booleans/kids_bedtime.yaml b/components/input_booleans/kids_bedtime.yaml
index d7b29ff..8818e1c 100644
--- a/components/input_booleans/kids_bedtime.yaml
+++ b/components/input_booleans/kids_bedtime.yaml
@@ -1,2 +1,2 @@
name: Bedtime for Kids
-icon: mdi:bunk-bed
\ No newline at end of file
+icon: mdi:teddy-bear
diff --git a/components/input_booleans/lovelace/lovelace_kids_bedtime_more.yaml b/components/input_booleans/lovelace/lovelace_kids_bedtime_more.yaml
index 9cf9ef9..986ea18 100644
--- a/components/input_booleans/lovelace/lovelace_kids_bedtime_more.yaml
+++ b/components/input_booleans/lovelace/lovelace_kids_bedtime_more.yaml
@@ -1,2 +1,2 @@
name: Kids Bedtime More
-icon: mdi:bunk-bed
\ No newline at end of file
+icon: mdi:teddy-bear
diff --git a/components/input_booleans/rooms/nursery_occupied.yaml b/components/input_booleans/rooms/nursery_occupied.yaml
index 826d6c8..28378c0 100644
--- a/components/input_booleans/rooms/nursery_occupied.yaml
+++ b/components/input_booleans/rooms/nursery_occupied.yaml
@@ -1,2 +1,2 @@
name: Nursery
-icon: mdi:bunk-bed
\ No newline at end of file
+icon: mdi:teddy-bear
diff --git a/components/input_booleans/teens_asleep.yaml b/components/input_booleans/teens_asleep.yaml
index 78aff01..e3eb8e8 100644
--- a/components/input_booleans/teens_asleep.yaml
+++ b/components/input_booleans/teens_asleep.yaml
@@ -1,2 +1,2 @@
name: Teens Asleep
-icon: mdi:bunk-bed
\ No newline at end of file
+icon: mdi:teddy-bear
diff --git a/components/input_booleans/teens_bedtime.yaml b/components/input_booleans/teens_bedtime.yaml
index d2323dd..fa5f554 100644
--- a/components/input_booleans/teens_bedtime.yaml
+++ b/components/input_booleans/teens_bedtime.yaml
@@ -1,2 +1,2 @@
name: Teens Bedtime
-icon: mdi:bunk-bed
\ No newline at end of file
+icon: mdi:teddy-bear
diff --git a/components/input_buttons/bedtimes.yaml b/components/input_buttons/bedtimes.yaml
index 092787d..3293595 100644
--- a/components/input_buttons/bedtimes.yaml
+++ b/components/input_buttons/bedtimes.yaml
@@ -1,10 +1,10 @@
nursery_bedtime:
name: Nursery Bedtime
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
nursery_awake:
name: Nursery Awake
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
master_bedroom_bedtime:
name: Master Bedroom Bedtime
@@ -20,4 +20,4 @@ boys_room_bedtime:
boys_room_awake:
name: Boys Room Awake
- icon: mdi:bed
\ No newline at end of file
+ icon: mdi:bed
diff --git a/components/packages/esphome_devices.yaml b/components/packages/esphome_devices.yaml
index a24c1a9..ce38cd9 100644
--- a/components/packages/esphome_devices.yaml
+++ b/components/packages/esphome_devices.yaml
@@ -1,15 +1,19 @@
template:
- binary_sensor:
- name: White Bed Occupied
+ unique_id: 909df431-a6a9-4b0a-b923-2b63fc425df5
state: "{{ is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'on') }}"
icon: >
- {% if is_state("binary_sensor.white_bed_occupied", "on") %}
- mdi:bed-single
- {% else %}
- mdi:bed-single-outline
- {% endif %}
+ {%- if is_state("binary_sensor.white_bed_occupied", "on") %}
+ mdi:bed
+ {%- elif is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'off') %}
+ mdi:bed-empty
+ {%- else %}
+ mdi:bed-outline
+ {%- endif %}
- name: Master Bed Occupied
+ unique_id: a5620335-43a1-47ce-bf37-ac8433f3a406
state: "{{ is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'on') }}"
icon: >
{% if is_state("binary_sensor.master_bed_occupied", "on") %}
@@ -19,6 +23,7 @@ template:
{% endif %}
- name: Master Bed Left Occupied
+ unique_id: d7956371-58d2-4c44-9121-a0fba2fd6904
state: "{{ is_state('binary_sensor.bed_presence_c175a4_bed_occupied_left', 'on') }}"
icon: >
{% if is_state("binary_sensor.master_bed_left_occupied", "on") %}
@@ -28,6 +33,7 @@ template:
{% endif %}
- name: Master Bed Right Occupied
+ unique_id: 93e5782c-f7ad-4e2f-a8d5-da7fc7e6d31d
state: "{{ is_state('binary_sensor.bed_presence_c175a4_bed_occupied_right', 'on') }}"
icon: >
{% if is_state("binary_sensor.master_bed_right_occupied", "on") %}
@@ -38,6 +44,7 @@ template:
- sensor:
- name: ESPHome Pending Updates
+ unique_id: 767eeda3-b70e-4e8f-96a8-e7031badaf0d
state: "{{ states.update | selectattr('state', 'eq', 'on') | map(attribute='entity_id') | select ('in',integration_entities('esphome')) | list | count }}"
icon: mdi:chip
attributes:
diff --git a/lovelace/details/view-hvac.yaml b/lovelace/details/view-hvac.yaml
index f92b79c..8e54e71 100644
--- a/lovelace/details/view-hvac.yaml
+++ b/lovelace/details/view-hvac.yaml
@@ -724,7 +724,7 @@ sections:
- type: grid
cards:
- type: heading
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
heading: Nursery
heading_style: title
badges:
diff --git a/lovelace/details/view-power-breaker.yaml b/lovelace/details/view-power-breaker.yaml
index 83f0b01..4da21d1 100644
--- a/lovelace/details/view-power-breaker.yaml
+++ b/lovelace/details/view-power-breaker.yaml
@@ -284,7 +284,7 @@ cards:
action: more-info
- type: custom:mushroom-template-card
primary: Nursery, Dining, Kitchen Lights
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
- type: horizontal-stack
cards:
- type: horizontal-stack
diff --git a/lovelace/frigate/view-ai-cam08.yaml b/lovelace/frigate/view-ai-cam08.yaml
index 5607d3d..c684354 100644
--- a/lovelace/frigate/view-ai-cam08.yaml
+++ b/lovelace/frigate/view-ai-cam08.yaml
@@ -1,6 +1,6 @@
title: AI Cam08
path: ai-cam08
-icon: mdi:bunk-bed
+icon: mdi:teddy-bear
type: sidebar
visible:
- user: 24a4bd075e7f41a497dd0390a1dd4a9f
@@ -46,7 +46,7 @@ cards:
cameras:
- camera_entity: camera.frigate_cam08
title: Person
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
live_provider: ha
frigate:
camera_name: frigate_cam08
diff --git a/lovelace/phone/girls-room.yaml b/lovelace/phone/girls-room.yaml
index 87bb3ea..d411242 100644
--- a/lovelace/phone/girls-room.yaml
+++ b/lovelace/phone/girls-room.yaml
@@ -1,7 +1,7 @@
subview: true
title: Girl's Room
path: girls-room
-icon: mdi:bunk-bed
+icon: mdi:teddy-bear
badges: []
cards:
# Header and HVAC
diff --git a/lovelace/phone/home.yaml b/lovelace/phone/home.yaml
index cacc368..d45e0ca 100644
--- a/lovelace/phone/home.yaml
+++ b/lovelace/phone/home.yaml
@@ -297,7 +297,7 @@ cards:
cards:
- type: custom:mushroom-template-card
primary: Girl's Room
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
entity: light.nursery_hue
tap_action:
action: navigate
diff --git a/lovelace/raw-cameras/nursery-view.yaml b/lovelace/raw-cameras/nursery-view.yaml
index da231c7..9a8bf9e 100644
--- a/lovelace/raw-cameras/nursery-view.yaml
+++ b/lovelace/raw-cameras/nursery-view.yaml
@@ -1,6 +1,6 @@
title: Nursery Camera
path: nursery-camera
-icon: mdi:bunk-bed
+icon: mdi:teddy-bear
type: panel
cards:
- - !include /config/lovelace/raw-cameras/nursery-card.yaml
\ No newline at end of file
+ - !include /config/lovelace/raw-cameras/nursery-card.yaml
diff --git a/lovelace/stretch-cameras/girls-room-view.yaml b/lovelace/stretch-cameras/girls-room-view.yaml
index 0218b3f..c7cb4f5 100644
--- a/lovelace/stretch-cameras/girls-room-view.yaml
+++ b/lovelace/stretch-cameras/girls-room-view.yaml
@@ -1,6 +1,6 @@
title: Girls Room Camera
path: girls-room-camera
-icon: mdi:bunk-bed
+icon: mdi:teddy-bear
type: panel
cards:
- - !include /config/lovelace/stretch-cameras/girls-room-card.yaml
\ No newline at end of file
+ - !include /config/lovelace/stretch-cameras/girls-room-card.yaml
diff --git a/lovelace/templates/card-mini-media-player.yaml b/lovelace/templates/card-mini-media-player.yaml
index 83c7797..415ea3b 100644
--- a/lovelace/templates/card-mini-media-player.yaml
+++ b/lovelace/templates/card-mini-media-player.yaml
@@ -34,7 +34,7 @@ shortcuts:
- name: Nursery
type: source
id: girls_room_hub
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
- name: Timeless
type: playlist
id: RDCLAK5uy_mH5mS2pbI9c743F2Xoi7WxRVBbw7k3hPE
diff --git a/lovelace/view-cameras.yaml b/lovelace/view-cameras.yaml
index 1608650..e9dc062 100644
--- a/lovelace/view-cameras.yaml
+++ b/lovelace/view-cameras.yaml
@@ -10,19 +10,16 @@ cards:
square: false
columns: 2
cards:
- # 8 and 12
- !include /config/lovelace/cameras/view-camera-08.yaml
-
- - !include /config/lovelace/cameras/view-camera-12.yaml
+ - !include /config/lovelace/cameras/view-camera-01.yaml
# 6 and 7
- !include /config/lovelace/cameras/view-camera-06.yaml
-
- !include /config/lovelace/cameras/view-camera-07.yaml
# 3 and 1
- !include /config/lovelace/cameras/view-camera-03.yaml
- - !include /config/lovelace/cameras/view-camera-01.yaml
+ - !include /config/lovelace/cameras/view-camera-12.yaml
- !include /config/lovelace/cameras/view-camera-04.yaml
diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml
index 77121a0..0439c8b 100644
--- a/lovelace/view-ha-floorplan.yaml
+++ b/lovelace/view-ha-floorplan.yaml
@@ -72,7 +72,7 @@ cards:
class: room-empty
action:
domain: homeassistant
- action: homeassistant.toggle
+ service: homeassistant.toggle
- entities:
- sensor.general_waste
@@ -578,19 +578,6 @@ cards:
return "info-text";
'
- # - entities:
- # - switch.shelly_sliding_glass_door
- # states:
- # - state: "on"
- # class: "light-on"
- # - state: "off"
- # class: "camera-streaming"
- # - state: "unavailable"
- # class: "light-unavailable"
- # action:
- # domain: homeassistant
- # action: homeassistant.toggle
-
- entities:
- light.front_room_splash_left
- light.front_room_splash_right
@@ -630,7 +617,7 @@ cards:
class: "entity-unavailable"
action:
domain: homeassistant
- action: homeassistant.toggle
+ service: homeassistant.toggle
- entities:
- binary_sensor.boys_room_naturally_lit
diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml
index 93f0af8..1b3ed30 100644
--- a/lovelace/view-overview.yaml
+++ b/lovelace/view-overview.yaml
@@ -715,7 +715,7 @@ badges:
entities:
- entity: sensor.nursery_thermal_comfort_humidex_perception
name: Nursery
- icon: mdi:bunk-bed
+ icon: mdi:teddy-bear
tap_action:
action: navigate
navigation_path: /details-yml/hvac
@@ -858,7 +858,7 @@ badges:
name: Mail
tap_action:
action: call-service
- action: homeassistant.turn_on
+ service: homeassistant.turn_on
service_data:
entity_id: input_boolean.mail_checked
hold_action:
@@ -867,7 +867,7 @@ badges:
name: Trash
tap_action:
action: call-service
- action: homeassistant.turn_on
+ service: homeassistant.turn_on
service_data:
entity_id: input_boolean.trash_out
hold_action:
diff --git a/lovelace/view-surveillance.yaml b/lovelace/view-surveillance.yaml
index 7efe5e0..f5f5e88 100644
--- a/lovelace/view-surveillance.yaml
+++ b/lovelace/view-surveillance.yaml
@@ -13,15 +13,20 @@ cards:
cards:
# 8 and 2
- !include /config/lovelace/cameras/view-camera-08.yaml
- - !include /config/lovelace/cameras/view-camera-13.yaml
+ - !include /config/lovelace/cameras/view-camera-01.yaml
+ - !include /config/lovelace/cameras/view-camera-03.yaml
+
+
+ # - !include /config/lovelace/cameras/view-camera-13.yaml
- !include /config/lovelace/cameras/view-camera-12.yaml
#- !include /config/lovelace/cameras/view-camera-02.yaml
-
+
+ - !include /config/lovelace/cameras/view-camera-06.yaml
# 5 and 9
#- !include /config/lovelace/cameras/view-camera-05.yaml
- - !include /config/lovelace/cameras/view-camera-03.yaml
+
- !include /config/lovelace/cameras/view-camera-04.yaml
#- !include /config/lovelace/cameras/view-camera-09.yaml
@@ -35,9 +40,7 @@ cards:
# 4 and 10
- - !include /config/lovelace/cameras/view-camera-01.yaml
- - !include /config/lovelace/cameras/view-camera-06.yaml
#- !include /config/lovelace/cameras/view-camera-10.yaml
# 11 and 12
diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg
index 205dcd3..f1f33b9 100644
--- a/www/floorplan/fullsized_floorplan.svg
+++ b/www/floorplan/fullsized_floorplan.svg
@@ -39,8 +39,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.028284271"
- inkscape:cx="53121.397"
- inkscape:cy="37388.271"
+ inkscape:cx="61076.349"
+ inkscape:cy="43045.126"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -2608,12 +2608,12 @@
@@ -3440,7 +3440,7 @@
-
inkscape:label="light.front_porch_overhead" />
---------
+ x="553.32788"
+ y="-16320.602">---------
---------
+ x="553.32788"
+ y="-16310.347">---------
---------
+ x="553.32788"
+ y="-16300.092">---------