Skip to content

Commit

Permalink
Sync latest production updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jumpalottahigh committed Jan 29, 2018
1 parent c76aefa commit 4e45c17
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 22 deletions.
16 changes: 8 additions & 8 deletions automations/home/home.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- alias: "Hello Mr. President!"
trigger:
platform: zone
entity_id: device_tracker.georgi6p_gp
entity_id: device_tracker.username_gp
zone: zone.mr_president
# Event is either enter or leave
event: enter # or "leave"
Expand All @@ -14,11 +14,11 @@
data:
message: "Hello there, Mr. President!"

# Turn on Main PC when Georgi comes home
- alias: "Turn on main PC when Georgi comes home"
# Georgi comes home
- alias: "Georgi has arrived home"
trigger:
platform: zone
entity_id: device_tracker.georgi6p_gp
entity_id: device_tracker.username_gp
zone: zone.home
event: enter
condition:
Expand All @@ -43,12 +43,12 @@
- alias: "Sofi has arrived home"
trigger:
platform: zone
entity_id: device_tracker.sofiip_sp
entity_id: device_tracker.username_sp
zone: zone.home
event: enter
condition:
- condition: time
after: "15:00:00"
after: "16:00:00"
- condition: time
weekday:
- mon
Expand Down Expand Up @@ -82,7 +82,7 @@
- service: homeassistant.turn_on
entity_id: switch.livingroom_tv_led_demo
- service: homeassistant.turn_on
entity_id: light.livingroom_strip
entity_id: light.christmas_tree

# Set TV backlights to demo when music is playing on Google Home
- alias: 'Stopping music played on Google Home turn regular TV backlight'
Expand All @@ -106,7 +106,7 @@
- service: homeassistant.turn_off
entity_id: switch.livingroom_music_jar
- service: homeassistant.turn_off
entity_id: light.livingroom_strip
entity_id: light.christmas_tree

# Activate 'Movies' scene when Plex is playing
- alias: 'Playing Plex runs Movies scene'
Expand Down
10 changes: 5 additions & 5 deletions automations/lights/lights.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
- light.office_hue
- light.living_room_hue
- light.kitchen
- light.christmas_tree
transition: 5
- service: homeassistant.turn_off
entity_id: switch.livingroom_window_lights
Expand All @@ -58,9 +59,8 @@
entity_id:
- light.office_hue
- light.living_room_hue
- light.antons_room
- light.kitchen
brightness: 100
brightness: 10
color_temp: 410
transition: 5
- service: tts.google_say
Expand Down Expand Up @@ -165,13 +165,13 @@
topic: "home/office/led_strip/set"
payload: '{"transition":{{ trigger.to_state.state | int }}}'

# Office ws2812b led strip
- alias: "Livingroom Animation Speed"
# Livingroom ws2812b led strip
- alias: "Christmas Tree Animation Speed"
initial_state: True
hide_entity: False
trigger:
- platform: state
entity_id: input_number.livingroom_animation_speed
entity_id: input_number.christmas_tree_animation_speed
action:
- service: mqtt.publish
data_template:
Expand Down
4 changes: 3 additions & 1 deletion automations/outlets/outlets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@
at: "08:00"
action:
- service: switch.turn_on
entity_id: switch.livingroom_window_lights
entity_id: switch.livingroom_window_lights
- service: switch.turn_on
entity_id: switch.livingroom_charger
2 changes: 1 addition & 1 deletion cameras.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Shows device_tracker.georgi_6p_georgi_6p on a map.
# Shows Georgi and Sofi on a map.
- platform: generic
name: Georgi's position
still_image_url: https://maps.googleapis.com/maps/api/staticmap?center={{ states.device_tracker.username_gp.attributes.latitude }},{{ states.device_tracker.username_gp.attributes.longitude }}&zoom=15&size=500x500&maptype=roadmap&markers=color:blue%7Clabel:P%7C{{ states.device_tracker.username_gp.attributes.latitude }},{{ states.device_tracker.username_gp.attributes.longitude }}
Expand Down
14 changes: 12 additions & 2 deletions configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ http:

map:

# Tradfri
# tradfri:
# host: !secret tradfri_ip
# api_key: !secret tradfri_api
# allow_tradfri_groups: false

# Checks for available updates
updater:

Expand All @@ -61,6 +67,9 @@ sun:
# Config panel enabler
config:

# Home Assistant Cloud
cloud:

# Text to speech
tts:
- platform: google
Expand Down Expand Up @@ -89,6 +98,7 @@ device_tracker:
- platform: owntracks
max_gps_accuracy: 200
consider_home: 180
# TODO: Work on the know devices list
- platform: netgear
host: !secret netgear_ip
username: !secret netgear_username
Expand Down Expand Up @@ -170,8 +180,8 @@ input_number:
min: 1
max: 150
step: 10
livingroom_animation_speed:
name: Livingroom Animation Speed
christmas_tree_animation_speed:
name: Christmas Tree Animation Speed
initial: 150
min: 1
max: 150
Expand Down
5 changes: 3 additions & 2 deletions groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ scenes_card:
entities:
- scene.movies
- scene.party
- scene.christmas
- scene.shutdown
backyard_card:
name: Backyard
Expand Down Expand Up @@ -123,8 +124,8 @@ living_room:
entities:
- light.living_room
- light.living_room_hue
- light.livingroom_strip
- input_number.livingroom_animation_speed
- light.christmas_tree
- input_number.christmas_tree_animation_speed
- switch.livingroom_music_jar
- switch.livingroom_window_lights
- switch.livingroom_ball_lights
Expand Down
4 changes: 2 additions & 2 deletions lights.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Yeelights
- platform: yeelight
devices:
192.168.10.78:
192.168.10.75:
name: Antons Room
transition: 1000
use_music_mode: True
Expand Down Expand Up @@ -68,7 +68,7 @@
qos: 0

- platform: mqtt_json
name: "Livingroom Strip"
name: "Christmas Tree"
state_topic: "home/livingroom/led_strip"
command_topic: "home/livingroom/led_strip/set"
effect: true
Expand Down
27 changes: 26 additions & 1 deletion scenes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,29 @@
switch.livingroom_music_jar: off
switch.kitchen_ceiling_lights: off
# Coming soon
# - name: Christmas
- name: Christmas
entities:
light.office_hue:
state: on
brightness: 90
transition: 5
effect: colorloop
light.kitchen:
state: on
brightness: 50
color_temp: 327
transition: 5
light.living_room_hue:
state: on
brightness: 50
color_temp: 327
transition: 5
light.downstairs:
state: on
brightness: 50
color_temp: 327
transition: 5
light.christmas_tree: on
switch.livingroom_ball_lights: on
switch.livingroom_window_lights: on
switch.livingroom_music_jar: on

0 comments on commit 4e45c17

Please sign in to comment.