diff --git a/automation/Timed_Triggers/0830.yaml b/automation/Timed_Triggers/0830.yaml index d52b9a64..1cf798b4 100755 --- a/automation/Timed_Triggers/0830.yaml +++ b/automation/Timed_Triggers/0830.yaml @@ -32,8 +32,3 @@ - group.all_lights - service: switch.turn_off entity_id: switch.kitchen_accents - - wait_template: >- - {{ is_state('group.bed', 'off') }} - - service: light.turn_on - entity_id: - - group.kitchen_lights diff --git a/automation/Timed_Triggers/wake_up.yaml b/automation/Timed_Triggers/wake_up.yaml new file mode 100755 index 00000000..50a8e1f0 --- /dev/null +++ b/automation/Timed_Triggers/wake_up.yaml @@ -0,0 +1,26 @@ +###################################################################### +## Stuff that needs to happen when we are both out of bed. +###################################################################### + +- alias: 'Time to wake up!' + trigger: + - platform: state + entity_id: group.bed + to: 'off' + + condition: + - condition: state + entity_id: group.family + state: home + - condition: state + entity_id: input_boolean.guest_mode + state: 'off' + - condition: time + after: '07:00:00' + before: '11:00:00' + action: + - service: light.turn_on + entity_id: + - group.kitchen_lights + - service: switch.turn_on + entity_id: switch.living_room_amp diff --git a/packages/juicenet.yaml b/packages/juicenet.yaml index a093e7e8..a360a6bc 100755 --- a/packages/juicenet.yaml +++ b/packages/juicenet.yaml @@ -75,7 +75,7 @@ automation: data_template: tweet: > {{ [ - "The #Chevy Bolt Charged for {{(states.sensor.carlojuice_charge_time.state | int /60) | round() }} minutes and Juiced up add {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs.", + "The #Chevy Bolt Charged for {{(states.sensor.carlojuice_charge_time.state | int /60) | round() }} minutes and Juiced up {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs.", "The last charging session was {{(states.sensor.carlojuice_charge_time.state | int /60) | round() }} minutes. Added {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs ", "The Juice Box Pro added {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs to the #Chevy #BoltEV in {{(states.sensor.carlojuice_charge_time.state | int /60) | round() }} minutes." ] | random + " (http://amzn.to/2zlQIUI) #Electric #Solar"}} diff --git a/packages/twitter.yaml b/packages/twitter.yaml index 8938f790..b955ae2e 100755 --- a/packages/twitter.yaml +++ b/packages/twitter.yaml @@ -86,7 +86,7 @@ automation: {% set location = trigger.event.data.location %} {% set phrases = [ "Thanks for the Follow " ~ handle ~ "! Chirp the Bird from " ~ location ~ "!!", - "Hey " ~ handle ~ "Thanks for the Follow from " ~ location ~ " !", + "Hey " ~ handle ~ "! Thanks for the Follow from " ~ location ~ " !", "New follower " ~ handle ~ " from " ~ location ~ ", I just sounded a chirp in the house.", "Boom! The " ~ location ~ " follow from " ~ handle ~ " makes me sound a chirp in the house.", "Wanna know who is super cool? "~ handle ~" IS!!! Thanks for making me CHIRP!", diff --git a/script/speech_processing.yaml b/script/speech_processing.yaml index a2c9a211..ee27551a 100755 --- a/script/speech_processing.yaml +++ b/script/speech_processing.yaml @@ -43,9 +43,8 @@ speech_processing: state: 'on' - service: switch.turn_on - data: - entity_id: switch.living_room_amp - + entity_id: switch.living_room_amp + - service: media_player.volume_set data_template: entity_id: >