Skip to content

Commit 62dd03d

Browse files
authored
Merge branch 'next' into MieleServiceAction2
2 parents cfbc172 + d030ac5 commit 62dd03d

File tree

8 files changed

+176
-12
lines changed

8 files changed

+176
-12
lines changed

source/_includes/common-tasks/backups.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,18 @@ The automatic backup process creates a backup on a predefined schedule and also
4343
- **System optimal** sets a time in a predefined time window as shown in the UI.
4444
- **Custom** lets you pick the time when you want the backup to start.
4545
- Make sure you pick a time when all your backup locations are up and running and available. Otherwise, the backup will fail for locations which are not available.
46-
5. Define how many backups you want to keep.
46+
5. Define if you want to back up automatically before updating.
47+
- This sets a default. But you can change this setting each time before updating.
48+
- For large installations, backups might take a while.
49+
- Your update might start later than you expected.
50+
6. Define how many backups you want to keep.
4751
- Older backups will be automatically deleted.
4852
- For example: if you back up daily, and select 7 backups, then the backup from 8 days ago and older will be deleted.
49-
6. Define the data you want to back up.
53+
7. Define the data you want to back up.
5054
- It is recommended to disable media and the shared folder to reduce the size of the backup.
5155
- A large backup also takes longer to restore.
5256
- Some add-ons may also be quite large.
53-
7. [Define the location for backups](#defining-backup-locations).
57+
8. [Define the location for backups](#defining-backup-locations).
5458

5559
### Defining backup locations
5660

source/_integrations/esphome.markdown

+39
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,42 @@ The entity will be named `livingroomdesk Temperature` and will default to having
100100
data:
101101
homeassistant.components.esphome: debug
102102
```
103+
104+
## Reconfiguration and Device Replacement
105+
106+
This integration supports reconfiguration, allowing you to make changes—such as updating the IP address—even after a device has already been set up.
107+
108+
### Name Conflict Resolution
109+
110+
If Home Assistant detects multiple devices with the same [**name**](https://esphome.io/components/esphome.html#configuration-variables), it will automatically initiate **Name Conflict Resolution**. This process is designed to help you seamlessly replace a failed or retired device with new hardware, while preserving your existing configuration if desired.
111+
112+
This process gives you two options:
113+
114+
- **Migrate**: Transfers the existing entity configuration to the new device. This preserves all your settings, entity names, and history. Use this when you're replacing the hardware but keeping the same YAML configuration.
115+
- **Overwrite**: Replaces the existing configuration with the new device.
116+
**Caution:** This will **erase all existing settings** for the old device including entity names, customizations, and history will be lost. Use this only if the new device is completely different and you don’t need anything from the previous setup.
117+
118+
{% tip %}
119+
If you’re using the same YAML file on the new device, choose **Migrate**. If it’s a totally different device (even if it shares the same name), **Overwrite** is the safer option.
120+
{% endtip %}
121+
122+
---
123+
124+
### Requirements for Name Conflict Resolution
125+
126+
To trigger Name Conflict Resolution, all of the following must be true:
127+
128+
- The new device must be running **ESPHome 2025.4.0 or later**.
129+
- The new device must use the same [**name**](https://esphome.io/components/esphome.html#configuration-variables) (not just the friendly name).
130+
- The original (old) device must be **offline**.
131+
132+
---
133+
134+
### How to Trigger Name Conflict Resolution
135+
136+
You can trigger Name Conflict Resolution in several ways:
137+
138+
- Connecting a new device with the same name and a **static IP address** will automatically launch a repair flow.
139+
- Using the **Reconfigure** option in the UI to point to a different IP that hosts a device with the same name.
140+
- Configuring a **newly discovered device** that uses the same name.
141+
- **Manually adding** a device with the same name via the integration setup.

source/_integrations/miele.markdown

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: Instructions on how to set up the Miele integration within Home Ass
44
ha_category:
55
- Climate
66
- Hub
7+
- Light
78
- Sensor
89
ha_iot_class: Cloud Push
910
ha_release: '2025.5'
@@ -14,6 +15,7 @@ ha_config_flow: true
1415
ha_platforms:
1516
- climate
1617
- diagnostics
18+
- light
1719
- sensor
1820
ha_integration_type: integration
1921
---
@@ -88,6 +90,14 @@ The integration configuration may ask for the *Client ID* and *Client Secret* cr
8890
Climate entities are used to control target temperatures in refrigerators, freezers, and wine cabinets. One, two, or three zones can be controlled depending on the capabilities of the appliance.
8991
{% enddetails %}
9092

93+
### Light
94+
95+
{% details "List of light entities" %}
96+
97+
- **Light**: The light can be turned on and off in many models of ovens, cooker hoods, and wine cabinets.
98+
- **Ambient light**: Some models of cooker hoods have ambient light that can be turned on and off.
99+
{% enddetails %}
100+
91101
### Sensor
92102

93103
{% details "List of sensors" %}
@@ -110,7 +120,6 @@ The service action can be set up by UI in Automations editor or Developer tools.
110120
| `program_id` | no | Enter the program_id number. The easiest way to find the number is to fetch a diagnostic download while running the actual program. Use the value from the key `state::programId::value_raw`.|
111121
| `duration` | yes | Set desired program duration in minutes for ovens. |
112122
| `temperature` | yes | Set desired target temperature for oven program. |
113-
114123
## Automation examples
115124

116125
Get started with these automation examples

source/_integrations/ntfy.markdown

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
---
2+
title: ntfy
3+
description: Instructions on how to integrate ntfy with Home Assistant.
4+
ha_category:
5+
- Notifications
6+
ha_iot_class: Cloud Push
7+
ha_release: 2025.5
8+
ha_config_flow: true
9+
ha_codeowners:
10+
- '@tr4nt0r'
11+
ha_domain: ntfy
12+
ha_integration_type: integration
13+
ha_platforms:
14+
- notify
15+
---
16+
17+
The **ntfy** {% term integration %} allows publishing push notifications on [ntfy.sh](https://ntfy.sh/) or other ntfy services.
18+
19+
## About ntfy
20+
21+
**ntfy** is a simple HTTP-based pub-sub notification service that allows you to send notifications to phones or desktops. The official [ntfy](https://ntfy.sh/) service also provides additional features, such as notifications via email or phone calls using text-to-speech to read messages aloud. Since ntfy is 100% open-source, you can choose to use alternative public ntfy services or even host your own instance.
22+
23+
## How you can use this integration
24+
25+
The ntfy integration can be used to send push notifications from automations and scripts in real-time to your mobile devices and desktops.
26+
27+
## Prerequisites
28+
29+
1. **Service URL**
30+
31+
To set up the **ntfy** integration, you need the URL of the ntfy service you wish to use.
32+
33+
- Use `https://ntfy.sh` for the official ntfy service.
34+
- Provide the URL of an alternative public ntfy service or your self-hosted instance (for example, `https://your-ntfy-instance.com`).
35+
36+
2. **Authentication**
37+
38+
Depending on whether the server is configured to support access control, some topics may be read/write protected so that only users with the correct credentials can subscribe or publish to them. To publish/subscribe to protected topics, you can provide a username and password.
39+
40+
3. **Adding a topic**
41+
42+
To set up topics for notifications, select the three-dot {% icon "mdi:dots-vertical" %} menu next to the entry of the previously configured ntfy service, then click **{% icon "mdi:plus" %} Add topic**.
43+
44+
You can now choose one of the following options:
45+
46+
- Select **Enter topic** to add a new topic. Use an **existing topic name** by retrieving it from the ntfy app or the ntfy service's website. Simply copy and paste the topic name into the configuration.
47+
- Select **Generate topic name** to allow the integration to generate a **random topic name** automatically.
48+
49+
Repeat these steps for each topic you want to add.
50+
51+
{% note %}
52+
53+
Topics may not be password-protected, so choose a name that's not easy to guess. If you are sending sensitive information, consider reserving the topic and restricting access to it.
54+
55+
{% endnote %}
56+
57+
{% include integrations/config_flow.md %}
58+
59+
## Configuration parameters
60+
61+
### Service parameters
62+
63+
{% configuration_basic %}
64+
"Service URL":
65+
description: "Address of the ntfy service. Defaults to `https://ntfy.sh`."
66+
"Username (optional)":
67+
description: "Username required to authenticate with protected ntfy topics."
68+
"Password (optional)":
69+
description: "Password corresponding to the provided username for authentication."
70+
{% endconfiguration_basic %}
71+
72+
### Topic parameters
73+
74+
{% configuration_basic %}
75+
"Topic":
76+
description: "Name of the topic."
77+
"Display name (optional)":
78+
description: "An alternative name to display instead of the topic name. This helps identify topics with complex or hard-to-read names more easily."
79+
{% endconfiguration_basic %}
80+
81+
## Notifiers
82+
83+
The **ntfy** integration will add a {% term device %} with an associated notify {% term entity %} for each configured topic. To publish notifications, you can use the `notify.send_message` {% term action %}. To use notifications, please see the [getting started with automation page](/getting-started/automation/).
84+
85+
{% details "Example YAML configuration" %}
86+
87+
{% raw %}
88+
89+
```yaml
90+
action: notify.send_message
91+
data:
92+
message: "Reminder: Have you considered frogs?"
93+
entity_id: notify.mytopic
94+
```
95+
96+
{% endraw %}
97+
98+
{% enddetails %}
99+
100+
## Removing the integration
101+
102+
This integration can be removed by following these steps:
103+
104+
{% include integrations/remove_device_service.md %}

source/_integrations/nuki.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Nuki
3-
description: Instructions on how to integrate a Nuki Smart Lock devices.
2+
title: Nuki Bridge
3+
description: Instructions on how to integrate a Nuki Bridge to control their Smart Lock devices.
44
ha_category:
55
- Lock
66
ha_release: 0.38
@@ -19,7 +19,7 @@ ha_dhcp: true
1919
ha_integration_type: integration
2020
---
2121

22-
The Nuki integration allows you to control [Nuki Smart Locks](https://nuki.io/en/smart-lock/) via a [Nuki Bridge](https://help.nuki.io/hc/en-001/sections/360004474718-Bridge) or Nuki Smart Lock with [Build-in WiFi](https://help.nuki.io/hc/en-001/sections/4402761196817-Built-in-Wi-Fi) using the cloud.
22+
The Nuki integration allows you to control [Nuki Smart Locks](https://nuki.io/en/smart-lock/) via a [Nuki Bridge](https://help.nuki.io/hc/en-001/sections/360004474718-Bridge).
2323
Many Nuki Smart Locks also support [local integrations](#local-integration-alternatives) using a different integration.
2424

2525
## Prerequisites

source/_integrations/renault.markdown

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ All vehicles linked to the account should then get added as devices, with sensor
5151

5252
In some situations, some of the features may require a subscription such as the *Pack EV Remote Control* and/or the *Pack Smart Navigation* subscription.
5353

54+
## Data updates
55+
56+
Due to rate limitations from the Renault servers, the integration limits {% term polling %} to 60 data requests/hour.
57+
For a single vehicle with all 7 endpoints available, the integration fetches data from the device every 7 minutes.
58+
5459
## Actions
5560

5661
### Action `renault.ac_start`

source/_integrations/teslemetry.markdown

+8
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ These are the entities available in the Teslemetry integration. Not all entities
6464
|Binary sensor|Brake pedal|No|
6565
|Binary sensor|Cabin overheat protection actively cooling|No|
6666
|Binary sensor|Charge cable|Yes|
67+
|Binary sensor|Charge enable request|No|
6768
|Binary sensor|Charge port cold weather mode|No|
6869
|Binary sensor|Charger has multiple phases|No|
6970
|Binary sensor|Dashcam|No|
7071
|Binary sensor|DC DC|No|
72+
|Binary sensor|Defrost for preconditioning|No|
7173
|Binary sensor|Drive rail|No|
7274
|Binary sensor|Driver seat belt|No|
7375
|Binary sensor|Driver seat occupied|No|
@@ -80,7 +82,10 @@ These are the entities available in the Teslemetry integration. Not all entities
8082
|Binary sensor|Front passenger window|Yes|
8183
|Binary sensor|GPS state|No|
8284
|Binary sensor|Guest mode enabled|No|
85+
|Binary sensor|High beams|No|
8386
|Binary sensor|Homelink nearby|No|
87+
|Binary sensor|HVAC auto mode|No|
88+
|Binary sensor|High voltage interlock loop fault|No|
8489
|Binary sensor|Located at favorite|Yes|
8590
|Binary sensor|Located at home|Yes|
8691
|Binary sensor|Located at work|Yes|
@@ -94,9 +99,12 @@ These are the entities available in the Teslemetry integration. Not all entities
9499
|Binary sensor|Rear driver window|Yes|
95100
|Binary sensor|Rear passenger door|Yes|
96101
|Binary sensor|Rear passenger window|Yes|
102+
|Binary sensor|Remote start|No|
97103
|Binary sensor|Right hand drive|No|
98104
|Binary sensor|Scheduled charging pending|No|
105+
|Binary sensor|Seat vent enabled|No|
99106
|Binary sensor|Service mode|No|
107+
|Binary sensor|Speed limited|No|
100108
|Binary sensor|Status|Yes|
101109
|Binary sensor|Supercharger session trip planner|No|
102110
|Binary sensor|Tire pressure warning front left|No|

source/_integrations/wallbox.markdown

-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ha_domain: wallbox
99
ha_platforms:
1010
- lock
1111
- number
12-
- select
1312
- sensor
1413
- switch
1514
ha_config_flow: true
@@ -55,10 +54,6 @@ The number {% term entity %} is only loaded if the supplied username has suffici
5554

5655
The {% term integration %} adds a lock {% term entity %}, allowing you to lock the charger. Please note, this only works with a user with admin rights.
5756

58-
## Select
59-
60-
The {% term integration %} adds a select {% term entity %} to control Solar Charging options, allowing you to choose between Eco Mode, Full Solar or disable Solar Charging.
61-
6257
## Switch
6358

6459
The {% term integration %} adds a switch {% term entity %}, allowing you to pause/resume the charging process.

0 commit comments

Comments
 (0)