diff --git a/alexa/alexa_confirm.yaml b/alexa/alexa_confirm.yaml old mode 100644 new mode 100755 diff --git a/alexa/intents.yaml b/alexa/intents.yaml old mode 100644 new mode 100755 diff --git a/automation.yaml b/automation.yaml old mode 100644 new mode 100755 diff --git a/automations/close_garage_at_nine.yaml b/automations/close_garage_at_nine.yaml old mode 100644 new mode 100755 diff --git a/automations/close_garage_on_away.yaml b/automations/close_garage_on_away.yaml old mode 100644 new mode 100755 diff --git a/automations/cloudy_inside_on_home.yaml b/automations/cloudy_inside_on_home.yaml old mode 100644 new mode 100755 diff --git a/automations/good_morning.yaml b/automations/good_morning.yaml old mode 100644 new mode 100755 index 3c7b547..cc39273 --- a/automations/good_morning.yaml +++ b/automations/good_morning.yaml @@ -1,8 +1,9 @@ alias: "Good Morning" trigger: - platform: sun - event: sunrise - offset: "-00:30:00" + platform: time + hours: 05 + minutes: 15 + seconds: 00 action: - service: scene.turn_on entity_id: scene.livingroom_normal diff --git a/automations/good_night.yaml b/automations/good_night.yaml old mode 100644 new mode 100755 diff --git a/automations/jeff_home_enter.yaml b/automations/jeff_home_enter.yaml old mode 100644 new mode 100755 index 515095d..006d013 --- a/automations/jeff_home_enter.yaml +++ b/automations/jeff_home_enter.yaml @@ -5,7 +5,6 @@ trigger: zone: zone.home entity_id: device_tracker.jeffreystonesiphone action: - - service: notify.notify + - service: notify.ios_katherinestonesiphone data: - title: "Jarvis" - message: "Jeff is arriving home" + message: "Jeff is home" diff --git a/automations/jeff_home_leave.yaml b/automations/jeff_home_leave.yaml old mode 100644 new mode 100755 index bff7baa..cc282ce --- a/automations/jeff_home_leave.yaml +++ b/automations/jeff_home_leave.yaml @@ -5,7 +5,6 @@ trigger: zone: zone.home entity_id: device_tracker.jeffreystonesiphone action: - - service: notify.notify + - service: notify.ios_katherinestonesiphone data: - title: "Jarvis" - message: "Jeff has left home" + message: "Jeff left home" diff --git a/automations/jeff_status_lost.yaml b/automations/jeff_status_lost.yaml old mode 100644 new mode 100755 diff --git a/automations/jeff_status_moving.yaml b/automations/jeff_status_moving.yaml old mode 100644 new mode 100755 diff --git a/automations/jeff_status_stationary.yaml b/automations/jeff_status_stationary.yaml old mode 100644 new mode 100755 diff --git a/automations/jeff_summit_enter.yaml b/automations/jeff_summit_enter.yaml old mode 100644 new mode 100755 index 2a5e616..4185d78 --- a/automations/jeff_summit_enter.yaml +++ b/automations/jeff_summit_enter.yaml @@ -5,7 +5,6 @@ trigger: zone: zone.summit entity_id: device_tracker.jeffreystonesiphone action: - - service: notify.notify + - service: notify.ios_katherinestonesiphone data: - title: "Jarvis" - message: "Jeff is arriving at Summit" + message: "Jeff arrived at Summit" diff --git a/automations/jeff_summit_leave.yaml b/automations/jeff_summit_leave.yaml old mode 100644 new mode 100755 index 77c947d..87024e9 --- a/automations/jeff_summit_leave.yaml +++ b/automations/jeff_summit_leave.yaml @@ -5,7 +5,6 @@ trigger: zone: zone.summit entity_id: device_tracker.jeffreystonesiphone action: - - service: notify.notify + - service: notify.ios_katherinestonesiphone data: - title: "Jarvis" - message: "Jeff has left summit" + message: "Jeff left summit" diff --git a/automations/kat_home_enter.yaml b/automations/kat_home_enter.yaml old mode 100644 new mode 100755 index 21260d8..430d2ce --- a/automations/kat_home_enter.yaml +++ b/automations/kat_home_enter.yaml @@ -3,8 +3,8 @@ trigger: platform: zone event: enter zone: zone.home - entity_id: device_tracker.katherinesiphone + entity_id: device_tracker.katherinestonesiphone action: - service: notify.ios_jeffreystonesiphone data: - message: "Kat is arriving home" + message: "Kat is home" diff --git a/automations/kat_home_leave.yaml b/automations/kat_home_leave.yaml old mode 100644 new mode 100755 index 7889714..22ec5d8 --- a/automations/kat_home_leave.yaml +++ b/automations/kat_home_leave.yaml @@ -3,8 +3,8 @@ trigger: platform: zone event: leave zone: zone.home - entity_id: device_tracker.katherinesiphone + entity_id: device_tracker.katherinestonesiphone action: - service: notify.ios_jeffreystonesiphone data: - message: "Kat has left home" + message: "Kat left home" diff --git a/automations/sunrise_inside_off.yaml b/automations/sunrise_inside_off.yaml old mode 100644 new mode 100755 index 2e12cca..ea9fb15 --- a/automations/sunrise_inside_off.yaml +++ b/automations/sunrise_inside_off.yaml @@ -1,7 +1,8 @@ alias: "Sunrise Inside off" trigger: - platform: sun - event: sunrise - offset: "+01:00:00" + platform: time + hours: 07 + minutes: 00 + seconds: 00 action: - service: script.inside_all_off \ No newline at end of file + service: script.inside_all_off diff --git a/automations/sunrise_outside_off.yaml b/automations/sunrise_outside_off.yaml old mode 100644 new mode 100755 diff --git a/automations/sunset_inside_on.yaml b/automations/sunset_inside_on.yaml old mode 100644 new mode 100755 diff --git a/automations/sunset_outside_on.yaml b/automations/sunset_outside_on.yaml old mode 100644 new mode 100755 diff --git a/automations/test.yaml b/automations/test.yaml old mode 100644 new mode 100755 diff --git a/configuration.yaml b/configuration.yaml old mode 100644 new mode 100755 index 194d3f4..9c53fb0 --- a/configuration.yaml +++ b/configuration.yaml @@ -78,8 +78,8 @@ zone 8: icon: mdi:office mqtt: - broker: 192.168.1.10 - port: 8883 + broker: 192.168.1.20 + port: 1883 username: !secret MQTT_USER password: !secret MQTT_PASS @@ -114,7 +114,6 @@ device_tracker: mode: router username: !secret ROUTER_USER password: !secret ROUTER_PASS - track_new_devices: yes interval_seconds: 60 consider_home: 180 - platform: icloud @@ -122,6 +121,7 @@ device_tracker: password: !secret ICLOUD_PASS interval_seconds: 60 consider_home: 180 + - platform: bluetooth_tracker notify: @@ -129,9 +129,9 @@ notify: # username: !secret GV_USER # password: !secret GV_PASS # name: googlevoice - - platform: pushbullet - api_key: !secret pushbullet_api - - platform: ios +# - platform: pushbullet +# api_key: !secret pushbullet_api + platform: ios ifttt: key: !secret IFTTT_API_KEY @@ -166,4 +166,3 @@ sun: # iOS ios: - diff --git a/customize.yaml b/customize.yaml old mode 100644 new mode 100755 diff --git a/groups.yaml b/groups.yaml old mode 100644 new mode 100755 diff --git a/input_select.yaml b/input_select.yaml old mode 100644 new mode 100755 diff --git a/lights/living_room.yaml b/lights/living_room.yaml old mode 100644 new mode 100755 diff --git a/scenes.yaml b/scenes.yaml old mode 100644 new mode 100755 diff --git a/scripts.yaml b/scripts.yaml old mode 100644 new mode 100755 diff --git a/scripts/inside_all_off.yaml b/scripts/inside_all_off.yaml old mode 100644 new mode 100755 diff --git a/scripts/inside_all_on.yaml b/scripts/inside_all_on.yaml old mode 100644 new mode 100755 diff --git a/scripts/jeff_is_moving.yaml b/scripts/jeff_is_moving.yaml old mode 100644 new mode 100755 diff --git a/scripts/jeff_is_stationary.yaml b/scripts/jeff_is_stationary.yaml old mode 100644 new mode 100755 diff --git a/scripts/jeff_unknown.yaml b/scripts/jeff_unknown.yaml old mode 100644 new mode 100755 diff --git a/scripts/outside_all_off.yaml b/scripts/outside_all_off.yaml old mode 100644 new mode 100755 diff --git a/scripts/outside_all_on.yaml b/scripts/outside_all_on.yaml old mode 100644 new mode 100755 diff --git a/scripts/refresh_devices.yaml b/scripts/refresh_devices.yaml old mode 100644 new mode 100755 diff --git a/sensors/devices.yaml b/sensors/devices.yaml old mode 100644 new mode 100755 diff --git a/sensors/google_travel_time.yaml b/sensors/google_travel_time.yaml old mode 100644 new mode 100755 diff --git a/sensors/owntracks.yaml b/sensors/owntracks.yaml old mode 100644 new mode 100755 diff --git a/sensors/smartthings.yaml b/sensors/smartthings.yaml old mode 100644 new mode 100755 diff --git a/sensors/speedtest.yaml b/sensors/speedtest.yaml old mode 100644 new mode 100755 diff --git a/sensors/weather.yaml b/sensors/weather.yaml old mode 100644 new mode 100755 diff --git a/sensors/wunderground.yaml b/sensors/wunderground.yaml old mode 100644 new mode 100755 diff --git a/switches/garage.yaml b/switches/garage.yaml old mode 100644 new mode 100755 diff --git a/switches/living_room.yaml b/switches/living_room.yaml old mode 100644 new mode 100755 diff --git a/switches/outside.yaml b/switches/outside.yaml old mode 100644 new mode 100755