diff --git a/automation/Speech/announcements.yaml b/automation/Speech/announcements.yaml index 4c2718fc..f095f21d 100755 --- a/automation/Speech/announcements.yaml +++ b/automation/Speech/announcements.yaml @@ -17,11 +17,6 @@ for: '00:02:00' action: - - service: input_boolean.turn_on - entity_id: - - input_boolean.responsibilities - - input_boolean.inside_weather - - service: script.Voice_notify data_template: personarriving: > @@ -41,3 +36,4 @@ ] | random }} {%- endmacro -%} "{{greeting_sentence(person)}}" + call_responsibilities: 1 diff --git a/automation/Speech/door_opened.yaml b/automation/Speech/door_opened.yaml index f877c99e..e2fb3c1e 100755 --- a/automation/Speech/door_opened.yaml +++ b/automation/Speech/door_opened.yaml @@ -29,3 +29,4 @@ - service: script.Voice_notify data_template: DoorOpened: "The {{ trigger.entity_id.split('.')[1]|replace('_', ' ') }} has been {{ (trigger.to_state.state)|replace('_', ' ') }}." + call_inside_weather: 1 diff --git a/automation/Speech/home_stats.yaml b/automation/Speech/home_stats.yaml index 03b528ce..3cf4bcf3 100755 --- a/automation/Speech/home_stats.yaml +++ b/automation/Speech/home_stats.yaml @@ -19,10 +19,11 @@ action: - service: input_boolean.turn_on entity_id: - - input_boolean.chore_check - - input_boolean.inside_temp - - input_boolean.outside_weather - input_boolean.lights_status - input_boolean.garage_check - service: script.Voice_notify + data: + call_inside_weather: 1 + call_responsibilities: 1 + call_outside_weather: 1 diff --git a/automation/Speech/responsibilities.yaml b/automation/Speech/responsibilities.yaml index f99c2bab..45d045d0 100755 --- a/automation/Speech/responsibilities.yaml +++ b/automation/Speech/responsibilities.yaml @@ -11,7 +11,6 @@ from: 'off' action: - - service: input_boolean.turn_on - entity_id: - - input_boolean.chore_check - service: script.Voice_notify + data: + call_responsibilities: 1 diff --git a/customize/input_booleans.yaml b/customize/input_booleans.yaml index a1c72eb3..15128df4 100755 --- a/customize/input_booleans.yaml +++ b/customize/input_booleans.yaml @@ -66,16 +66,6 @@ input_boolean.home_stats: hidden: False icon: mdi:chart-bar - - -input_boolean.inside_weather: - friendly_name: 'Inside Weather' - emulated_hue: False - hidden: False - - - - input_boolean.last_message: friendly_name: 'Last Message' emulated_hue: True @@ -108,12 +98,6 @@ input_boolean.medicine: -input_boolean.outside_weather: - friendly_name: 'Outside Weather' - emulated_hue: True - hidden: False - - input_boolean.responsibilities: diff --git a/input_boolean/hidden_booleans.yaml b/input_boolean/hidden_booleans.yaml index 41739ce7..b40d3974 100755 --- a/input_boolean/hidden_booleans.yaml +++ b/input_boolean/hidden_booleans.yaml @@ -6,9 +6,6 @@ responsibilities: name: responsibilities initial: off -chore_check: - name: responsibilities - initial: off medicine: name: medicine @@ -18,13 +15,7 @@ lights_status: name: Lights Status initial: off -inside_weather: - name: Inside Weather - initial: off -outside_weather: - name: Outside Weather - initial: off garage_check: name: Garage Check diff --git a/script/voice_notify.yaml b/script/voice_notify.yaml index 39446f13..5218ddd1 100755 --- a/script/voice_notify.yaml +++ b/script/voice_notify.yaml @@ -173,10 +173,10 @@ voice_notify: {{ personarriving }} {# Called from Annoucenments #} {{ NestStatus}} {# Called from Nest when thermostats turn on #} - {% if is_state('input_boolean.inside_weather', 'on') or call_inside_weather == 1 %} + {% if call_inside_weather == 1 %} {{inside_weather()}} {%endif%} - {% if is_state('input_boolean.outside_weather', 'on') %} + {% if call_outside_weather == 1 %} {{outside_weather()}} {%endif%} {{uv_rays()}} @@ -190,7 +190,7 @@ voice_notify: {% if is_state('input_boolean.lights_status', 'on') %} {{lights_status()}} {%endif%} - {% if is_state('input_boolean.chore_check', 'on') %} + {% if call_responsibilities == 1%} {{responsibilities()}} {%endif%} {% if now().strftime("%H")|int > 22 %} @@ -208,8 +208,5 @@ voice_notify: - input_boolean.alert_mode - input_boolean.home_stats - input_boolean.responsibilities - - input_boolean.chore_check - - input_boolean.inside_temp - - input_boolean.outside_weather - input_boolean.lights_status - input_boolean.garage_check