Merge branch 'next' into rc

2025-07-24 09:46:59 +00:00 · 2020-09-07 23:24:25 +02:00 · 2020-09-07 23:24:25 +02:00 · 3511426a12
commit 3511426a12
parent 65574d2977 c039a605e1
13 changed files with 103 additions and 22 deletions
--- a/2
+++ b/2
@ -18,7 +18,7 @@ group :jekyll_plugins do
  gem 'jekyll-commonmark', '1.3.1'
 end

-gem 'sinatra', '2.0.8.1'
+gem 'sinatra', '2.1.0'
 gem 'nokogiri', '1.10.10'

 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -81,7 +81,7 @@ GEM
      forwardable-extended (~> 2.6)
    public_suffix (4.0.6)
    rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
      rack
    rake (13.0.1)
    rb-fsevent (0.10.4)
@ -100,10 +100,10 @@ GEM
      ffi (~> 1.9)
    sassc (2.4.0-x64-mingw32)
      ffi (~> 1.9)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
      tilt (~> 2.0)
    stringex (2.8.5)
    terminal-table (1.8.0)
@ -130,7 +130,7 @@ DEPENDENCIES
  nokogiri (= 1.10.10)
  rake (= 13.0.1)
  sass-globbing (= 1.1.5)
-  sinatra (= 2.0.8.1)
+  sinatra (= 2.1.0)
  stringex (= 2.8.5)
  tzinfo (~> 2.0)
  tzinfo-data
--- a/source/_docs/automation/trigger.markdown
+++ b/source/_docs/automation/trigger.markdown
@ -152,9 +152,68 @@ automation:
    from: "not_home"
    # Optional
    to: "home"
+```

-    # If given, will trigger when state has been the to state for X time.
-    for: "01:10:05"
+#### Holding a state
+
+You can use `for` to have the state trigger only fire if the state holds for some time.
+
+This example fires, when the entity state changed to `"on"` and holds that
+state for 30 seconds:
+
+```yaml
+automation:
+  trigger:
+    platform: state
+    entity_id: light.office
+    # Must stay "on" for 30 seconds
+    to: "on"
+    for: "00:00:30"
+```
+
+You can also fire the trigger when the state value changed from a specific
+state, but hasn't returned to that state value for the specified time.
+
+This can be useful, e.g., checking if a media player hasn't turned "off" for
+the time specified, but doesn't care about "playing" or "paused".
+
+```yaml
+automation:
+  trigger:
+    platform: state
+    entity_id: media_player.kitchen
+    # Not "off" for 30 minutes
+    from: "off"
+    for: "00:30:00"
+```
+
+Please note, that when using `from`, `to` and `for`, only the value of the
+`to` option is considered for the time specified.
+
+In this example, the trigger fires if the state value of the entity remains the
+same for `for` the time specified, regardless of the current state value.
+
+```yaml
+automation:
+  trigger:
+    platform: state
+    entity_id: media_player.kitchen
+    # The media player remained in its current state for 1 hour
+    for: "01:00:00"
+```
+
+When the `attribute` option is specified, all of the above works, but only
+applies to the specific state value of that attribute.
+
+For example, this trigger only fires if the boiler was heating for 10 minutes:
+
+```yaml
+automation:
+  trigger:
+    platform: state
+    entity_id: climate.living_room
+    attribute: hvac_action
+    state: "heating"
 ```

 You can also use templates in the `for` option.
--- a/source/_docs/scripts/conditions.markdown
+++ b/source/_docs/scripts/conditions.markdown
@ -225,6 +225,17 @@ condition:
  state: heat
 ```

+Finally, the `state` option accepts helper entities (also known as `input_*`
+entities). The condition will pass if the state of the entity matches the state
+of the given helper entity.
+
+```yaml
+condition:
+  condition: state
+  entity_id: alarm_control_panel.home
+  state: input_select.guest_mode
+```
+
 ### Sun condition

 #### Sun state condition
--- a/source/_integrations/camera.markdown
+++ b/source/_integrations/camera.markdown
@ -14,7 +14,7 @@ The camera integration allows you to use IP cameras with Home Assistant.

 If your camera supports it, and the [`stream`](/integrations/stream) integration is setup, you will be able to stream your cameras in the frontend and on supported media players.

