From d3df83e2e5cfa58af08d8dfb262d36c5b5ff3b91 Mon Sep 17 00:00:00 2001 From: jazzyisj Date: Mon, 30 Dec 2024 00:27:10 -0500 Subject: [PATCH] Update to 2025.1.0 - update sump automations - bugfix timed light automations (not always turning off) - preipitation_text custom template bugfix - precipitation_type_change_alert bugfix, name change - add cloud, wind average statistics - update recorder entries - update mass config_entry_id - misc bugfixes, ui tweaks --- .HA_VERSION | 2 +- automations.yaml | 1 - .../appliance/appliance_sump_pump.yaml | 18 +++++++++++---- .../lights/light_bathroom_vanity_light.yaml | 12 +++++----- .../lights/light_side_entrance_light.yaml | 23 +++++++++++++++---- automations/weather/precipitation_alert.yaml | 6 ++--- custom_templates/easy_time.jinja | 8 +++---- custom_templates/weather.jinja | 6 ++--- logging/recorder.yaml | 8 +++++-- packages/weather.yaml | 2 +- scripts.yaml | 1 - templates/media/alarm_clock.yaml | 6 ++--- .../media/preset/media_preset_charlie.yaml | 16 ++++++------- .../media/preset/media_preset_chill.yaml | 16 ++++++------- .../media/preset/media_preset_company.yaml | 16 ++++++------- .../media/preset/media_preset_guest.yaml | 16 ++++++------- .../media/preset/media_preset_jason.yaml | 16 ++++++------- .../media/preset/media_preset_morning.yaml | 16 ++++++------- templates/media/preset/media_preset_play.yaml | 16 ++++++------- .../media/preset/media_preset_shower.yaml | 16 ++++++------- .../media/preset/media_preset_sleep.yaml | 16 ++++++------- templates/media/preset/media_preset_wake.yaml | 16 ++++++------- templates/weather/weather.yaml | 12 +++++----- ui/button/weather/precipitation.yaml | 2 +- .../weather/include/air_quality_entities.yaml | 18 +++++++-------- ui/card/weather/include/allergy_entities.yaml | 18 +++++++-------- ui/card/weather/include/asthma_entities.yaml | 18 +++++++-------- ui/card/weather/include/flu_entities.yaml | 18 +++++++-------- .../weather/include/lightning_entities.yaml | 18 +++++++-------- .../include/precipitation_entities.yaml | 22 +++++++++--------- ui/card/weather/include/uv_entities.yaml | 19 ++++++++------- .../include/weather_condition_colors.yaml | 2 +- ui/card/weather/include/wind_entities.yaml | 18 +++++++-------- .../weather/atmospheric_conditions.yaml | 2 +- .../subview/weather/precipitation.yaml | 4 ++-- ui/dashboard/subview/weather/temperature.yaml | 4 ++-- ui/dashboard/subview/weather/wind.yaml | 6 ++--- .../atmospheric_conditions_detail.yaml | 12 +++++++++- ui/graph/weather/precipitation_detail.yaml | 2 +- ui/graph/weather/temperature_detail.yaml | 2 +- ui/graph/weather/wind_detail.yaml | 12 +++++++++- 41 files changed, 253 insertions(+), 209 deletions(-) diff --git a/.HA_VERSION b/.HA_VERSION index 7495b3137..6fbc34f33 100644 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -2025.1.0b2 \ No newline at end of file +2025.1.0b3 \ No newline at end of file diff --git a/automations.yaml b/automations.yaml index fe51488c7..e69de29bb 100644 --- a/automations.yaml +++ b/automations.yaml @@ -1 +0,0 @@ -[] diff --git a/automations/appliance/appliance_sump_pump.yaml b/automations/appliance/appliance_sump_pump.yaml index a61ecb0e3..c439ec6e9 100644 --- a/automations/appliance/appliance_sump_pump.yaml +++ b/automations/appliance/appliance_sump_pump.yaml @@ -5,6 +5,9 @@ alias: "[Appliance] Indoor Sump On" description: "Turn indoor sump on." triggers: + - trigger: homeassistant + event: start + - trigger: event event_type: mobile_app_notification_action event_data: @@ -89,14 +92,21 @@ sump: outdoor ############################################################################### -## Appliance - Outdoor Sump Hass Restart +## Appliance - Outdoor Sump Restart ############################################################################### -- id: appliance_outdoor_sump_hass_restart - alias: "[Appliance] Outdoor Sump Hass Restart" - description: "Turn outdoor sump on/off at restart." +- id: appliance_outdoor_sump_restart + alias: "[Appliance] Outdoor Sump Restart" + description: "Determine sump state when sump switch comes online." triggers: - trigger: homeassistant event: start + + - trigger: state + entity_id: switch.outdoor_sump + to: + from: + - unknown + - unavailable actions: - wait_template: > {{ has_value('switch.outdoor_sump') diff --git a/automations/light/lights/light_bathroom_vanity_light.yaml b/automations/light/lights/light_bathroom_vanity_light.yaml index 56a8313b2..fc846b58a 100644 --- a/automations/light/lights/light_bathroom_vanity_light.yaml +++ b/automations/light/lights/light_bathroom_vanity_light.yaml @@ -83,15 +83,15 @@ for: minutes: 5 - - trigger: state - id: night - entity_id: input_select.occupancy_mode - from: Night - - trigger: event event_type: timer.finished event_data: entity_id: timer.bathroom_vanity_light + + - trigger: state + id: night + entity_id: input_select.occupancy_mode + from: Night conditions: - condition: state entity_id: light.bathroom_vanity_light_rgb @@ -117,7 +117,7 @@ data: lights: light.bathroom_vanity_light_rgb activate_timer: false - reset: "{{ trigger.id == 'night' }}" # turn off night manual mode + reset: true ############################################################################### ## Light - Bathroom Vanity Night Light On diff --git a/automations/light/lights/light_side_entrance_light.yaml b/automations/light/lights/light_side_entrance_light.yaml index 4f7e0e5a1..1059ee117 100644 --- a/automations/light/lights/light_side_entrance_light.yaml +++ b/automations/light/lights/light_side_entrance_light.yaml @@ -30,6 +30,7 @@ data: lights: light.side_entrance_light activate_timer: true + reset: true ############################################################################### ## Light - Side Entrance Light Auto Off @@ -43,17 +44,17 @@ - trigger: homeassistant event: start - - trigger: event - event_type: timer.finished - event_data: - entity_id: timer.side_entrance_light - - trigger: state id: motion entity_id: binary_sensor.side_entrance_motion to: "off" for: minutes: 10 + + - trigger: event + event_type: timer.finished + event_data: + entity_id: timer.side_entrance_light conditions: - condition: state entity_id: light.side_entrance_light @@ -62,7 +63,19 @@ - condition: state entity_id: input_boolean.alarm_triggered state: "off" + + - condition: state + entity_id: binary_sensor.side_entrance_motion + state: "off" + for: + minutes: 10 + + - condition: state + entity_id: timer.side_entrance_light + state: idle actions: - action: light.turn_off target: entity_id: light.side_entrance_light + data: + activate_timer: false diff --git a/automations/weather/precipitation_alert.yaml b/automations/weather/precipitation_alert.yaml index 2bd502190..3b019dff3 100644 --- a/automations/weather/precipitation_alert.yaml +++ b/automations/weather/precipitation_alert.yaml @@ -13,7 +13,7 @@ - trigger: state id: change - entity_id: binary_sensor.precipitation_change_alert + entity_id: binary_sensor.precipitation_type_change_alert to: "on" not_from: - unknown @@ -57,7 +57,7 @@ state: "on" - condition: state - entity_id: binary_sensor.precipitation_change_alert + entity_id: binary_sensor.precipitation_type_change_alert state: "on" - condition: template @@ -82,7 +82,7 @@ - "off" - condition: state - entity_id: binary_sensor.precipitation_change_alert + entity_id: binary_sensor.precipitation_type_change_alert state: "off" - condition: template diff --git a/custom_templates/easy_time.jinja b/custom_templates/easy_time.jinja index 7330eb751..3471afb8e 100644 --- a/custom_templates/easy_time.jinja +++ b/custom_templates/easy_time.jinja @@ -233,7 +233,7 @@ 15: 'kwart over {hour}', 30: 'half {hour}', 45: 'kwart voor {hour}', - 59: '1 vor {hour}', + 59: '1 voor {hour}', 'past_hour': '{minute} over {hour}', 'to_hour': '{minute} voor {hour}', 'to_half_hour': '{minute} voor half {hour}', @@ -1447,8 +1447,8 @@ {%- endmacro %} {%- macro _time_between(func, input1, attr1, utc1, input2, attr2, utc2) -%} -{%- set t1 = _to_datetime(input1, attr1, utc1) | as_datetime -%} -{%- set t2 = _to_datetime(input2, attr2, utc2) | as_datetime -%} +{%- set t1 = _to_datetime(input1, attr1, utc1) | as_datetime | as_local -%} +{%- set t2 = _to_datetime(input2, attr2, utc2) | as_datetime | as_local -%} {%- if t1 is not none and t2 is not none -%} {{- func(t1, t2) -}} {%- else -%} @@ -1764,7 +1764,7 @@ {%- endmacro %} {%- macro count_the_days(input, attr, utc=False) %} -{%- set input = _to_datetime(input, attr, utc) | as_datetime %} +{%- set input = _to_datetime(input, attr, utc) | as_datetime | as_local %} {%- set midnight = today_at() %} {{- (input - midnight).days }} {%- endmacro %} diff --git a/custom_templates/weather.jinja b/custom_templates/weather.jinja index 0b298868a..f957cb67f 100644 --- a/custom_templates/weather.jinja +++ b/custom_templates/weather.jinja @@ -6,8 +6,8 @@ {%- set time = state_attr('sensor.precipitation_start', '12hour') %} {%- set dist = states('sensor.nearest_storm_distance') | int(-1) %} {%- set dir = full_cardinal_direction(states('sensor.nearest_storm_bearing')) %} -{%- if is_state('binary_sensor.precipitation_change_alert', 'on') %} -}The current precipitation is changing to {{ current }} right now! +{%- if is_state('binary_sensor.precipitation_type_change_alert', 'on') %} +The current precipitation is changing to {{ current }} right now! {%- elif is_state('binary_sensor.precipitation_active', 'on') %} It is {{ current }}ing right now. {%- elif time != none %} @@ -29,7 +29,7 @@ The storm is {{ iif(dist > 0, {%- from 'weather.jinja' import precip_today -%} {%- set fog = states('sensor.fog_probability') | int(-1) > 70 %} {%- set now = is_state('binary_sensor.precipitation_active', 'on') %} -{%- set change = is_state('binary_sensor.precipitation_change_alert', 'on') %} +{%- set change = is_state('binary_sensor.precipitation_type_change_alert', 'on') %} {%- set soon = precip_today() | bool %} {%- set type = iif(now, states('sensor.precipitation_type'), states('sensor.precipitation_type_expected')) %} {%- set time = state_attr('sensor.precipitation_start', '12hour') %} diff --git a/logging/recorder.yaml b/logging/recorder.yaml index 1246577ef..a4051b602 100644 --- a/logging/recorder.yaml +++ b/logging/recorder.yaml @@ -54,8 +54,6 @@ include: - sensor.current_condition - sensor.outdoor_temperature - sensor.outdoor_apparent_temperature - - sensor.outdoor_temperature_24_hour_average_mean #TEST - - sensor.outdoor_temperature_24_hour_average_median #TEST - sensor.outdoor_temperature_24_hour_average_step - sensor.outdoor_temperature_daily_low_time - sensor.outdoor_temperature_daily_high_time @@ -65,6 +63,7 @@ include: - sensor.outdoor_normal_low_temperature - sensor.outdoor_high_temperature_differential - sensor.outdoor_low_temperature_differential + - sensor.outdoor_temperature_trend - sensor.dew_point - sensor.outdoor_humidity - sensor.outdoor_humidity_24_hour_average_step @@ -97,12 +96,15 @@ include: - sensor.lightning_count - sensor.lightning_distance - sensor.barometric_pressure + - sensor.pressure_trend - sensor.wind_speed + - sensor.wind_speed_24_hour_average_step - sensor.wind_gust - sensor.wind_lull - sensor.wind_bearing - sensor.wind_bearing_24_hour_average_circle - sensor.cloud_coverage + - sensor.cloud_cover_24_hour_average_step - sensor.visibility - sensor.air_quality_index - sensor.allergy_index_today @@ -124,6 +126,8 @@ include: - sensor.home_sensors_precipitation_yesterday_checked - sensor.home_sensors_distance_last_lightning_strike - sensor.home_sensors_lightnings_strikes + - sensor.outdoor_temperature_24_hour_average_mean + - sensor.outdoor_temperature_24_hour_average_median # ~~~~ Tempest ~~~~ # graphs - sensor.tempest_st_00057689_battery diff --git a/packages/weather.yaml b/packages/weather.yaml index 70af905d0..90fea5617 100644 --- a/packages/weather.yaml +++ b/packages/weather.yaml @@ -254,7 +254,7 @@ alert: group: Weather visibility: public notification_icon: mdi:flash-alert - icon_url: !secret AQI_ICON + icon_url: !secret STORM_ICON ledColor: !secret MINOR_COLOR color: !secret MINOR_COLOR vibrationPattern: !secret ALERT_VIBRATION diff --git a/scripts.yaml b/scripts.yaml index 8b1378917..e69de29bb 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -1 +0,0 @@ - diff --git a/templates/media/alarm_clock.yaml b/templates/media/alarm_clock.yaml index ea0d3097a..ae79988c1 100644 --- a/templates/media/alarm_clock.yaml +++ b/templates/media/alarm_clock.yaml @@ -240,7 +240,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -285,7 +285,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -326,7 +326,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_charlie.yaml b/templates/media/preset/media_preset_charlie.yaml index 4f3b36aa2..2043218ca 100644 --- a/templates/media/preset/media_preset_charlie.yaml +++ b/templates/media/preset/media_preset_charlie.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 100 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_chill.yaml b/templates/media/preset/media_preset_chill.yaml index ad490a3bd..e1d1b07e3 100644 --- a/templates/media/preset/media_preset_chill.yaml +++ b/templates/media/preset/media_preset_chill.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_company.yaml b/templates/media/preset/media_preset_company.yaml index f235fe8e5..55bff3643 100644 --- a/templates/media/preset/media_preset_company.yaml +++ b/templates/media/preset/media_preset_company.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_guest.yaml b/templates/media/preset/media_preset_guest.yaml index 434f329a5..e55487fa9 100644 --- a/templates/media/preset/media_preset_guest.yaml +++ b/templates/media/preset/media_preset_guest.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_jason.yaml b/templates/media/preset/media_preset_jason.yaml index 0ed58599b..66cb45e13 100644 --- a/templates/media/preset/media_preset_jason.yaml +++ b/templates/media/preset/media_preset_jason.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_morning.yaml b/templates/media/preset/media_preset_morning.yaml index f530b9d8e..9024f9519 100644 --- a/templates/media/preset/media_preset_morning.yaml +++ b/templates/media/preset/media_preset_morning.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_play.yaml b/templates/media/preset/media_preset_play.yaml index f6138d460..579e1cc25 100644 --- a/templates/media/preset/media_preset_play.yaml +++ b/templates/media/preset/media_preset_play.yaml @@ -110,7 +110,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -159,7 +159,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -210,7 +210,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -261,7 +261,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -312,7 +312,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -365,7 +365,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -373,7 +373,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -437,7 +437,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_shower.yaml b/templates/media/preset/media_preset_shower.yaml index 5d3db4158..d848e00c2 100644 --- a/templates/media/preset/media_preset_shower.yaml +++ b/templates/media/preset/media_preset_shower.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_sleep.yaml b/templates/media/preset/media_preset_sleep.yaml index c603b3dd7..34ea8541d 100644 --- a/templates/media/preset/media_preset_sleep.yaml +++ b/templates/media/preset/media_preset_sleep.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/media/preset/media_preset_wake.yaml b/templates/media/preset/media_preset_wake.yaml index 1e727d465..c984ec6fa 100644 --- a/templates/media/preset/media_preset_wake.yaml +++ b/templates/media/preset/media_preset_wake.yaml @@ -101,7 +101,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: artist favorite: true limit: 50 @@ -150,7 +150,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -201,7 +201,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -252,7 +252,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: playlist favorite: true limit: 100 @@ -303,7 +303,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: radio favorite: true limit: 100 @@ -356,7 +356,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 @@ -364,7 +364,7 @@ - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: album favorite: true limit: 100 @@ -428,7 +428,7 @@ action: - action: music_assistant.get_library data: - config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM + config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP media_type: track favorite: true limit: 100 diff --git a/templates/weather/weather.yaml b/templates/weather/weather.yaml index 8fb8a2bc0..7104d1552 100644 --- a/templates/weather/weather.yaml +++ b/templates/weather/weather.yaml @@ -598,7 +598,7 @@ - snow - trigger: state - id: change + id: start entity_id: sensor.precipitation_type to: - rain @@ -606,7 +606,7 @@ from: none - trigger: state - id: change + id: stop entity_id: sensor.precipitation_type to: none from: @@ -619,18 +619,18 @@ above: 0 below: 1 binary_sensor: - - name: "Precipitation Change Alert" - unique_id: precipitation_change_alert + - name: "Precipitation Type Change Alert" + unique_id: precipitation_type_change_alert icon: mdi:weather-snowy-rainy state: > #NOTE always false after startup and template reload if not temp {{ (trigger.id == 'change' and states.sensor.precipitation_type.state != 'none' and now() - states.sensor.precipitation_type.last_changed < timedelta(minutes=30) or ((is_state('sensor.precipitation_type', 'rain') and states('sensor.outdoor_temperature') | int <= 0 - and states('sensor.outdoor_temperature_trend') != 'rising') + and states('sensor.outdoor_temperature_trend') != 'falling') or (is_state('sensor.precipitation_type', 'snow') and states('sensor.outdoor_temperature') | int > 0) - and states('sensor.outdoor_temperature_trend') != 'falling')) }} + and states('sensor.outdoor_temperature_trend') != 'rising')) }} - binary_sensor: ############################################################################### diff --git a/ui/button/weather/precipitation.yaml b/ui/button/weather/precipitation.yaml index 400c2bc2a..e7f8d2bdb 100644 --- a/ui/button/weather/precipitation.yaml +++ b/ui/button/weather/precipitation.yaml @@ -20,7 +20,7 @@ styles: [[[ if (states['sensor.precipitation_type'].state == 'unavailable') return 'var(--entity-disabled-color)'; - else if (states['binary_sensor.precipitation_change_alert'].state == 'on') + else if (states['binary_sensor.precipitation_type_change_alert'].state == 'on') return 'var(--red-color)'; else if (states['sensor.precipitation_type'].state == 'snow') return 'var(--light-blue-color)'; diff --git a/ui/card/weather/include/air_quality_entities.yaml b/ui/card/weather/include/air_quality_entities.yaml index f0e91b35c..ec02f5234 100644 --- a/ui/card/weather/include/air_quality_entities.yaml +++ b/ui/card/weather/include/air_quality_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Air Quality Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.air_quality + state_not: idle + row: + entity: alert.air_quality + name: "Air Quality ALert" + - type: custom:template-entity-row entity: sensor.air_quality_index name: "Air Quality Risk" @@ -49,15 +58,6 @@ {% from 'weather.jinja' import smoke_level_color %} {{ smoke_level_color(states('sensor.smoke_level')) }} -- type: conditional - conditions: - - condition: state - entity: alert.air_quality - state_not: idle - row: - entity: alert.air_quality - name: "Air Quality ALert" - - type: button entity: sensor.aqi_risk_level name: "AQI Map" diff --git a/ui/card/weather/include/allergy_entities.yaml b/ui/card/weather/include/allergy_entities.yaml index b8fea6464..3515ad671 100644 --- a/ui/card/weather/include/allergy_entities.yaml +++ b/ui/card/weather/include/allergy_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Allergy Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.allergy_risk + state_not: idle + row: + entity: alert.allergy_risk + name: "Allergy Risk Alert" + - type: custom:template-entity-row entity: sensor.allergy_risk_today name: "Risk Today" @@ -28,15 +37,6 @@ {% from 'weather.jinja' import iqvia_index_color %} {{ iqvia_index_color(states('sensor.allergy_index_forecasted_average')) }} -- type: conditional - conditions: - - condition: state - entity: alert.allergy_risk - state_not: idle - row: - entity: alert.allergy_risk - name: "Allergy Risk Alert" - - type: button entity: sensor.allergy_index_today name: "Allergy Forecast" diff --git a/ui/card/weather/include/asthma_entities.yaml b/ui/card/weather/include/asthma_entities.yaml index ec28fea04..484c8dded 100644 --- a/ui/card/weather/include/asthma_entities.yaml +++ b/ui/card/weather/include/asthma_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Asthma Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.asthma_risk + state_not: idle + row: + entity: alert.asthma_risk + name: "Asthma Risk Alert" + - type: custom:template-entity-row entity: sensor.asthma_risk_today name: "Risk Today" @@ -28,15 +37,6 @@ {% from 'weather.jinja' import iqvia_index_color %} {{ iqvia_index_color(states('sensor.asthma_index_forecasted_average')) }} -- type: conditional - conditions: - - condition: state - entity: alert.asthma_risk - state_not: idle - row: - entity: alert.asthma_risk - name: "Asthma Risk Alert" - - type: button entity: sensor.asthma_index_today name: "Asthma Forecast" diff --git a/ui/card/weather/include/flu_entities.yaml b/ui/card/weather/include/flu_entities.yaml index e9860f36b..8c391be9c 100644 --- a/ui/card/weather/include/flu_entities.yaml +++ b/ui/card/weather/include/flu_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Cold & Flu Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.flu_risk + state_not: idle + row: + entity: alert.flu_risk + name: "Flu Risk Alert" + - type: custom:template-entity-row entity: sensor.flu_risk_today name: "Risk Today" @@ -18,15 +27,6 @@ {% from 'weather.jinja' import iqvia_index_color %} {{ iqvia_index_color(states('sensor.cold_flu_forecasted_average')) }} -- type: conditional - conditions: - - condition: state - entity: alert.flu_risk - state_not: idle - row: - entity: alert.flu_risk - name: "Flu Risk Alert" - - type: button entity: sensor.cold_flu_index_today name: "Cold & Flu Forecast" diff --git a/ui/card/weather/include/lightning_entities.yaml b/ui/card/weather/include/lightning_entities.yaml index e140bc141..23466053c 100644 --- a/ui/card/weather/include/lightning_entities.yaml +++ b/ui/card/weather/include/lightning_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Lightning Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.lightning + state_not: idle + row: + entity: alert.lightning + name: "Lightning Alert" + - entity: sensor.lightning_count name: "Lightning Strikes" @@ -11,15 +20,6 @@ name: "Last Strike Time" format: relative -- type: conditional - conditions: - - condition: state - entity: alert.lightning - state_not: idle - row: - entity: alert.lightning - name: "Lightning Alert" - - type: button name: "EnvCan Map" icon: mdi:lightning-bolt-circle diff --git a/ui/card/weather/include/precipitation_entities.yaml b/ui/card/weather/include/precipitation_entities.yaml index f83130e67..54b9d7fb6 100644 --- a/ui/card/weather/include/precipitation_entities.yaml +++ b/ui/card/weather/include/precipitation_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Precipitation Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.precipitation + state_not: idle + row: + entity: alert.precipitation + name: "Precipitation Alert" + - type: conditional conditions: - condition: state @@ -128,10 +137,10 @@ - type: conditional conditions: - condition: state - entity: binary_sensor.precipitation_change_alert + entity: binary_sensor.precipitation_type_change_alert state: "on" row: - entity: binary_sensor.precipitation_change_alert + entity: binary_sensor.precipitation_type_change_alert - type: conditional conditions: @@ -308,15 +317,6 @@ Last 24h: {{ '%0.1f' | format(last24) }} hours {%- endif %} -- type: conditional - conditions: - - condition: state - entity: alert.precipitation - state_not: idle - row: - entity: alert.precipitation - name: "Precipitation Alert" - - type: button name: "Precipitation Radar" icon: mdi:weather-rainy diff --git a/ui/card/weather/include/uv_entities.yaml b/ui/card/weather/include/uv_entities.yaml index 23a7f7e3d..e82272f0d 100644 --- a/ui/card/weather/include/uv_entities.yaml +++ b/ui/card/weather/include/uv_entities.yaml @@ -1,6 +1,14 @@ ############################################################################### ## UV Entities -############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.uv_risk + state_not: idle + row: + entity: alert.uv_risk + name: "UV Risk Alert" + - type: custom:template-entity-row entity: sensor.uv_risk name: "Current UV Risk" @@ -21,15 +29,6 @@ {% from 'weather.jinja' import uv_index_color %} {{ uv_index_color(states('sensor.uv_index_today')) }} -- type: conditional - conditions: - - condition: state - entity: alert.uv_risk - state_not: idle - row: - entity: alert.uv_risk - name: "UV Risk Alert" - - type: button name: "UV Map" entity: sensor.uv_index diff --git a/ui/card/weather/include/weather_condition_colors.yaml b/ui/card/weather/include/weather_condition_colors.yaml index 388d62198..38e629a95 100644 --- a/ui/card/weather/include/weather_condition_colors.yaml +++ b/ui/card/weather/include/weather_condition_colors.yaml @@ -17,7 +17,7 @@ lightning: background: rgb(100, 100, 100) foreground: rgb(232, 235, 87) lightning-rainy: - background: rgb(12, 36, 150) + background: rgb(31, 50, 149) foreground: rgb(232, 235, 87) partlycloudy: background: rgb(90, 116, 158) diff --git a/ui/card/weather/include/wind_entities.yaml b/ui/card/weather/include/wind_entities.yaml index 8d5c6090d..56111b786 100644 --- a/ui/card/weather/include/wind_entities.yaml +++ b/ui/card/weather/include/wind_entities.yaml @@ -1,6 +1,15 @@ ############################################################################### ## Wind Entities ############################################################################### +- type: conditional + conditions: + - condition: state + entity: alert.wind + state_not: idle + row: + entity: alert.wind + name: "Wind Alert" + - entity: sensor.wind_speed name: "Speed" card_mod: @@ -34,15 +43,6 @@ - entity: sensor.wind_direction_average name: "Average Last 24" -- type: conditional - conditions: - - condition: state - entity: alert.wind - state_not: idle - row: - entity: alert.wind - name: "Wind Alert" - - type: button entity: sensor.wind_speed name: "Wind Map" diff --git a/ui/dashboard/subview/weather/atmospheric_conditions.yaml b/ui/dashboard/subview/weather/atmospheric_conditions.yaml index e37d1d355..18f48fa75 100644 --- a/ui/dashboard/subview/weather/atmospheric_conditions.yaml +++ b/ui/dashboard/subview/weather/atmospheric_conditions.yaml @@ -65,7 +65,7 @@ sections: fixed_period: - type: statistic - entity: sensor.cloud_coverage #TODO helper step? + entity: sensor.cloud_cover_24_hour_average_step name: "Cloud Avg (All)" stat_type: mean period: diff --git a/ui/dashboard/subview/weather/precipitation.yaml b/ui/dashboard/subview/weather/precipitation.yaml index 1191aae19..d3886e27d 100644 --- a/ui/dashboard/subview/weather/precipitation.yaml +++ b/ui/dashboard/subview/weather/precipitation.yaml @@ -46,7 +46,7 @@ sections: cards: - type: statistic entity: sensor.rain_accumulation_today - name: "Rain (24 Hours)" + name: "Rain (Last 24)" stat_type: change period: rolling_window: @@ -55,7 +55,7 @@ sections: - type: statistic entity: sensor.snow_accumulation_today - name: "Snow (24 Hours)" + name: "Snow (Last 24)" stat_type: change period: rolling_window: diff --git a/ui/dashboard/subview/weather/temperature.yaml b/ui/dashboard/subview/weather/temperature.yaml index bcedc26ee..16d2f28a4 100644 --- a/ui/dashboard/subview/weather/temperature.yaml +++ b/ui/dashboard/subview/weather/temperature.yaml @@ -29,7 +29,7 @@ sections: cards: - type: statistic entity: sensor.outdoor_temperature - name: "Low Temp (Day)" + name: "Low Temp (Last 24)" stat_type: min period: rolling_window: @@ -38,7 +38,7 @@ sections: - type: statistic entity: sensor.outdoor_temperature - name: "High Temp (Day)" + name: "High Temp (Last 24)" stat_type: max period: rolling_window: diff --git a/ui/dashboard/subview/weather/wind.yaml b/ui/dashboard/subview/weather/wind.yaml index 5bec2122d..64b09c419 100644 --- a/ui/dashboard/subview/weather/wind.yaml +++ b/ui/dashboard/subview/weather/wind.yaml @@ -21,7 +21,7 @@ sections: cards: - type: statistic entity: sensor.wind_speed - name: "Speed Max (Day)" + name: "Speed Max (Last 24)" stat_type: max period: rolling_window: @@ -30,7 +30,7 @@ sections: - type: statistic entity: sensor.wind_gust - name: "Gust Max (Day)" + name: "Gust Max (Last 24)" stat_type: max period: rolling_window: @@ -52,7 +52,7 @@ sections: fixed_period: - type: statistic - entity: sensor.wind_speed #TODO helper median? + entity: sensor.wind_speed_24_hour_average_step name: "Speed Avg (All)" stat_type: mean period: diff --git a/ui/graph/weather/atmospheric_conditions_detail.yaml b/ui/graph/weather/atmospheric_conditions_detail.yaml index 6b026854c..0dce02975 100644 --- a/ui/graph/weather/atmospheric_conditions_detail.yaml +++ b/ui/graph/weather/atmospheric_conditions_detail.yaml @@ -190,7 +190,7 @@ series: color: rgb(76, 138, 252) - entity: sensor.cloud_coverage - name: "Clouds" + name: "Cloud" yaxis_id: clouds extend_to: now stroke_width: 1 @@ -221,6 +221,16 @@ series: color: rgb(150, 150, 150) color_threshold: !include /config/ui/graph/include/cloud_cover_area_color.yaml + - entity: sensor.cloud_cover_24_hour_average_step + name: "Cloud Average" + yaxis_id: clouds + extend_to: now + type: area + show: + legend_value: false + stroke_width: 0 + color: rgb(83, 253, 5) + - entity: sensor.hourly_weather name: " " yaxis_id: clouds diff --git a/ui/graph/weather/precipitation_detail.yaml b/ui/graph/weather/precipitation_detail.yaml index ff0e24163..431b55df8 100644 --- a/ui/graph/weather/precipitation_detail.yaml +++ b/ui/graph/weather/precipitation_detail.yaml @@ -59,7 +59,7 @@ yaxis: show: true opposite: true min: 0 - max: ~40 + max: ~10 apex_config: tickAmount: 5 decimalsInFloat: 1 diff --git a/ui/graph/weather/temperature_detail.yaml b/ui/graph/weather/temperature_detail.yaml index b462611e3..ba3d2b9a4 100644 --- a/ui/graph/weather/temperature_detail.yaml +++ b/ui/graph/weather/temperature_detail.yaml @@ -110,7 +110,7 @@ series: color: rgb(250, 83, 0) - entity: sensor.outdoor_temperature_24_hour_average_step - name: "Median (24h)" + name: "Step (24h)" yaxis_id: temperature extend_to: now opacity: 0.8 diff --git a/ui/graph/weather/wind_detail.yaml b/ui/graph/weather/wind_detail.yaml index 49083c98b..c13c615ff 100644 --- a/ui/graph/weather/wind_detail.yaml +++ b/ui/graph/weather/wind_detail.yaml @@ -61,7 +61,7 @@ yaxis: fontWeight: normal series: - entity: sensor.wind_bearing_24_hour_average_circle - name: "Average Wind Direction" + name: "Average Bearing" yaxis_id: bearing extend_to: now stroke_width: 3 @@ -151,6 +151,16 @@ series: color: rgb(17, 146, 49) color_threshold: !include /config/ui/graph/include/wind_speed_area_color.yaml + - entity: sensor.wind_speed_24_hour_average_step + name: "Speed Average" + yaxis_id: speed + type: area + extend_to: now + show: + legend_value: false + stroke_width: 0 + color: rgb(10, 204, 207) + - entity: sensor.wind_lull name: "Lull" yaxis_id: speed