diff --git a/automation/holiday.yaml b/automation/holiday.yaml deleted file mode 100755 index f4b48061..00000000 --- a/automation/holiday.yaml +++ /dev/null @@ -1,29 +0,0 @@ -################################### -## Holiday Lights on/off with IFTTT/Alexa support -## [Etekcity Outlets](http://amzn.to/2efNoBP) -## [433Mhz Transmitter and receiver](http://amzn.to/2dceNY2) -################################### - -- alias: 'Holiday Stuff on' - trigger: - - platform: sun - event: sunset - - platform: event - event_type: holiday_lights_on - - action: - - service: script.holiday_switches_on - - -- alias: 'Holiday Stuff off' - trigger: - - platform: sun - event: sunrise -#offset: '-0{{ (range(1, 3)|random|int) }}:{{ (range(1, 59)|random|int) }}:00' - - platform: event - event_type: holiday_lights_off - - action: - - service: script.switch_turn_off_all - - \ No newline at end of file diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml index d8209cd3..6038e0ac 100755 --- a/automation/sunrise_turnon_and_off.yaml +++ b/automation/sunrise_turnon_and_off.yaml @@ -13,16 +13,24 @@ - service: switch.turn_on entity_id: - switch.front_door_outlet + - switch.living_room_outlet + - switch.den_outlet + - switch.foyer_outlet - service: light.turn_on entity_id: - light.outdoor_bathroom - group.living_room_accents - - service: script.holiday_switches_on - - delay: '00:{{ (range(1, 30)|random|int) }}:00' + - delay: '00:{{ (range(1, 20)|random|int) }}:00' - service: script.monthly_color_scene - service: script.Voice_notify - data: - value1: 'Sunset has occurred. I will turn on the outside lights now.' + data_template: + value1: > + {{ [ + "It is pretty dark outside. I will turn on the outside lights now.", + "It's a little past Sunset. Time to turn on the outside lights. I'm on it.", + "I'll switch on the outside lights. It's getting dark outside.", + "Time to turn on the front lights. I'll take care of it." + ] | random }} ###################################################################### - alias: 'Sunset Stuff off' @@ -35,7 +43,7 @@ - service: light.turn_off entity_id: - group.all_lights - - light.outfoor_front + - light.outdoor_front - group.outdoor_lights - service: script.interior_off diff --git a/script/holiday_switches_on.yaml b/script/holiday_switches_on.yaml deleted file mode 100755 index 6a6b43cf..00000000 --- a/script/holiday_switches_on.yaml +++ /dev/null @@ -1,28 +0,0 @@ -###################################################################################################### -###Script to shut switches with a 30 second delay to not trample codes -### connected to [Etekcity Outlets](http://amzn.to/2efNoBP) -## [433Mhz Transmitter and receiver](http://amzn.to/2dceNY2) -### Sample Call -# action: -# - service: script.holiday_switches_on -###################################################################################################### - -holiday_switches_on: - sequence: - - service: switch.turn_on - entity_id: switch.living_room_outlet - - delay: 00:00:30 - - service: switch.turn_on - entity_id: switch.foyer_outlet - - delay: 00:00:30 - - service: switch.turn_on - entity_id: switch.front_door_outlet - - - condition: sun - after: sunset - - service: switch.turn_on - entity_id: switch.den_outlet - - delay: 00:00:30 - - service: switch.turn_on - entity_id: switch.dining_room_outlet - diff --git a/script/monthly_colors_scene.yaml b/script/monthly_colors_scene.yaml index ab08c1a5..e08ff60f 100755 --- a/script/monthly_colors_scene.yaml +++ b/script/monthly_colors_scene.yaml @@ -29,7 +29,7 @@ monthly_color_scene: - service: scene.turn_on data_template: entity_id: > - "scene.month_ + scene.month_ {%- if now().strftime("%m%d")|int == 101 -%} new_years_day {%- elif now().strftime("%m%d")|int == 212 @@ -53,7 +53,7 @@ monthly_color_scene: st_patty {%- else -%} standard - {%- endif -%}_colors" + {%- endif -%}_colors # http://www.calendar-365.com/holidays/2017.html diff --git a/script/voice_notify.yaml b/script/voice_notify.yaml index 0063189c..890560f8 100755 --- a/script/voice_notify.yaml +++ b/script/voice_notify.yaml @@ -48,9 +48,9 @@ voice_notify: {% if now().strftime("%H")|int < 12 %} 0.20 {% elif now().strftime("%H")|int < 18 %} - 0.70 + 0.50 {% else %} - 0.40 + 0.25 {% endif %} - service: tts.google_say