From 1e63ccbd3fa717656793d3129d8590d248b1ce1c Mon Sep 17 00:00:00 2001 From: Jeffrey Stone Date: Mon, 9 Jan 2017 14:48:07 -0500 Subject: [PATCH] Cleaning up automations --- automation.yaml | 4 ++-- automations/good_morning.yaml | 2 +- automations/good_night.yaml | 2 +- automations/jeff_home_enter.yaml | 2 +- automations/jeff_home_leave.yaml | 2 +- automations/jeff_manheim_enter.yaml | 2 +- automations/jeff_manheim_leave.yaml | 2 +- automations/sunrise_inside_off.yaml | 4 ++-- automations/sunrise_outside_off.yaml | 8 ++++++-- configuration.yaml | 6 +++--- scripts/inside_all_off.yaml | 4 ++-- scripts/inside_all_on.yaml | 2 +- scripts/outside_all_off.yaml | 4 ++-- scripts/outside_all_on.yaml | 2 +- 14 files changed, 25 insertions(+), 21 deletions(-) diff --git a/automation.yaml b/automation.yaml index 665f3f6..9151e87 100644 --- a/automation.yaml +++ b/automation.yaml @@ -4,8 +4,8 @@ # Sun Based - !include automations/sunset_outside_on.yaml - !include automations/sunset_inside_on.yaml -- !include automations/sunset_outside_off.yaml -- !include automations/sunset_inside_off.yaml +- !include automations/sunrise_outside_off.yaml +- !include automations/sunrise_inside_off.yaml # Weather Based - !include automations/cloudy_inside_on_home.yaml # Jeff diff --git a/automations/good_morning.yaml b/automations/good_morning.yaml index 017587f..44574a0 100644 --- a/automations/good_morning.yaml +++ b/automations/good_morning.yaml @@ -8,5 +8,5 @@ action: entity_id: scene.livingroom_normal - service: notify.notify data: - title: 'Anchorage House' + title: 'Good Morning' message: "Good Morning, Anchorage House is up and online." diff --git a/automations/good_night.yaml b/automations/good_night.yaml index 40019f1..047dc54 100644 --- a/automations/good_night.yaml +++ b/automations/good_night.yaml @@ -9,5 +9,5 @@ action: entity_id: scene.livingroom_night - service: notify.notify data: - title: 'Anchorage House' + title: 'Good Night' message: "Shutting down for the night, Good Night" diff --git a/automations/jeff_home_enter.yaml b/automations/jeff_home_enter.yaml index ae2637c..a477063 100644 --- a/automations/jeff_home_enter.yaml +++ b/automations/jeff_home_enter.yaml @@ -7,7 +7,7 @@ trigger: action: - service: notify.notify data: - title: 'Anchorage House' + title: 'Jeff is Home' message: "Jeff is home!" - service: input_select.select_option data: diff --git a/automations/jeff_home_leave.yaml b/automations/jeff_home_leave.yaml index 4aee532..ccd75da 100644 --- a/automations/jeff_home_leave.yaml +++ b/automations/jeff_home_leave.yaml @@ -7,7 +7,7 @@ trigger: action: - service: notify.notify data: - title: 'Anchorage House' + title: 'Jeff Left Home' message: "Jeff left home" - service: input_select.select_option data: diff --git a/automations/jeff_manheim_enter.yaml b/automations/jeff_manheim_enter.yaml index 877752d..00e8a70 100644 --- a/automations/jeff_manheim_enter.yaml +++ b/automations/jeff_manheim_enter.yaml @@ -7,7 +7,7 @@ trigger: action: - service: notify.notify data: - title: 'Anchorage House' + title: 'Jeff is at Manheim' message: "Jeff arrived at Manheim" - service: input_select.select_option data: diff --git a/automations/jeff_manheim_leave.yaml b/automations/jeff_manheim_leave.yaml index 05f38c8..aea025a 100644 --- a/automations/jeff_manheim_leave.yaml +++ b/automations/jeff_manheim_leave.yaml @@ -7,7 +7,7 @@ trigger: action: - service: notify.notify data: - title: 'Anchorage House' + title: 'Jeff Left Manheim' message: "Jeff left Manheim" - service: input_select.select_option data: diff --git a/automations/sunrise_inside_off.yaml b/automations/sunrise_inside_off.yaml index 64d0a8e..2e12cca 100644 --- a/automations/sunrise_inside_off.yaml +++ b/automations/sunrise_inside_off.yaml @@ -1,7 +1,7 @@ -alias: "Sunset Inside on" +alias: "Sunrise Inside off" trigger: platform: sun - event: sunset + event: sunrise offset: "+01:00:00" action: service: script.inside_all_off \ No newline at end of file diff --git a/automations/sunrise_outside_off.yaml b/automations/sunrise_outside_off.yaml index e044409..3c054d2 100644 --- a/automations/sunrise_outside_off.yaml +++ b/automations/sunrise_outside_off.yaml @@ -1,6 +1,10 @@ -alias: "Sunset Outside off" +alias: "Sunrise Outside off" trigger: platform: sun event: sunrise action: - service: script.outside_all_off \ No newline at end of file + - service: notify.notify + data: + title: 'Sun is Up!' + message: "Turning off Outside Lights." + - service: script.outside_all_off \ No newline at end of file diff --git a/configuration.yaml b/configuration.yaml index 40d461c..7d9fc40 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -117,9 +117,9 @@ device_tracker: track_new_devices: yes interval_seconds: 60 consider_home: 180 - #- platform: owntracks - # max_gps_accuracy: 200 - # consider_home: 180 + - platform: owntracks + max_gps_accuracy: 200 + consider_home: 180 - platform: icloud username: !secret ICLOUD_USER password: !secret ICLOUD_PASS diff --git a/scripts/inside_all_off.yaml b/scripts/inside_all_off.yaml index 37d61ed..8582246 100644 --- a/scripts/inside_all_off.yaml +++ b/scripts/inside_all_off.yaml @@ -8,5 +8,5 @@ sequence: entity_id: switch.tower_lamp - service: notify.notify data: - title: 'Anchorage House' - message: "Inside lights are on!" \ No newline at end of file + title: 'Turning inside lights off' + message: "Inside lights are off!" \ No newline at end of file diff --git a/scripts/inside_all_on.yaml b/scripts/inside_all_on.yaml index e0208a2..b5edde7 100644 --- a/scripts/inside_all_on.yaml +++ b/scripts/inside_all_on.yaml @@ -11,5 +11,5 @@ sequence: entity_id: scene.livingroom_normal - service: notify.notify data: - title: 'Anchorage House' + title: 'Inside lights are on' message: "Inside lights are on!" \ No newline at end of file diff --git a/scripts/outside_all_off.yaml b/scripts/outside_all_off.yaml index f66eff7..eb0ee52 100644 --- a/scripts/outside_all_off.yaml +++ b/scripts/outside_all_off.yaml @@ -14,8 +14,8 @@ sequence: entity_id: switch.front_porch_left - service: switch.turn_off data: - entity_id: switch.front_porch_right + entity_id: switch.front_porch_right - service: notify.notify data: - title: 'Anchorage House' + title: 'Outside lights are off' message: "Outside lights are off!" \ No newline at end of file diff --git a/scripts/outside_all_on.yaml b/scripts/outside_all_on.yaml index ca4b05d..25b3b48 100644 --- a/scripts/outside_all_on.yaml +++ b/scripts/outside_all_on.yaml @@ -17,5 +17,5 @@ sequence: entity_id: switch.front_porch_right - service: notify.notify data: - title: 'Anchorage House' + title: 'Outside lights are on' message: "Outside lights are on!" \ No newline at end of file