From 0ca48f786c21fab774677ffb0154e62454c1c1ee Mon Sep 17 00:00:00 2001 From: Jeffrey Stone Date: Wed, 1 Feb 2017 19:31:52 -0500 Subject: [PATCH] Cleaning up scripts --- automation.yaml | 6 ---- automations/jeff_manheim_enter.yaml | 14 -------- automations/jeff_manheim_leave.yaml | 14 -------- automations/jeff_summit_enter.yaml | 14 -------- automations/jeff_summit_leave.yaml | 15 -------- automations/kat_work_enter.yaml | 10 ------ automations/kat_work_leave.yaml | 10 ------ configuration.yaml | 54 ----------------------------- groups.yaml | 6 +--- scripts/inside_all_on.yaml | 2 +- scripts/outside_all_on.yaml | 2 +- 11 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 automations/jeff_manheim_enter.yaml delete mode 100644 automations/jeff_manheim_leave.yaml delete mode 100644 automations/jeff_summit_enter.yaml delete mode 100644 automations/jeff_summit_leave.yaml delete mode 100644 automations/kat_work_enter.yaml delete mode 100644 automations/kat_work_leave.yaml diff --git a/automation.yaml b/automation.yaml index b16fba6..11275f5 100644 --- a/automation.yaml +++ b/automation.yaml @@ -9,10 +9,6 @@ # Weather Based - !include automations/cloudy_inside_on_home.yaml # Jeff -- !include automations/jeff_manheim_enter.yaml -- !include automations/jeff_manheim_leave.yaml -- !include automations/jeff_summit_enter.yaml -- !include automations/jeff_summit_leave.yaml - !include automations/jeff_home_enter.yaml - !include automations/jeff_home_leave.yaml #- !include automations/jeff_stationary.yaml @@ -20,7 +16,5 @@ #- !include automations/jeff_walking.yaml #- !include automations/jeff_driving.yaml # Kat -- !include automations/kat_work_enter.yaml -- !include automations/kat_work_leave.yaml - !include automations/kat_home_enter.yaml - !include automations/kat_home_leave.yaml diff --git a/automations/jeff_manheim_enter.yaml b/automations/jeff_manheim_enter.yaml deleted file mode 100644 index 0341165..0000000 --- a/automations/jeff_manheim_enter.yaml +++ /dev/null @@ -1,14 +0,0 @@ -alias: "Jeff Arrives At Manheim" -trigger: - platform: zone - event: enter - zone: zone.manheim - entity_id: device_tracker.owntracks_jeffreysphone -action: - - service: notify.notify - data: - message: "Jeff arrived at Manheim" - - service: input_select.select_option - data: - entity_id: input_select.jeff_status - option: stationary diff --git a/automations/jeff_manheim_leave.yaml b/automations/jeff_manheim_leave.yaml deleted file mode 100644 index f3d765d..0000000 --- a/automations/jeff_manheim_leave.yaml +++ /dev/null @@ -1,14 +0,0 @@ -alias: "Jeff Leaves Manheim" -trigger: - platform: zone - event: leave - zone: zone.manheim - entity_id: device_tracker.owntracks_jeffreysphone -action: - - service: notify.notify - data: - message: "Jeff left Manheim" - - service: input_select.select_option - data: - entity_id: input_select.jeff_status - option: moving diff --git a/automations/jeff_summit_enter.yaml b/automations/jeff_summit_enter.yaml deleted file mode 100644 index 2162fb4..0000000 --- a/automations/jeff_summit_enter.yaml +++ /dev/null @@ -1,14 +0,0 @@ -alias: "Jeff Arrives At CAI" -trigger: - platform: zone - event: enter - zone: zone.summit - entity_id: device_tracker.owntracks_jeffreysphone -action: - - service: notify.notify - data: - message: "Jeff arrived at CAI-Summit" - - service: input_select.select_option - data: - entity_id: input_select.jeff_status - option: stationary diff --git a/automations/jeff_summit_leave.yaml b/automations/jeff_summit_leave.yaml deleted file mode 100644 index e6f4ac4..0000000 --- a/automations/jeff_summit_leave.yaml +++ /dev/null @@ -1,15 +0,0 @@ -alias: "Jeff Leaves Summit" -trigger: - platform: zone - event: leave - zone: zone.summit - entity_id: device_tracker.owntracks_jeffreysphone -action: - - service: notify.notify - data: - title: 'Jeff Left CAI-Summit' - message: "Jeff left CAI-Summit" - - service: input_select.select_option - data: - entity_id: input_select.jeff_status - option: moving \ No newline at end of file diff --git a/automations/kat_work_enter.yaml b/automations/kat_work_enter.yaml deleted file mode 100644 index ce1ee00..0000000 --- a/automations/kat_work_enter.yaml +++ /dev/null @@ -1,10 +0,0 @@ -alias: "Kat Arrives Work" -trigger: - platform: zone - event: enter - zone: zone.zoo_atlanta - entity_id: device_tracker.katheriesiphone_2 -action: - - service: notify.notify - data: - message: "Kat arrived at Zoo Atlanta" diff --git a/automations/kat_work_leave.yaml b/automations/kat_work_leave.yaml deleted file mode 100644 index 1f60211..0000000 --- a/automations/kat_work_leave.yaml +++ /dev/null @@ -1,10 +0,0 @@ -alias: "Kat Leaves Work" -trigger: - platform: zone - event: leave - zone: zone.home - entity_id: device_tracker.katheriesiphone_2 -action: - - service: notify.notify - data: - message: "Kat left Zoo Atlanta" diff --git a/configuration.yaml b/configuration.yaml index 7d9fc40..46c0172 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -28,55 +28,6 @@ zone: radius: 100 icon: mdi:account-multiple -zone 2: - name: Manheim - latitude: !secret WORK_LATITUDE - longitude: !secret WORK_LONGITUDE - radius: 500 - icon: mdi:office - -zone 3: - name: Zoo Atlanta - latitude: 33.7321545 - longitude: -84.3734925 - radius: 350 - icon: mdi:paw - -zone 4: - name: Gump - latitude: 33.89261183797744 - longitude: -83.96071630537878 - radius: 200 - icon: mdi:school - -zone 5: - name: Pottery - latitude: 33.987571 - longitude: -84.0951167 - radius: 100 - icon: mdi:palette - -zone 6: - name: The Learning Gym - latitude: 33.8992118 - longitude: -84.0054688 - radius: 100 - icon: mdi:dumbbell - -zone 7: - name: Gwinnett Swim - latitude: 34.1414549 - longitude: -83.9602195 - radius: 100 - icon: mdi:swim - -zone 8: - name: Summit - latitude: !secret SUMMIT_LATITUDE - longitude: !secret SUMMIT_LONGITUDE - radius: 500 - icon: mdi:office - mqtt: broker: 192.168.1.15 port: 8883 @@ -150,8 +101,3 @@ updater: # Track the sun sun: - - - - - diff --git a/groups.yaml b/groups.yaml index c37aff7..1e85186 100644 --- a/groups.yaml +++ b/groups.yaml @@ -37,7 +37,7 @@ environment: ### Grops ### Family: - device_tracker.owntracks_jeffreysphone - - device_tracker.katherinestonesiphone + - device_tracker.katheriesiphone_2 Jeffrey: - device_tracker.owntracks_jeffreysphone @@ -45,10 +45,6 @@ Jeffrey: - input_select.jeff_status - sensor.jeff_ett_home -Jeff Trackers: - - device_tracker.owntracks_jeffreysphone - - device_tracker.jeffreysiphone - Katherine: - device_tracker.katheriesiphone_2 - sensor.kat_iphone_batt diff --git a/scripts/inside_all_on.yaml b/scripts/inside_all_on.yaml index 738d042..ad62be6 100644 --- a/scripts/inside_all_on.yaml +++ b/scripts/inside_all_on.yaml @@ -11,4 +11,4 @@ sequence: entity_id: scene.livingroom_normal - service: notify.notify data: - message: "Inside lights are on" + title: "Inside lights are on" diff --git a/scripts/outside_all_on.yaml b/scripts/outside_all_on.yaml index a681769..7859e23 100644 --- a/scripts/outside_all_on.yaml +++ b/scripts/outside_all_on.yaml @@ -17,4 +17,4 @@ sequence: entity_id: switch.front_porch_right - service: notify.notify data: - message: "Outside lights are on" + title: "Outside lights are on"