From 6b733ce9c7c6034399174d35fbfdef63492af771 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Mon, 12 Mar 2018 09:36:08 -0700
Subject: [PATCH] Sync with upstream
3a0af0f
---
.HA_VERSION | 2 +-
automations/balcony-sunrise-off.yaml | 2 +-
automations/balcony-sunset-on.yaml | 4 +-
binary-sensors/vps-digital-ocean.yaml | 4 ++
binary-sensors/vps-linode.yaml | 3 ++
binary-sensors/vps-vultr-lax.yaml | 2 +
binary-sensors/vps-vultr-ldj.yaml | 2 +
configuration.yaml | 19 ++++++----
customizations/binary-sensors.yaml | 16 ++++++++
customizations/lights.yaml | 2 -
customizations/sensors.yaml | 16 --------
customizations/switches.yaml | 2 -
device-tracker.yaml | 2 +
entity_registry.yaml | 54 +++++++++++++++++++++++++++
google-assistant.yaml | 40 ++++++++++++++++++++
groups.yaml | 12 ++++++
scripts.yaml | 2 +-
secrets.yaml | 8 ++++
18 files changed, 159 insertions(+), 33 deletions(-)
create mode 100644 binary-sensors/vps-digital-ocean.yaml
create mode 100644 binary-sensors/vps-linode.yaml
create mode 100644 binary-sensors/vps-vultr-lax.yaml
create mode 100644 binary-sensors/vps-vultr-ldj.yaml
create mode 100644 customizations/binary-sensors.yaml
create mode 100644 entity_registry.yaml
create mode 100644 google-assistant.yaml
diff --git a/.HA_VERSION b/.HA_VERSION
index 12193b8..8341424 100644
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.60.0
\ No newline at end of file
+0.65.3
\ No newline at end of file
diff --git a/automations/balcony-sunrise-off.yaml b/automations/balcony-sunrise-off.yaml
index 0277a47..9132c8b 100644
--- a/automations/balcony-sunrise-off.yaml
+++ b/automations/balcony-sunrise-off.yaml
@@ -9,4 +9,4 @@ condition:
state: 'on'
action:
service: light.turn_off
- entity_id: light.balcony
\ No newline at end of file
+ entity_id: light.balcony
diff --git a/automations/balcony-sunset-on.yaml b/automations/balcony-sunset-on.yaml
index 3ca801d..6f7983e 100644
--- a/automations/balcony-sunset-on.yaml
+++ b/automations/balcony-sunset-on.yaml
@@ -8,5 +8,5 @@ condition:
entity_id: light.balcony
state: 'off'
action:
- service: scene.turn_on
- entity_id: scene.balcony_read
\ No newline at end of file
+ service: light.turn_on
+ entity_id: light.balcony
diff --git a/binary-sensors/vps-digital-ocean.yaml b/binary-sensors/vps-digital-ocean.yaml
new file mode 100644
index 0000000..b18c012
--- /dev/null
+++ b/binary-sensors/vps-digital-ocean.yaml
@@ -0,0 +1,4 @@
+platform: digital_ocean
+droplets:
+ - ''
+ - ''
diff --git a/binary-sensors/vps-linode.yaml b/binary-sensors/vps-linode.yaml
new file mode 100644
index 0000000..5ce7c62
--- /dev/null
+++ b/binary-sensors/vps-linode.yaml
@@ -0,0 +1,3 @@
+platform: linode
+nodes:
+ - ''
diff --git a/binary-sensors/vps-vultr-lax.yaml b/binary-sensors/vps-vultr-lax.yaml
new file mode 100644
index 0000000..2373c31
--- /dev/null
+++ b/binary-sensors/vps-vultr-lax.yaml
@@ -0,0 +1,2 @@
+platform: vultr
+subscription:
diff --git a/binary-sensors/vps-vultr-ldj.yaml b/binary-sensors/vps-vultr-ldj.yaml
new file mode 100644
index 0000000..2373c31
--- /dev/null
+++ b/binary-sensors/vps-vultr-ldj.yaml
@@ -0,0 +1,2 @@
+platform: vultr
+subscription:
diff --git a/configuration.yaml b/configuration.yaml
index edb2f64..768bdb1 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -100,14 +100,7 @@ panel_iframe: !include panels-iframe.yaml
apcupsd:
-emulated_hue:
- type: google_home
- host_ip: !secret host_ip
- listen_port: 80
- expose_by_default: true
- exposed_domains:
- - switch
- - light
+google_assistant: !include google-assistant.yaml
# Display
group: !include groups.yaml
@@ -125,3 +118,13 @@ automation: !include_dir_list automations
input_select: !include input-selects.yaml
input_number: !include input-numbers.yaml
+
+# VPS hosts
+linode:
+ access_token: !secret linode1
+
+digital_ocean:
+ access_token: !secret digital_ocean
+
+vultr:
+ api_key: !secret vultr
diff --git a/customizations/binary-sensors.yaml b/customizations/binary-sensors.yaml
new file mode 100644
index 0000000..127a796
--- /dev/null
+++ b/customizations/binary-sensors.yaml
@@ -0,0 +1,16 @@
+binary_sensor.master_bedroom_smoke_detector:
+ friendly_name: Master Bedroom Smoke
+binary_sensor.living_room_smoke_detector:
+ friendly_name: Living Room Smoke
+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
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index 574a968..f0cf059 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -1,9 +1,7 @@
light.office:
friendly_name: Office Lamp
- emulated_hue_name: "Floor Lamp"
light.ericks_desk_lamp:
icon: mdi:lightbulb-outline
- emulated_hue_name: "Desk Lamp"
light.ceiling_fan_1:
friendly_name: Ceiling Fan Front
light.ceiling_fan_2:
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index 21d0451..16b23f6 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -52,22 +52,6 @@ sensor.office_cabinet_battery_level:
sensor.green_keys_battery_level:
friendly_name: Green keys
icon: mdi:battery-outline
-binary_sensor.master_bedroom_smoke_detector:
- friendly_name: Master Bedroom Smoke
-binary_sensor.living_room_smoke_detector:
- friendly_name: Living Room Smoke
-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
sensor.pws_weather:
friendly_name: Weather
sensor.pws_temp_f:
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index 7975332..581a938 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -7,11 +7,9 @@ switch.wireless_charger:
switch.august_interior:
friendly_name: Interior Bolt
icon: mdi:key
- emulated_hue_hidden: true
switch.august_keyed:
friendly_name: Keyed Bolt
icon: mdi:key
- emulated_hue_hidden: true
switch.kitchen_nightlight:
icon: mdi:theme-light-dark
switch.alarm_status:
diff --git a/device-tracker.yaml b/device-tracker.yaml
index 664553d..896499d 100644
--- a/device-tracker.yaml
+++ b/device-tracker.yaml
@@ -7,3 +7,5 @@
username: !secret asus_user
ssh_key: !secret asus_key
consider_home: 90
+ new_device_defaults:
+ track_new_devices: false
diff --git a/entity_registry.yaml b/entity_registry.yaml
new file mode 100644
index 0000000..fecaaf7
--- /dev/null
+++ b/entity_registry.yaml
@@ -0,0 +1,54 @@
+light.ericks_desk_lamp:
+ platform: hue
+ unique_id: 00:17:88:01:10:28:1d:5c-0b
+light.master_bath_1:
+ platform: hue
+ unique_id: 00:17:88:01:10:26:ea:c1-0b
+light.master_bath_2:
+ platform: hue
+ unique_id: 00:17:88:01:10:26:e0:cf-0b
+light.nightstand:
+ platform: hue
+ unique_id: 00:17:88:01:10:26:c4:ec-0b
+light.ceiling_fan_1:
+ platform: hue
+ unique_id: 00:17:88:01:10:28:05:62-0b
+light.office:
+ platform: hue
+ unique_id: 00:17:88:01:10:26:c8:f8-0b
+light.corner_table:
+ platform: hue
+ unique_id: 00:17:88:01:10:26:f1:99-0b
+light.ceiling_fan_2:
+ platform: hue
+ unique_id: 00:17:88:01:10:28:1e:05-0b
+light.master_bath_3:
+ platform: hue
+ unique_id: 00:17:88:01:10:28:5d:db-0b
+light.balcony_2:
+ platform: hue
+ unique_id: 00:17:88:01:10:28:58:54-0b
+light.endtable:
+ platform: hue
+ unique_id: 00:17:88:01:10:26:be:26-0b
+switch.kitchen_nightlight:
+ platform: wemo
+ unique_id: 231624K12008CB
+media_player.nexus_player:
+ platform: cast
+ unique_id: 3ab2baa0-f44b-431c-2101-9ea71c44c871
+media_player.living_room:
+ platform: cast
+ unique_id: 85609ba9-d576-0aef-b97b-2f00c7a28979
+media_player.apartment:
+ platform: cast
+ unique_id: 70741ea6-7b39-44e9-ae21-14d85ebf8686
+media_player.common_area:
+ platform: cast
+ unique_id: 95937ccb-b60f-429e-8773-6513038c6535
+media_player.kitchen:
+ platform: cast
+ unique_id: eac89627-50fe-bcfa-1498-ec83c7a4ed62
+media_player.office:
+ platform: cast
+ unique_id: 541ec58c-063e-2dfb-59c2-1b9a867616c2
diff --git a/google-assistant.yaml b/google-assistant.yaml
new file mode 100644
index 0000000..09f541b
--- /dev/null
+++ b/google-assistant.yaml
@@ -0,0 +1,40 @@
+project_id: !secret google_home_project_id
+client_id: !secret google_home_client_id
+access_token: !secret google_home_access_token
+api_key: !secret google_home_api_key
+exposed_domains:
+ - switch
+ - light
+entity_config:
+ group.locks:
+ expose: false
+ switch.august_interior:
+ expose: false
+ switch.august_keyed:
+ expose: false
+ switch.alarm_status:
+ expose: false
+ switch.christmas_tree:
+ expose: false
+ switch.balcony_outlet:
+ expose: false
+ light.office:
+ name: Floor Lamp
+ light.ericks_desk_lamp:
+ name: Desk Lamp
+ switch.kitchen:
+ name: Kitchen Light
+ group.ceiling_fan:
+ expose: true
+ light.ceiling_fan_1:
+ expose: false
+ light.ceiling_fan_2:
+ expose: false
+ group.master_bathroom:
+ expose: true
+ light.master_bath_1:
+ expose: false
+ light.master_bath_2:
+ expose: false
+ light.master_bath_3:
+ expose: false
diff --git a/groups.yaml b/groups.yaml
index 985892e..4f612e5 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -36,6 +36,7 @@ status_view:
- group.time_date
- group.sensor_pi
- group.sensor_apc
+ - group.vps
weather_view:
name: Weather
view: yes
@@ -56,6 +57,8 @@ locks:
entities:
- switch.august_interior
- switch.august_keyed
+ - script.force_unlock_interior
+ - script.force_unlock_keyed
master_bedroom:
name: Master Bedroom
entities:
@@ -84,6 +87,11 @@ dining_area:
- light.ceiling_fan_2
- input_number.brightness_da
- input_select.scene_da
+ceiling_fan:
+ name: Ceiling Fan
+ entities:
+ - light.ceiling_fan_1
+ - light.ceiling_fan_2
office:
name: Office
entities:
@@ -195,6 +203,10 @@ sensor_apc:
- sensor.ups_nominal_input_voltage
- sensor.ups_nominal_output_power
- sensor.ups_load_mean
+vps:
+ name: VPS
+ entities:
+ - binary_sensor.example
scripts_misc:
name: Lock Actions
control: hidden
diff --git a/scripts.yaml b/scripts.yaml
index b6e8cc0..ebc9013 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -18,7 +18,7 @@ wireless_charger_timeout:
alias: "Turn off wireless charger after three hours"
sequence:
- delay:
- hours: 3
+ hours: 5
- service: switch.turn_off
data:
entity_id: switch.wireless_charger
diff --git a/secrets.yaml b/secrets.yaml
index 499ba70..48a99eb 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -21,3 +21,11 @@ pi_hole_backup_host:
pi_hole_admin:
monit_admin:
mattermost_webhook:
+linode1:
+linode2:
+digital_ocean:
+vultr:
+google_home_project_id:
+google_home_client_id:
+google_home_access_token:
+google_home_api_key:
--
GitLab