diff --git a/automations.yaml b/automations.yaml index f6c6ba6..70089b9 100644 --- a/automations.yaml +++ b/automations.yaml @@ -405,7 +405,7 @@ state: 'off' then: - service: script.status_annc - data_template: + data: who: basement call_ha_started: 1 else: diff --git a/packages/alerts.yaml b/packages/alerts.yaml index 254266f..5baf368 100644 --- a/packages/alerts.yaml +++ b/packages/alerts.yaml @@ -60,7 +60,7 @@ automation: seconds: 0 action: - service: script.status_annc - data_template: + data: who: 'living_room' call_interuption: 1 call_snark_door_open: 1 \ No newline at end of file diff --git a/packages/alexa.yaml b/packages/alexa.yaml index 8885341..028f909 100644 --- a/packages/alexa.yaml +++ b/packages/alexa.yaml @@ -26,7 +26,7 @@ automation: minutes: 15 action: - service: script.activate_alexa_actionable_notification - data_template: + data: text: >- The furnace room light is on, should I turn it off? event_id: 'actionable_notification_furnace_room_light_on' diff --git a/packages/announcements.yaml b/packages/announcements.yaml index 291d13e..526d3a1 100644 --- a/packages/announcements.yaml +++ b/packages/announcements.yaml @@ -344,7 +344,7 @@ script: alias: 'Dinner Is Ready' sequence: - service: script.status_annc - data_template: + data: who: 'everywhere' call_dinner_is_ready: 1 @@ -352,7 +352,7 @@ script: alias: 'We Are Leaving' sequence: - service: script.status_annc - data_template: + data: who: 'everywhere' call_we_are_leaving: 1 @@ -369,7 +369,7 @@ script: - delay: seconds: 5 - service: script.speech_engine - data_template: + data: who: living_room message: !include ../templates/speech/welcome_home.yaml mode: restart diff --git a/packages/audio.yaml b/packages/audio.yaml index 963f95e..01d0133 100644 --- a/packages/audio.yaml +++ b/packages/audio.yaml @@ -154,7 +154,7 @@ automation: entity_id: sensor.room_audio action: - service: input_text.set_value - data_template: + data: entity_id: input_text.room_presence value: '{{ states(''sensor.room_audio'') }}' - service: mqtt.publish diff --git a/packages/custom_weather.yaml b/packages/custom_weather.yaml index 4c78801..975b011 100644 --- a/packages/custom_weather.yaml +++ b/packages/custom_weather.yaml @@ -890,7 +890,7 @@ automation: # at: '23:58:00' # action: # service: mqtt.publish - # data_template: + # data: # topic: 'house/rain/yesterday_total' # retain: true # payload: "{{ states('sensor.todays_rainfall') }}" @@ -951,6 +951,6 @@ script: alias: 'Weather Briefing' sequence: - service: script.speech_engine - data_template: + data: who: "{{ who }}" message: !include ../templates/speech/weather_briefing_full.yaml \ No newline at end of file diff --git a/packages/notify.yaml b/packages/notify.yaml index e9ab1cf..c0c12f1 100644 --- a/packages/notify.yaml +++ b/packages/notify.yaml @@ -1024,12 +1024,12 @@ script: alias: 'Jarvis Alert' sequence: - service: mqtt.publish - data_template: + data: topic: 'house/polly/lastmsg' payload: 'This message is from {{ now().strftime("%-I") }}:{{ now().strftime("%M") }} {{ now().strftime("%p") }}. {{ message | striptags | truncate(220)}}' retain: true - service: media_player.turn_on - data_template: + data: entity_id: > {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %} media_player.kallen_bedroom_speaker @@ -1041,7 +1041,7 @@ script: {% endif %} {% endif %} - service: media_player.volume_set - data_template: + data: entity_id: > {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %} media_player.kallen_bedroom_speaker @@ -1063,7 +1063,7 @@ script: {% endif %} {% endif %} - service: tts.amazon_polly_say - data_template: + data: entity_id: > {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %} media_player.kallen_bedroom_speaker @@ -1154,7 +1154,7 @@ script: voice: "{{ states('input_select.jarvis_voice') }}" sequence: - service: mqtt.publish - data_template: + data: topic: 'house/polly/lastmsg' payload: > {% if msg_summary == 'recall' %} @@ -1171,13 +1171,13 @@ script: {% endif %} retain: true - service: mqtt.publish - data_template: + data: topic: 'house/polly/msgtime' payload: > {{ now().strftime("%-I") }}:{{ now().strftime("%M") }} {{ now().strftime("%p") }} retain: true - service: mqtt.publish - data_template: + data: topic: 'house/polly/lastloc' payload: '{{ who }}' retain: true @@ -1338,7 +1338,7 @@ script: entity_id: input_boolean.vacation_mode state: 'off' - service: mqtt.publish - data_template: + data: topic: 'house/polly/lastmsg' payload: > {% if msg_summary == 'recall' %} @@ -1355,18 +1355,18 @@ script: {% endif %} retain: true - service: mqtt.publish - data_template: + data: topic: 'house/polly/msgtime' payload: > {{ now().strftime("%-I") }}:{{ now().strftime("%M") }} {{ now().strftime("%p") }} retain: true - service: mqtt.publish - data_template: + data: topic: 'house/polly/lastloc' payload: '{{ who }}' retain: true - service: script.alexa_voice - data_template: + data: entity_id: >- {{ who }} message: >- @@ -1466,7 +1466,7 @@ script: then: - stop: 'Kids are sleeping' - service: media_player.turn_on - data_template: + data: entity_id: >- {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %} {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %} @@ -1490,7 +1490,7 @@ script: {% endif %} {% endif %} - service: media_player.volume_set - data_template: + data: entity_id: >- {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %} {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %} @@ -1558,7 +1558,7 @@ script: {% endif %} {% endif %} - service: tts.amazon_polly_say - data_template: + data: entity_id: >- {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %} {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %} @@ -1585,7 +1585,7 @@ script: alias: 'Nabu Voice' sequence: - service: media_player.turn_on - data_template: + data: entity_id: > {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %} media_player.kallen_bedroom_speaker @@ -1597,7 +1597,7 @@ script: {% endif %} {% endif %} - service: media_player.volume_set - data_template: + data: entity_id: > {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %} media_player.kallen_bedroom_speaker @@ -1615,7 +1615,7 @@ script: .3 {% endif %} - service: tts.cloud_say - data_template: + data: entity_id: > {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %} media_player.kallen_bedroom_speaker @@ -1640,12 +1640,12 @@ script: # entity_id: 'media_player.ha_blue' # state: 'playing' # - service: input_number.set_value - # data_template: + # data: # entity_id: input_number.old_volume # value: > # {{ states.media_player.ha_blue.attributes.volume_level }} # - service: media_player.volume_set - # data_template: + # data: # entity_id: media_player.ha_blue # volume_level: .2 @@ -1655,7 +1655,7 @@ script: # entity_id: 'media_player.ha_blue' # state: 'playing' # - service: media_player.volume_set - # data_template: + # data: # entity_id: media_player.ha_blue # volume_level: > # {{ states.input_number.old_volume.state }} diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index 737f854..cae63d5 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -160,7 +160,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.kallen_school_day_start - data_template: + data: time: > {% if is_state('input_boolean.kallen_two_hour_delay','on') %} 11:00 @@ -171,7 +171,7 @@ script: seconds: 1 - service: input_datetime.set_datetime entity_id: input_datetime.kallen_wakeup_time - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_today', 'on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} @@ -185,7 +185,7 @@ script: - service: input_select.select_option target: entity_id: input_select.kallen_morning_briefing_location - data_template: + data: option: > {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} @@ -198,7 +198,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.kallen_morning_briefing - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_today', 'on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} @@ -211,7 +211,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.kallen_school_day_start_reminder - data_template: + data: time: > {% if is_state('input_boolean.kallen_two_hour_delay','on') %} 10:00 @@ -220,7 +220,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.kallen_school_day_end_reminder - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_early_release','on') %} 13:30 @@ -233,7 +233,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.kallen_bedtime - data_template: + data: time: > {% if is_state('sensor.kallen_school_tomorrow', 'on') %} 21:00 @@ -242,7 +242,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.kallen_nightly_briefing - data_template: + data: time: > {% if is_state('sensor.kallen_school_tomorrow', 'on') %} 20:40 @@ -267,7 +267,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.audible_notification_on - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_today','on') %} {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 5400) | timestamp_custom('%H:%M', false) }} @@ -276,7 +276,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.morning_briefing - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} @@ -297,7 +297,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.daily_briefing - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_school_early_release','on') %} @@ -357,7 +357,7 @@ script: {{ (state_attr('input_datetime.kallen_bedtime','timestamp') - 3600) | timestamp_custom('%H:%M', false) }} - service: input_datetime.set_datetime entity_id: input_datetime.audible_notification_off - data_template: + data: time: > {% if is_state('sensor.kallen_school_tomorrow','on') %} 22:00 @@ -370,7 +370,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.master_bedroom_wakeup - data_template: + data: time: > {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_school_early_release','on') %} @@ -387,7 +387,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.master_bedroom_cooling - data_template: + data: time: > {% set low = state_attr('sensor.current_forecast','overnight_low') | float %} {% if is_state('input_boolean.hot_day','on') and is_state('sensor.kallen_school_tomorrow','on') %} @@ -403,7 +403,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.master_bedroom_fan - data_template: + data: time: > {% set low = state_attr('sensor.current_forecast','overnight_low') | float %} {% if low > 60 %} @@ -444,7 +444,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.emma_wakeup - data_template: + data: time: "{{ states('input_datetime.master_bedroom_wakeup') }}" emma_bedroom_scheduling_evening: @@ -452,7 +452,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.emma_bedtime - data_template: + data: time: > {% set high = state_attr('sensor.current_forecast','high_temp') | float %} {% set low = state_attr('sensor.current_forecast','overnight_low') | float %} @@ -483,7 +483,7 @@ script: sequence: - service: input_datetime.set_datetime entity_id: input_datetime.morning_alarm_disarm - data_template: + data: time: > {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} {% if is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','on') %} @@ -505,7 +505,7 @@ script: {% endif %} - service: input_datetime.set_datetime entity_id: input_datetime.morning_alarm_rearm - data_template: + data: time: > {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} {% if is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','off') %} diff --git a/packages/security.yaml b/packages/security.yaml index 5bd43ff..14ab3b9 100644 --- a/packages/security.yaml +++ b/packages/security.yaml @@ -301,7 +301,7 @@ automation: color_name: red brightness_pct: 100 - service: script.status_annc - data_template: + data: who: common call_interruption: 1 call_lockdown_issue: 1 diff --git a/packages/weatheralerts.yaml b/packages/weatheralerts.yaml index b379563..03e887b 100644 --- a/packages/weatheralerts.yaml +++ b/packages/weatheralerts.yaml @@ -1330,7 +1330,7 @@ automation: value_template: "{{ state_attr('sensor.weatheralerts_alert_1', 'alert_id') not in states('input_text.weatheralerts_triggered_ui_alert_ids') }}" action: - service: script.weatheralerts_popup_on_wx_alert - data_template: + data: title: > {% if (states('sensor.weatheralerts_alert_1') == 'on') and ((as_timestamp(now()) - as_timestamp(state_attr('sensor.weatheralerts_alert_1', 'alert_effective'))|float) <= 3600) %} {{ state_attr('sensor.weatheralerts_alert_1', 'display_title') }} @@ -1373,7 +1373,7 @@ automation:
Alert:
{{ state_attr('sensor.weatheralerts_alert_5', 'display_title') }} {% endif %} - service: input_text.set_value - data_template: + data: entity_id: input_text.weatheralerts_triggered_ui_alert_ids value: "{{ state_attr('sensor.weatheralerts_alert_1', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_2', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_3', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_4', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_5', 'alert_id') }}" @@ -1415,7 +1415,7 @@ automation: value_template: "{{ state_attr('sensor.weatheralerts_alert_1', 'alert_id') not in states('input_text.weatheralerts_triggered_alert_ids') }}" action: - service: notify.notify - data_template: + data: message: > Current NWS Weather Alerts: @@ -1442,7 +1442,7 @@ automation: {{ states.sensor.weatheralerts_alert_5.attributes.display_title }} for {{ state_attr('sensor.weatheralerts', 'friendly_name') }} {% endif %} - service: input_text.set_value - data_template: + data: entity_id: input_text.weatheralerts_triggered_alert_ids value: "{{ state_attr('sensor.weatheralerts_alert_1', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_2', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_3', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_4', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_5', 'alert_id') }}" @@ -1458,7 +1458,7 @@ automation: # above: 0 # action: # - service: script.text_notify - # data_template: + # data: # title: "Weather Alert for Anchorage House" # message: > # There are currently {{ state_attr('sensor.weatheralerts_active_alerts', 'warning_count') | int }} active warnings and {{ state_attr('sensor.weatheralerts_active_alerts', 'watch_count') | int }} watches for our area. @@ -1487,7 +1487,7 @@ automation: who: everywhere message: Severe thunderstorm warning has been issued, it's about to get loud! - service: input_text.set_value - data_template: + data: entity_id: input_text.weatheralerts_triggered_audible_alert_ids value: "{{ state_attr('sensor.weatheralerts_alert_1', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_2', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_3', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_4', 'alert_id') }} {{ state_attr('sensor.weatheralerts_alert_5', 'alert_id') }}" @@ -1631,7 +1631,7 @@ script: data: color_name: red - service: script.status_annc - data_template: + data: who: 'common' call_interuption: 1 call_lightning_alert: 1 @@ -1662,7 +1662,7 @@ script: data: tag: lightning-warning - service: script.status_annc - data_template: + data: who: 'common' call_interuption: 1 call_lightning_clear: 1 diff --git a/scripts.yaml b/scripts.yaml index 70f8f99..c0fada2 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -38,7 +38,7 @@ give_me_darkness: alias: Both adults are home then: - service: script.activate_alexa_actionable_notification - data_template: + data: text: Would you like me to arm the security system? event_id: actionable_notification_night_security_arm @@ -278,7 +278,7 @@ going_upstairs: data: {} alias: Shut down laptop - service: script.activate_alexa_actionable_notification - data_template: + data: text: Would you like me to shut down your computer? event_id: actionable_notification_shutdown_computer