diff --git a/config/automation/Speech/announcements.yaml b/config/automation/Speech/announcements.yaml
index b71b9dde..6f80b006 100755
--- a/config/automation/Speech/announcements.yaml
+++ b/config/automation/Speech/announcements.yaml
@@ -11,8 +11,8 @@
trigger:
- platform: state
entity_id:
- - device_tracker.carlo
- - device_tracker.stacey
+ - person.carlo
+ - person.stacey
from: 'not_home'
to: 'home'
diff --git a/config/automation/good_night.yaml b/config/automation/good_night.yaml
index a6192a3e..b7f2ad3d 100755
--- a/config/automation/good_night.yaml
+++ b/config/automation/good_night.yaml
@@ -28,7 +28,7 @@
entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
state: 'on'
- condition: state
- entity_id: device_tracker.carlo
+ entity_id: person.carlo
state: 'not_home'
- condition: or
conditions:
@@ -36,7 +36,7 @@
entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
state: 'on'
- condition: state
- entity_id: device_tracker.stacey
+ entity_id: person.stacey
state: 'not_home'
action:
diff --git a/config/automation/kitchen_lights_and_accents.yaml b/config/automation/kitchen_lights_and_accents.yaml
index 786ef7d5..88737cf0 100755
--- a/config/automation/kitchen_lights_and_accents.yaml
+++ b/config/automation/kitchen_lights_and_accents.yaml
@@ -47,7 +47,7 @@
entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
state: 'off'
- condition: state
- entity_id: device_tracker.carlo
+ entity_id: person.carlo
state: 'not_home'
- condition: or
conditions:
@@ -55,7 +55,7 @@
entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
state: 'off'
- condition: state
- entity_id: device_tracker.stacey
+ entity_id: person.stacey
state: 'not_home'
- condition: or
conditions:
diff --git a/config/automation/master_bath_accents.yaml b/config/automation/master_bath_accents.yaml
index c86742c2..d87ec9ed 100755
--- a/config/automation/master_bath_accents.yaml
+++ b/config/automation/master_bath_accents.yaml
@@ -35,8 +35,8 @@
- service: switch.turn_on
entity_id: switch.master_bathroom_accent_1
- wait_template: >-
- {{ not is_state('binary_sensor.sleepnumber_carlo_stacey_is_in_bed', 'off') or is_state('device_tracker.stacey', 'not_home')}}
+ {{ not is_state('binary_sensor.sleepnumber_carlo_stacey_is_in_bed', 'off') or is_state('person.stacey', 'not_home')}}
- wait_template: >-
- {{ not is_state('binary_sensor.sleepnumber_carlo_carlo_is_in_bed', 'off') or is_state('device_tracker.carlo', 'not_home') }}
+ {{ not is_state('binary_sensor.sleepnumber_carlo_carlo_is_in_bed', 'off') or is_state('person.carlo', 'not_home') }}
- service: switch.turn_off
entity_id: group.master_bathroom_accents
diff --git a/config/packages/ios.yaml b/config/packages/ios.yaml
index 48a02f61..d2c68b28 100755
--- a/config/packages/ios.yaml
+++ b/config/packages/ios.yaml
@@ -75,7 +75,7 @@ automation:
who: 'carlo'
apns_id: 'Medicine'
- wait_template: >-
- {{ states.device_tracker.carlo.state == 'home' }}
+ {{ states.person.carlo.state == 'home' }}
- service: script.notify_engine
data_template:
title: 'Medicine Reminder'
@@ -92,14 +92,14 @@ automation:
- platform: time
at: '21:30:00'
- platform: state
- entity_id: device_tracker.carlo
+ entity_id: person.carlo
to: 'home'
condition:
- condition: time
after: '21:30:00'
- condition: state
- entity_id: device_tracker.carlo
+ entity_id: person.carlo
state: 'home'
- condition: state
entity_id: input_boolean.medicine
diff --git a/config/packages/landscape_lighting.yaml b/config/packages/landscape_lighting.yaml
index a4c073ce..88601eb7 100755
--- a/config/packages/landscape_lighting.yaml
+++ b/config/packages/landscape_lighting.yaml
@@ -34,7 +34,7 @@ automation:
entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
state: 'on'
- condition: state
- entity_id: device_tracker.carlo
+ entity_id: person.carlo
state: 'not_home'
- condition: or
conditions:
@@ -42,7 +42,7 @@ automation:
entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
state: 'on'
- condition: state
- entity_id: device_tracker.stacey
+ entity_id: person.stacey
state: 'not_home'
action:
diff --git a/config/www/custom_ui/floorplan/alarm.svg b/config/www/custom_ui/floorplan/alarm.svg
index 734f40a2..7041e12e 100755
--- a/config/www/custom_ui/floorplan/alarm.svg
+++ b/config/www/custom_ui/floorplan/alarm.svg
@@ -758,9 +758,9 @@
XX
- away
+ away
- home
+ home
diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml
index e3d56899..75845b58 100755
--- a/config/www/custom_ui/floorplan/alarm.yaml
+++ b/config/www/custom_ui/floorplan/alarm.yaml
@@ -68,8 +68,8 @@ rules:
- name: Family
entities:
- - device_tracker.carlo
- - device_tracker.stacey
+ - person.carlo
+ - person.stacey
- device_tracker.juicebox
text_template: '${entity.state ? entity.state.replace("not_home", "away") : "undefined"}'
diff --git a/config/www/custom_ui/floorplan/floorplan_original.svg b/config/www/custom_ui/floorplan/floorplan_original.svg
index d7520fe2..08501da4 100755
--- a/config/www/custom_ui/floorplan/floorplan_original.svg
+++ b/config/www/custom_ui/floorplan/floorplan_original.svg
@@ -6706,7 +6706,7 @@
style="font-style:normal;font-weight:normal;font-size:18.67578125px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.40068376"
x="-168.23798"
y="-50.657494"
- id="device_tracker.carlo"
+ id="person.carlo"
inkscape:label="#text1979">