Skip to content

Commit d35658e

Browse files
committed
Merge remote-tracking branch 'upstream/next' into volvo/feature/device-tracker
2 parents dfd7d3a + 98b68d8 commit d35658e

File tree

209 files changed

+5431
-1115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+5431
-1115
lines changed

.github/copilot-instructions.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ speakers.
5151
The writing needs to be inclusive, objective, and not gender biased, polarizing,
5252
or discriminatory. We want to be welcoming to all users.
5353

54-
Write towards the reader directly, and not a group of users. Write from a second-person perspective, using "you" and "your" instead of "the user"
55-
second-person perspective, using "you" and "your" instead of "the user"
56-
or "users".
54+
Write towards the reader directly, and not a group of users.
55+
Write from a second-person perspective, using "you" and "your" instead of "the user" or "users".
5756

5857
Make the text feel personal and friendly, as if you are talking to a friend who
5958
really enjoys technology and enjoys this hobby of home automation. Write in

CODEOWNERS

Lines changed: 35 additions & 26 deletions
Large diffs are not rendered by default.

_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ social:
107107

108108
# Home Assistant release details
109109
current_major_version: 2025
110-
current_minor_version: 9
111-
current_patch_version: 4
112-
date_released: 2025-09-19
110+
current_minor_version: 10
111+
current_patch_version: 0
112+
date_released: 2025-10-01
113113

114114
# Either # or the anchor link to latest release notes in the blog post.
115115
# Must be prefixed with a # and have double quotes around it.

