diff --git a/config/.HA_VERSION b/config/.HA_VERSION index 65bd990d..f6b9d6c1 100755 --- a/config/.HA_VERSION +++ b/config/.HA_VERSION @@ -1 +1 @@ -2025.8.0 \ No newline at end of file +2025.8.1 \ No newline at end of file diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml index c273a4a2..5ea7d545 100755 --- a/config/automation/System/watchdog_light.yaml +++ b/config/automation/System/watchdog_light.yaml @@ -33,7 +33,6 @@ #Turn it off! action: - - service: script.garage_lights_off # C by GE Lights (https://amzn.to/30w3UWy) - service: homeassistant.turn_off data: diff --git a/config/automation/garage_entry_light.yaml b/config/automation/garage_entry_light.yaml index 1eb5e674..22c2d361 100755 --- a/config/automation/garage_entry_light.yaml +++ b/config/automation/garage_entry_light.yaml @@ -60,8 +60,6 @@ - delay: minutes: 30 - - service: script.garage_lights_off # C by GE Lights (https://amzn.to/30w3UWy) - ############################################################## - alias: Shutdown Helper light id: 124f95f6-78ca-4c22-9348-1f3a1da2d803 diff --git a/config/packages/cbyge.yaml b/config/packages/cbyge.yaml index 10a600dc..3973c4f5 100755 --- a/config/packages/cbyge.yaml +++ b/config/packages/cbyge.yaml @@ -29,29 +29,3 @@ script: entity_id: media_player.paige_room media_content_id: paigelighton media_content_type: routine - - garage_lights_off: - alias: 'ALL Garage Lights Off' - sequence: - - - service: media_player.play_media - data: - entity_id: media_player.garage - media_content_id: 'turn off c life 3' - media_content_type: custom - - - delay: "00:01:30" - - - service: media_player.play_media - data: - entity_id: media_player.garage - media_content_id: 'turn off c sleep 1' - media_content_type: custom - - - delay: "00:01:30" - - - service: media_player.play_media - data: - entity_id: media_player.garage - media_content_id: 'turn off c sleep 2' - media_content_type: custom diff --git a/config/packages/climate.yaml b/config/packages/climate.yaml index e3482b7f..8c2e69c8 100644 --- a/config/packages/climate.yaml +++ b/config/packages/climate.yaml @@ -120,7 +120,7 @@ automation: who: "Carlo" group: "maintenance" - - alias: 'AC Status off Announcement' + - alias: 'AC Status Announcement' id: 7812fdaf-a3f8-498b-8f07-28e977e528fe trigger: - platform: state @@ -128,6 +128,11 @@ automation: - climate.downstairs - climate.upstairs from: 'off' + - platform: state + entity_id: + - climate.downstairs + - climate.upstairs + to: 'off' action: - service: script.speech_engine data: diff --git a/config/packages/fridge.yaml b/config/packages/fridge.yaml index 964fea23..a0dee2b4 100644 --- a/config/packages/fridge.yaml +++ b/config/packages/fridge.yaml @@ -32,7 +32,7 @@ automation: - service: script.speech_engine data: - value1: "Attention! The fridge door has been open for more than 5 minutes. Please close the fridge door." + value1: "[Tell Household the Fridge Door is Open for more than 5 minutes]" - delay: 00:30:00 - event: event_fridge_door_open diff --git a/config/packages/garadget.yaml b/config/packages/garadget.yaml index 5f5c93fa..42346a8b 100755 --- a/config/packages/garadget.yaml +++ b/config/packages/garadget.yaml @@ -269,7 +269,6 @@ automation: DoorClosed: "The {{ trigger.entity_id.split('.')[1]|replace('_', ' ') }} is now {{ (trigger.to_state.state)|replace('_', ' ') }}." call_garage_check: 1 - delay: "00:10:00" - - service: script.garage_lights_off default: - service: script.speech_engine @@ -316,11 +315,11 @@ automation: value1: > "The wind speed is {{ states('sensor.pirateweather_wind_speed')|round}} miles per hour. For safety, please close the garage doors. {% if is_state('cover.large_garage_door', 'open') -%} - The Large Garage Door is open + Large Garage Door: open {% endif -%} {% if is_state('cover.small_garage_door', 'open') -%} {% if is_state('cover.large_garage_door', 'open') -%}and - {%- endif %} The small Garage Door is open. + {%- endif %} Small Garage Door: open. {% endif %}" ############################################################################## @@ -379,7 +378,7 @@ automation: - service: script.speech_engine data: - value1: "Check the garage doors. The Small garage is {{ states('cover.small_garage_door')}} and the large garage is {{ states('cover.large_garage_door')}} [Only mention the garage door that is open and remind us to close it for the night]" + value1: "Check the garage doors. The Small garage is {{ states('cover.small_garage_door')}} and the large garage is {{ states('cover.large_garage_door')}} [Always mention the specific garage door that is currently open and remind us to close it for the night]" - alias: 'Garage Camera on Alexa Shows' id: 4373df2a-77f2-4e19-be7c-46c7b27ca583 @@ -437,7 +436,6 @@ automation: media_content_id: 'hide garage camera' media_content_type: custom - - service: script.garage_lights_off - alias: 'Garage Camera on Alexa Shows' id: 4373df2a-77f2-4e19-be7c-46c7b27ca583 @@ -494,6 +492,5 @@ automation: data: media_content_id: 'hide garage camera' media_content_type: custom - - - service: script.garage_lights_off + diff --git a/config/packages/minecraft.yaml b/config/packages/minecraft.yaml deleted file mode 100755 index 56e1acc4..00000000 --- a/config/packages/minecraft.yaml +++ /dev/null @@ -1,24 +0,0 @@ -#------------------------------------------- -# @CCOSTAN -# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig -# Minecraft related stuff -#------------------------------------------- -automation: - - alias: Someone on the MC server! - id: e7cc50d1-2374-4923-8e0c-2a59ff593cf8 - trigger: - - platform: state - entity_id: sensor.minecraft_players_online - - action: - - service: script.notify_engine - data: - value1: > - {% if states.sensor.minecraft_players_online.state|int > 0 %} - {{ states.sensor.minecraft_players_online.state }} player(s) connected to Minecraft server - {% else %} - All players disconnected from Minecraft server - {% endif %} - title: "Minecraft Server Status" - who: 'carlo' - group: 'information' diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml index fb192da5..2933664c 100755 --- a/config/packages/powerwall.yaml +++ b/config/packages/powerwall.yaml @@ -38,7 +38,7 @@ automation: trigger: - platform: state entity_id: binary_sensor.powerwall_grid_status - to: 'False' + to: 'off' action: - service: homeassistant.turn_off @@ -102,7 +102,7 @@ automation: trigger: - platform: state entity_id: binary_sensor.powerwall_grid_status - to: 'False' + to: 'off' for: minutes: 6 @@ -130,10 +130,10 @@ automation: trigger: - platform: state entity_id: binary_sensor.powerwall_grid_status - from: 'False' - to: 'True' + from: 'off' + to: 'on' for: - minutes: 5 + minutes: 10 condition: - condition: template @@ -151,7 +151,7 @@ automation: - service: climate.set_hvac_mode data: entity_id: climate.downstairs - hvac_mode: auto + hvac_mode: cool - service: climate.set_hvac_mode data: entity_id: climate.upstairs diff --git a/config/script/interior_off.yaml b/config/script/interior_off.yaml index 9c576ec7..cc367377 100755 --- a/config/script/interior_off.yaml +++ b/config/script/interior_off.yaml @@ -14,5 +14,4 @@ interior_off: - switch.lr_amp - group.tvs - service: script.paige_lights_off # C by GE Lights (https://amzn.to/30w3UWy) - - service: script.garage_lights_off # C by GE Lights (https://amzn.to/30w3UWy) # - service: script.noon_lights_off # Noon Home Smart Lights (https://amzn.to/3fOIPx6) diff --git a/config/templates/speech/briefing.yaml b/config/templates/speech/briefing.yaml index 17df215a..7b3a6027 100755 --- a/config/templates/speech/briefing.yaml +++ b/config/templates/speech/briefing.yaml @@ -18,7 +18,7 @@ >- {%- macro dark_outside() -%} - The sun has set. I will turn on the outside lights. + [Because the sun has set, outside lights have been turned on] {%- endmacro -%} {%- macro garbage_day() -%} @@ -26,7 +26,7 @@ {% if day_of_week in ['Wed', 'Sun'] %} Today is garbage day. {% if day_of_week == 'Wed' %} - Both Recycling and regular Garbage goes out. + Both Recycling and regular Garbage goes out. {% endif %} {% endif %} {%- endmacro -%} @@ -163,7 +163,7 @@ {%- macro uv() -%} {% if states.sensor.pirateweather_uv_index.state|int(9999)>= 6 %} - Today's UV index is {{ states.sensor.pirateweather_uv_index.state }}. + UV index is {{ states.sensor.pirateweather_uv_index.state }}. {%- for entity in states.sensor if 'pirateweather' in entity.entity_id %} {%- set state = entity.state %} {%- set unit = entity.attributes.unit_of_measurement if 'unit_of_measurement' in entity.attributes else '' %} @@ -180,13 +180,13 @@ {%- endif -%} {%- endif %} {% endfor -%} - [Give helpful tip based on the current UV index and weather conditions] + [Give a helpful suggestion based on the current UV index or weather conditions] {% endif %} {%- endmacro -%} {%- macro holiday() -%} {% if states.sensor.holiday.state != '' %} - Today is {{ states.sensor.holiday.state }}. [Give an interesting fact or quote related to today] + Today is {{ states.sensor.holiday.state }}. {% endif %} {%- endmacro -%} @@ -197,7 +197,7 @@ {%- elif states('sensor.fathers_countdown') | int(9999)< 20 -%} and don't forget, there are {{ states.sensor.fathers_countdown.state }} days until Fathers day! {%- elif states('sensor.easter_countdown') | int(9999)< 15 -%} - and don't forget, there are {{ states.sensor.easter_countdown.state }} days until Easter Sunday! + and don't forget, there are {{ states.sensor.easter_countdown.state }} colorful days until Easter Sunday! {%- elif states('sensor.thanksgiving_day_countdown') | int(9999)< 10 and states('sensor.thanksgiving_day_countdown') | int(9999)> 0 -%} and don't forget, there are {{ states.sensor.thanksgiving_day_countdown.state }} thankful days until Thanksgiving {%- elif states('sensor.thanksgiving_day_countdown') | int(9999)< 1 -%} @@ -220,12 +220,8 @@ {{state_attr('sensor.bear_stone_common_air_quality_index', 'description')}} {% endmacro %} - {% macro inspirational_quote() %} - [Include an inspirational quote relevant to the day or situation at the end of the message"] - {% endmacro %} - {% macro fact_of_the_day() %} - [Include a relevant fact about something that happened in the past on this day at the end of the message] + [incorporate into the message a relevant fact about something that happened in the past on this day] {% endmacro %} {# a macro that removes all newline characters, empty spaces, and returns formatted text and replaces underscores with spaces #} @@ -250,9 +246,9 @@ {% set day = current_date.strftime('%d') %} {% set year = current_date.strftime('%Y') %} {% set time = current_date.strftime('%I:%M %p') %} - Current date time: {{ month }} {{ day }}, {{ year }} {{ time }} + [Current date time: {{ month }} {{ day }}, {{ year }} {{ time }}] - Resident: Location + [Resident: Location: - Carlo: {%- if states('sensor.carlo_place') != 'unknown' %} {{ states('sensor.carlo_place') }} @@ -278,12 +274,10 @@ Away {% endif -%} {% if range(1, 100) | random <= 25 %} - and our cat Molly: Always home. + Cat Molly: Always home. {% endif %} - Previous broadcast: "{{ state_attr('sensor.openai_response', 'response') }}" - [For each person, mention their location. If the same location update has already been broadcasted, do not repeat it.] - - New Information: + ] + [Sensor Data: {% if call_no_announcement != 1 %} {% if now().strftime('%H')|int(9999)< 12 and now().strftime('%H')|int(9999)> 6 %} Good morning. [if there is only one person home, address them specifically] @@ -359,7 +353,9 @@ {% endif %} {# call a Random fact about the house or inspiration quote #} - {{ ([moon, uv, holiday, days_until, outside_weather, outside_weather, inspirational_quote, fact_of_the_day]|random)() }} + {{ ([moon, uv, holiday, days_until, outside_weather, outside_weather, fact_of_the_day]|random)() }} + ] + [Previous broadcast: "{{ state_attr('sensor.openai_response', 'response') }}" ] {%- endmacro -%} {{- cleanup(mother_of_all_macros()) -}}