From d4073e1f0b7277595b0a08dc83659dd7b417a779 Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Sun, 2 Jul 2023 19:34:49 -0400 Subject: [PATCH] Fixing more things I shouldn't have to fix because Pirateweather --- custom_templates/weather.jinja | 2 +- packages/custom_weather.yaml | 56 ++++++++++++++----- packages/scheduling.yaml | 6 +- templates/speech/kallen_morning_briefing.yaml | 2 +- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/custom_templates/weather.jinja b/custom_templates/weather.jinja index fd2c1cc..6ab491e 100644 --- a/custom_templates/weather.jinja +++ b/custom_templates/weather.jinja @@ -10,7 +10,7 @@ {% endif %} {% if type in ['forecast','full'] %} {% if 14400 <= ct <= 61200 %} - The forecast high is {{ states('sensor.todays_high_temp') }}. + The forecast high is {{ states('sensor.today_corrected_high_temp') }}. {% else %} Overnight you can expect a low of {{ states('sensor.overnight_lowest_temperature') }}. {% endif %} diff --git a/packages/custom_weather.yaml b/packages/custom_weather.yaml index e4396ae..3412b92 100644 --- a/packages/custom_weather.yaml +++ b/packages/custom_weather.yaml @@ -104,7 +104,7 @@ template: - name: Heat Warning unique_id: 02b8020a-4fa1-4489-abea-bfadf82ec7e5 state: > - {% set day = states('sensor.todays_high_temp') | int %} + {% set day = states('sensor.today_corrected_high_temp') | int %} {% set night = states('sensor.overnight_lowest_temperature') | int %} {% set dayThreshold = states('input_number.extended_heat_threshold') | int %} {% set nightThreshold = states('input_number.hot_overnight_threshold') | int %} @@ -113,7 +113,7 @@ template: device_class: heat attributes: trigger: > - {% set day = states('sensor.todays_high_temp') | int %} + {% set day = states('sensor.today_corrected_high_temp') | int %} {% set night = states('sensor.overnight_lowest_temperature') | int %} {% set dayThreshold = states('input_number.extended_heat_threshold') | int %} {% set nightThreshold = states('input_number.hot_overnight_threshold') | int %} @@ -214,7 +214,7 @@ sensor: 'Later Today ', 'For the rest of the day ' ] | random }} - expect a high of {{ states('sensor.todays_high_temp') }} + expect a high of {{ states('sensor.today_corrected_high_temp') }} {%- if states('sensor.current_forecast') == 'sunny' and is_state('binary_sensor.night','off')%} {{ [ 'and sunny. ', @@ -529,7 +529,7 @@ sensor: 'Later Today ', 'For the rest of the day ' ] | random }} - expect a high of {{ states('sensor.todays_high_temp') }} + expect a high of {{ states('sensor.today_corrected_high_temp') }} {%- if states('sensor.current_forecast') == 'sunny' and is_state('binary_sensor.night','off')%} {{ [ 'and sunny. ', @@ -658,22 +658,22 @@ sensor: unique_id: 8ed2684b-d0ad-402c-bc3c-340cb9b2437a value_template: >- {% if is_state('binary_sensor.overnight', 'off') %} - {% set temp = states('sensor.todays_high_temp')|int %} + {% set temp = states('sensor.today_corrected_high_temp')|int %} {% else %} {% set temp = states('sensor.pirateweather_temperature')|round %} {% endif %} - {%- if states('sensor.todays_high_temp')|int > 63 %} - {%- if states('sensor.todays_high_temp')|int < 80 %} + {%- if states('sensor.today_corrected_high_temp')|int > 63 %} + {%- if states('sensor.today_corrected_high_temp')|int < 80 %} Nice - {% elif states('sensor.todays_high_temp')|int > 90 %} + {% elif states('sensor.today_corrected_high_temp')|int > 90 %} Hot {% else %} Toasty {%- endif %} - {% elif states('sensor.todays_high_temp')|int < 64 %} - {%- if states('sensor.todays_high_temp')|int < 32 %} + {% elif states('sensor.today_corrected_high_temp')|int < 64 %} + {%- if states('sensor.today_corrected_high_temp')|int < 32 %} Freezing - {% elif states('sensor.todays_high_temp')|int > 48 %} + {% elif states('sensor.today_corrected_high_temp')|int > 48 %} Chilly {% else %} Cold @@ -936,18 +936,24 @@ sensor: unit_of_measurement: 'in' value_template: "{{ state_attr('sensor.rain_factor','day_0_rain') | float }}" icon_template: mdi:weather-rainy + today_corrected_high_temp: + friendly_name: 'Today Corrected High Temp' + unique_id: c0c40ec1-605e-4739-a935-ac0a2937fab2 + unit_of_measurement: °F + value_template: "{{ states('input_number.today_corrected_high_temp') | int }}" + icon_template: mdi:thermometer-high input_number: - today_calculated_high_temp: - name: Today Calculated High Temp + today_corrected_high_temp: + name: Today Corrected High Temp min: -100 max: 150 step: 1 unit_of_measurement: °F icon: mdi:thermometer mode: box - today_calculated_low_temp: - name: Today Calculated Low Temp + today_corrected_low_temp: + name: Today Corrected Low Temp min: -100 max: 150 step: 1 @@ -1020,6 +1026,26 @@ input_boolean: # - service: input_boolean.turn_off # entity_id: input_boolean.freeze_warning +automation: + - id: bae55746-c571-4a5d-88e0-8c83aea8110b + alias: Fix High Temperature + description: Gotta make up for one of a few shortcomings in Pirateweather + mode: single + trigger: + - platform: time + at: "00:30" + - platform: time + at: "06:00" + - platform: time + at: "12:00" + - platform: time + at: "17:45" + action: + - service: input_number.set_value + target: + entity_id: input_number.today_corrected_high_temp + data: + value: "{{ states('sensor.todays_high_temp') | int }}" script: diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index ebdc49c..e005f12 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -507,7 +507,7 @@ script: entity_id: input_boolean.hot_day - if: - condition: template - value_template: "{{ states('sensor.todays_high_temp') | int <= states('input_number.cold_day_threshold') | int }}" + value_template: "{{ states('sensor.today_corrected_high_temp') | int <= states('input_number.cold_day_threshold') | int }}" then: - service: input_boolean.turn_on target: @@ -628,7 +628,7 @@ script: data: time: > {% set low = states('sensor.overnight_lowest_temperature') | int %} - {% set high = states('sensor.todays_high_temp') | int %} + {% set high = states('sensor.today_corrected_high_temp') | int %} {% if low > 60 or is_state('input_boolean.hot_day','on') %} 22:30 {% elif 50 <= low <= 60 %} @@ -709,7 +709,7 @@ script: entity_id: input_datetime.emma_bedtime data: time: > - {% set high = states('sensor.todays_high_temp') | int %} + {% set high = states('sensor.today_corrected_high_temp') | int %} {% set low = states('sensor.overnight_lowest_temperature') | int %} {% if is_state('input_boolean.hot_day','on') %} 22:00 diff --git a/templates/speech/kallen_morning_briefing.yaml b/templates/speech/kallen_morning_briefing.yaml index a35a16a..637d05d 100644 --- a/templates/speech/kallen_morning_briefing.yaml +++ b/templates/speech/kallen_morning_briefing.yaml @@ -43,7 +43,7 @@ {% endif %}

- Today the high temperature will be {{ states('sensor.todays_high_temp') }} degrees. + Today the high temperature will be {{ states('sensor.today_corrected_high_temp') }} degrees. {{ states('sensor.clothing_forecast_detail') }}