source/_dashboards/button.markdown

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,18 @@ Name:
3434
description: The button name that is displayed on the card. If this field is left blank and the card interacts with an entity, the button name defaults to the entity name. Otherwise, no name is displayed.
3535
Icon:
3636
description: The icon that is displayed on the card. If this field is left blank and the card interacts with an entity, the icon defaults to the entity domain icon. Otherwise, no icon is displayed.
37-
Show Name:
38-
description: A toggle to show or hide the button name.
39-
Show Icon:
40-
description: A toggle to show or hide the icon.
4137
Icon Height:
4238
description: The height of the icon, in pixels.
39+
Color:
40+
description: The color of the icon.
4341
Theme:
4442
description: Name of any loaded theme to be used for this card. For more information about themes, see the [frontend documentation](/integrations/frontend/).
43+
Show Name:
44+
description: A toggle to show or hide the button name.
45+
Show State:
46+
description: A toggle to show or hide the state of the entity.
47+
Show Icon:
48+
description: A toggle to show or hide the icon.
4549
Tap Action:
4650
description: The action taken on card tap. For more information, see the [action documentation](/dashboards/actions/#tap-action).
4751
Hold Action:
@@ -91,11 +95,11 @@ icon_height:
9195
description: The height of the icon. Any CSS value may be used.
9296
type: string
9397
default: auto
94-
state_color:
98+
color:
9599
required: false
96-
description: If false, the icon does not change color when the entity is active.
97-
type: boolean
98-
default: true
100+
description: Set the color for the icon. By default, the color is based on `state`, `domain`, and `device_class` of your entity. It accepts [color token](/dashboards/button/#available-colors) or hex color code.
101+
type: string
102+
default: state
99103
tap_action:
100104
required: false
101105
description: The action taken on card tap. For more information, see the [action documentation](/dashboards/actions/#tap-action).
@@ -203,3 +207,7 @@ cards:
203207
show_name: true
204208
show_icon: true
205209
```
210+
211+
## Available colors
212+
213+
The following colors are available to colorize the button card: `primary`, `accent`, `disabled`, `red`, `pink`, `purple`, `deep-purple`, `indigo`, `blue`, `light-blue`, `cyan`, `teal`, `green`, `light-green`, `lime`, `yellow`, `amber`, `orange`, `deep-orange`, `brown`, `grey`, `blue-grey`, `black`, `white`, or any hex color code (for example, `#93c47d`).

source/_dashboards/energy.markdown

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,29 @@ link_dashboard: true
121121
The energy sources table card shows all your energy sources, and the corresponding amount of energy.
122122
If setup, it will also show the costs and compensation per source and the total.
123123

124+
125+
### YAML configuration
126+
127+
The following YAML options are available
128+
129+
{% configuration %}
130+
type:
131+
required: true
132+
description: "`energy-sources-table`"
133+
type: string
134+
types:
135+
required: false
136+
description: "If defined, table displays listed types of consumption only. Valid values are: `grid`, `solar`, `battery`, `gas`, and `water`."
137+
type: list
138+
{% endconfiguration %}
139+
124140
### Example
125141

126142
```yaml
127143
type: energy-sources-table
144+
types:
145+
- gas
146+
- water
128147
```
129148

130149
## Grid neutrality gauge
@@ -196,7 +215,29 @@ type: energy-self-sufficiency-gauge
196215

197216
The devices energy graph show the energy usage per device, it is sorted by usage.
198217

199-
By default, this card will show all your devices. Optionally, the number of devices can be limited by adding the `max_devices` option and specifying the maximum number of devices to show. If there are more devices available than shown, the devices with the highest energy usage are shown.
218+
### YAML configuration
219+
220+
The following YAML options are available
221+
222+
{% configuration %}
223+
type:
224+
required: true
225+
description: "`energy-devices-graph`"
226+
type: string
227+
title:
228+
required: false
229+
description: The title of the card.
230+
type: string
231+
max_devices:
232+
required: false
233+
description: By default, this card will show all your devices. Optionally, the number of devices can be limited by adding the `max_devices` option and specifying the maximum number of devices to show. If there are more devices available than shown, the devices with the highest energy usage are shown.
234+
type: integer
235+
hide_compound_stats:
236+
required: false
237+
description: Hide higher level devices like breakers. These are devices that are set as `included_in_stat` of another device.
238+
type: boolean
239+
default: false
240+
{% endconfiguration %}
200241

201242
### Examples
202243

source/_dashboards/plant-status.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type:
3232
type: string
3333
entity:
3434
required: true
35-
description: Entity ID of `plant` domain.
35+
description: Entity ID of `plant` domain. For more information, see the [`plant` integration](/integrations/plant).
3636
type: string
3737
name:
3838
required: false

source/_dashboards/thermostat.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
type: card
33
title: "Thermostat card"
44
sidebar_label: Thermostat
5-
description: "The thermostat card gives control of your climate entity, allowing you to change the temperature and mode of the entity."
5+
description: "The thermostat card gives control of your climate or water heater entity, allowing you to change the temperature and mode of the entity."
66
related:
77
- docs: /integrations/frontend/
88
title: Themes
99
- docs: /dashboards/cards/
1010
title: Dashboard cards
1111
---
1212

13-
The thermostat card gives control of your [climate](/integrations/#climate) {% term entity %}, allowing you to change the temperature and mode of the {% term entity %}.
13+
The thermostat card gives control of your [climate](/integrations/#climate) {% term entity %} or [water heater](/integrations/#water_heater) {% term entity %}, allowing you to change the temperature and mode of the {% term entity %}.
1414

1515
<p class='img'>
1616
<img src='/images/dashboards/thermostat_card.png' alt='Screenshot of the thermostat card'>
@@ -32,7 +32,7 @@ type:
3232
type: string
3333
entity:
3434
required: true
35-
description: Entity ID of `climate` domain.
35+
description: Entity ID of `climate` or `water_heater` domain.
3636
type: string
3737
name:
3838
required: false
@@ -50,7 +50,7 @@ show_current_as_primary:
5050
default: false
5151
features:
5252
required: false
53-
description: Additional widgets to control your entity. See [available features](/dashboards/features). Only climate related features are supported.
53+
description: Additional widgets to control your entity. See [available features](/dashboards/features). Only climate or water heater related features are supported.
5454
type: list
5555
{% endconfiguration %}
5656

source/_dashboards/todo-list.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ hide_create:
7171
description: Hide the textbox for creating new tasks at the top of the card.
7272
type: boolean
7373
default: "false"
74+
hide_section_headers:
75+
required: false
76+
description: Hide the 'Active' and 'Completed' sections with the overflow menus.
77+
type: boolean
78+
default: "false"
7479
display_order:
7580
required: false
7681
description: "Optionally sorts the items in the to-do list for display. Options are: `none`: Show the list in its original order. `alpha_asc`: Sort the list in alphabetical order. `alpha_desc`: Sort the list in reverse alphabetical order. `duedate_asc`: Sort the list by due date (soonest first). `duedate_desc`: Sort the list by reverse due date (soonest last)."

source/_docs/automation/trigger.markdown

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,17 +967,27 @@ See the [Persistent Notification](/integrations/persistent_notification/) integr
967967

968968
## Webhook trigger
969969

970-
Webhook trigger fires when a web request is made to the webhook endpoint: `/api/webhook/<webhook_id>`. The webhook endpoint is created automatically when you set it as the `webhook_id` in an automation trigger.
970+
Webhook trigger fires when a web request is made to the webhook endpoint: `/api/webhook/<webhook_id>`. The webhook endpoint is created automatically when you set it as the `webhook_id` in an automation trigger. The `webhook_id` can either be a static value or computed using [limited templates](/docs/configuration/templating/#limited-templates).
971+
972+
{% note %}
973+
The `webhook_id` template is only evaluated when setting up the trigger, they will not be re-evaluated for incomming webhook triggers.
974+
{% endnote %}
971975

972976
```yaml
973977
automation:
978+
trigger_variables:
979+
webhook_id_variable: "template_webhook_id"
974980
triggers:
975981
- trigger: webhook
976982
webhook_id: "some_hook_id"
977983
allowed_methods:
978984
- POST
979985
- PUT
980986
local_only: true
987+
- trigger: webhook
988+
webhook_id: "{{ webhook_id_variable }}"
989+
allowed_methods:
990+
- POST
981991
```
982992

983993
You can run this automation by sending an HTTP POST request to `http://your-home-assistant:8123/api/webhook/some_hook_id`. Here is an example using the **curl** command line program, with an example form data payload:

source/_docs/configuration/splitting_configuration.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ learn more about packages, see the [Packages](/docs/configuration/packages) page
221221

222222
That about wraps it up.
223223

224-
If you have issues, checkout `home-assistant.log` in the configuration directory as well as your indentations. If all else fails, head over to our [Discord chat server][discord] and ask away.
224+
If you have issues, check the file indentations and check [the Home Assistant logs](/integrations/logger/#viewing-logs). If all else fails, head over to our [Discord chat server][discord] and ask away.
225225

226226
## Debugging configuration files
227227

0 commit comments

Comments
 (0)