-This option will keep the stream alive, and preload the feed on Home Assistant startup. This will result in reduced latency when opening the stream in the frontend, as well as when using the `play_stream` service or Google Assistant integration. It does, however, utilize more resources on your machine, so it is recommended to check CPU usage if you plan to use this feature.
+The `Preload stream` option will start the camera feed on Home Assistant startup and continue to keep the stream alive. This will result in reduced latency when opening the stream in the frontend, as well as when using the `play_stream` service or Google Assistant integration. It does, however, utilize more resources on your machine, so it is recommended to check CPU usage if you plan to use this feature.

 <p class='img'>
  <img src='/images/integrations/camera/preload-stream.png' alt='Screenshot showing Preload Stream option in Home Assistant front end.'>
--- a/source/_integrations/devolo_home_control.markdown
+++ b/source/_integrations/devolo_home_control.markdown
@ -42,8 +42,10 @@ The integration provides support for the following Z-Wave devices:

 - devolo Door/Window Contact
 - devolo Flood Sensor
+- devolo Key-Fob Switch
 - devolo Motion Sensor
 - devolo Smoke Detector
+- devolo Wall Switch
 - Fibaro Floor Sensor
 - Fibaro Motion Sensor
 - Fibaro Smoke Sensor
--- a/source/_integrations/logi_circle.markdown
+++ b/source/_integrations/logi_circle.markdown
@ -32,7 +32,7 @@ The `logi_circle` implementation allows you to integrate your [Logi Circle](http
 * At the time you submit your request to Logitech, you need to demonstrate that you have exclusive control of the fully qualified domain name in your redirect URI. An active Home Assistant instance at the redirect URI will suffice. If you don't want to expose your Home Assistant instance publicly, you may also place a static page at the redirect URI with a short message that you will manage redirection of the authorization token to your local Home Assistant instance. Free static hosts that issue subdomains for hosting (e.g., Netlify) are permitted.
 * As the redirect URI must be public facing, no local/reserved TLDs are permitted (eg. .local, .localhost, .example, etc. are not allowed).

-Please note that the turn-around time for API access takes a few business days after which you will be contacted by Logitech using the email address you provided in the form.
+Please note that the turn-around time for API access takes up to a month after which you will be contacted by Logitech using the email address you provided in the form.

 ## Configuration

--- a/source/_integrations/plugwise.markdown
+++ b/source/_integrations/plugwise.markdown
@ -45,6 +45,8 @@ The Plugwise Smile(s) present in your network will be automatically detected via

 Repeat the above procedure for each Smile gateway (i.e., if you have an Adam setup and a P1 DSMR you'll have to add two integrations).

+After adding the Plugwise integration(s), the default Smile-data refresh-interval can be changed by pressing the "OPTIONS" button: change the number via the up- or down-button and press "SUBMIT".
+
 <div class='note warning'>
 When you have an Anna and an Adam, make sure to only configure the Adam integration. You can press the "IGNORE" button on the Anna integration to remove this integration. In case you need to rediscover the Adam integration, make sure to click the "STOP IGNORING" button on the Plugwise integration first, available via "show ignored integrations".
 </div>
--- a/source/_integrations/risco.markdown
+++ b/source/_integrations/risco.markdown
@ -94,3 +94,4 @@ This undoes a zone bypass. You can only unbypass a zone when the partitions it b

 - [Alarm Control Panel](/integrations/alarm_control_panel/)
 - [Binary Sensor](/integrations/binary_sensor/)
+- [Sensor](/integrations/sensor/)
--- a/source/_integrations/spotify.markdown
+++ b/source/_integrations/spotify.markdown
@ -30,11 +30,15 @@ To create the required Spotify application:
 - Visit the [My Applications](https://developer.spotify.com/my-applications/#!/applications) page.
 - Select **Create An App**. Enter any name and description.
 - Once your application is created, view it and copy your **Client ID** and **Client Secret**, which are used in the Home Assistant configuration file.
- Add a **Redirect URI** in one of the following forms:
+- On the Spotify page, enter the **Edit Settings** dialog of your newly created application and add a **Redirect URI**:
  - If you are not using SSL: `http://<your_home_assistant_url_or_local_ip>:<port>/auth/external/callback`
  - If you are using SSL: `https://<your_home_assistant_url_or_local_ip>:<port>/auth/external/callback`
 - Click **Save** after adding the URI.

+<div class='note'>
+  Your Home Assitant instance does not need to be exposed to the internet. It works just fine with local IP addresses.
+</div>  
+
 ## Configuration

 To add Spotify to your installation, add the following to your `configuration.yaml` file:
@ -61,18 +65,18 @@ client_secret:

 After you have set up the above:

- Go to the integrations page in the Home Assistant frontend
- Go to **Integrations**
+- Go to the **Configurations** page in the Home Assistant frontend.
+- Go to **Integrations**.
 - Add a new **Spotify** integration.
 - Follow the steps shown to authenticate Home Assistant with your Spotify account.

 <div class='note'>
  
-  If you receive an `INVALID_CLIENT: Invalid redirect URI` error while trying to authenticate with your Spotify account, make sure to check the Redirect URI in the address bar after adding the new integration. Compare this value with the Redirect URL defined in the Spotify Developer Portal.
+  If you receive an `INVALID_CLIENT: Invalid redirect URI` error while trying to authenticate with your Spotify account, make sure to check the Redirect URI in the address bar after adding the new integration. Compare this value with the Redirect URI defined in the Spotify Developer Portal.

 </div>

-## URI Links For Playlists
+## URI Links for Playlists

 You can send playlists to Spotify using the `"media_content_type": "playlist"`, which are part of the
 [media_player.play_media](/integrations/media_player/#service-media_playerplay_media) service.
--- a/source/_integrations/weather.knx.markdown
+++ b/source/_integrations/weather.knx.markdown
@ -3,7 +3,7 @@ title: "KNX Weather"
 description: "Instructions on how to integrate KNX weather stations with Home Assistant."
 ha_category:
  - Weather
-ha_release: 0.115.0
+ha_release: 0.115
 ha_iot_class: Local Push
 ha_domain: knx
 ---
--- a/source/_integrations/webostv.markdown
+++ b/source/_integrations/webostv.markdown
@ -184,7 +184,7 @@ Available services: `button`, `command`
 | Service data attribute | Optional | Description                                                                                                                                                                                                                                                                            |
 | ---------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `entity_id`            | no       | Target a specific webostv media player.                                                                                                                                                                                                                                                |
-| `button`               | no       | Name of the button. Known possible values are `LEFT`, `RIGHT`, `DOWN`, `UP`, `HOME`, `BACK`, `ENTER`, `DASH`, `INFO`, `ASTERISK`, `CC`, `EXIT`, `MUTE`, `RED`, `GREEN`, `BLUE`, `VOLUMEUP`, `VOLUMEDOWN`, `CHANNELUP`, `CHANNELDOWN`, `0`, `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9` |
+| `button`               | no       | Name of the button. Known possible values are `LEFT`, `RIGHT`, `DOWN`, `UP`, `HOME`, `MENU`, `BACK`, `ENTER`, `DASH`, `INFO`, `ASTERISK`, `CC`, `EXIT`, `MUTE`, `RED`, `GREEN`, `BLUE`, `VOLUMEUP`, `VOLUMEDOWN`, `CHANNELUP`, `CHANNELDOWN`, `0`, `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9` |

 ### Service `webostv.command`

--- a/source/_integrations/zha.markdown
+++ b/source/_integrations/zha.markdown
@ -101,11 +101,12 @@ a new pop-up asking for a radio type. In the pop-up:

 | Radio Type | Zigbee Radio Hardware |
 | ------------- | ------------- |
-| `ezsp`  | Silicon Labs EmberZNet protocol (ex; Elelabs, HUSBZB-1, Telegesis) |
-| `deconz` | dresden elektronik deCONZ protocol: ConBee I/II, RaspBee I/II |
-| `ti_cc` | Texas Instruments Z-Stack ZNP protocol (ex: CC253x, CC26x2, CC13x2) |
-| `zigate` | ZiGate Serial protocol: PiZiGate, ZiGate USB-TTL, ZiGate WiFi |
-| `xbee` | Digi XBee ZB Coordinator Firmware protocol (Digi XBee Series 2, 2C, 3) |
+| `ezsp`  | Silicon Labs EmberZNet protocol (e.g., Elelabs, HUSBZB-1, Telegesis) |
+| `deconz` | dresden elektronik deCONZ protocol (e.g., ConBee I/II, RaspBee I/II) |
+| `znp` | Texas Instruments new (active): Z-Stack 3.x.x ZNP protocol (e.g., CC26x2, CC13x2) |
+| `ti_cc` | Texas Instruments legacy & HA12: Z-Stack Home 1.2.x ZNP protocol (e.g., CC253x) |
+| `zigate` | ZiGate Serial protocol (e.g., ZiGate USB-TTL, PiZiGate, ZiGate WiFi) |
+| `xbee` | Digi XBee ZB Coordinator Firmware protocol (e.g., Digi XBee Series 2, 2C, 3) |

 - Submit

@ -202,6 +203,7 @@ logger:
    zigpy_xbee.zigbee.application: debug
    zigpy_xbee.api: debug
    zigpy_zigate: debug
+    zigpy_znp: debug
    zhaquirks: debug
 ```