Skip to content

Commit

Permalink
Update to 2025.1.0
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
jazzyisj committed Dec 30, 2024
1 parent 0c24ad4 commit d3df83e
Show file tree
Hide file tree
Showing 41 changed files with 253 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .HA_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025.1.0b2
2025.1.0b3
1 change: 0 additions & 1 deletion automations.yaml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
[]
18 changes: 14 additions & 4 deletions automations/appliance/appliance_sump_pump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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')
Expand Down
12 changes: 6 additions & 6 deletions automations/light/lights/light_bathroom_vanity_light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
23 changes: 18 additions & 5 deletions automations/light/lights/light_side_entrance_light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
data:
lights: light.side_entrance_light
activate_timer: true
reset: true

###############################################################################
## Light - Side Entrance Light Auto Off
Expand All @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions automations/weather/precipitation_alert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions custom_templates/easy_time.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
Expand Down Expand Up @@ -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 -%}
Expand Down Expand Up @@ -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 %}
Expand Down
6 changes: 3 additions & 3 deletions custom_templates/weather.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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') %}
Expand Down
8 changes: 6 additions & 2 deletions logging/recorder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/weather.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts.yaml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

6 changes: 3 additions & 3 deletions templates/media/alarm_clock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions templates/media/preset/media_preset_charlie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -356,15 +356,15 @@
action:
- action: music_assistant.get_library
data:
config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM
config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP
media_type: track
favorite: true
limit: 100
response_variable: mass_tracks

- action: music_assistant.get_library
data:
config_entry_id: 01JG78VERDDPB4JB2BA6W0Z4WM
config_entry_id: 01JG86QY33GS4K1FFQJ18SREYP
media_type: album
favorite: true
limit: 100
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit d3df83e

Please sign in to comment.