Updating Repo to match RasPi

automations/good_morning.yaml

@@ -1,8 +1,9 @@
 alias: "Good Morning"
 trigger:
-  platform: sun
+  platform: time
-  event: sunrise
+  hours: 05
-  offset: "-00:30:00"
+  minutes: 15
+  seconds: 00
 action:
   - service: scene.turn_on
     entity_id: scene.livingroom_normal

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 home"
-      message: "Jeff is arriving home"

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 left home"
-      message: "Jeff has left home"

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 arrived at Summit"
-      message: "Jeff is arriving at Summit"

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 left summit"
-      message: "Jeff has left summit"

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"

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"

automations/sunrise_inside_off.yaml

@@ -1,7 +1,8 @@
 alias: "Sunrise Inside off"
 trigger:
-  platform: sun
+  platform: time
-  event: sunrise
+  hours: 07
-  offset: "+01:00:00"
+  minutes: 00
+  seconds: 00
 action:
-  service: script.inside_all_off
+  service: script.inside_all_off

configuration.yaml

@@ -78,8 +78,8 @@ zone 8:
   icon: mdi:office
 
 mqtt:
- broker: 192.168.1.10
+ broker: 192.168.1.20
- port: 8883
+ 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
+#  - platform: pushbullet
-    api_key: !secret pushbullet_api
+#    api_key: !secret pushbullet_api
-  - platform: ios
+  platform: ios
 
 ifttt:
   key: !secret IFTTT_API_KEY
@@ -166,4 +166,3 @@ sun:
 
 # iOS
 ios:
-