Updating Repo to match RasPi

2025-04-14 16:15:29 +00:00 · 2017-05-04 20:26:44 -04:00 · 2017-05-04 20:26:44 -04:00 · d0e9db33c8
commit d0e9db33c8
parent 70496ab13b
47 changed files with 27 additions and 30 deletions
--- a/alexa/alexa_confirm.yaml
+++ b/alexa/alexa_confirm.yaml
--- a/alexa/intents.yaml
+++ b/alexa/intents.yaml
--- a/automation.yaml
+++ b/automation.yaml
--- a/automations/close_garage_at_nine.yaml
+++ b/automations/close_garage_at_nine.yaml
--- a/automations/close_garage_on_away.yaml
+++ b/automations/close_garage_on_away.yaml
--- a/automations/cloudy_inside_on_home.yaml
+++ b/automations/cloudy_inside_on_home.yaml
--- 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
--- a/automations/good_night.yaml
+++ b/automations/good_night.yaml
--- 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"
--- 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"
--- a/automations/jeff_status_lost.yaml
+++ b/automations/jeff_status_lost.yaml
--- a/automations/jeff_status_moving.yaml
+++ b/automations/jeff_status_moving.yaml
--- a/automations/jeff_status_stationary.yaml
+++ b/automations/jeff_status_stationary.yaml
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
+  service: script.inside_all_off
--- a/automations/sunrise_outside_off.yaml
+++ b/automations/sunrise_outside_off.yaml
--- a/automations/sunset_inside_on.yaml
+++ b/automations/sunset_inside_on.yaml
--- a/automations/sunset_outside_on.yaml
+++ b/automations/sunset_outside_on.yaml
--- a/automations/test.yaml
+++ b/automations/test.yaml
--- 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:
-  
--- a/customize.yaml
+++ b/customize.yaml
--- a/groups.yaml
+++ b/groups.yaml
--- a/input_select.yaml
+++ b/input_select.yaml
--- a/lights/living_room.yaml
+++ b/lights/living_room.yaml
--- a/scenes.yaml
+++ b/scenes.yaml
--- a/scripts.yaml
+++ b/scripts.yaml
--- a/scripts/inside_all_off.yaml
+++ b/scripts/inside_all_off.yaml
--- a/scripts/inside_all_on.yaml
+++ b/scripts/inside_all_on.yaml
--- a/scripts/jeff_is_moving.yaml
+++ b/scripts/jeff_is_moving.yaml
--- a/scripts/jeff_is_stationary.yaml
+++ b/scripts/jeff_is_stationary.yaml
--- a/scripts/jeff_unknown.yaml
+++ b/scripts/jeff_unknown.yaml
--- a/scripts/outside_all_off.yaml
+++ b/scripts/outside_all_off.yaml
--- a/scripts/outside_all_on.yaml
+++ b/scripts/outside_all_on.yaml
--- a/scripts/refresh_devices.yaml
+++ b/scripts/refresh_devices.yaml
--- a/sensors/devices.yaml
+++ b/sensors/devices.yaml
--- a/sensors/google_travel_time.yaml
+++ b/sensors/google_travel_time.yaml
--- a/sensors/owntracks.yaml
+++ b/sensors/owntracks.yaml
--- a/sensors/smartthings.yaml
+++ b/sensors/smartthings.yaml
--- a/sensors/speedtest.yaml
+++ b/sensors/speedtest.yaml
--- a/sensors/weather.yaml
+++ b/sensors/weather.yaml
--- a/sensors/wunderground.yaml
+++ b/sensors/wunderground.yaml
--- a/switches/garage.yaml
+++ b/switches/garage.yaml
--- a/switches/living_room.yaml
+++ b/switches/living_room.yaml
--- a/switches/outside.yaml
+++ b/switches/outside.yaml