diff --git a/Gemfile.lock b/Gemfile.lock index ad36bb2c44e..ff13138ec9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,8 +25,8 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) - ffi (1.12.2) - ffi (1.12.2-x64-mingw32) + ffi (1.13.0) + ffi (1.13.0-x64-mingw32) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (1.8.2) diff --git a/source/_docs/configuration/splitting_configuration.markdown b/source/_docs/configuration/splitting_configuration.markdown index 8762fea4bfb..2c8774dcb50 100644 --- a/source/_docs/configuration/splitting_configuration.markdown +++ b/source/_docs/configuration/splitting_configuration.markdown @@ -84,7 +84,44 @@ switch: !include switch.yaml device_tracker: !include device_tracker.yaml ``` -Note that there can only be one `!include:` for each integration so chaining them isn't going to work. If that sounds like Greek, don't worry about it. +Nesting `!include`s (having an `!include` within a file that is itself `!include`d) isn't going to work. You can, however, have multiple top-level `!include`s for a given integration, if you give a different label to each one: + +```yaml +light: +- platform: group + name: Bedside Lights + entities: + - light.left_bedside_light + - light.right_bedside_light + +# define more light groups in a separate file +light groups: !include light-groups.yaml + +# define some light switch mappings in a different file +light switches: !include light-switches.yaml +``` + +where `light-groups.yaml` might look like: + +```yaml +- platform: group + name: Outside Lights + entities: + - light.porch_lights + - light.patio_lights + ``` + +with `light-switches.yaml` containing: + +```yaml +- platform: switch + name: Patio Lights + entity_id: switch.patio_lights + +- platform: switch + name: Floor Lamp + entity_id: switch.floor_lamp_plug +``` Alright, so we've got the single integrations and the include statements in the base file, what goes in those extra files? diff --git a/source/_docs/configuration/troubleshooting.markdown b/source/_docs/configuration/troubleshooting.markdown index 3aadb1251ff..d7e1132c183 100644 --- a/source/_docs/configuration/troubleshooting.markdown +++ b/source/_docs/configuration/troubleshooting.markdown @@ -14,14 +14,14 @@ Whenever an integration or configuration option results in a warning, it will be When an integration does not show up, many different things can be the case. Before you try any of these steps, make sure to look at the `home-assistant.log` file and see if there are any errors related to your integration you are trying to set up. -If you have incorrect entries in your configuration files you can use the [`check_config`](/docs/tools/check_config/) script to assist in identifying them: `hass --script check_config`. If you need to provide the path for your configuration you can do this using the `-c` argument like this: `hass --script check_config -c /path/to/your/config/dir`. +If you have incorrect entries in your configuration files you can use the configuration check command (below) to assist in identifying them. ### Problems with the configuration One of the most common problems with Home Assistant is an invalid `configuration.yaml` or other configuration file. - With Home Assistant you can use the [`ha` command](/hassio/commandline/#home-assistant): `ha core check`. - - You can test your configuration with Home Assistant Core using the command line with: `hass --script check_config`. + - You can test your configuration with Home Assistant Core using the command line with: `hass --script check_config`. If you need to provide the path for your configuration you can do this using the `-c` argument like this: `hass --script check_config -c /path/to/your/config/dir`. - On Docker you can use `docker exec home-assistant python -m homeassistant --script check_config --config /config` - where `home-assistant` is the name of the container. - The configuration files, including `configuration.yaml` must be UTF-8 encoded. If you see error like `'utf-8' codec can't decode byte`, edit the offending configuration and re-save it as UTF-8. - You can verify your configuration's YAML structure using [this online YAML parser](http://yaml-online-parser.appspot.com/) or [YAML Lint](http://www.yamllint.com/). diff --git a/source/_docs/z-wave/adding.markdown b/source/_docs/z-wave/adding.markdown index 57c4d5ade65..ce23ab920ea 100644 --- a/source/_docs/z-wave/adding.markdown +++ b/source/_docs/z-wave/adding.markdown @@ -88,10 +88,11 @@ If your device isn't responding to this process, possibly because you've factory 1. Go to the *States* menu under *Developer tools* in the Home Assistant frontend 2. Click on the name of the `zwave.` entity you want to remove 3. Make note of the entity's "node_id" value as you will need to re-add the "node_id" attribute and value in step 4. -4. At the top, edit the JSON attributes to replace `false` with `true` for `"is_failed": false,` so that it reads `"is_failed": true.` Also add the "node_id" value to the number listed in the entity's attribute. The JSON attributes should look something like below: +4. At the top, edit the JSON attributes to replace `false` with `true` for `"is_failed": false,` so that it reads `"is_failed": true.` Also add the "node_id" value to the number listed in the entity's attribute. The YAML attributes should look something like below: ```yaml - {"node_id":6, "is_failed":true} + node_id: 6 + is_failed: true ``` 5. Click **Set State** diff --git a/source/_integrations/denonavr.markdown b/source/_integrations/denonavr.markdown index 1a2bf8f7a7e..e16dd4b03a0 100644 --- a/source/_integrations/denonavr.markdown +++ b/source/_integrations/denonavr.markdown @@ -22,6 +22,7 @@ Known supported devices: - Denon AVR-X2000 - Denon AVR-X2100W - Denon AVR-X2200W +- Denon AVR-X2300W - Denon AVR-X3400H - Denon AVR-X4100W - Denon AVR-X4300H diff --git a/source/_integrations/doorbird.markdown b/source/_integrations/doorbird.markdown index ed85a46fcc8..0c6d804ced1 100644 --- a/source/_integrations/doorbird.markdown +++ b/source/_integrations/doorbird.markdown @@ -182,24 +182,7 @@ Note: Remember to complete the schedule assignment steps above for each event ty The `doorbird` implementation allows you to view the live video, the last doorbell ring image, and the last motion sensor image from your [DoorBird](https://www.doorbird.com/) device in Home Assistant. -### Configuration - -To enable the camera, add the following to your `configuration.yaml` file: - -```yaml -# Example configuration.yaml entry -camera: - - platform: doorbird -``` ## Switch The `doorbird` switch platform allows you to power connected relays and trigger the IR array in your [DoorBird](https://www.doorbird.com/) video doorbell device. - -To enable this switch, add the following lines to your `configuration.yaml` file: - -```yaml -# Example configuration.yaml entry -switch: - - platform: doorbird -``` diff --git a/source/_integrations/withings.markdown b/source/_integrations/withings.markdown index 6de0a2b05d0..b51901c4c86 100644 --- a/source/_integrations/withings.markdown +++ b/source/_integrations/withings.markdown @@ -25,7 +25,7 @@ Values for your account: - Logo: Any reasonable picture will do. - Description: Personal app for collecting my data. - Contact Email: Your email address -- Callback Uri: `https://your-domain-name/auth/external/callback` - Withings will check if this URL is accessible (HTTP HEAD) upon submitting the form. +- Callback Uri: `https://your-domain-name/auth/external/callback` - Withings will check if this URL is accessible (HTTP HEAD) upon submitting the form. If you are using the Home Assistant Cloud, this URL will look like `https://YOUR_NABU_CASA_ID.ui.nabu.casa/auth/external/callback`. - Company: Home Assistant Once saved, the "Client Id" and "Consumer Secret" fields will be populated. You will need these in the next step. diff --git a/source/hassio/installation.markdown b/source/hassio/installation.markdown index fbd9c372e4c..9cc2b16cc86 100644 --- a/source/hassio/installation.markdown +++ b/source/hassio/installation.markdown @@ -15,17 +15,17 @@ The following will take you through the steps required to install Home Assistant - [Raspberry Pi 4 Model B 64bit][pi4-64] - [Tinkerboard][tinker] - [Odroid-C2][odroid-c2] - - [Odroid-N2 (Beta)][odroid-n2] + - [Odroid-N2][odroid-n2] - [Odroid-XU4][odroid-xu4] - [Intel-Nuc][intel-nuc] - As a virtual appliance (x86_64/UEFI): - - [VMDK][vmdk] (VMWare Workstation) + - [VMDK][vmdk] - [VHDX][vhdx] - [VDI][vdi] - - [QCOW2 (beta)][qcow2] - - [OVA (Beta)][Virtual Appliance] + - [QCOW2][qcow2] + - [OVA][Virtual Appliance] - Not recommended Hardware: @@ -107,14 +107,14 @@ If you would like to test next release before anyone else, you can install the b [balenaEtcher]: https://www.balena.io/etcher [hassos-network]: https://github.com/home-assistant/operating-system/blob/dev/Documentation/network.md -[pi0-w]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi0-w-3.13.img.gz -[pi1]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi-3.13.img.gz -[pi2]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi2-3.13.img.gz -[pi3-32]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi3-3.13.img.gz -[pi3-64]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi3-64-3.13.img.gz -[pi4-32]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi4-3.13.img.gz -[pi4-64]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_rpi4-64-3.13.img.gz -[tinker]: https://github.com/home-assistant/operating-system/releases/download/3.13/hassos_tinker-3.13.img.gz +[pi0-w]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi0-w-4.8.img.gz +[pi1]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi-4.8.img.gz +[pi2]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi2-4.8.img.gz +[pi3-32]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi3-4.8.img.gz +[pi3-64]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi3-64-4.8.img.gz +[pi4-32]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi4-4.8.img.gz +[pi4-64]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_rpi4-64-4.8.img.gz +[tinker]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_tinker-4.8.img.gz [odroid-c2]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_odroid-c2-4.8.img.gz [odroid-n2]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_odroid-n2-4.8.img.gz [odroid-xu4]: https://github.com/home-assistant/operating-system/releases/download/4.8/hassos_odroid-xu4-4.8.img.gz