From 2786b7bfd6c947903ec13b60c9fc5626d0838fb7 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sun, 5 May 2019 21:07:14 -0700
Subject: [PATCH] Sync with upstream
96a334d
---
.HA_VERSION | 2 +-
.gitignore | 2 ++
august.yaml | 3 ++
automations/office-lights-timeout.yaml | 2 +-
cloud.yaml | 27 +++++++++++++++++
configuration.yaml | 16 +++++-----
customizations/lights.yaml | 2 +-
google-assistant.yaml | 38 ------------------------
groups.yaml | 18 +++++++++--
known_devices.yaml | 6 ++--
scenes/all-lights-off.yaml | 2 +-
scenes/ericks-desk-lamp-blink-long.yaml | 2 +-
scenes/ericks-desk-lamp-blink-short.yaml | 2 +-
scenes/ericks-desk-lamp-nightlight.yaml | 2 +-
scenes/ericks-desk-lamp-off.yaml | 2 +-
scenes/ericks-desk-lamp-relax.yaml | 2 +-
scenes/office-desk-nightlight.yaml | 2 +-
scripts.yaml | 30 +------------------
secrets.yaml | 4 +--
19 files changed, 72 insertions(+), 92 deletions(-)
create mode 100644 august.yaml
create mode 100644 cloud.yaml
delete mode 100644 google-assistant.yaml
diff --git a/.HA_VERSION b/.HA_VERSION
index 08de1c6..5f8dbbf 100644
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.88.1
\ No newline at end of file
+0.92.2
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 031a39f..7b0fa07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
deps
*.db
+.cloud/
.storage/
+.august.conf
diff --git a/august.yaml b/august.yaml
new file mode 100644
index 0000000..51f92b9
--- /dev/null
+++ b/august.yaml
@@ -0,0 +1,3 @@
+login_method: email
+username: !secret august_user
+password: !secret august_pass
diff --git a/automations/office-lights-timeout.yaml b/automations/office-lights-timeout.yaml
index ab52771..5b0ae69 100644
--- a/automations/office-lights-timeout.yaml
+++ b/automations/office-lights-timeout.yaml
@@ -10,7 +10,7 @@ condition:
entity_id: light.office
state: 'on'
- condition: state
- entity_id: light.ericks_desk_lamp
+ entity_id: light.erick_s_desk_lamp
state: 'on'
- condition: state
entity_id: switch.lava_lamp
diff --git a/cloud.yaml b/cloud.yaml
new file mode 100644
index 0000000..67072dc
--- /dev/null
+++ b/cloud.yaml
@@ -0,0 +1,27 @@
+google_actions:
+ filter:
+ include_domains:
+ - switch
+ - light
+ include_entities:
+ - group.ceiling_fan
+ - group.master_bathroom
+ exclude_entities:
+ - lock.interior_bolt
+ - 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.office:
+ name: Floor Lamp
+ light.erick_s_desk_lamp:
+ name: Desk Lamp
+ switch.kitchen:
+ name: Kitchen Light
diff --git a/configuration.yaml b/configuration.yaml
index 78d4a04..b07cd20 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -13,20 +13,18 @@ homeassistant:
auth_providers:
- type: homeassistant
- type: legacy_api_password
- - type: trusted_networks
+ api_password: !secret api_password
auth:
+config:
+
http:
- api_password: !secret api_password
server_port: 8123
ssl_certificate: /home/pi/ssl/chain
ssl_key: /home/pi/ssl/key
- trusted_networks:
- # - 127.0.0.1
- # - ::1
- - 192.168.1.0/24
- - 2605:e000:1417:40e2::/64
+
+cloud: !include cloud.yaml
zone:
name: Home
@@ -100,7 +98,9 @@ panel_iframe: !include panels-iframe.yaml
apcupsd:
-google_assistant: !include google-assistant.yaml
+august: !include august.yaml
+
+system_health:
# Display
group: !include groups.yaml
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index f0cf059..a9d6473 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -1,6 +1,6 @@
light.office:
friendly_name: Office Lamp
-light.ericks_desk_lamp:
+light.erick_s_desk_lamp:
icon: mdi:lightbulb-outline
light.ceiling_fan_1:
friendly_name: Ceiling Fan Front
diff --git a/google-assistant.yaml b/google-assistant.yaml
deleted file mode 100644
index 4e73071..0000000
--- a/google-assistant.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-project_id: !secret google_home_project_id
-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 ad2bc2c..fcf7acb 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -3,6 +3,7 @@ default_view:
view: yes
icon: mdi:home
entities:
+ - group.locks
- group.master_bedroom
- group.master_bathroom
- group.living_room
@@ -10,7 +11,6 @@ default_view:
- group.office
- group.balcony
- group.other
- - alarm_control_panel.shm
sensor_view:
name: Sensors
view: yes
@@ -36,12 +36,21 @@ media_view:
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
@@ -82,7 +91,7 @@ office:
name: Office
entities:
- light.office
- - light.ericks_desk_lamp
+ - light.erick_s_desk_lamp
- switch.lava_lamp
- input_select.scene_office
- input_select.scene_ericks_desk_lamp
@@ -216,3 +225,8 @@ sensor_battery_levels:
- sensor.office_motion_sensor_far_wall_battery_level
- sensor.office_cabinet_battery_level
- sensor.green_keys_battery_level
+locks:
+ name: Locks
+ entities:
+ - lock.keyed_bolt
+ - lock.interior_bolt
diff --git a/known_devices.yaml b/known_devices.yaml
index 8563ff7..7cf026f 100644
--- a/known_devices.yaml
+++ b/known_devices.yaml
@@ -2,19 +2,19 @@ green_keys:
name: Green Keys
mac:
picture:
- track: yes
+ track: true
hide_if_away: no
eh_nexus_6:
name: EH Nexus 6
mac: -
gravatar: !secret gravatar_erick
- track: yes
+ track: true
hide_if_away: no
cl_samsung_s5:
name: CL Samsung S5
mac: -
gravatar: !secret gravatar_chris
- track: yes
+ track: true
hide_if_away: no
diff --git a/scenes/all-lights-off.yaml b/scenes/all-lights-off.yaml
index 9a18b52..e6c1c7f 100644
--- a/scenes/all-lights-off.yaml
+++ b/scenes/all-lights-off.yaml
@@ -20,7 +20,7 @@ entities:
state: off
light.office:
state: off
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: off
switch.lava_lamp:
state: off
diff --git a/scenes/ericks-desk-lamp-blink-long.yaml b/scenes/ericks-desk-lamp-blink-long.yaml
index 287aaba..a6d0163 100644
--- a/scenes/ericks-desk-lamp-blink-long.yaml
+++ b/scenes/ericks-desk-lamp-blink-long.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Blink Long
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 144
color_temp: 443
diff --git a/scenes/ericks-desk-lamp-blink-short.yaml b/scenes/ericks-desk-lamp-blink-short.yaml
index 9cb8781..eaa8890 100644
--- a/scenes/ericks-desk-lamp-blink-short.yaml
+++ b/scenes/ericks-desk-lamp-blink-short.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Blink Short
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 144
color_temp: 443
diff --git a/scenes/ericks-desk-lamp-nightlight.yaml b/scenes/ericks-desk-lamp-nightlight.yaml
index 45fb8dc..5914174 100644
--- a/scenes/ericks-desk-lamp-nightlight.yaml
+++ b/scenes/ericks-desk-lamp-nightlight.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Nightlight
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 1
color_temp: 450
diff --git a/scenes/ericks-desk-lamp-off.yaml b/scenes/ericks-desk-lamp-off.yaml
index 50eb45e..7714e42 100644
--- a/scenes/ericks-desk-lamp-off.yaml
+++ b/scenes/ericks-desk-lamp-off.yaml
@@ -1,4 +1,4 @@
name: Erick's Desk Lamp Off
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: off
diff --git a/scenes/ericks-desk-lamp-relax.yaml b/scenes/ericks-desk-lamp-relax.yaml
index db22cb3..8467764 100644
--- a/scenes/ericks-desk-lamp-relax.yaml
+++ b/scenes/ericks-desk-lamp-relax.yaml
@@ -1,6 +1,6 @@
name: Erick's Desk Lamp Relax
entities:
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 144
color_temp: 443
diff --git a/scenes/office-desk-nightlight.yaml b/scenes/office-desk-nightlight.yaml
index a843a10..b9ce202 100644
--- a/scenes/office-desk-nightlight.yaml
+++ b/scenes/office-desk-nightlight.yaml
@@ -4,7 +4,7 @@ entities:
state: on
brightness: 1
color_temp: 450
- light.ericks_desk_lamp:
+ light.erick_s_desk_lamp:
state: on
brightness: 1
color_temp: 450
diff --git a/scripts.yaml b/scripts.yaml
index ebc9013..c1c7884 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -45,7 +45,7 @@ office_lights_timeout:
data:
entity_id:
- light.office
- - light.ericks_desk_lamp
+ - light.erick_s_desk_lamp
- service: switch.turn_off
data:
entity_id: switch.lava_lamp
@@ -97,34 +97,6 @@ dining_area_lights_timeout:
entity_id:
- light.ceiling_fan_1
- light.ceiling_fan_2
-# Restart August Lock daemon
-restart_august_daemon:
- sequence:
- - service: shell_command.restart_august_daemon
-# Force lock keyed
-force_lock_keyed:
- sequence:
- - service: shell_command.force_lock_keyed
-# Force unlock keyed
-force_unlock_keyed:
- sequence:
- - service: shell_command.force_unlock_keyed
-# Force disconnect keyed
-force_disconnect_keyed:
- sequence:
- - service: shell_command.force_disconnect_keyed
-# Force lock interior
-force_lock_interior:
- sequence:
- - service: shell_command.force_lock_interior
-# Force unlock interior
-force_unlock_interior:
- sequence:
- - service: shell_command.force_unlock_interior
-# Force disconnect interior
-force_disconnect_interior:
- sequence:
- - service: shell_command.force_disconnect_interior
# Kitchen light timeout
kitchen_light_set_timeout:
diff --git a/secrets.yaml b/secrets.yaml
index 1db37fc..0b98c12 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -15,5 +15,5 @@ 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
-google_home_project_id: 1
-google_home_api_key: abcdef0123456789
+august_user: something@example.com
+august_pass: password
--
GitLab