diff --git a/.HA_VERSION b/.HA_VERSION
index 2b88988297af6faeb630e97ee834ce95a9f9d38b..e2fd4c75574fa7e04bf4a88429a59a8fadd8ce5a 100644
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.93.2
\ No newline at end of file
+0.102.3
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7367bc9a94f735145a51c9b3653cf75b129b1443..3c35c2db67f3c778c1c8346ba5b1f5f11b16d206 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,25 @@
stages:
- test
-lint:
+before_script:
+ - mkdir -p /home/pi/ssl
+ - mkdir -p /home/pi/.ssh
+ - touch /home/pi/ssl/chain
+ - touch /home/pi/ssl/key
+ - touch /home/pi/.ssh/id_rsa
+
+.lint: &lint
+ - hass --version
+ - hass --script check_config -c .
+
+lint:current:
+ stage: test
+ image: homeassistant/amd64-homeassistant:0.102.3
+ script:
+ - *lint
+
+lint:latest:
stage: test
- image: homeassistant/amd64-homeassistant
- before_script:
- - mkdir -p /home/pi/ssl
- - mkdir -p /home/pi/.ssh
- - touch /home/pi/ssl/chain
- - touch /home/pi/ssl/key
- - touch /home/pi/.ssh/id_rsa
+ image: homeassistant/amd64-homeassistant:latest
script:
- - hass --version
- - hass --script check_config -c .
+ - *lint
diff --git a/asuswrt.yaml b/asuswrt.yaml
deleted file mode 100644
index 30bf48445354b1d1c9ffaca7644200db19aa22dc..0000000000000000000000000000000000000000
--- a/asuswrt.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-host: 192.168.1.1
-username: !secret asus_user
-ssh_key: !secret asus_key
diff --git a/automations.yaml b/automations.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fe51488c7066f6687ef680d6bfaa4f7768ef205c
--- /dev/null
+++ b/automations.yaml
@@ -0,0 +1 @@
+[]
diff --git a/automations/alarm-status-indicator-off.yaml b/automations/alarm-status-indicator-off.yaml
deleted file mode 100644
index 0a51fa4586bf532a0a77eb16a33069c1067840f5..0000000000000000000000000000000000000000
--- a/automations/alarm-status-indicator-off.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-alias: Alarm status indicator off
-trigger:
- - platform: state
- entity_id: alarm_control_panel.shm
- to: "disarmed"
-action:
- service: switch.turn_off
- entity_id: switch.alarm_status
diff --git a/automations/alarm-status-indicator-on.yaml b/automations/alarm-status-indicator-on.yaml
deleted file mode 100644
index a2a1487750b9585b97c7466a2dbdfd2d964188a0..0000000000000000000000000000000000000000
--- a/automations/alarm-status-indicator-on.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-alias: Alarm status indicator on
-trigger:
- - platform: state
- entity_id: alarm_control_panel.shm
- to: "armed_home"
- - platform: state
- entity_id: alarm_control_panel.shm
- to: "armed_away"
-action:
- service: switch.turn_on
- entity_id: switch.alarm_status
diff --git a/automations/alert-garage-camera-offline.yaml b/automations/alert-garage-camera-offline.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dedbda4a23103109db1f837d8b04db4adb71eafb
--- /dev/null
+++ b/automations/alert-garage-camera-offline.yaml
@@ -0,0 +1,12 @@
+alias: Alert when Garage Camera offline
+description: ''
+trigger:
+ - entity_id: device_tracker.50_dc_e7_14_03_ba
+ from: home
+ platform: state
+ to: not_home
+condition: []
+action:
+ - service: notify.mattermost
+ data:
+ message: ':exclamation: Garage camera offline!'
diff --git a/automations/alert-myq-offline.yaml b/automations/alert-myq-offline.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..92fbfb2fff2da953b93ef24eb704a8fbbb4a4cd9
--- /dev/null
+++ b/automations/alert-myq-offline.yaml
@@ -0,0 +1,12 @@
+alias: Alert when myQ offline
+description: ''
+trigger:
+ - entity_id: device_tracker.64_52_99_c1_9f_68
+ from: home
+ platform: state
+ to: not_home
+condition: []
+action:
+ - service: notify.mattermost
+ data:
+ message: ':exclamation: myQ offline!'
diff --git a/automations/balcony-late-night-dim.yaml b/automations/balcony-late-night-dim.yaml
index 91d91db2420d37d01f2d8be7fc9d3f1f59faec1e..4a1aff45de13e2d6ebb6127c62bc30068afaecc8 100644
--- a/automations/balcony-late-night-dim.yaml
+++ b/automations/balcony-late-night-dim.yaml
@@ -3,9 +3,14 @@ trigger:
platform: time
at: "00:00"
condition:
- - condition: state
- entity_id: light.balcony
- state: 'on'
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: light.balcony_left
+ state: 'on'
+ - condition: state
+ entity_id: light.balcony_right
+ state: 'on'
action:
service: scene.turn_on
entity_id: scene.balcony_dimmed
diff --git a/automations/balcony-relax-after-sunset.yaml b/automations/balcony-relax-after-sunset.yaml
index 6113b550ce0ff5e753601d7a1d9f916f5039075d..90637a57cad59b8d3ff1221bc41910105ddbae9a 100644
--- a/automations/balcony-relax-after-sunset.yaml
+++ b/automations/balcony-relax-after-sunset.yaml
@@ -4,11 +4,15 @@ trigger:
entity_id: sun.sun
from: 'above_horizon'
to: 'below_horizon'
- # offset: "+00:30:00"
condition:
- - condition: state
- entity_id: light.balcony
- state: 'on'
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: light.balcony_left
+ state: 'on'
+ - condition: state
+ entity_id: light.balcony_right
+ state: 'on'
action:
service: scene.turn_on
entity_id: scene.balcony_relax
diff --git a/automations/balcony-sunrise-off.yaml b/automations/balcony-sunrise-off.yaml
index 9132c8b71ca1d9492796439edeec20d639cc575e..be4f029238baa3e3c68227f57f0c8dc29e4e95e0 100644
--- a/automations/balcony-sunrise-off.yaml
+++ b/automations/balcony-sunrise-off.yaml
@@ -2,11 +2,16 @@ alias: 'Turn off balcony at sunrise'
trigger:
platform: sun
event: sunrise
- offset: "+00:30:00"
+ offset: "+00:10:00"
condition:
- - condition: state
- entity_id: light.balcony
- state: 'on'
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: light.balcony_left
+ state: 'on'
+ - condition: state
+ entity_id: light.balcony_right
+ state: 'on'
action:
- service: light.turn_off
- entity_id: light.balcony
+ service: scene.turn_on
+ entity_id: scene.balcony_off
diff --git a/automations/balcony-sunset-on.yaml b/automations/balcony-sunset-on.yaml
index 6f7983eae5b993e2b72d1f1f86e8e9c1b36ad9b2..d52c97942f93bae70dffb9131c89abf36051da84 100644
--- a/automations/balcony-sunset-on.yaml
+++ b/automations/balcony-sunset-on.yaml
@@ -2,11 +2,16 @@ alias: 'Turn on balcony at sunset'
trigger:
platform: sun
event: sunset
- offset: "-00:60:00"
+ offset: "+00:30:00"
condition:
- - condition: state
- entity_id: light.balcony
- state: 'off'
+ condition: and
+ conditions:
+ - condition: state
+ entity_id: light.balcony_left
+ state: 'off'
+ - condition: state
+ entity_id: light.balcony_right
+ state: 'off'
action:
- service: light.turn_on
- entity_id: light.balcony
+ service: scene.turn_on
+ entity_id: scene.balcony_relax
diff --git a/automations/brightness-balcony-set.yaml b/automations/brightness-balcony-set.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6f4a0fa06b34b292f0c332304271ab3008174cfa
--- /dev/null
+++ b/automations/brightness-balcony-set.yaml
@@ -0,0 +1,12 @@
+alias: Brightness Balcony
+trigger:
+ platform: state
+ entity_id: input_number.brightness_balcony
+action:
+ service: light.turn_on
+ data:
+ entity_id:
+ - light.balcony_left
+ - light.balcony_right
+ data_template:
+ brightness: '{{ states( "input_number.brightness_balcony" )|round( 0 ) }}'
diff --git a/automations/brightness-dining-area-sync.yaml b/automations/brightness-balcony-sync.yaml
similarity index 57%
rename from automations/brightness-dining-area-sync.yaml
rename to automations/brightness-balcony-sync.yaml
index d911588e21fb6b9645e8691771b10856ee4561cf..af680ee1529cf61b4249a9bba60b7dbccc02aa1a 100644
--- a/automations/brightness-dining-area-sync.yaml
+++ b/automations/brightness-balcony-sync.yaml
@@ -1,20 +1,20 @@
-alias: Brightness Dining Area Sync
+alias: Brightness Balcony Sync
trigger:
- platform: state
- entity_id: light.ceiling_fan_1
+ entity_id: light.balcony_left
- platform: state
- entity_id: light.ceiling_fan_2
+ entity_id: light.balcony_right
condition:
condition: and
conditions:
- condition: state
- entity_id: light.ceiling_fan_1
+ entity_id: light.balcony_left
state: 'on'
- condition: state
- entity_id: light.ceiling_fan_2
+ entity_id: light.balcony_right
state: 'on'
action:
service: input_number.set_value
data_template:
- entity_id: input_number.brightness_da
+ entity_id: input_number.brightness_balcony
value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/brightness-den-set.yaml b/automations/brightness-den-set.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0ab4edd87d15cd62d816bf15f7b78ad40be7472c
--- /dev/null
+++ b/automations/brightness-den-set.yaml
@@ -0,0 +1,12 @@
+alias: Brightness Den
+trigger:
+ platform: state
+ entity_id: input_number.brightness_den
+action:
+ service: light.turn_on
+ data:
+ entity_id:
+ - light.den_left
+ - light.den_right
+ data_template:
+ brightness: '{{ states( "input_number.brightness_den" )|round( 0 ) }}'
diff --git a/automations/brightness-den-sync.yaml b/automations/brightness-den-sync.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1aed46ae93a517fc236e2ded2f355befa017a1a0
--- /dev/null
+++ b/automations/brightness-den-sync.yaml
@@ -0,0 +1,20 @@
+alias: Brightness Den Sync
+trigger:
+ - platform: state
+ entity_id: light.den_left
+ - platform: state
+ entity_id: light.den_right
+condition:
+ condition: and
+ conditions:
+ - condition: state
+ entity_id: light.den_left
+ state: 'on'
+ - condition: state
+ entity_id: light.den_right
+ state: 'on'
+action:
+ service: input_number.set_value
+ data_template:
+ entity_id: input_number.brightness_den
+ value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/brightness-dining-area-set.yaml b/automations/brightness-dining-area-set.yaml
deleted file mode 100644
index 7be10dc49109d24b581347293c99d0feb9fb8437..0000000000000000000000000000000000000000
--- a/automations/brightness-dining-area-set.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-alias: Brightness Dining Area
-trigger:
- platform: state
- entity_id: input_number.brightness_da
-action:
- service: light.turn_on
- data:
- entity_id:
- - light.ceiling_fan_1
- - light.ceiling_fan_2
- data_template:
- brightness: '{{ states( "input_number.brightness_da" )|round( 0 ) }}'
diff --git a/automations/brightness-living-room-set.yaml b/automations/brightness-living-room-set.yaml
index 4f6057e98420df5e7950687fe52a2cc6a33f51c8..877f4272a2bc87dcb2f30fe08663e9767a26400f 100644
--- a/automations/brightness-living-room-set.yaml
+++ b/automations/brightness-living-room-set.yaml
@@ -6,7 +6,7 @@ action:
service: light.turn_on
data:
entity_id:
- - light.endtable
- - light.corner_table
+ - light.living_room_endtable_left
+ - light.living_room_endtable_right
data_template:
brightness: '{{ states( "input_number.brightness_lr" )|round( 0 ) }}'
diff --git a/automations/brightness-living-room-sync.yaml b/automations/brightness-living-room-sync.yaml
index 21ad09a69962c1cec1e3800845ac976d180bac5d..481a6e8658e400f67d7812c4b391c2449ae48217 100644
--- a/automations/brightness-living-room-sync.yaml
+++ b/automations/brightness-living-room-sync.yaml
@@ -1,17 +1,17 @@
alias: Brightness Living Room Sync
trigger:
- platform: state
- entity_id: light.endtable
+ entity_id: light.living_room_endtable_left
- platform: state
- entity_id: light.corner_table
+ entity_id: light.living_room_endtable_right
condition:
condition: and
conditions:
- condition: state
- entity_id: light.endtable
+ entity_id: light.living_room_endtable_left
state: 'on'
- condition: state
- entity_id: light.corner_table
+ entity_id: light.living_room_endtable_right
state: 'on'
action:
service: input_number.set_value
diff --git a/automations/brightness-lr-ceiling-set.yaml b/automations/brightness-lr-ceiling-set.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7c034467f08bb8b74226e14f3ede5b9a7cf28090
--- /dev/null
+++ b/automations/brightness-lr-ceiling-set.yaml
@@ -0,0 +1,13 @@
+alias: Brightness LR Ceiling
+trigger:
+ platform: state
+ entity_id: input_number.brightness_lr_ceiling
+action:
+ service: light.turn_on
+ data:
+ entity_id:
+ - light.living_room_left
+ - light.living_room_center
+ - light.living_room_right
+ data_template:
+ brightness: '{{ states( "input_number.brightness_lr_ceiling" )|round( 0 ) }}'
diff --git a/automations/brightness-master-bath-sync.yaml b/automations/brightness-lr-ceiling-sync.yaml
similarity index 52%
rename from automations/brightness-master-bath-sync.yaml
rename to automations/brightness-lr-ceiling-sync.yaml
index 001be74a9fc65c1d40a9b1d5c3338da0545e70af..889f55310878ea2045cad1cbd10416dcc30fc3ed 100644
--- a/automations/brightness-master-bath-sync.yaml
+++ b/automations/brightness-lr-ceiling-sync.yaml
@@ -1,25 +1,25 @@
-alias: Brightness Master Bath Sync
+alias: Brightness LR Ceiling Sync
trigger:
- platform: state
- entity_id: light.master_bath_1
+ entity_id: light.living_room_left
- platform: state
- entity_id: light.master_bath_2
+ entity_id: light.living_room_center
- platform: state
- entity_id: light.master_bath_3
+ entity_id: light.living_room_right
condition:
condition: and
conditions:
- condition: state
- entity_id: light.master_bath_1
+ entity_id: light.living_room_left
state: 'on'
- condition: state
- entity_id: light.master_bath_2
+ entity_id: light.living_room_center
state: 'on'
- condition: state
- entity_id: light.master_bath_3
+ entity_id: light.living_room_right
state: 'on'
action:
service: input_number.set_value
data_template:
- entity_id: input_number.brightness_master_bath
+ entity_id: input_number.brightness_lr_ceiling
value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/brightness-master-bath-set.yaml b/automations/brightness-master-bath-set.yaml
deleted file mode 100644
index 7b7a6fa8c2fb1ebecefd30564d592255b8ae275c..0000000000000000000000000000000000000000
--- a/automations/brightness-master-bath-set.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-alias: Brightness Master Bath
-trigger:
- platform: state
- entity_id: input_number.brightness_master_bath
-action:
- service: light.turn_on
- data:
- entity_id:
- - light.master_bath_1
- - light.master_bath_2
- - light.master_bath_3
- data_template:
- brightness: '{{ states( "input_number.brightness_master_bath" )|round( 0 ) }}'
diff --git a/automations/brightness-master-bedroom-set.yaml b/automations/brightness-master-bedroom-set.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..aeec502025076a7f52611beae6b98464e1c9287d
--- /dev/null
+++ b/automations/brightness-master-bedroom-set.yaml
@@ -0,0 +1,12 @@
+alias: Brightness Master Bedroom
+trigger:
+ platform: state
+ entity_id: input_number.brightness_master_bedroom
+action:
+ service: light.turn_on
+ data:
+ entity_id:
+ - light.nightstand_left
+ - light.nightstand_right
+ data_template:
+ brightness: '{{ states( "input_number.brightness_master_bedroom" )|round( 0 ) }}'
diff --git a/automations/brightness-master-bedroom-sync.yaml b/automations/brightness-master-bedroom-sync.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2ad9f8db19857dccdfcc1f261c2656af107fa21f
--- /dev/null
+++ b/automations/brightness-master-bedroom-sync.yaml
@@ -0,0 +1,20 @@
+alias: Brightness Master Bedroom Sync
+trigger:
+ - platform: state
+ entity_id: light.nightstand_left
+ - platform: state
+ entity_id: light.nightstand_right
+condition:
+ condition: and
+ conditions:
+ - condition: state
+ entity_id: light.nightstand_left
+ state: 'on'
+ - condition: state
+ entity_id: light.nightstand_right
+ state: 'on'
+action:
+ service: input_number.set_value
+ data_template:
+ entity_id: input_number.brightness_master_bedroom
+ value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/common-area-timeout.yaml b/automations/common-area-timeout.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..55fd2e2f281efc251999a116ff40bc007eb12dd6
--- /dev/null
+++ b/automations/common-area-timeout.yaml
@@ -0,0 +1,41 @@
+alias: Turn off common area items after no motion
+trigger:
+ platform: state
+ entity_id: binary_sensor.common_area
+ to: 'on'
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: light.living_room_endtable_left
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_endtable_right
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_left
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_center
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_right
+ state: 'on'
+ - condition: state
+ entity_id: light.kitchen_entrance
+ state: 'on'
+ - condition: state
+ entity_id: light.entryway
+ state: 'on'
+ - condition: state
+ entity_id: light.dining_corner
+ state: 'on'
+ - condition: state
+ entity_id: switch.fireplace
+ state: 'on'
+ - condition: state
+ entity_id: switch.over_front_door
+ state: 'on'
+action:
+ service: homeassistant.turn_on
+ entity_id: script.common_area_set_timeout
diff --git a/automations/den-lights-timeout.yaml b/automations/den-lights-timeout.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c92c5238189d51529ee38ced1fd805be6ba76983
--- /dev/null
+++ b/automations/den-lights-timeout.yaml
@@ -0,0 +1,20 @@
+alias: Turn off den lights after no motion
+trigger:
+ platform: state
+ entity_id: binary_sensor.den_motion_sensor
+ to: 'on'
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: light.den_left
+ state: 'on'
+ - condition: state
+ entity_id: light.den_right
+ state: 'on'
+ - condition: state
+ entity_id: switch.lava_lamp
+ state: 'on'
+action:
+ service: homeassistant.turn_on
+ entity_id: script.den_lights_set_timeout
diff --git a/automations/dining-area-timeout.yaml b/automations/dining-area-timeout.yaml
deleted file mode 100644
index b4f6439a2741a68e038a066fa16c060e0da7b656..0000000000000000000000000000000000000000
--- a/automations/dining-area-timeout.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-alias: Turn off dining area lights after no motion
-trigger:
- platform: state
- entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
- to: 'on'
-condition:
- condition: or
- conditions:
- - condition: state
- entity_id: light.ceiling_fan_1
- state: 'on'
- - condition: state
- entity_id: light.ceiling_fan_2
- state: 'on'
-action:
- service: homeassistant.turn_on
- entity_id: script.dining_area_lights_set_timeout
diff --git a/automations/dining-area-window-opened-outside.yaml b/automations/dining-area-window-opened-outside.yaml
deleted file mode 100644
index e8947325294566684dfcc0b22a6ebb4c60294226..0000000000000000000000000000000000000000
--- a/automations/dining-area-window-opened-outside.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-alias: Turn on lights when dining room window opened from outside
-trigger:
- - platform: state
- entity_id: binary_sensor.dining_area_window_motion
- to: 'on'
-condition:
- condition: and
- conditions:
- - condition: state
- entity_id: binary_sensor.lr_motion_sensor_over_slider
- state: 'off'
- - condition: state
- entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
- state: 'off'
- - condition: state
- entity_id: binary_sensor.kitchen
- state: 'off'
-action:
- service: scene.turn_on
- entity_id:
- - scene.da_bright
- - scene.lr_bright
- - scene.balcony_bright
diff --git a/automations/ecobee-away.yaml b/automations/ecobee-away.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..16df35a82c6aae85731e857427021bd3204808b7
--- /dev/null
+++ b/automations/ecobee-away.yaml
@@ -0,0 +1,15 @@
+alias: Set ecobee to away when we leave
+trigger:
+ platform: state
+ entity_id: group.presence
+ from: 'home'
+ to: 'not_home'
+ for:
+ hours: 0
+ minutes: 10
+ seconds: 0
+action:
+ service: climate.set_preset_mode
+ data:
+ entity_id: climate.forest_park
+ preset_mode: Away
diff --git a/automations/ecobee-home.yaml b/automations/ecobee-home.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..02f5ce2aed050bfea6141a68b5fa1b4bb1ef6168
--- /dev/null
+++ b/automations/ecobee-home.yaml
@@ -0,0 +1,15 @@
+alias: Set ecobee to home when we return
+trigger:
+ platform: state
+ entity_id: group.presence
+ from: 'not_home'
+ to: 'home'
+action:
+ - service: climate.set_preset_mode
+ data:
+ entity_id: climate.forest_park
+ preset_mode: Home
+ - service: ecobee.resume_program
+ data:
+ entity_id: climate.forest_park
+ resume_all: 'true'
diff --git a/automations/dining-area-on-at-entry.yaml b/automations/entryway-on-at-entry.yaml
similarity index 56%
rename from automations/dining-area-on-at-entry.yaml
rename to automations/entryway-on-at-entry.yaml
index 6127291fd380bc1c6db112cec0548ea616987a7e..d2ccf1e53b6dc8025ea011d720ab2795fef491af 100644
--- a/automations/dining-area-on-at-entry.yaml
+++ b/automations/entryway-on-at-entry.yaml
@@ -1,4 +1,4 @@
-alias: Turn on dining area lights when front door opens
+alias: Turn on lights when front door opens
trigger:
platform: state
entity_id: binary_sensor.front_door
@@ -10,20 +10,17 @@ condition:
entity_id: group.living_room
state: 'off'
- condition: state
- entity_id: group.dining_area
+ entity_id: group.entryway
state: 'off'
- condition: state
- entity_id: binary_sensor.lr_motion_sensor_over_slider
+ entity_id: group.kitchen
state: 'off'
- condition: state
- entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
- state: 'off'
- - condition: state
- entity_id: binary_sensor.kitchen
+ entity_id: binary_sensor.common_area
state: 'off'
- condition: state
entity_id: sun.sun
state: 'below_horizon'
action:
service: scene.turn_on
- entity_id: scene.da_relax
+ entity_id: scene.entryway_bright
diff --git a/automations/kitchen-light-timeout.yaml b/automations/kitchen-light-timeout.yaml
deleted file mode 100644
index e273f0d2a0baecfba27fb1f1d2255ac27cdda157..0000000000000000000000000000000000000000
--- a/automations/kitchen-light-timeout.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-alias: Turn off kitchen light after no motion
-trigger:
- platform: state
- entity_id: binary_sensor.kitchen
- to: 'on'
-condition:
- condition: or
- conditions:
- - condition: state
- entity_id: switch.kitchen
- state: 'on'
-action:
- service: homeassistant.turn_on
- entity_id: script.kitchen_light_set_timeout
diff --git a/automations/kitchen-nightlight-off.yaml b/automations/kitchen-nightlight-off.yaml
index c83e9c0496b9b66490bf2b93bd8677cda07a0765..bc53537346fe75ca793a774d3bcc4c30ea962bf0 100644
--- a/automations/kitchen-nightlight-off.yaml
+++ b/automations/kitchen-nightlight-off.yaml
@@ -1,22 +1,17 @@
alias: Turn kitchen nightlight off
trigger:
- platform: state
- entity_id: switch.kitchen
+ entity_id: light.living_room_right
- platform: state
- entity_id: light.ceiling_fan_1
- - platform: state
- entity_id: light.ceiling_fan_2
+ entity_id: light.kitchen_entrance
condition:
condition: or
conditions:
- condition: state
- entity_id: light.ceiling_fan_1
- state: 'on'
- - condition: state
- entity_id: light.ceiling_fan_2
+ entity_id: light.living_room_right
state: 'on'
- condition: state
- entity_id: switch.kitchen
+ entity_id: light.kitchen_entrance
state: 'on'
action:
service: switch.turn_off
diff --git a/automations/kitchen-nightlight-on-am.yaml b/automations/kitchen-nightlight-on-am.yaml
index cf79801751f31db563d883577c61ec10a2b92d1f..50a6c4e6894573f520eaa51f69151e2c64b382e5 100644
--- a/automations/kitchen-nightlight-on-am.yaml
+++ b/automations/kitchen-nightlight-on-am.yaml
@@ -1,15 +1,11 @@
alias: Turn kitchen nightlight on AM
trigger:
- platform: state
- entity_id: switch.kitchen
+ entity_id: light.living_room_right
- platform: state
- entity_id: light.ceiling_fan_1
+ entity_id: light.kitchen_entrance
- platform: state
- entity_id: light.ceiling_fan_2
- - platform: state
- entity_id: binary_sensor.kitchen
- - platform: state
- entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+ entity_id: binary_sensor.common_area
condition:
condition: and
conditions:
@@ -22,13 +18,10 @@ condition:
- condition: time
before: '09:00:00'
- condition: state
- entity_id: light.ceiling_fan_1
- state: 'off'
- - condition: state
- entity_id: light.ceiling_fan_2
+ entity_id: light.living_room_right
state: 'off'
- condition: state
- entity_id: switch.kitchen
+ entity_id: light.kitchen_entrance
state: 'off'
action:
service: switch.turn_on
diff --git a/automations/kitchen-nightlight-on-pm.yaml b/automations/kitchen-nightlight-on-pm.yaml
index fe1a77f62071c56da797b73c123bc515b0046804..3f0f56dc44315554513b522045a0377108243c1b 100644
--- a/automations/kitchen-nightlight-on-pm.yaml
+++ b/automations/kitchen-nightlight-on-pm.yaml
@@ -1,15 +1,11 @@
alias: Turn kitchen nightlight on PM
trigger:
- platform: state
- entity_id: switch.kitchen
+ entity_id: light.living_room_right
- platform: state
- entity_id: light.ceiling_fan_1
+ entity_id: light.kitchen_entrance
- platform: state
- entity_id: light.ceiling_fan_2
- - platform: state
- entity_id: binary_sensor.kitchen
- - platform: state
- entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+ entity_id: binary_sensor.common_area
condition:
condition: and
conditions:
@@ -22,13 +18,10 @@ condition:
- condition: time
after: '21:30:00'
- condition: state
- entity_id: light.ceiling_fan_1
- state: 'off'
- - condition: state
- entity_id: light.ceiling_fan_2
+ entity_id: light.living_room_right
state: 'off'
- condition: state
- entity_id: switch.kitchen
+ entity_id: light.kitchen_entrance
state: 'off'
action:
service: switch.turn_on
diff --git a/automations/lights-off-no-one-home.yaml b/automations/lights-off-no-one-home.yaml
index 9cd01589fbd02cb84c99610b9f76194e5f220071..28a57a1b201049b8edc01f77c5cc9075d61e8eab 100644
--- a/automations/lights-off-no-one-home.yaml
+++ b/automations/lights-off-no-one-home.yaml
@@ -1,4 +1,4 @@
-alias: Turn off certain lights when no one is home
+alias: Turn off certain items when no one is home
trigger:
platform: state
entity_id: group.presence
@@ -7,4 +7,6 @@ trigger:
action:
service: switch.turn_off
entity_id:
+ - switch.fireplace
- switch.lava_lamp
+ - switch.wireless_charger
diff --git a/automations/lights-off-when-alarm-away.yaml b/automations/lights-off-when-alarm-away.yaml
index 84d187cb52cdfc555adb79caa8b7b44134e02cd9..d270ea152c7fde0a9ac722ed218892c02751a4d2 100644
--- a/automations/lights-off-when-alarm-away.yaml
+++ b/automations/lights-off-when-alarm-away.yaml
@@ -7,8 +7,9 @@ action:
service: homeassistant.turn_off
entity_id:
- group.master_bedroom
- - group.master_bathroom
- group.living_room
- - group.dining_area
+ - group.den
+ - group.kitchen
+ - group.entryway
- group.office
- group.other
diff --git a/automations/living-room-sunrise-off.yaml b/automations/living-room-sunrise-off.yaml
index e4c68cda42c7fd92225681ecece1a42c5a3bb73c..139cdfea568de35f0e521179c5730b40ebe8fcef 100644
--- a/automations/living-room-sunrise-off.yaml
+++ b/automations/living-room-sunrise-off.yaml
@@ -2,16 +2,27 @@ alias: 'Turn off living room at sunrise'
trigger:
platform: sun
event: sunrise
- offset: "+00:60:00"
+ offset: "+00:15:00"
condition:
condition: or
conditions:
- condition: state
- entity_id: light.endtable
+ entity_id: light.living_room_endtable_left
state: 'on'
- condition: state
- entity_id: light.corner_table
+ entity_id: light.living_room_endtable_right
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_left
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_center
+ state: 'on'
+ - condition: state
+ entity_id: light.living_room_right
state: 'on'
action:
- service: light.turn_off
- entity_id: group.living_room
\ No newline at end of file
+ - service: scene.turn_on
+ entity_id: scene.lr_off
+ - service: scene.turn_on
+ entity_id: scene.lr_ceiling_off
diff --git a/automations/living-room-sunset-on.yaml b/automations/living-room-sunset-on.yaml
index b5c41174bbbb858d86308e2f6d7a87ed3c4e1657..b3d82c8268c632a047647ded88130df3ac4f2178 100644
--- a/automations/living-room-sunset-on.yaml
+++ b/automations/living-room-sunset-on.yaml
@@ -2,7 +2,7 @@ alias: 'Turn on living room at sunset'
trigger:
platform: sun
event: sunset
- offset: "-00:45:00"
+ offset: "+00:30:00"
condition:
condition: and
conditions:
@@ -12,11 +12,22 @@ condition:
- condition: or
conditions:
- condition: state
- entity_id: light.endtable
+ entity_id: light.living_room_endtable_left
state: 'off'
- condition: state
- entity_id: light.corner_table
+ entity_id: light.living_room_endtable_right
+ state: 'off'
+ - condition: state
+ entity_id: light.living_room_left
+ state: 'off'
+ - condition: state
+ entity_id: light.living_room_center
+ state: 'off'
+ - condition: state
+ entity_id: light.living_room_right
state: 'off'
action:
- service: scene.turn_on
- entity_id: scene.lr_relax
+ - service: scene.turn_on
+ entity_id: scene.lr_relax
+ - service: scene.turn_on
+ entity_id: scene.lr_ceiling_dimmed
diff --git a/automations/living-room-timeout.yaml b/automations/living-room-timeout.yaml
deleted file mode 100644
index 77a18d5ba66129d3806e6cd5ea2100c579a10eba..0000000000000000000000000000000000000000
--- a/automations/living-room-timeout.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-alias: Turn off living room lights after no motion
-trigger:
- platform: state
- entity_id: binary_sensor.lr_motion_sensor_over_slider
- to: 'on'
-condition:
- condition: or
- conditions:
- - condition: state
- entity_id: light.endtable
- state: 'on'
- - condition: state
- entity_id: light.corner_table
- state: 'on'
-action:
- service: homeassistant.turn_on
- entity_id: script.living_room_lights_set_timeout
diff --git a/automations/notify-shutdown.yaml b/automations/notify-shutdown.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ba2d6026b6e865e0b931f4b114b74f117056f7b5
--- /dev/null
+++ b/automations/notify-shutdown.yaml
@@ -0,0 +1,11 @@
+alias: Notify on Hass shutdown
+description: Send Mattermost notification when instance shuts down.
+trigger:
+ - event: shutdown
+ platform: homeassistant
+condition: []
+action:
+ - alias: ''
+ data:
+ message: Home Assistant shutdown called
+ service: notify.mattermost
diff --git a/automations/office-lights-timeout.yaml b/automations/office-lights-timeout.yaml
index 5b0ae698a57c435a57e25889c687315ff859c513..6085d0ce361de0176e465ba746a4a3c15b6be064 100644
--- a/automations/office-lights-timeout.yaml
+++ b/automations/office-lights-timeout.yaml
@@ -1,7 +1,7 @@
alias: Turn off office lights after no motion
trigger:
platform: state
- entity_id: binary_sensor.office_motion_sensor_over_closet
+ entity_id: binary_sensor.office_motion_sensor
to: 'on'
condition:
condition: or
@@ -12,9 +12,6 @@ condition:
- condition: state
entity_id: light.erick_s_desk_lamp
state: 'on'
- - condition: state
- entity_id: switch.lava_lamp
- state: 'on'
action:
service: homeassistant.turn_on
entity_id: script.office_lights_set_timeout
diff --git a/automations/scenes-den.yaml b/automations/scenes-den.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..47672e723d58d3cdc49ce8cb12a92ede65492807
--- /dev/null
+++ b/automations/scenes-den.yaml
@@ -0,0 +1,36 @@
+alias: Scene Den
+trigger:
+ platform: state
+ entity_id: input_select.scene_den
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: 'input_select.scene_den'
+ state: 'Nightlight'
+ - condition: state
+ entity_id: 'input_select.scene_den'
+ state: 'Dimmed'
+ - condition: state
+ entity_id: 'input_select.scene_den'
+ state: 'Bright'
+ - condition: state
+ entity_id: 'input_select.scene_den'
+ state: 'Off'
+action:
+ - service: scene.turn_on
+ data_template:
+ entity_id: >
+ {% if is_state( "input_select.scene_den", "Nightlight" ) %}
+ scene.den_nightlight
+ {%-elif is_state( "input_select.scene_den", "Dimmed" ) %}
+ scene.den_dimmed
+ {%-elif is_state( "input_select.scene_den", "Bright" ) %}
+ scene.den_bright
+ {%-elif is_state( "input_select.scene_den", "Off" ) %}
+ scene.den_off
+ {% endif %}
+ - service: input_select.select_option
+ data:
+ entity_id: input_select.scene_den
+ option: "-"
diff --git a/automations/scenes-entryway.yaml b/automations/scenes-entryway.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..317203235e59f1c67b194997089fb742d1199996
--- /dev/null
+++ b/automations/scenes-entryway.yaml
@@ -0,0 +1,36 @@
+alias: Scene Entryway
+trigger:
+ platform: state
+ entity_id: input_select.scene_entryway
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: 'input_select.scene_entryway'
+ state: 'Nightlight'
+ - condition: state
+ entity_id: 'input_select.scene_entryway'
+ state: 'Dimmed'
+ - condition: state
+ entity_id: 'input_select.scene_entryway'
+ state: 'Bright'
+ - condition: state
+ entity_id: 'input_select.scene_entryway'
+ state: 'Off'
+action:
+ - service: scene.turn_on
+ data_template:
+ entity_id: >
+ {% if is_state( "input_select.scene_entryway", "Nightlight" ) %}
+ scene.entryway_nightlight
+ {%-elif is_state( "input_select.scene_entryway", "Dimmed" ) %}
+ scene.entryway_dimmed
+ {%-elif is_state( "input_select.scene_entryway", "Bright" ) %}
+ scene.entryway_bright
+ {%-elif is_state( "input_select.scene_entryway", "Off" ) %}
+ scene.entryway_off
+ {% endif %}
+ - service: input_select.select_option
+ data:
+ entity_id: input_select.scene_entryway
+ option: "-"
diff --git a/automations/scenes-kitchen-entrance.yaml b/automations/scenes-kitchen-entrance.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d1db533e3cd6ea706cdb5538a6b9b2552cd9f464
--- /dev/null
+++ b/automations/scenes-kitchen-entrance.yaml
@@ -0,0 +1,36 @@
+alias: Scene Kitchen Entrance
+trigger:
+ platform: state
+ entity_id: input_select.scene_kitchen_entrance
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: 'input_select.scene_kitchen_entrance'
+ state: 'Nightlight'
+ - condition: state
+ entity_id: 'input_select.scene_kitchen_entrance'
+ state: 'Dimmed'
+ - condition: state
+ entity_id: 'input_select.scene_kitchen_entrance'
+ state: 'Bright'
+ - condition: state
+ entity_id: 'input_select.scene_kitchen_entrance'
+ state: 'Off'
+action:
+ - service: scene.turn_on
+ data_template:
+ entity_id: >
+ {% if is_state( "input_select.scene_kitchen_entrance", "Nightlight" ) %}
+ scene.kitchen_entrance_nightlight
+ {%-elif is_state( "input_select.scene_kitchen_entrance", "Dimmed" ) %}
+ scene.kitchen_entrance_dimmed
+ {%-elif is_state( "input_select.scene_kitchen_entrance", "Bright" ) %}
+ scene.kitchen_entrance_bright
+ {%-elif is_state( "input_select.scene_kitchen_entrance", "Off" ) %}
+ scene.kitchen_entrance_off
+ {% endif %}
+ - service: input_select.select_option
+ data:
+ entity_id: input_select.scene_kitchen_entrance
+ option: "-"
diff --git a/automations/scenes-lr-ceiling.yaml b/automations/scenes-lr-ceiling.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..966cf9ba3ebd5940952f4d07e57ec579cd91a3a3
--- /dev/null
+++ b/automations/scenes-lr-ceiling.yaml
@@ -0,0 +1,36 @@
+alias: Scene LR Ceiling
+trigger:
+ platform: state
+ entity_id: input_select.scene_lr_ceiling
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: 'input_select.scene_lr_ceiling'
+ state: 'Nightlight'
+ - condition: state
+ entity_id: 'input_select.scene_lr_ceiling'
+ state: 'Dimmed'
+ - condition: state
+ entity_id: 'input_select.scene_lr_ceiling'
+ state: 'Bright'
+ - condition: state
+ entity_id: 'input_select.scene_lr_ceiling'
+ state: 'Off'
+action:
+ - service: scene.turn_on
+ data_template:
+ entity_id: >
+ {% if is_state( "input_select.scene_lr_ceiling", "Nightlight" ) %}
+ scene.lr_ceiling_nightlight
+ {%-elif is_state( "input_select.scene_lr_ceiling", "Dimmed" ) %}
+ scene.lr_ceiling_dimmed
+ {%-elif is_state( "input_select.scene_lr_ceiling", "Bright" ) %}
+ scene.lr_ceiling_bright
+ {%-elif is_state( "input_select.scene_lr_ceiling", "Off" ) %}
+ scene.lr_ceiling_off
+ {% endif %}
+ - service: input_select.select_option
+ data:
+ entity_id: input_select.scene_lr_ceiling
+ option: "-"
diff --git a/automations/scenes-master-bath.yaml b/automations/scenes-master-bath.yaml
deleted file mode 100644
index ed5533a685c056daa81089e60caf67662d671e1e..0000000000000000000000000000000000000000
--- a/automations/scenes-master-bath.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-alias: Scene Master Bath
-trigger:
- platform: state
- entity_id: input_select.scene_master_bath
-condition:
- condition: or
- conditions:
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Nightlight (single)'
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Nightlight'
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Dimmed'
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Relax'
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Read'
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Bright'
- - condition: state
- entity_id: 'input_select.scene_master_bath'
- state: 'Off'
-action:
- - service: scene.turn_on
- data_template:
- entity_id: >
- {% if is_state( "input_select.scene_master_bath", "Nightlight (single)" ) %}
- scene.master_bath_single_nightlight
- {%-elif is_state( "input_select.scene_master_bath", "Nightlight" ) %}
- scene.master_bath_nightlight
- {%-elif is_state( "input_select.scene_master_bath", "Dimmed" ) %}
- scene.master_bath_dimmed
- {%-elif is_state( "input_select.scene_master_bath", "Relax" ) %}
- scene.master_bath_relax
- {%-elif is_state( "input_select.scene_master_bath", "Read" ) %}
- scene.master_bath_read
- {%-elif is_state( "input_select.scene_master_bath", "Bright" ) %}
- scene.master_bath_concentrate
- {%-elif is_state( "input_select.scene_master_bath", "Off" ) %}
- scene.master_bath_off
- {% endif %}
- - service: input_select.select_option
- data:
- entity_id: input_select.scene_master_bath
- option: "-"
diff --git a/binary-sensors/acceleration-dining-area-window.yaml b/binary-sensors/acceleration-dining-area-window.yaml
deleted file mode 100644
index 73a10d86946ac02e315cc74323f8189bc370b04a..0000000000000000000000000000000000000000
--- a/binary-sensors/acceleration-dining-area-window.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Window/acceleration"
-name: "Dining Area Window motion"
-payload_on: "active"
-payload_off: "inactive"
-device_class: moving
diff --git a/binary-sensors/acceleration-master-bedroom-window.yaml b/binary-sensors/acceleration-master-bedroom-window.yaml
deleted file mode 100644
index 74683f63791affd76cb605b550fbcf52ef83b262..0000000000000000000000000000000000000000
--- a/binary-sensors/acceleration-master-bedroom-window.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Master Bedroom Window/acceleration"
-name: "Master Bedroom Window motion"
-payload_on: "active"
-payload_off: "inactive"
-device_class: moving
diff --git a/binary-sensors/acceleration-office-window.yaml b/binary-sensors/acceleration-office-window.yaml
deleted file mode 100644
index 7de1eac05b3951e43b9004d6ea6b7ff20de03c74..0000000000000000000000000000000000000000
--- a/binary-sensors/acceleration-office-window.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Window/acceleration"
-name: "Office Window motion"
-payload_on: "active"
-payload_off: "inactive"
-device_class: moving
diff --git a/binary-sensors/contact-dining-area-window.yaml b/binary-sensors/contact-dining-area-window.yaml
deleted file mode 100644
index c3b7682289844f54898c94f754b7eab5b6d143b8..0000000000000000000000000000000000000000
--- a/binary-sensors/contact-dining-area-window.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Window/contact"
-name: "Dining Area Window"
-payload_on: "open"
-payload_off: "closed"
-device_class: opening
diff --git a/binary-sensors/contact-master-bedroom-window.yaml b/binary-sensors/contact-master-bedroom-window.yaml
deleted file mode 100644
index 297b3641edfa09a5fcaf41b719208e775d9c449f..0000000000000000000000000000000000000000
--- a/binary-sensors/contact-master-bedroom-window.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Master Bedroom Window/contact"
-name: "Master Bedroom Window"
-payload_on: "open"
-payload_off: "closed"
-device_class: opening
diff --git a/binary-sensors/contact-office-window.yaml b/binary-sensors/contact-office-window.yaml
deleted file mode 100644
index 1fcc8cf70d9541f8f0e1b96ff074fe9466af273a..0000000000000000000000000000000000000000
--- a/binary-sensors/contact-office-window.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Window/contact"
-name: "Office Window"
-payload_on: "open"
-payload_off: "closed"
-device_class: opening
diff --git a/binary-sensors/motion-common-area.yaml b/binary-sensors/motion-common-area.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e5bc5db0ce091516461ab0fb3ffe3a35b820f71e
--- /dev/null
+++ b/binary-sensors/motion-common-area.yaml
@@ -0,0 +1,6 @@
+platform: mqtt
+state_topic: "smartthings/Common Area Motion Sensor/motion"
+name: "Common Area"
+payload_on: "active"
+payload_off: "inactive"
+device_class: motion
diff --git a/binary-sensors/motion-den.yaml b/binary-sensors/motion-den.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cd217533cd662165fc609b157064a80a91ed16fb
--- /dev/null
+++ b/binary-sensors/motion-den.yaml
@@ -0,0 +1,6 @@
+platform: mqtt
+state_topic: "smartthings/Den Motion Sensor/motion"
+name: "Den Motion Sensor"
+payload_on: "active"
+payload_off: "inactive"
+device_class: motion
diff --git a/binary-sensors/motion-kitchen.yaml b/binary-sensors/motion-kitchen.yaml
deleted file mode 100644
index 63a24d27378a68010e1ac9187990b52b595bff43..0000000000000000000000000000000000000000
--- a/binary-sensors/motion-kitchen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Motion Sensor near cabinets/motion"
-name: "Kitchen"
-payload_on: "active"
-payload_off: "inactive"
-device_class: motion
diff --git a/binary-sensors/motion-master-bedroom-closet.yaml b/binary-sensors/motion-master-bedroom-closet.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..70c0f899af1f8ce6a27f8584014c45d2f049c6b9
--- /dev/null
+++ b/binary-sensors/motion-master-bedroom-closet.yaml
@@ -0,0 +1,6 @@
+platform: mqtt
+state_topic: "smartthings/Master Bedroom Closet/motion"
+name: "Master Bedroom Closet Motion"
+payload_on: "active"
+payload_off: "inactive"
+device_class: motion
diff --git a/binary-sensors/motion-office-far-wall.yaml b/binary-sensors/motion-office-far-wall.yaml
deleted file mode 100644
index aebf6026884d1c54a157576d2fcca542e18de95a..0000000000000000000000000000000000000000
--- a/binary-sensors/motion-office-far-wall.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Motion Sensor Far Wall/motion"
-name: "Office Motion Sensor Far Wall"
-payload_on: "active"
-payload_off: "inactive"
-device_class: motion
diff --git a/binary-sensors/motion-office-over-closet.yaml b/binary-sensors/motion-office-over-closet.yaml
deleted file mode 100644
index 05f6249d031b4f9db33a456129525a2b4ab4d245..0000000000000000000000000000000000000000
--- a/binary-sensors/motion-office-over-closet.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Motion Sensor over Closet/motion"
-name: "Office Motion Sensor over Closet"
-payload_on: "active"
-payload_off: "inactive"
-device_class: motion
diff --git a/binary-sensors/motion-office.yaml b/binary-sensors/motion-office.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..246d9fdbf06d2953de68060f33db528151f88903
--- /dev/null
+++ b/binary-sensors/motion-office.yaml
@@ -0,0 +1,6 @@
+platform: mqtt
+state_topic: "smartthings/Office Motion Sensor/motion"
+name: "Office Motion Sensor"
+payload_on: "active"
+payload_off: "inactive"
+device_class: motion
diff --git a/binary-sensors/motion-over-slider.yaml b/binary-sensors/motion-over-slider.yaml
deleted file mode 100644
index 9e1fb50f55084ff0ae169847fa44aa3f5b2be699..0000000000000000000000000000000000000000
--- a/binary-sensors/motion-over-slider.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/LR Motion Sensor over Slider/motion"
-name: "LR Motion Sensor over Slider"
-payload_on: "active"
-payload_off: "inactive"
-device_class: motion
diff --git a/binary-sensors/motion-over-utility-closet.yaml b/binary-sensors/motion-over-utility-closet.yaml
deleted file mode 100644
index 2dc01c9054fcd4e0af8b9013ed2fe37b5b7101af..0000000000000000000000000000000000000000
--- a/binary-sensors/motion-over-utility-closet.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/LR Motion Sensor over Utility Closet/motion"
-name: "LR Motion Sensor over Utility Closet"
-payload_on: "active"
-payload_off: "inactive"
-device_class: motion
diff --git a/binary-sensors/tamper-master-bedroom-closet.yaml b/binary-sensors/tamper-master-bedroom-closet.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..08ef21cb444d7b3f00330605448b2217570b61c5
--- /dev/null
+++ b/binary-sensors/tamper-master-bedroom-closet.yaml
@@ -0,0 +1,6 @@
+platform: mqtt
+state_topic: "smartthings/Master Bedroom Closet/tamper"
+name: "Master Bedroom Closet Tamper"
+payload_on: "detected"
+payload_off: "clear"
+device_class: problem
diff --git a/cloud.yaml b/cloud.yaml
index 67072dc124049a172c42b32499c1efd56e2c1970..301a0e9ca92ef422c29060c4500f3279a39a8da4 100644
--- a/cloud.yaml
+++ b/cloud.yaml
@@ -3,25 +3,53 @@ google_actions:
include_domains:
- switch
- light
- include_entities:
- - group.ceiling_fan
- - group.master_bathroom
exclude_entities:
- - lock.interior_bolt
+ - light.balcony
+ - light.den
+ - light.dining
+ - light.entryway_2
+ - light.erick_s_desk
+ - light.kitchen
+ - light.living_room
+ - light.living_room_2
+ - light.master_bedroom
+ - light.office
- lock.keyed_bolt
- group.locks
- switch.alarm_status
- switch.christmas_tree
- switch.balcony_outlet
- - light.ceiling_fan_1
- - light.ceiling_fan_2
- - light.master_bath_1
- - light.master_bath_2
- - light.master_bath_3
entity_config:
+ light.den_left:
+ name: Left den flood
+ room: Den
+ light.den_right:
+ name: Right den flood
+ room: Den
+ light.entryway:
+ name: Entryway flood
+ light.living_room_left:
+ name: Left living room flood
+ room: Living Room
+ light.living_room_center:
+ name: Center living room flood
+ room: Living Room
+ light.living_room_right:
+ name: Right living room flood
+ room: Living Room
+ light.living_room_endtable_left:
+ name: Left endtable
+ room: Living Room
+ light.living_room_endtable_right:
+ name: Right endtable
+ room: Living Room
+ light.kitchen_entrance:
+ name: Kitchen Entrance
light.office:
name: Floor Lamp
light.erick_s_desk_lamp:
name: Desk Lamp
switch.kitchen:
name: Kitchen Light
+ light.dining_corner:
+ name: Dining area
diff --git a/configuration.yaml b/configuration.yaml
index b07cd20b560f165d2632a021fc2cd91256f39ec4..e4230a1521b433331e808bb8e87e8acb3d2f87a6 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -5,7 +5,7 @@ homeassistant:
latitude: !secret latitude
longitude: !secret longitude
# Impacts weather/sunrise data
- elevation: 250
+ elevation: 105
# Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
time_zone: America/Los_Angeles
unit_system: imperial
@@ -18,6 +18,7 @@ homeassistant:
auth:
config:
+ssdp:
http:
server_port: 8123
@@ -53,13 +54,12 @@ history:
# Discover some devices automatically
discovery:
- ignore:
- - apple_tv
- - samsung_tv
# Logging settings
logger:
default: warn # default logging level
+ logs:
+ homeassistant.components.cloud.google_config: error # bad entities following FP move.
# View all events in a logbook
logbook:
@@ -75,10 +75,7 @@ mqtt:
broker: localhost
# Components
-asuswrt: !include asuswrt.yaml
-
hue:
- bridges: !include hue.yaml
cast:
@@ -100,17 +97,26 @@ apcupsd:
august: !include august.yaml
+cover: !include cover.yaml
+
+ecobee:
+ api_key: !secret ecobee_key
+
system_health:
# Display
group: !include groups.yaml
+lovelace:
+ mode: yaml
+
# Automation
scene: !include_dir_list scenes
script: !include scripts.yaml
-automation: !include_dir_list automations
+automation: !include automations.yaml
+automation old: !include_dir_list automations
# Controls
input_select: !include input-selects.yaml
diff --git a/cover.yaml b/cover.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a5f3c8d788c7a6e824d48758a56916b6fe7dab4f
--- /dev/null
+++ b/cover.yaml
@@ -0,0 +1,3 @@
+- platform: myq
+ username: !secret myq_user
+ password: !secret myq_pass
diff --git a/customizations/binary-sensors.yaml b/customizations/binary-sensors.yaml
index 127a7967f4e7e6d3da9e76ec14afd5bee82e450c..6b0720694f55987c2993761edf42b95c24b114c1 100644
--- a/customizations/binary-sensors.yaml
+++ b/customizations/binary-sensors.yaml
@@ -6,11 +6,11 @@ binary_sensor.master_bedroom_co_detector:
friendly_name: Master Bedroom CO
binary_sensor.living_room_co_detector:
friendly_name: Living Room CO
-binary_sensor.lr_motion_sensor_over_slider:
- friendly_name: LR over slider
-binary_sensor.lr_motion_sensor_over_utility_closet:
- friendly_name: LR over utility closet
-binary_sensor.office_motion_sensor_over_closet:
- friendly_name: Office near closet
-binary_sensor.office_motion_sensor_far_wall:
- friendly_name: Office far wall
+binary_sensor.forest_park_occupancy:
+ friendly_name: Thermostat
+binary_sensor.master_bed_occupancy:
+ friendly_name: Master Bedroom
+binary_sensor.office_occupancy:
+ friendly_name: Office
+binary_sensor.den_occupancy:
+ friendly_name: Den
diff --git a/customizations/climate.yaml b/customizations/climate.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3f88891e00141b1ec38062ee7143a425adaa2e97
--- /dev/null
+++ b/customizations/climate.yaml
@@ -0,0 +1,2 @@
+climate.forest_park:
+ friendly_name: Thermostat
diff --git a/customizations/covers.yaml b/customizations/covers.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8786846374b474f00f8b6de74145846398774e1f
--- /dev/null
+++ b/customizations/covers.yaml
@@ -0,0 +1,2 @@
+cover.garage_door:
+ friendly_name: Door
diff --git a/customizations/device-tracker.yaml b/customizations/device-tracker.yaml
index 96be49eec4e5c2dfd106502057a9074763fceb38..11a7be5cbe1904278aab2369584ef2199f57d68e 100644
--- a/customizations/device-tracker.yaml
+++ b/customizations/device-tracker.yaml
@@ -1,9 +1,15 @@
+device_tracker.28ff3c5525f0:
+ friendly_name: Chris (iPhone 8)
+device_tracker.3c286d080a46:
+ friendly_name: Erick (Pixel 3 XL)
+device_tracker.adams_iphone:
+ friendly_name: Adam (iPhone)
device_tracker.cl_samsung_s5:
friendly_name: Chris (S4)
device_tracker.cl_iphone_5:
friendly_name: Chris (iPhone)
device_tracker.eh_nexus_6:
- friendly_name: Erick
+ friendly_name: Erick (Nexus 6)
device_tracker.green_keys:
friendly_name: Green keys
icon: mdi:key
diff --git a/customizations/input-numbers.yaml b/customizations/input-numbers.yaml
index 1f2151ca37991153bf81b9c6ff9c4da45c0d597a..ce8d225bcc34b5f268ac2d3f44a8834f1b6a8e66 100644
--- a/customizations/input-numbers.yaml
+++ b/customizations/input-numbers.yaml
@@ -1,7 +1,15 @@
-input_number.brightness_da:
- friendly_name: DA Brightness
+input_number.brightness_master_bedroom:
+ friendly_name: Brightness
icon: mdi:brightness-6
input_number.brightness_lr:
+ friendly_name: Endtable
icon: mdi:brightness-6
-input_number.brightness_master_bath:
+input_number.brightness_lr_ceiling:
+ friendly_name: Flood
+ icon: mdi:brightness-6
+input_number.brightness_den:
+ friendly_name: Brightness
+ icon: mdi:brightness-6
+input_number.brightness_balcony:
+ friendly_name: Brightness
icon: mdi:brightness-6
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index a9d6473df8a8f6a4341b62d8e74e0fbcb059c8ae..933e926025fe53816a1cce6d97869a7bc7504aef 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -1,16 +1,45 @@
light.office:
friendly_name: Office Lamp
+ icon: mdi:floor-lamp
light.erick_s_desk_lamp:
- icon: mdi:lightbulb-outline
-light.ceiling_fan_1:
- friendly_name: Ceiling Fan Front
-light.ceiling_fan_2:
- friendly_name: Ceiling Fan Rear
-light.master_bath_1:
- friendly_name: Vanity Left
-light.master_bath_2:
- friendly_name: Vanity Center
-light.master_bath_3:
- friendly_name: Vanity Right
-light.balcony:
- friendly_name: Sconce
+ icon: mdi:lamp
+light.balcony_left:
+ friendly_name: Left
+ icon: mdi:outdoor-lamp
+light.balcony_right:
+ friendly_name: Right
+ icon: mdi:outdoor-lamp
+light.living_room_endtable_left:
+ friendly_name: Endtable Left
+ icon: mdi:lamp
+light.living_room_endtable_right:
+ friendly_name: Endtable Right
+ icon: mdi:lamp
+light.living_room_left:
+ friendly_name: Flood Left
+ icon: mdi:spotlight
+light.living_room_center:
+ friendly_name: Flood Center
+ icon: mdi:spotlight
+light.living_room_right:
+ friendly_name: Flood Right
+ icon: mdi:spotlight
+light.nightstand_left:
+ icon: mdi:lamp
+light.nightstand_right:
+ icon: mdi:lamp
+light.entryway:
+ friendly_name: Flood
+ icon: mdi:spotlight
+light.kitchen_entrance:
+ friendly_name: Entrance
+ icon: mdi:spotlight
+light.den_left:
+ friendly_name: Flood Left
+ icon: mdi:spotlight
+light.den_right:
+ friendly_name: Flood Right
+ icon: mdi:spotlight
+light.dining_corner:
+ friendly_name: Dining Area
+ icon: mdi:lamp
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index 325e190df22f0a840eed042a20eb26e1ece72dc2..5e6b667092029d337fc0c0b3e0f49efae30dd2cf 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -4,48 +4,6 @@ sensor.kitchen_fluorescent_consumption:
sensor.lava_lamp_consumption:
friendly_name: Lava Lamp
icon: mdi:radiator
-sensor.living_room_alarm_battery_level:
- friendly_name: Living Room Smoke/CO
- icon: mdi:battery-outline
-sensor.master_bedroom_alarm_battery_level:
- friendly_name: Master Bedroom Smoke/CO
- icon: mdi:battery-outline
-sensor.front_door_battery_level:
- friendly_name: Front Door
- icon: mdi:battery-outline
-sensor.slider_battery_level:
- friendly_name: Slider
- icon: mdi:battery-outline
-sensor.master_bedroom_window_battery_level:
- friendly_name: Master Bedroom Window
- icon: mdi:battery-outline
-sensor.dining_area_window_battery_level:
- friendly_name: Dining Area Window
- icon: mdi:battery-outline
-sensor.office_window_battery_level:
- friendly_name: Office Window
- icon: mdi:battery-outline
-sensor.motion_sensor_above_slider_battery_level:
- friendly_name: Motion sensor over slider
- icon: mdi:battery-outline
-sensor.motion_sensor_over_utility_closet_battery_level:
- friendly_name: Motion sensor over utility closet
- icon: mdi:battery-outline
-sensor.kitchen_motion_sensor_battery_level:
- friendly_name: Kitchen
- icon: mdi:battery-outline
-sensor.office_motion_sensor_near_closet_battery_level:
- friendly_name: Office motion sensor near closet
- icon: mdi:battery-outline
-sensor.office_motion_sensor_far_wall_battery_level:
- friendly_name: Office motion sensor far wall
- icon: mdi:battery-outline
-sensor.office_cabinet_battery_level:
- friendly_name: Office cabinet
- icon: mdi:battery-outline
-sensor.green_keys_battery_level:
- friendly_name: Green keys
- icon: mdi:battery-outline
sensor.time:
friendly_name: Time (PT)
sensor.ups_status:
@@ -74,9 +32,22 @@ sensor.ups_nominal_output_power:
friendly_name: Nominal output power
sensor.ups_load_mean:
friendly_name: Load mean
-sensor.breaches_somethingexamplecom:
- friendly_name: something@example.com
- icon: mdi:email-open-outline
sensor.spare_outlet_consumption:
friendly_name: Christmas Tree
icon: mdi:pine-tree-box
+sensor.fireplace_consumption:
+ icon: mdi:fire
+sensor.forest_park_temperature:
+ friendly_name: ecobee
+sensor.forest_park_humidity:
+ friendly_name: ecobee
+sensor.master_bed_temperature:
+ friendly_name: Master Bedroom
+sensor.master_bedroom_closet_humidity:
+ friendly_name: Master Bedroom Closet
+ device_class: humidity
+ unit_of_measurement: '%'
+sensor.office_temperature:
+ friendly_name: Office (ecobee)
+sensor.den_temperature:
+ friendly_name: Den (ecobee)
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index 581a9382954b53e21bb8848207ca413da38c075c..19c2a3a265d81b12cc1983a7e91b8b42f35351f6 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -1,23 +1,24 @@
switch.kitchen:
icon: mdi:lightbulb-outline
switch.lava_lamp:
- icon: mdi:led-on
+ icon: mdi:lava-lamp
switch.wireless_charger:
icon: mdi:battery-charging
-switch.august_interior:
- friendly_name: Interior Bolt
- icon: mdi:key
-switch.august_keyed:
- friendly_name: Keyed Bolt
- icon: mdi:key
switch.kitchen_nightlight:
icon: mdi:theme-light-dark
-switch.alarm_status:
- friendly_name: Alarm Status indicator
- icon: mdi:security-home
switch.balcony_christmas_lights:
friendly_name: Christmas Lights
icon: mdi:led-outline
switch.christmas_tree:
friendly_name: Christmas Tree
icon: mdi:pine-tree
+switch.fireplace:
+ friendly_name: Fireplace
+ icon: mdi:fireplace
+switch.over_front_door:
+ icon: mdi:wall-sconce-flat
+switch.balcony_outlet:
+ icon: mdi:power-socket-us
+switch.garage_lights:
+ friendly_name: Garage Lights
+ icon: mdi:spotlight-beam
diff --git a/customizations/weather.yaml b/customizations/weather.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5c591e9cff4557c99395e4e8b4f758ed2f947be5
--- /dev/null
+++ b/customizations/weather.yaml
@@ -0,0 +1,2 @@
+weather.forest_park:
+ friendly_name: Weather
diff --git a/device-tracker.yaml b/device-tracker.yaml
index c99a62c731a4b1e309a18747fb3dc892033236dd..a285f70c3c166aa645e4cb2d34da4773e70bce9d 100644
--- a/device-tracker.yaml
+++ b/device-tracker.yaml
@@ -2,3 +2,11 @@
qos: 1
devices:
green_keys: smartthings/Green Keys/presence
+- platform: nmap_tracker
+ hosts: 192.168.1.0/24
+ home_interval: 5
+ exclude:
+ - !secret host_ip
+ - !secret secondary_pi_ip
+ new_device_defaults:
+ track_new_devices: false
diff --git a/groups.yaml b/groups.yaml
index fcf7acbd66b3b29a8d1368d9ada863120b3b488b..3d1812496058ffc28fca58b33594d89d73038459 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -1,134 +1,60 @@
-default_view:
- name: DEFAULT
- view: yes
- icon: mdi:home
- entities:
- - group.locks
- - group.master_bedroom
- - group.master_bathroom
- - group.living_room
- - group.dining_area
- - group.office
- - group.balcony
- - group.other
-sensor_view:
- name: Sensors
- view: yes
- icon: mdi:gauge
- entities:
- - group.temperature
- - group.motion_sensors
- - group.doors_windows
- - group.smoke_gas
- - group.power_consumption
- - group.presence
- - sun.sun
-status_view:
- name: Status
- view: yes
- icon: mdi:chip
- entities:
- - group.time_date
- - group.sensor_pi
- - group.sensor_apc
-media_view:
- name: Media
- view: yes
- icon: mdi:play-network
- entities:
- - media_player.apartment
- - media_player.common_area
- - media_player.everywhere
- - media_player.office
- - media_player.living_room
- - media_player.kitchen
- - media_player.nexus_player
- - media_player.bedroom_speaker
- - media_player.chromecastultra9699
-misc_view:
- name: Misc
- view: yes
- icon: mdi:power
- entities:
- - alarm_control_panel.shm
- - group.misc_misc
- - group.haveibeenpwned
- - group.sensor_battery_levels
master_bedroom:
name: Master Bedroom
entities:
- - light.nightstand
- - input_select.scene_master_bedroom
-master_bathroom:
- name: Master Bathroom
- entities:
- - light.master_bath_1
- - light.master_bath_2
- - light.master_bath_3
- - input_number.brightness_master_bath
- - input_select.scene_master_bath
+ - light.nightstand_left
+ - light.nightstand_right
living_room:
name: Living Room
entities:
- - light.endtable
- - light.corner_table
- - input_number.brightness_lr
- - input_select.scene_lr
-dining_area:
+ - light.living_room_endtable_left
+ - light.living_room_endtable_right
+ - light.living_room_left
+ - light.living_room_center
+ - light.living_room_right
+ - switch.fireplace
+den:
+ name: Den
+ entities:
+ - light.den_left
+ - light.den_right
+ - switch.lava_lamp
+kitchen:
name: Kitchen & Dining
entities:
- - switch.kitchen
- - light.ceiling_fan_1
- - light.ceiling_fan_2
- - input_number.brightness_da
- - input_select.scene_da
-ceiling_fan:
- name: Ceiling Fan
+ - light.kitchen_entrance
+ - light.dining_corner
+entryway:
+ name: Entryway
entities:
- - light.ceiling_fan_1
- - light.ceiling_fan_2
+ - light.entryway
office:
name: Office
entities:
- light.office
- light.erick_s_desk_lamp
- - switch.lava_lamp
- - input_select.scene_office
- - input_select.scene_ericks_desk_lamp
balcony:
name: Balcony
entities:
- - light.balcony
- - input_select.scene_balcony
- - switch.balcony_outlet
+ - light.balcony_left
+ - light.balcony_right
+garage:
+ name: Garage
+ entities:
+ - cover.garage_door
+ - switch.garage_lights
other:
name: Other
- control: hidden
entities:
- switch.wireless_charger
+ - switch.balcony_outlet
+ - switch.over_front_door
- scene.all_lights_off
-temperature:
- name: Temperature
- entities:
- - sensor.master_bedroom_window
- - sensor.slider
- - sensor.above_slider
- - sensor.above_utility_closet
- - sensor.front_door
- - sensor.dining_area_window
- - sensor.kitchen
- - sensor.office_window
- - sensor.office_near_closet
- - sensor.office_far_wall
- - sensor.office_cabinet
motion_sensors:
name: Motion Sensors
entities:
- - binary_sensor.lr_motion_sensor_over_slider
- - binary_sensor.lr_motion_sensor_over_utility_closet
- - binary_sensor.kitchen
- - binary_sensor.office_motion_sensor_over_closet
- - binary_sensor.office_motion_sensor_far_wall
+ - binary_sensor.common_area
+ - binary_sensor.office_motion_sensor
+ - binary_sensor.den_motion_sensor
doors_windows:
name: Doors & Windows
entities:
@@ -136,12 +62,6 @@ doors_windows:
- binary_sensor.front_door_motion
- binary_sensor.slider
- binary_sensor.slider_motion
- - binary_sensor.master_bedroom_window
- - binary_sensor.master_bedroom_window_motion
- - binary_sensor.dining_area_window
- - binary_sensor.dining_area_window_motion
- - binary_sensor.office_window
- - binary_sensor.office_window_motion
- binary_sensor.office_cabinet
- binary_sensor.office_cabinet_door_motion
smoke_gas:
@@ -154,79 +74,17 @@ smoke_gas:
power_consumption:
name: Power Consumption
entities:
- - sensor.kitchen_fluorescent_consumption
+ - sensor.fireplace_consumption
- sensor.lava_lamp_consumption
presence:
name: Presence
entities:
- - device_tracker.eh_nexus_6
- - device_tracker.cl_samsung_s5
- - device_tracker.cl_iphone_5
-time_date:
- name: Time & Date
- entities:
- - sensor.date
- - sensor.time
- - sensor.time_utc
-sensor_pi:
- name: Raspberry Pi
- entities:
- - sensor.cpu_use
- - sensor.disk_use
- - sensor.disk_use_varlog
- - sensor.ram_use
- - sensor.ram_free
- - sensor.swap_use
- - sensor.swap_free
- - sensor.last_boot
- - sensor.since_last_boot
- - sensor.received_eth1
- - sensor.sent_eth1
-sensor_apc:
- name: APC
- entities:
- - sensor.ups_status
- - sensor.ups_load
- - sensor.ups_time_left
- - sensor.ups_time_on_battery
- - sensor.ups_last_transfer
- - sensor.ups_transfer_count
- - sensor.ups_battery
- - sensor.ups_battery_voltage
- - sensor.ups_battery_nominal_voltage
- - sensor.ups_input_voltage
- - sensor.ups_nominal_input_voltage
- - sensor.ups_nominal_output_power
- - sensor.ups_load_mean
-misc_misc:
- name: Other
- control: hidden
- entities:
- - switch.alarm_status
- - switch.kitchen_nightlight
-haveibeenpwned:
- name: haveibeenpwned
- entities:
- - sensor.breaches_somethingexamplecom
-sensor_battery_levels:
- name: Sensor Battery Levels
- entities:
- - sensor.living_room_alarm_battery_level
- - sensor.master_bedroom_alarm_battery_level
- - sensor.front_door_battery_level
- - sensor.slider_battery_level
- - sensor.master_bedroom_window_battery_level
- - sensor.dining_area_window_battery_level
- - sensor.office_window_battery_level
- - sensor.motion_sensor_above_slider_battery_level
- - sensor.motion_sensor_over_utility_closet_battery_level
- - sensor.kitchen_motion_sensor_battery_level
- - sensor.office_motion_sensor_near_closet_battery_level
- - sensor.office_motion_sensor_far_wall_battery_level
- - sensor.office_cabinet_battery_level
- - sensor.green_keys_battery_level
-locks:
- name: Locks
+ - device_tracker.3c286d080a46
+ - device_tracker.28ff3c5525f0
+occupancy:
+ name: ecobee Occupancy
entities:
- - lock.keyed_bolt
- - lock.interior_bolt
+ - binary_sensor.forest_park_occupancy
+ - binary_sensor.master_bed_occupancy
+ - binary_sensor.office_occupancy
+ - binary_sensor.den_occupancy
diff --git a/hue-token-living-room.conf b/hue-token-living-room.conf
deleted file mode 100644
index 11affa856244fe77e9bcec0a263fbe2d1656e5fe..0000000000000000000000000000000000000000
--- a/hue-token-living-room.conf
+++ /dev/null
@@ -1 +0,0 @@
-{"192.168.1.245": {"username": ""}}
diff --git a/hue-token-office.conf b/hue-token-office.conf
deleted file mode 100644
index 55c94e9dd1c32cc7c617dd6a8f75bce4fca0d6ce..0000000000000000000000000000000000000000
--- a/hue-token-office.conf
+++ /dev/null
@@ -1 +0,0 @@
-{"192.168.1.231": {"username": ""}}
diff --git a/hue.yaml b/hue.yaml
deleted file mode 100644
index 49364b65586f66dae1a977cb5210de188d3957f2..0000000000000000000000000000000000000000
--- a/hue.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- host: 192.168.1.245
- allow_unreachable: true
- filename: hue-token-living-room.conf
-- host: 192.168.1.231
- allow_unreachable: true
- filename: hue-token-office.conf
diff --git a/input-numbers.yaml b/input-numbers.yaml
index f4f24c211d1f85fd1c7a6001114a5ae842c2c83d..a37ae2a947c03ec4c0d9bb166c16fd717dca44d1 100644
--- a/input-numbers.yaml
+++ b/input-numbers.yaml
@@ -1,18 +1,32 @@
-brightness_da:
+brightness_lr:
name: Brightness
initial: 1
min: 1
max: 255
step: 1
mode: slider
-brightness_lr:
+brightness_lr_ceiling:
+ name: Brightness
+ initial: 1
+ min: 1
+ max: 255
+ step: 1
+ mode: slider
+brightness_master_bedroom:
+ name: Brightness
+ initial: 1
+ min: 1
+ max: 255
+ step: 1
+ mode: slider
+brightness_den:
name: Brightness
initial: 1
min: 1
max: 255
step: 1
mode: slider
-brightness_master_bath:
+brightness_balcony:
name: Brightness
initial: 1
min: 1
diff --git a/input-selects.yaml b/input-selects.yaml
index b5068a02b9e769ff9077fa960650bd62e036c275..157c0d44e6fbc6a5a97aa6d629a14fc89b5e22f6 100644
--- a/input-selects.yaml
+++ b/input-selects.yaml
@@ -11,7 +11,7 @@ scene_balcony:
- Read
- Bright
scene_da:
- name: Dining Area Scene
+ name: Dining Area
icon: mdi:brightness-auto
initial: "-"
options:
@@ -22,7 +22,7 @@ scene_da:
- Relax
- Read
scene_ericks_desk_lamp:
- name: Desk Lamp Scene
+ name: Desk Lamp
icon: mdi:brightness-auto
initial: "-"
options:
@@ -31,7 +31,7 @@ scene_ericks_desk_lamp:
- Nightlight
- Relax
scene_lr:
- name: Scene
+ name: Endtable
icon: mdi:brightness-auto
initial: "-"
options:
@@ -41,18 +41,15 @@ scene_lr:
- Dimmed
- Relax
- Read
-scene_master_bath:
- name: Scene
+scene_lr_ceiling:
+ name: Flood
icon: mdi:brightness-auto
initial: "-"
options:
- "-"
- "Off"
- - "Nightlight (single)"
- Nightlight
- Dimmed
- - Relax
- - Read
- Bright
scene_master_bedroom:
name: Scene
@@ -66,7 +63,7 @@ scene_master_bedroom:
- Relax
- Read
scene_office:
- name: Office Lamp Scene
+ name: Table Lamp
icon: mdi:brightness-auto
initial: "-"
options:
@@ -76,3 +73,33 @@ scene_office:
- Dimmed
- Relax
- Read
+scene_entryway:
+ name: Scene
+ icon: mdi:brightness-auto
+ initial: "-"
+ options:
+ - "-"
+ - "Off"
+ - Nightlight
+ - Dimmed
+ - Bright
+scene_kitchen_entrance:
+ name: Entrance
+ icon: mdi:brightness-auto
+ initial: "-"
+ options:
+ - "-"
+ - "Off"
+ - Nightlight
+ - Dimmed
+ - Bright
+scene_den:
+ name: Scene
+ icon: mdi:brightness-auto
+ initial: "-"
+ options:
+ - "-"
+ - "Off"
+ - Nightlight
+ - Dimmed
+ - Bright
diff --git a/scenes/all-lights-off.yaml b/scenes/all-lights-off.yaml
index e6c1c7f71b4a09ad43a27b440fbee385a0051489..c97c55d46910d7cb3b97fe440170d57723a68d18 100644
--- a/scenes/all-lights-off.yaml
+++ b/scenes/all-lights-off.yaml
@@ -1,22 +1,28 @@
name: All Lights Off
entities:
- light.master_bath_1:
+ light.nightstand_left:
state: off
- light.master_bath_2:
+ light.nightstand_right:
state: off
- light.master_bath_3:
+ light.living_room_endtable_left:
state: off
- light.nightstand:
+ light.living_room_endtable_right:
state: off
- light.endtable:
+ light.living_room_left:
state: off
- light.corner_table:
+ light.living_room_center:
+ state: off
+ light.living_room_right:
state: off
switch.kitchen:
state: off
- light.ceiling_fan_1:
+ light.kitchen_entrance:
+ state: off
+ light.entryway:
+ state: off
+ light.den_left:
state: off
- light.ceiling_fan_2:
+ light.den_right:
state: off
light.office:
state: off
diff --git a/scenes/balcony-relax.yaml b/scenes/balcony-relax.yaml
index d3e71ab43c32fcfda2b7f6e262377b653dfb7760..1430a10220b7234749c3edb1a4e7abfc469aaed8 100644
--- a/scenes/balcony-relax.yaml
+++ b/scenes/balcony-relax.yaml
@@ -2,5 +2,5 @@ name: Balcony Relax
entities:
light.balcony:
state: on
- brightness: 144
+ brightness: 200
color_temp: 443
diff --git a/scenes/da-bright.yaml b/scenes/da-bright.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e298c8587e9a7fd65500f2a5b9460f3fc47d3c72
--- /dev/null
+++ b/scenes/da-bright.yaml
@@ -0,0 +1,6 @@
+name: DA Bright
+entities:
+ light.dining_corner:
+ state: on
+ brightness: 255
+ color_temp: 363
diff --git a/scenes/da-dimmed.yaml b/scenes/da-dimmed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..74b30e75683d5a0d478060fa78940fad648726f8
--- /dev/null
+++ b/scenes/da-dimmed.yaml
@@ -0,0 +1,6 @@
+name: DA Dimmed
+entities:
+ light.dining_corner:
+ state: on
+ brightness: 77
+ color_temp: 443
diff --git a/scenes/da-nightlight.yaml b/scenes/da-nightlight.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..90537426f8991d9637349abf6adceed1f9d54971
--- /dev/null
+++ b/scenes/da-nightlight.yaml
@@ -0,0 +1,6 @@
+name: DA Nightlight
+entities:
+ light.dining_corner:
+ state: on
+ brightness: 1
+ color_temp: 450
diff --git a/scenes/da-off.yaml b/scenes/da-off.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ed29abf50f0247f65c1817ec9c664a07e37b5324
--- /dev/null
+++ b/scenes/da-off.yaml
@@ -0,0 +1,4 @@
+name: DA Off
+entities:
+ light.dining_corner:
+ state: off
diff --git a/scenes/da-read.yaml b/scenes/da-read.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..759c73fa46b693e4af3843e98deaf83b096a3628
--- /dev/null
+++ b/scenes/da-read.yaml
@@ -0,0 +1,6 @@
+name: DA Read
+entities:
+ light.dining_corner:
+ state: on
+ brightness: 255
+ color_temp: 343
diff --git a/scenes/da-relax.yaml b/scenes/da-relax.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..edb27392d0a490eaaaa309eae8cc5ff254f75117
--- /dev/null
+++ b/scenes/da-relax.yaml
@@ -0,0 +1,6 @@
+name: DA Relax
+entities:
+ light.dining_corner:
+ state: on
+ brightness: 200
+ color_temp: 443
diff --git a/scenes/den-bright.yaml b/scenes/den-bright.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..62c7f079e5648e82386032aa22c77ce84b97d46c
--- /dev/null
+++ b/scenes/den-bright.yaml
@@ -0,0 +1,8 @@
+name: Den Bright
+entities:
+ light.den_left:
+ state: on
+ brightness: 255
+ light.den_right:
+ state: on
+ brightness: 255
diff --git a/scenes/den-dimmed.yaml b/scenes/den-dimmed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..74115b49302bfcc3163544f98cd091a628e5130b
--- /dev/null
+++ b/scenes/den-dimmed.yaml
@@ -0,0 +1,8 @@
+name: Den Dimmed
+entities:
+ light.den_left:
+ state: on
+ brightness: 77
+ light.den_right:
+ state: on
+ brightness: 77
diff --git a/scenes/den-nightlight.yaml b/scenes/den-nightlight.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1a93e83d71c079034c65a3b772557d59f76ad7d3
--- /dev/null
+++ b/scenes/den-nightlight.yaml
@@ -0,0 +1,8 @@
+name: Den Nightlight
+entities:
+ light.den_left:
+ state: on
+ brightness: 1
+ light.den_right:
+ state: on
+ brightness: 1
diff --git a/scenes/den-off.yaml b/scenes/den-off.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ec004448394b4f9a0383788827f2c8c606430e67
--- /dev/null
+++ b/scenes/den-off.yaml
@@ -0,0 +1,6 @@
+name: Den Off
+entities:
+ light.den_left:
+ state: off
+ light.den_right:
+ state: off
diff --git a/scenes/dining-area-bright.yaml b/scenes/dining-area-bright.yaml
deleted file mode 100644
index 6c1d1d1621b1b06f78f10e4188808160c17e7753..0000000000000000000000000000000000000000
--- a/scenes/dining-area-bright.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: DA Bright
-entities:
- light.ceiling_fan_1:
- state: on
- brightness: 255
- color_temp: 363
- light.ceiling_fan_2:
- state: on
- brightness: 255
- color_temp: 363
diff --git a/scenes/dining-area-concentrate.yaml b/scenes/dining-area-concentrate.yaml
deleted file mode 100644
index 33b6fcd839887005236ef3441ffe07003bfccb71..0000000000000000000000000000000000000000
--- a/scenes/dining-area-concentrate.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: DA Concentrate
-entities:
- light.ceiling_fan_1:
- state: on
- brightness: 255
- color_temp: 230
- light.ceiling_fan_2:
- state: on
- brightness: 255
- color_temp: 230
diff --git a/scenes/dining-area-dimmed.yaml b/scenes/dining-area-dimmed.yaml
deleted file mode 100644
index 6079d2eccf4cb28cfa428f47bb2df4c3c25d87c5..0000000000000000000000000000000000000000
--- a/scenes/dining-area-dimmed.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: DA Dimmed
-entities:
- light.ceiling_fan_1:
- state: on
- brightness: 77
- color_temp: 363
- light.ceiling_fan_2:
- state: on
- brightness: 77
- color_temp: 363
diff --git a/scenes/dining-area-nightlight.yaml b/scenes/dining-area-nightlight.yaml
deleted file mode 100644
index 2272e6d0a3df36cda99ecdf9d4d8065ded8e6519..0000000000000000000000000000000000000000
--- a/scenes/dining-area-nightlight.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: DA Nightlight
-entities:
- light.ceiling_fan_1:
- state: on
- brightness: 1
- color_temp: 450
- light.ceiling_fan_2:
- state: on
- brightness: 1
- color_temp: 450
diff --git a/scenes/dining-area-off.yaml b/scenes/dining-area-off.yaml
deleted file mode 100644
index 32cb76b8342c8d01b451de770d7b6680ba076474..0000000000000000000000000000000000000000
--- a/scenes/dining-area-off.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: DA Off
-entities:
- light.ceiling_fan_1:
- state: off
- light.ceiling_fan_2:
- state: off
diff --git a/scenes/dining-area-read.yaml b/scenes/dining-area-read.yaml
deleted file mode 100644
index c3b79e5e70718e8492904fece92c4c32c81c00fc..0000000000000000000000000000000000000000
--- a/scenes/dining-area-read.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: DA Read
-entities:
- light.ceiling_fan_1:
- state: on
- brightness: 255
- color_temp: 343
- light.ceiling_fan_2:
- state: on
- brightness: 255
- color_temp: 343
diff --git a/scenes/dining-area-relax.yaml b/scenes/dining-area-relax.yaml
deleted file mode 100644
index a43363131f09abe04e4146efecf00fed24157217..0000000000000000000000000000000000000000
--- a/scenes/dining-area-relax.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: DA Relax
-entities:
- light.ceiling_fan_1:
- state: on
- brightness: 144
- color_temp: 443
- light.ceiling_fan_2:
- state: on
- brightness: 144
- color_temp: 443
diff --git a/scenes/entryway-bright.yaml b/scenes/entryway-bright.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a9a954fd4ae236e2a9cc1e7375553c41ebd2d328
--- /dev/null
+++ b/scenes/entryway-bright.yaml
@@ -0,0 +1,5 @@
+name: Entryway Bright
+entities:
+ light.entryway:
+ state: on
+ brightness: 255
diff --git a/scenes/entryway-dimmed.yaml b/scenes/entryway-dimmed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4dd3f77de93fdb6c1460a29807316ab1f1037aff
--- /dev/null
+++ b/scenes/entryway-dimmed.yaml
@@ -0,0 +1,5 @@
+name: Entryway Dimmed
+entities:
+ light.entryway:
+ state: on
+ brightness: 77
diff --git a/scenes/entryway-nightlight.yaml b/scenes/entryway-nightlight.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9e3ba3f0ccf9ddf7c2c3e35b18035fa803cd718d
--- /dev/null
+++ b/scenes/entryway-nightlight.yaml
@@ -0,0 +1,5 @@
+name: Entryway Nightlight
+entities:
+ light.entryway:
+ state: on
+ brightness: 1
diff --git a/scenes/entryway-off.yaml b/scenes/entryway-off.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b7b5f6ba47aed394e84c2dcb8abad5d65624b478
--- /dev/null
+++ b/scenes/entryway-off.yaml
@@ -0,0 +1,4 @@
+name: Entryway Off
+entities:
+ light.entryway:
+ state: off
diff --git a/scenes/ericks-desk-lamp-relax.yaml b/scenes/ericks-desk-lamp-relax.yaml
index 84677649b107bb1aedb04adf5cca0113afc7baa5..a8a0a588f6fb203fd688718a9dad750e2a407464 100644
--- a/scenes/ericks-desk-lamp-relax.yaml
+++ b/scenes/ericks-desk-lamp-relax.yaml
@@ -2,5 +2,5 @@ name: Erick's Desk Lamp Relax
entities:
light.erick_s_desk_lamp:
state: on
- brightness: 144
+ brightness: 200
color_temp: 443
diff --git a/scenes/kitchen-entrance-bright.yaml b/scenes/kitchen-entrance-bright.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2bbff8c55613028d92f97a6153b9131c2d60a62a
--- /dev/null
+++ b/scenes/kitchen-entrance-bright.yaml
@@ -0,0 +1,5 @@
+name: Kitchen Entrance Bright
+entities:
+ light.kitchen_entrance:
+ state: on
+ brightness: 255
diff --git a/scenes/kitchen-entrance-dimmed.yaml b/scenes/kitchen-entrance-dimmed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..91cc847adb0bc92c889ed42bf1d9250c80a4e71a
--- /dev/null
+++ b/scenes/kitchen-entrance-dimmed.yaml
@@ -0,0 +1,5 @@
+name: Kitchen Entrance Dimmed
+entities:
+ light.kitchen_entrance:
+ state: on
+ brightness: 77
diff --git a/scenes/kitchen-entrance-nightlight.yaml b/scenes/kitchen-entrance-nightlight.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..690028d3fca62d9c95f73a5aac39e775f6654ea1
--- /dev/null
+++ b/scenes/kitchen-entrance-nightlight.yaml
@@ -0,0 +1,5 @@
+name: Kitchen Entrance Nightlight
+entities:
+ light.kitchen_entrance:
+ state: on
+ brightness: 1
diff --git a/scenes/kitchen-entrance-off.yaml b/scenes/kitchen-entrance-off.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cb472cd68dda75f39c14928cf880b266dc7ea9a5
--- /dev/null
+++ b/scenes/kitchen-entrance-off.yaml
@@ -0,0 +1,4 @@
+name: Kitchen Entrance Off
+entities:
+ light.kitchen_entrance:
+ state: off
diff --git a/scenes/living-room-bright.yaml b/scenes/living-room-bright.yaml
index 6a5bd5e4ddc927a893f98d147ba7c54642d11951..9a3fb7c67e6efe232b6d1c3ead0a89f8c09d64e8 100644
--- a/scenes/living-room-bright.yaml
+++ b/scenes/living-room-bright.yaml
@@ -1,10 +1,10 @@
name: LR Bright
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: on
brightness: 255
color_temp: 363
- light.corner_table:
+ light.living_room_endtable_right:
state: on
brightness: 255
color_temp: 363
diff --git a/scenes/living-room-concentrate.yaml b/scenes/living-room-concentrate.yaml
index 27bcc2331194950e28fa7408f01e0cbd0b9861d8..6c72c67f163fbd45247a5dc3f2eddf2e4c70b4f4 100644
--- a/scenes/living-room-concentrate.yaml
+++ b/scenes/living-room-concentrate.yaml
@@ -1,10 +1,10 @@
name: LR Concentrate
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: on
brightness: 255
color_temp: 230
- light.corner_table:
+ light.living_room_endtable_right:
state: on
brightness: 255
color_temp: 230
diff --git a/scenes/living-room-dimmed.yaml b/scenes/living-room-dimmed.yaml
index a7de8702a87d63d41bd7638ce598e4a30aaa4c23..cd2729cd6cb36d7b6daef4e8c8140df2cc915a20 100644
--- a/scenes/living-room-dimmed.yaml
+++ b/scenes/living-room-dimmed.yaml
@@ -1,10 +1,10 @@
name: LR Dimmed
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: on
brightness: 77
color_temp: 443
- light.corner_table:
+ light.living_room_endtable_right:
state: on
brightness: 77
color_temp: 443
diff --git a/scenes/living-room-nightlight.yaml b/scenes/living-room-nightlight.yaml
index 8dca67a2179c6cb1dd2bc5d9c5e33621113af3e0..7461ef51a3c1fd7a0d3e61886689f262046be4e9 100644
--- a/scenes/living-room-nightlight.yaml
+++ b/scenes/living-room-nightlight.yaml
@@ -1,10 +1,10 @@
name: LR Nightlight
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: on
brightness: 1
color_temp: 450
- light.corner_table:
+ light.living_room_endtable_right:
state: on
brightness: 1
color_temp: 450
diff --git a/scenes/living-room-off.yaml b/scenes/living-room-off.yaml
index 48f2ec006bea9ff788ccae452cf1612d0180bdb7..fb259442bf3e9e54114dc0ee47123c802f5c3eaa 100644
--- a/scenes/living-room-off.yaml
+++ b/scenes/living-room-off.yaml
@@ -1,6 +1,6 @@
name: LR Off
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: off
- light.corner_table:
+ light.living_room_endtable_right:
state: off
diff --git a/scenes/living-room-read.yaml b/scenes/living-room-read.yaml
index 32bf0dce26b5b39f83393b428ddde176089c9df0..b45d260d55f866d186465241fb4ac33adefa2a6b 100644
--- a/scenes/living-room-read.yaml
+++ b/scenes/living-room-read.yaml
@@ -1,10 +1,10 @@
name: LR Read
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: on
brightness: 255
color_temp: 343
- light.corner_table:
+ light.living_room_endtable_right:
state: on
brightness: 255
color_temp: 343
diff --git a/scenes/living-room-relax.yaml b/scenes/living-room-relax.yaml
index f77bbc4ad072129c4236ebf89112c0d98897009f..0ff3028ccc2c6adf2271ba9e05333dd7e83b757c 100644
--- a/scenes/living-room-relax.yaml
+++ b/scenes/living-room-relax.yaml
@@ -1,10 +1,10 @@
name: LR Relax
entities:
- light.endtable:
+ light.living_room_endtable_left:
state: on
- brightness: 144
+ brightness: 200
color_temp: 443
- light.corner_table:
+ light.living_room_endtable_right:
state: on
- brightness: 144
+ brightness: 200
color_temp: 443
diff --git a/scenes/lr-ceiling-bright.yaml b/scenes/lr-ceiling-bright.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c37c25bd14ea188de2c2a07b98a0de42e539e5a9
--- /dev/null
+++ b/scenes/lr-ceiling-bright.yaml
@@ -0,0 +1,11 @@
+name: LR Ceiling Bright
+entities:
+ light.living_room_left:
+ state: on
+ brightness: 255
+ light.living_room_center:
+ state: on
+ brightness: 255
+ light.living_room_right:
+ state: on
+ brightness: 255
diff --git a/scenes/lr-ceiling-dimmed.yaml b/scenes/lr-ceiling-dimmed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ded5b604995702ad9146fce84c554637ee346dca
--- /dev/null
+++ b/scenes/lr-ceiling-dimmed.yaml
@@ -0,0 +1,11 @@
+name: LR Ceiling Dimmed
+entities:
+ light.living_room_left:
+ state: on
+ brightness: 77
+ light.living_room_center:
+ state: on
+ brightness: 77
+ light.living_room_right:
+ state: on
+ brightness: 77
diff --git a/scenes/lr-ceiling-nightlight.yaml b/scenes/lr-ceiling-nightlight.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3ab510b55fd9032881ebdbf1fe69031272d8ba55
--- /dev/null
+++ b/scenes/lr-ceiling-nightlight.yaml
@@ -0,0 +1,11 @@
+name: LR Ceiling Nightlight
+entities:
+ light.living_room_left:
+ state: on
+ brightness: 1
+ light.living_room_center:
+ state: on
+ brightness: 1
+ light.living_room_right:
+ state: on
+ brightness: 1
diff --git a/scenes/lr-ceiling-off.yaml b/scenes/lr-ceiling-off.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c9107e4768f048ae132dbec2ba7e3a73963325e3
--- /dev/null
+++ b/scenes/lr-ceiling-off.yaml
@@ -0,0 +1,8 @@
+name: LR Ceiling Off
+entities:
+ light.living_room_left:
+ state: off
+ light.living_room_center:
+ state: off
+ light.living_room_right:
+ state: off
diff --git a/scenes/master-bath-bright.yaml b/scenes/master-bath-bright.yaml
deleted file mode 100644
index 99ad20dc320b66e71e768e744bb3fa77b307051f..0000000000000000000000000000000000000000
--- a/scenes/master-bath-bright.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Master Bath Bright
-entities:
- light.master_bath_1:
- state: on
- brightness: 255
- color_temp: 363
- light.master_bath_2:
- state: on
- brightness: 255
- color_temp: 363
- light.master_bath_3:
- state: on
- brightness: 255
- color_temp: 363
diff --git a/scenes/master-bath-concentrate.yaml b/scenes/master-bath-concentrate.yaml
deleted file mode 100644
index a51eb4aa1879bf58970a07ea5eb959464d40de14..0000000000000000000000000000000000000000
--- a/scenes/master-bath-concentrate.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Master Bath Concentrate
-entities:
- light.master_bath_1:
- state: on
- brightness: 255
- color_temp: 230
- light.master_bath_2:
- state: on
- brightness: 255
- color_temp: 230
- light.master_bath_3:
- state: on
- brightness: 255
- color_temp: 230
diff --git a/scenes/master-bath-dimmed.yaml b/scenes/master-bath-dimmed.yaml
deleted file mode 100644
index 0b5969116269ff36faf4621a738520187929d09b..0000000000000000000000000000000000000000
--- a/scenes/master-bath-dimmed.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Master Bath Dimmed
-entities:
- light.master_bath_1:
- state: on
- brightness: 77
- color_temp: 443
- light.master_bath_2:
- state: on
- brightness: 77
- color_temp: 443
- light.master_bath_3:
- state: on
- brightness: 77
- color_temp: 443
diff --git a/scenes/master-bath-nightlight.yaml b/scenes/master-bath-nightlight.yaml
deleted file mode 100644
index 208af2d9c2bdfa7ed3bd2cb1c21079c1774cf8f3..0000000000000000000000000000000000000000
--- a/scenes/master-bath-nightlight.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Master Bath Nightlight
-entities:
- light.master_bath_1:
- state: on
- brightness: 1
- color_temp: 450
- light.master_bath_2:
- state: on
- brightness: 1
- color_temp: 450
- light.master_bath_3:
- state: on
- brightness: 1
- color_temp: 450
diff --git a/scenes/master-bath-off.yaml b/scenes/master-bath-off.yaml
deleted file mode 100644
index f7fb8ef2e1cb1d44c47b69c11273e33719425101..0000000000000000000000000000000000000000
--- a/scenes/master-bath-off.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Master Bath Off
-entities:
- light.master_bath_1:
- state: off
- light.master_bath_2:
- state: off
- light.master_bath_3:
- state: off
diff --git a/scenes/master-bath-read.yaml b/scenes/master-bath-read.yaml
deleted file mode 100644
index ba0b5673e7731332d3efc88443e1e3bc95824ace..0000000000000000000000000000000000000000
--- a/scenes/master-bath-read.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Master Bath Read
-entities:
- light.master_bath_1:
- state: on
- brightness: 255
- color_temp: 343
- light.master_bath_2:
- state: on
- brightness: 255
- color_temp: 343
- light.master_bath_3:
- state: on
- brightness: 255
- color_temp: 343
diff --git a/scenes/master-bath-relax.yaml b/scenes/master-bath-relax.yaml
deleted file mode 100644
index 20f2a33545c7c95fc59e9b410a4c206a696067d3..0000000000000000000000000000000000000000
--- a/scenes/master-bath-relax.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Master Bath Relax
-entities:
- light.master_bath_1:
- state: on
- brightness: 144
- color_temp: 443
- light.master_bath_2:
- state: on
- brightness: 144
- color_temp: 443
- light.master_bath_3:
- state: on
- brightness: 144
- color_temp: 443
diff --git a/scenes/master-bath-single-nightlight.yaml b/scenes/master-bath-single-nightlight.yaml
deleted file mode 100644
index dc40c1a997ff2f31b89d41b5086fb04115568a85..0000000000000000000000000000000000000000
--- a/scenes/master-bath-single-nightlight.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Master Bath Single Nightlight
-entities:
- light.master_bath_1:
- state: off
- light.master_bath_2:
- state: on
- brightness: 1
- color_temp: 450
- light.master_bath_3:
- state: off
- # automation.brightness_master_bath_sync:
- # state: off
diff --git a/scenes/master-bedroom-bright.yaml b/scenes/master-bedroom-bright.yaml
index 402bf9d48fd370f16ff943f4342fdcd78d5f3eed..2120e5d8c000c89a0d94fe9426866fd7c4f401d7 100644
--- a/scenes/master-bedroom-bright.yaml
+++ b/scenes/master-bedroom-bright.yaml
@@ -1,6 +1,10 @@
name: Master Bedroom Bright
entities:
- light.nightstand:
+ light.nightstand_left:
+ state: on
+ brightness: 255
+ color_temp: 363
+ light.nightstand_right:
state: on
brightness: 255
color_temp: 363
diff --git a/scenes/master-bedroom-concentrate.yaml b/scenes/master-bedroom-concentrate.yaml
index e52a068865b7faf767826966442a9f4c116e3a6a..19979916820e2ef37945eafaeb4f4d360ec31363 100644
--- a/scenes/master-bedroom-concentrate.yaml
+++ b/scenes/master-bedroom-concentrate.yaml
@@ -1,6 +1,10 @@
name: Master Bedroom Concentrate
entities:
- light.nightstand:
+ light.nightstand_left:
+ state: on
+ brightness: 255
+ color_temp: 230
+ light.nightstand_right:
state: on
brightness: 255
color_temp: 230
diff --git a/scenes/master-bedroom-dimmed.yaml b/scenes/master-bedroom-dimmed.yaml
index 018e0d4980c050472bb091b97c2f5b32d456bca3..49e14abf1313f3fc50ae0087b64c66f661e3b115 100644
--- a/scenes/master-bedroom-dimmed.yaml
+++ b/scenes/master-bedroom-dimmed.yaml
@@ -1,6 +1,10 @@
name: Master Bedroom Dimmed
entities:
- light.nightstand:
+ light.nightstand_left:
+ state: on
+ brightness: 77
+ color_temp: 443
+ light.nightstand_right:
state: on
brightness: 77
color_temp: 443
diff --git a/scenes/master-bedroom-nightlight.yaml b/scenes/master-bedroom-nightlight.yaml
index 7a29e26f113be5d70f0cdcdb018f2de3552cb94f..9ee3a01051ea6aad9b08e7dc06495e4c66befde3 100644
--- a/scenes/master-bedroom-nightlight.yaml
+++ b/scenes/master-bedroom-nightlight.yaml
@@ -1,6 +1,10 @@
name: Master Bedroom Nightlight
entities:
- light.nightstand:
+ light.nightstand_left:
+ state: on
+ brightness: 1
+ color_temp: 450
+ light.nightstand_right:
state: on
brightness: 1
color_temp: 450
diff --git a/scenes/master-bedroom-off.yaml b/scenes/master-bedroom-off.yaml
index 96ce7a35260495b94c89d3061e3e53272ebe9d32..1eaeddea8b1593cc160ab7c434e91f1e62291955 100644
--- a/scenes/master-bedroom-off.yaml
+++ b/scenes/master-bedroom-off.yaml
@@ -1,4 +1,6 @@
name: Master Bedroom Off
entities:
- light.nightstand:
+ light.nightstand_left:
+ state: off
+ light.nightstand_right:
state: off
diff --git a/scenes/master-bedroom-read.yaml b/scenes/master-bedroom-read.yaml
index cb4ba6fc71b465040d66fcb09d1bead9560d7d12..bb3d575e58f41f679410d73c5ef849a29fbb6acb 100644
--- a/scenes/master-bedroom-read.yaml
+++ b/scenes/master-bedroom-read.yaml
@@ -1,6 +1,10 @@
name: Master Bedroom Read
entities:
- light.nightstand:
+ light.nightstand_left:
+ state: on
+ brightness: 255
+ color_temp: 343
+ light.nightstand_right:
state: on
brightness: 255
color_temp: 343
diff --git a/scenes/master-bedroom-relax.yaml b/scenes/master-bedroom-relax.yaml
index 869e4b84a84c4082f74fee966c673d83a80f86e1..534a5bfbc165804e6dcb19c8c88c8072796abf2d 100644
--- a/scenes/master-bedroom-relax.yaml
+++ b/scenes/master-bedroom-relax.yaml
@@ -1,6 +1,10 @@
name: Master Bedroom Relax
entities:
- light.nightstand:
+ light.nightstand_left:
state: on
- brightness: 144
+ brightness: 200
+ color_temp: 443
+ light.nightstand_right:
+ state: on
+ brightness: 200
color_temp: 443
diff --git a/scenes/office-relax.yaml b/scenes/office-relax.yaml
index c3f4d725c985d690286bf3de3ee1ae8fc4388bcb..5e983b08904419ffe0b1923e19d2151152b704e6 100644
--- a/scenes/office-relax.yaml
+++ b/scenes/office-relax.yaml
@@ -2,5 +2,5 @@ name: Office Relax
entities:
light.office:
state: on
- brightness: 144
+ brightness: 200
color_temp: 443
diff --git a/scripts.yaml b/scripts.yaml
index c1c788427be3f2d1cc66749476a48a272591d69e..742d71962cb82b0221910cc04d42c71f63fcd4ba 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -46,76 +46,65 @@ office_lights_timeout:
entity_id:
- light.office
- light.erick_s_desk_lamp
- - service: switch.turn_off
- data:
- entity_id: switch.lava_lamp
-# Living Room lights timeout
-living_room_lights_set_timeout:
- alias: "Set timeout for living room lights"
+# Den lights timeout
+den_lights_set_timeout:
+ alias: "Set timeout for den lights"
sequence:
# Cancel ev. old timers
- service: script.turn_off
data:
- entity_id: script.living_room_lights_timeout
+ entity_id: script.den_lights_timeout
# Set new timer
- service: script.turn_on
data:
- entity_id: script.living_room_lights_timeout
+ entity_id: script.den_lights_timeout
-living_room_lights_timeout:
- alias: "Turn off living room lights after two hours of inactivity"
+den_lights_timeout:
+ alias: "Turn off den lights after one hour of inactivity"
sequence:
- delay:
- hours: 2
+ hours: 1
- service: light.turn_off
data:
entity_id:
- - light.endtable
- - light.corner_table
+ - light.den_left
+ - light.den_right
+ - service: switch.turn_off
+ data:
+ entity_id: switch.lava_lamp
-# Dining Area lights timeout
-dining_area_lights_set_timeout:
- alias: "Set timeout for dining area lights"
+# Common Area timeout
+common_area_set_timeout:
+ alias: "Set timeout for common area items"
sequence:
# Cancel ev. old timers
- service: script.turn_off
data:
- entity_id: script.dining_area_lights_timeout
+ entity_id: script.common_area_timeout
# Set new timer
- service: script.turn_on
data:
- entity_id: script.dining_area_lights_timeout
+ entity_id: script.common_area_timeout
-dining_area_lights_timeout:
- alias: "Turn off dining area lights after two hours of inactivity"
+common_area_timeout:
+ alias: "Turn off common area items after two hours of inactivity"
sequence:
- delay:
hours: 2
- service: light.turn_off
data:
entity_id:
- - light.ceiling_fan_1
- - light.ceiling_fan_2
-
-# Kitchen light timeout
-kitchen_light_set_timeout:
- alias: "Set timeout for kitchen light"
- sequence:
- # Cancel ev. old timers
- - service: script.turn_off
- data:
- entity_id: script.kitchen_light_timeout
- # Set new timer
- - service: script.turn_on
- data:
- entity_id: script.kitchen_light_timeout
-
-kitchen_light_timeout:
- alias: "Turn off kitchen light after 15 minutes of inactivity"
- sequence:
- - delay:
- minutes: 15
+ - light.living_room_endtable_left
+ - light.living_room_endtable_right
+ - light.living_room_left
+ - light.living_room_center
+ - light.living_room_right
+ - light.kitchen_entrance
+ - light.entryway
+ - light.dining_corner
- service: switch.turn_off
data:
- entity_id: switch.kitchen
+ entity_id:
+ - switch.fireplace
+ - switch.over_front_door
diff --git a/secrets.yaml b/secrets.yaml
index 0b98c127421ffa42c53e0087f68e06687a4f7e54..5b346bcb497faf71b54aae147884f5a201a4adfe 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -2,8 +2,6 @@ host_ip: 127.0.0.1
api_password: password
latitude: 0
longitude: 0
-asus_user: asus
-asus_key: /home/pi/.ssh/id_rsa
gravatar_erick: something@example.com
gravatar_chris: something@example.com
gravatar_chris_2: something@example.com
@@ -13,7 +11,11 @@ wemo_kitchen_ip: 127.0.0.1
pi_hole_host: 127.0.0.1
pi_hole_backup_host: 127.0.0.1
pi_hole_admin: 127.0.0.1
-monit_admin: 'https://127.0.0.1:2812/'
-mattermost_webhook: http://127.0.0.1
+monit_admin: https://127.0.0.1:2812/
+mattermost_webhook: https://127.0.0.1
august_user: something@example.com
august_pass: password
+secondary_pi_ip: 127.0.0.1
+myq_user: something@example.com
+myq_pass: password
+ecobee_key: abcdef0123456789
diff --git a/sensors/apcupsd.yaml b/sensors/apcupsd.yaml
index 7566d941564783a759094fbf4ff476ac60c338ad..c4c54fe95381dcf20e2b2eaebb61d9d3ba149972 100644
--- a/sensors/apcupsd.yaml
+++ b/sensors/apcupsd.yaml
@@ -3,11 +3,6 @@ resources:
- bcharge
- linev
- battv
- - loadpct
- - nominv
- - nombattv
- - nompower
- - numxfers
- status
- timeleft
- tonbatt
diff --git a/sensors/battery-above-slider.yaml b/sensors/battery-above-slider.yaml
deleted file mode 100644
index 277fe8816b27f5dd5a3b4054830044ba3fc5aa58..0000000000000000000000000000000000000000
--- a/sensors/battery-above-slider.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/LR Motion Sensor over Slider/battery"
-name: "Motion sensor above slider battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-above-utility-closet.yaml b/sensors/battery-above-utility-closet.yaml
deleted file mode 100644
index 53e10610a1c00fe6f132c9d6693b57cb76c5d351..0000000000000000000000000000000000000000
--- a/sensors/battery-above-utility-closet.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/LR Motion Sensor over Utility Closet/battery"
-name: "Motion sensor over utility closet battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-dining-area-window.yaml b/sensors/battery-dining-area-window.yaml
deleted file mode 100644
index cf2f8e9a6733e4452500917d9b36d5ec4d352ea2..0000000000000000000000000000000000000000
--- a/sensors/battery-dining-area-window.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Window/battery"
-name: "Dining Area Window battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-front-door.yaml b/sensors/battery-front-door.yaml
deleted file mode 100644
index 0b34b0d281ed1c3d9daa158c4f8c9dda5fe7adad..0000000000000000000000000000000000000000
--- a/sensors/battery-front-door.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Front Door/battery"
-name: "Front Door battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-green-keys.yaml b/sensors/battery-green-keys.yaml
deleted file mode 100644
index 9189d09a705d74fb49c2f450a4b023cb661a2846..0000000000000000000000000000000000000000
--- a/sensors/battery-green-keys.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Green Keys/battery"
-name: "Green Keys battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-kitchen.yaml b/sensors/battery-kitchen.yaml
deleted file mode 100644
index 45aae5a9af6d89311a8b4377837a7d1464617adc..0000000000000000000000000000000000000000
--- a/sensors/battery-kitchen.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Motion Sensor near cabinets/battery"
-name: "Kitchen motion sensor battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-living-room-alarm.yaml b/sensors/battery-living-room-alarm.yaml
deleted file mode 100644
index fed721cafd0c136dba0e20b781e750123c826c8b..0000000000000000000000000000000000000000
--- a/sensors/battery-living-room-alarm.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Living Room Alarm/battery"
-name: "Living Room Alarm battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-master-bedroom-alarm.yaml b/sensors/battery-master-bedroom-alarm.yaml
deleted file mode 100644
index 14c5991a36e601dcbc5d6c2979d4d5e13b82cc5c..0000000000000000000000000000000000000000
--- a/sensors/battery-master-bedroom-alarm.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Master Bedroom Alarm/battery"
-name: "Master Bedroom Alarm battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-master-bedroom-window.yaml b/sensors/battery-master-bedroom-window.yaml
deleted file mode 100644
index 960d025d1025321018bcb315c377cdc2b581dbb3..0000000000000000000000000000000000000000
--- a/sensors/battery-master-bedroom-window.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Master Bedroom Window/battery"
-name: "Master Bedroom Window battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-office-cabinet.yaml b/sensors/battery-office-cabinet.yaml
deleted file mode 100644
index 5847fada68ca6c2534cb57bf17e42855315413e4..0000000000000000000000000000000000000000
--- a/sensors/battery-office-cabinet.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Cabinet/battery"
-name: "Office Cabinet battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-office-far-wall.yaml b/sensors/battery-office-far-wall.yaml
deleted file mode 100644
index 4907b8ba7012f87177a5dae538aa5408a212dbb6..0000000000000000000000000000000000000000
--- a/sensors/battery-office-far-wall.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Motion Sensor Far Wall/battery"
-name: "Office Motion Sensor Far Wall battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-office-near-closet.yaml b/sensors/battery-office-near-closet.yaml
deleted file mode 100644
index aaa8be2ffe5069d1d03985f904b7a4e615a0c5cc..0000000000000000000000000000000000000000
--- a/sensors/battery-office-near-closet.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Motion Sensor over Closet/battery"
-name: "Office Motion Sensor near closet battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-office-window.yaml b/sensors/battery-office-window.yaml
deleted file mode 100644
index 41485d0ebc372db77dfae66d6370a28b316b99c2..0000000000000000000000000000000000000000
--- a/sensors/battery-office-window.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Window/battery"
-name: "Office Window battery level"
-unit_of_measurement: "%"
diff --git a/sensors/battery-slider.yaml b/sensors/battery-slider.yaml
deleted file mode 100644
index 4f2e09c3089c1687566be70bdb5739609b5053c0..0000000000000000000000000000000000000000
--- a/sensors/battery-slider.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Slider/battery"
-name: "Slider battery level"
-unit_of_measurement: "%"
diff --git a/sensors/cpuspeed.yaml b/sensors/cpuspeed.yaml
deleted file mode 100644
index 3469f7811863b2587a0008f0713ad41ecc0bc521..0000000000000000000000000000000000000000
--- a/sensors/cpuspeed.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-platform: cpuspeed
-name: CPU
diff --git a/sensors/haveibeenpwned.yaml b/sensors/haveibeenpwned.yaml
deleted file mode 100644
index e59c9df92e185fde51e7cfd63d29b1c93bbca7c5..0000000000000000000000000000000000000000
--- a/sensors/haveibeenpwned.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-platform: haveibeenpwned
-email:
- - something@example.com
diff --git a/sensors/humidity-master-bedroom-closet.yaml b/sensors/humidity-master-bedroom-closet.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d566edc15db8fad28ece072cbeaf54a010fcbeb3
--- /dev/null
+++ b/sensors/humidity-master-bedroom-closet.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Master Bedroom Closet/humidity"
+name: "Master Bedroom Closet Humidity"
+device_class: humidity
diff --git a/sensors/illuminance-master-bedroom-closet.yaml b/sensors/illuminance-master-bedroom-closet.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..016a07d965279bddcdb0453010842209aa961dcc
--- /dev/null
+++ b/sensors/illuminance-master-bedroom-closet.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Master Bedroom Closet/illuminance"
+name: "Master Bedroom Closet Illuminance"
+device_class: illuminance
diff --git a/sensors/nut-upsd.yaml b/sensors/nut-upsd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..49c0cfa8a12d16115b2b8c7214c764a054e3ab2f
--- /dev/null
+++ b/sensors/nut-upsd.yaml
@@ -0,0 +1,10 @@
+platform: nut
+host: 192.168.1.220
+port: 3493
+username: hass
+password: toaster12
+resources:
+ - ups.load
+ - ups.realpower.nominal
+ - input.voltage
+ - battery.runtime
\ No newline at end of file
diff --git a/sensors/power-fireplace.yaml b/sensors/power-fireplace.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9d3d27dd8169117d09c7d4bdfe52e642f822e88b
--- /dev/null
+++ b/sensors/power-fireplace.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Fireplace/power"
+name: "Fireplace Consumption"
+unit_of_measurement: "W"
diff --git a/sensors/power-kitchen-light.yaml b/sensors/power-kitchen-light.yaml
deleted file mode 100644
index 58dc6ed917de317fbd16fc11260ee9147c0340d6..0000000000000000000000000000000000000000
--- a/sensors/power-kitchen-light.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Kitchen/power"
-name: "Kitchen Fluorescent Consumption"
-unit_of_measurement: "W"
diff --git a/sensors/power-spare-outlet.yaml b/sensors/power-spare-outlet.yaml
deleted file mode 100644
index 181e6f0770d50d0108eac9a36b97c74ddde10c59..0000000000000000000000000000000000000000
--- a/sensors/power-spare-outlet.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Spare Outlet/power"
-name: "Spare Outlet Consumption"
-unit_of_measurement: "W"
diff --git a/sensors/statistics-ups-load.yaml b/sensors/statistics-ups-load.yaml
deleted file mode 100644
index c7c85a03ae8a2fb1b6c982e6f19b0ac2229a0092..0000000000000000000000000000000000000000
--- a/sensors/statistics-ups-load.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-platform: statistics
-name: UPS Load
-entity_id: sensor.ups_load
diff --git a/sensors/systemmonitor.yaml b/sensors/systemmonitor.yaml
deleted file mode 100644
index 7e708990d994f100614a7b769c3be2222f413273..0000000000000000000000000000000000000000
--- a/sensors/systemmonitor.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-platform: systemmonitor
-resources:
- - type: disk_use_percent
- arg: /
- - type: disk_use_percent
- arg: /var/log
- - type: memory_use_percent
- - type: memory_use
- - type: memory_free
- - type: processor_use
- - type: swap_use_percent
- - type: swap_use
- - type: swap_free
- - type: last_boot
- - type: network_in
- arg: eth0
- - type: network_out
- arg: eth0
- - type: packets_in
- arg: eth0
- - type: packets_out
- arg: eth0
- - type: ipv4_address
- arg: eth0
- - type: ipv6_address
- arg: eth0
- - type: network_in
- arg: eth1
- - type: network_out
- arg: eth1
- - type: packets_in
- arg: eth1
- - type: packets_out
- arg: eth1
- - type: ipv4_address
- arg: eth1
- - type: ipv6_address
- arg: eth1
diff --git a/sensors/temperature-above-slider.yaml b/sensors/temperature-above-slider.yaml
deleted file mode 100644
index 4021b85976a81f9e17fa7b5ab84c671e78f9ca5f..0000000000000000000000000000000000000000
--- a/sensors/temperature-above-slider.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/LR Motion Sensor over Slider/temperature"
-name: "Above Slider"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-above-utility-closet.yaml b/sensors/temperature-above-utility-closet.yaml
deleted file mode 100644
index 40e4547f0bc5de3476585c6c485e3ef897b1c9e7..0000000000000000000000000000000000000000
--- a/sensors/temperature-above-utility-closet.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/LR Motion Sensor over Utility Closet/temperature"
-name: "Above Utility Closet"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-common-area.yaml b/sensors/temperature-common-area.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ac26b44f9c1e575970cbfc51df8b352fdfabfbe2
--- /dev/null
+++ b/sensors/temperature-common-area.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Common Area Motion Sensor/temperature"
+name: "Common Area"
+unit_of_measurement: "°F"
diff --git a/sensors/temperature-den.yaml b/sensors/temperature-den.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7edbb7fab9c0cb88f12b2fac5d15ec883fbcbd12
--- /dev/null
+++ b/sensors/temperature-den.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Den Motion Sensor/temperature"
+name: "Den"
+unit_of_measurement: "°F"
diff --git a/sensors/temperature-dining-area-window.yaml b/sensors/temperature-dining-area-window.yaml
deleted file mode 100644
index 408c81c5acc548367efa52f6965e699950545ec7..0000000000000000000000000000000000000000
--- a/sensors/temperature-dining-area-window.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Window/temperature"
-name: "Dining Area Window"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-kitchen.yaml b/sensors/temperature-kitchen.yaml
deleted file mode 100644
index ab0ddcb42ecef730bc9f768470bc6a562eff5391..0000000000000000000000000000000000000000
--- a/sensors/temperature-kitchen.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Dining Area Motion Sensor near cabinets/temperature"
-name: "Kitchen"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-master-bedroom-closet.yaml b/sensors/temperature-master-bedroom-closet.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a823c7f8dd9b6317dc89fc8c85ef0f1d8b1353ca
--- /dev/null
+++ b/sensors/temperature-master-bedroom-closet.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Master Bedroom Closet/temperature"
+name: "Master Bedroom Closet Temp"
+unit_of_measurement: "°F"
diff --git a/sensors/temperature-master-bedroom-window.yaml b/sensors/temperature-master-bedroom-window.yaml
deleted file mode 100644
index 16df3122a3fb1033ba76ca3a700e0d559e8a860a..0000000000000000000000000000000000000000
--- a/sensors/temperature-master-bedroom-window.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Master Bedroom Window/temperature"
-name: "Master Bedroom Window"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-office-far-wall.yaml b/sensors/temperature-office-far-wall.yaml
deleted file mode 100644
index 48fe6e3e67857d21198ac7c72db43b99c0598aeb..0000000000000000000000000000000000000000
--- a/sensors/temperature-office-far-wall.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Motion Sensor Far Wall/temperature"
-name: "Office far wall"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-office-near-closet.yaml b/sensors/temperature-office-near-closet.yaml
deleted file mode 100644
index b67786dde60a037ecb77ba43efe1000690436176..0000000000000000000000000000000000000000
--- a/sensors/temperature-office-near-closet.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Motion Sensor over Closet/temperature"
-name: "Office near closet"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-office-window.yaml b/sensors/temperature-office-window.yaml
deleted file mode 100644
index b4792ec7036be8e9a1dd5673da8ff698c3fd955f..0000000000000000000000000000000000000000
--- a/sensors/temperature-office-window.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: mqtt
-state_topic: "smartthings/Office Window/temperature"
-name: "Office Window"
-unit_of_measurement: "°F"
diff --git a/sensors/temperature-office.yaml b/sensors/temperature-office.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d6df87627504a023d3a7ee8d73f8a8396c40b5e1
--- /dev/null
+++ b/sensors/temperature-office.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Office Motion Sensor/temperature"
+name: "Office"
+unit_of_measurement: "°F"
diff --git a/switches.yaml b/switches.yaml
index f663c23bd9480e4b99a8423b6e921db35df13617..dcdfd53c947337b84dc6cce50754536471818f7e 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -1,10 +1,3 @@
-- platform: mqtt
- name: "Kitchen"
- state_topic: "smartthings/Kitchen/switch"
- command_topic: "smartthings/Kitchen/switch"
- payload_on: "on"
- payload_off: "off"
- retain: true
- platform: mqtt
name: "Lava Lamp"
state_topic: "smartthings/Lava Lamp/switch"
@@ -34,9 +27,16 @@
payload_off: "off"
retain: true
- platform: mqtt
- name: "Christmas Tree"
- state_topic: "smartthings/Spare Outlet/switch"
- command_topic: "smartthings/Spare Outlet/switch"
+ name: "Fireplace"
+ state_topic: "smartthings/Fireplace/switch"
+ command_topic: "smartthings/Fireplace/switch"
+ payload_on: "on"
+ payload_off: "off"
+ retain: true
+- platform: mqtt
+ name: "Over Front Door"
+ state_topic: "smartthings/Over Front Door/switch"
+ command_topic: "smartthings/Over Front Door/switch"
payload_on: "on"
payload_off: "off"
retain: true
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9f1e78c0af541f567130ee9bfb035121f6c92629
--- /dev/null
+++ b/ui-lovelace.yaml
@@ -0,0 +1,332 @@
+title: Home
+views:
+ - badges:
+ - entity: climate.forest_park
+ - entity: sensor.forest_park_temperature
+ - entity: weather.forest_park
+ - entity: sun.sun
+ cards:
+ - cards:
+ - entity: lock.keyed_bolt
+ hold_action:
+ action: toggle
+ icon_height: 40px
+ tap_action:
+ action: more-info
+ type: entity-button
+ - entity: cover.garage_door
+ hold_action:
+ action: toggle
+ icon_height: 40px
+ name: Garage
+ tap_action:
+ action: more-info
+ type: entity-button
+ title: Doors
+ type: horizontal-stack
+ - cards:
+ - entity: light.entryway
+ icon_height: 40px
+ type: entity-button
+ - entities:
+ - input_select.scene_entryway
+ icon_height: 40px
+ type: entities
+ title: Entryway
+ type: vertical-stack
+ - cards:
+ - cards:
+ - entity: light.nightstand_left
+ icon_height: 40px
+ name: Left
+ type: entity-button
+ - entity: light.nightstand_right
+ icon_height: 40px
+ name: Right
+ type: entity-button
+ type: horizontal-stack
+ - entities:
+ - input_select.scene_master_bedroom
+ - input_number.brightness_master_bedroom
+ icon_height: 40px
+ type: entities
+ title: Master Bedroom
+ type: vertical-stack
+ - cards:
+ - cards:
+ - entity: light.living_room_endtable_left
+ name: L
+ type: entity-button
+ - entity: light.living_room_endtable_right
+ name: R
+ type: entity-button
+ - entity: light.living_room_left
+ name: L
+ type: entity-button
+ - entity: light.living_room_center
+ name: C
+ type: entity-button
+ - entity: light.living_room_right
+ name: R
+ type: entity-button
+ - entity: switch.fireplace
+ name: FP
+ type: entity-button
+ type: horizontal-stack
+ - cards:
+ - entities:
+ - input_select.scene_lr
+ icon_height: 40px
+ type: entities
+ - entities:
+ - input_select.scene_lr_ceiling
+ icon_height: 40px
+ type: entities
+ type: horizontal-stack
+ - type: entities
+ icon_height: 40px
+ entities:
+ - input_number.brightness_lr
+ - input_number.brightness_lr_ceiling
+ title: Living Room
+ type: vertical-stack
+ - cards:
+ - cards:
+ - entity: light.kitchen_entrance
+ icon_height: 40px
+ type: entity-button
+ - entity: light.dining_corner
+ icon_height: 40px
+ type: entity-button
+ type: horizontal-stack
+ - cards:
+ - entities:
+ - input_select.scene_kitchen_entrance
+ type: entities
+ - entities:
+ - input_select.scene_da
+ type: entities
+ type: horizontal-stack
+ title: Kitchen & Dining
+ type: vertical-stack
+ - cards:
+ - cards:
+ - entity: light.office
+ icon_height: 40px
+ name: Table
+ type: entity-button
+ - entity: light.erick_s_desk_lamp
+ icon_height: 40px
+ name: Desk
+ type: entity-button
+ type: horizontal-stack
+ - cards:
+ - entities:
+ - input_select.scene_office
+ icon_height: 40px
+ type: entities
+ - entities:
+ - input_select.scene_ericks_desk_lamp
+ icon_height: 40px
+ type: entities
+ type: horizontal-stack
+ title: Office
+ type: vertical-stack
+ - cards:
+ - cards:
+ - entity: light.den_left
+ icon_height: 40px
+ name: Left
+ type: entity-button
+ - entity: light.den_right
+ icon_height: 40px
+ name: Right
+ type: entity-button
+ - entity: switch.lava_lamp
+ icon_height: 40px
+ type: entity-button
+ type: horizontal-stack
+ - entities:
+ - input_select.scene_den
+ - input_number.brightness_den
+ icon_height: 40px
+ type: entities
+ title: Den
+ type: vertical-stack
+ - cards:
+ - cards:
+ - entity: light.balcony_left
+ icon_height: 40px
+ name: Left
+ type: entity-button
+ - entity: light.balcony_right
+ icon_height: 40px
+ name: Right
+ type: entity-button
+ type: horizontal-stack
+ - entities:
+ - input_select.scene_balcony
+ - input_number.brightness_balcony
+ icon_height: 40px
+ type: entities
+ title: Balcony
+ type: vertical-stack
+ - cards:
+ - entity: switch.wireless_charger
+ icon_height: 40px
+ type: entity-button
+ - entity: switch.garage_lights
+ icon_height: 40px
+ type: entity-button
+ - entity: switch.over_front_door
+ icon_height: 40px
+ type: entity-button
+ - entity: switch.balcony_outlet
+ icon_height: 40px
+ type: entity-button
+ - entity: scene.all_lights_off
+ hold_action:
+ action: more-info
+ icon_height: 40px
+ tap_action:
+ action: call-service
+ service: scene.turn_on
+ service_data:
+ entity_id: scene.all_lights_off
+ type: entity-button
+ title: Other
+ type: horizontal-stack
+ icon: 'mdi:home'
+ panel: false
+ path: default_view
+ title: DEFAULT
+ - badges: []
+ cards:
+ - entities:
+ - sensor.forest_park_temperature
+ - sensor.master_bed_temperature
+ - sensor.slider
+ - sensor.common_area
+ - sensor.front_door
+ - sensor.office
+ - sensor.office_temperature
+ - sensor.office_cabinet
+ - sensor.den
+ - sensor.den_temperature
+ show_header_toggle: false
+ title: Temperature
+ type: entities
+ - entities:
+ - sensor.forest_park_humidity
+ - sensor.master_bedroom_closet_humidity
+ show_header_toggle: false
+ title: Humidity
+ type: entities
+ - entities:
+ - binary_sensor.common_area
+ - binary_sensor.office_motion_sensor
+ - binary_sensor.den_motion_sensor
+ show_header_toggle: false
+ title: Motion Sensors
+ type: entities
+ - entities:
+ - binary_sensor.front_door
+ - binary_sensor.front_door_motion
+ - binary_sensor.slider
+ - binary_sensor.slider_motion
+ - binary_sensor.office_cabinet
+ - binary_sensor.office_cabinet_door_motion
+ show_header_toggle: false
+ title: Doors & Windows
+ type: entities
+ - entities:
+ - binary_sensor.master_bedroom_smoke_detector
+ - binary_sensor.living_room_smoke_detector
+ - binary_sensor.master_bedroom_co_detector
+ - binary_sensor.living_room_co_detector
+ show_header_toggle: false
+ title: Smoke & CO
+ type: entities
+ - entities:
+ - sensor.fireplace_consumption
+ - sensor.lava_lamp_consumption
+ show_header_toggle: false
+ title: Power Consumption
+ type: entities
+ - entities:
+ - device_tracker.3c286d080a46
+ - device_tracker.28ff3c5525f0
+ show_header_toggle: false
+ title: Presence
+ type: entities
+ - entities:
+ - binary_sensor.forest_park_occupancy
+ - binary_sensor.master_bed_occupancy
+ - binary_sensor.office_occupancy
+ - binary_sensor.den_occupancy
+ show_header_toggle: false
+ title: ecobee Occupancy
+ type: entities
+ icon: 'mdi:gauge'
+ path: sensor_view
+ title: Sensors
+ - badges: []
+ cards:
+ - entities:
+ - sensor.date
+ - sensor.time
+ - sensor.time_utc
+ show_header_toggle: false
+ title: Time & Date
+ type: entities
+ - entities:
+ - sensor.ups_status
+ - sensor.ups_time_left
+ - sensor.ups_time_on_battery
+ - sensor.ups_last_transfer
+ - sensor.ups_battery
+ - sensor.ups_battery_voltage
+ - sensor.ups_input_voltage
+ show_header_toggle: false
+ title: APC
+ type: entities
+ icon: 'mdi:chip'
+ path: status_view
+ title: Status
+ - badges: []
+ cards:
+ - entity: media_player.all_devices
+ type: media-control
+ - entity: media_player.apartment
+ type: media-control
+ - entity: media_player.common_area
+ type: media-control
+ - entity: media_player.d_d
+ type: media-control
+ - entity: media_player.googlehome4437
+ type: media-control
+ - entity: media_player.kitchen
+ type: media-control
+ - entity: media_player.living_room
+ type: media-control
+ - entity: media_player.living_room_tv
+ type: media-control
+ - entity: media_player.office
+ type: media-control
+ icon: 'mdi:play-network'
+ path: media_view
+ title: Media
+ - badges: []
+ cards:
+ - entities:
+ - switch.kitchen_nightlight
+ show_header_toggle: false
+ title: Other
+ type: entities
+ - entity: alarm_control_panel.shm
+ type: alarm-panel
+ - entity: weather.forest_park
+ type: weather-forecast
+ icon: 'mdi:power'
+ path: misc_view
+ title: Misc