diff --git a/Gemfile.lock b/Gemfile.lock index cbcee356060..29440d0f77f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.17.0) + rouge (3.18.0) ruby-enum (0.8.0) i18n ruby2_keywords (0.0.2) @@ -94,9 +94,7 @@ GEM sass (3.4.25) sass-globbing (1.1.5) sass (>= 3.1) - sassc (2.2.1) - ffi (~> 1.9) - sassc (2.2.1-x64-mingw32) + sassc (2.3.0) ffi (~> 1.9) sinatra (2.0.8.1) mustermann (~> 1.0) diff --git a/_config.yml b/_config.yml index c5f0d7c8236..3a9f638c958 100644 --- a/_config.yml +++ b/_config.yml @@ -101,8 +101,8 @@ social: # Home Assistant release details current_major_version: 0 current_minor_version: 108 -current_patch_version: 3 -date_released: 2020-04-10 +current_patch_version: 6 +date_released: 2020-04-16 # Either # or the anchor link to latest release notes in the blog post. # Must be prefixed with a # and have double quotes around it. diff --git a/source/_docs/autostart/macos.markdown b/source/_docs/autostart/macos.markdown index 8dc41a3fc8f..b7ab19dbd93 100644 --- a/source/_docs/autostart/macos.markdown +++ b/source/_docs/autostart/macos.markdown @@ -8,7 +8,6 @@ Setting up Home Assistant to run as a background service is simple; macOS will s To get Home Assistant installed as a background service, run: - ```bash $ hass --script macos install @@ -26,3 +25,11 @@ $ hass --script macos uninstall Home Assistant has been uninstalled. ``` + + +Note: +`automake` is required for `hass` to start. If you are missing this on your system, you can install this by running: + +```bash +$ brew install autoconf +``` diff --git a/source/_docs/configuration/basic.markdown b/source/_docs/configuration/basic.markdown index 0c80d3cb26c..3f1d4d868c1 100644 --- a/source/_docs/configuration/basic.markdown +++ b/source/_docs/configuration/basic.markdown @@ -35,7 +35,11 @@ elevation: required: false type: integer unit_system: - description: "`metric` for Metric, `imperial` for Imperial." + description: "`metric` for Metric, `imperial` for Imperial. This also sets temperature_unit, Celsius for Metric and Fahrenheit for Imperial" + required: false + type: string +temperature_unit: + description: "Override temperature unit set by unit_system. `C` for Celsius, `F` for Fahrenheit." required: false type: string time_zone: diff --git a/source/_docs/configuration/yaml.markdown b/source/_docs/configuration/yaml.markdown index 4fd7bcf2a70..fa79cd97054 100644 --- a/source/_docs/configuration/yaml.markdown +++ b/source/_docs/configuration/yaml.markdown @@ -111,3 +111,13 @@ This means that you've mistakenly entered a tab character, instead of spaces. Home Assistant is case sensitive, a state of `'on'` is not the same as `'On'` or `'ON'`. Similarly an entity of `group.Doors` is not the same as `group.doors`. If you're having trouble, check the case that Home Assistant is reporting in the dev-state menu, under *Developer tools*. + +### Booleans + +YAML treats `Y`, `true`, `Yes`, `ON` all as `true` and `n`, `FALSE`, `No`, `off` as `false`. This means that if you want to set the state of an entity to `on` you *must* quote it as `'on'` otherwise it will be translated as setting the state to true. The same applies to `off`. + +Not quoting the value may generate an error such as: + +```txt +not a valid value for dictionary value @ data +``` diff --git a/source/_docs/z-wave/device-specific.markdown b/source/_docs/z-wave/device-specific.markdown index 2c3d99eb847..feaf37bd625 100644 --- a/source/_docs/z-wave/device-specific.markdown +++ b/source/_docs/z-wave/device-specific.markdown @@ -163,7 +163,7 @@ Some models of the Zooz Toggle switches ship with an instruction manual with inc ## Central Scene configuration -To provide Central Scene support you need to **shutdown Home Assistant** and modify your `zwcfg_*.xml` file according to the following guides. +To provide Central Scene support you need to **stop your Z-Wave network** and modify your `zwcfg_*.xml` file according to the following guides. Start your Z-Wave network again after editing `zwcfg_*.xml`. ### Inovelli Scene Capable On/Off and Dimmer Wall Switches @@ -191,131 +191,399 @@ Triple tap on|2|4 5x tap off|1|6 5x tap on|2|6 -### Zooz Scene Capable On/Off and Dimmer Wall Switches (Zen26 & Zen27 - Firmware 2.0+) +### Zooz Scene Capable On/Off and Dimmer Wall Switches (Zen21v2 & Zen22v2 - Firmware 3.0+ and Zen26 & Zen27 - Firmware 2.0+) Many Zooz Zen26/27 switches that have been sold do not have firmware 2.0+. Contact Zooz to obtain the over the air firmware update instructions and new user manual for the switches. Once the firmware is updated, the the new configuration parameters will have to be added to the `zwcfg` file. Replace the existing `COMMAND_CLASS_CONFIGURATION` with the one of the following options (depending on your model of switch): +Zen21v2 (On/Off Switch): +```xml + + + + Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse mode: Upper paddle turns the light off, lower paddle turns the light on. Toggle mode: Either paddle toggles the light. + + + + + + LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. + + + + + + + + + + + Time, in minutes, for auto-off timer delay. + + + + + + + Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off. + + + Choose which physical and Z-Wave triggers should prompt the switch to send a status change report to associated devices. + + + + + + + + + + + + + + + + + + + Status after power failure. Off: always turn light off. On: always turn light on. Restore: remember the latest state and restore that state. + + + + + + Enable or Disable scene control functionality for quick double tap triggers (Available for select hubs only). + + + + + Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles. + + + + + + Choose the type of 3-way switch you want to use with this dimmer in a 3-way set-up. Changing this setting can allow you to control brightness and dim the light from both 3-way locations. Use a regular momentary switch (like the Zooz ZAC99 accessory switch) if value is set to 2. + + + + + Set reporting behavior for disabled physical control. + + + + +``` + +Zen22v2 (Dimmer): +```xml + + + + Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse mode: Upper paddle turns the light off, lower paddle turns the light on. Toggle mode: Either paddle toggles the light. + + + + + + LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. + + + + + + + + + + + Time, in minutes, for auto-off timer delay. + + + + + + + Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off. + + + Choose which physical and Z-Wave triggers should prompt the switch to send a status change report to associated devices. + + + + + + + + + + + + + + + + + + + Status after power failure. Off: always turn light off. On: always turn light on. Restore: remember the latest state and restore that state. + + + + + + Adjust the physical ramp rate for your dimmer (fade-in / fade-out effect for on / off operation). Values correspond to the number of seconds it take for the dimmer to reach full brightness or turn off when operated manually. This setting is for physical taps only, see parameter 17 to adjust Z-Wave ramp rate. Values: 1 – 99 (seconds). 0 – instant on/off. Default: 1 + + + Set the minimum brightness level (in %) for your dimmer. You won’t be able to dim the light below the set value. Default: 1 + + + Set the maximum brightness level (in %) for your dimmer. You won’t be able to add brightness to the light beyond the set value. Note: if Parameter 12 is set to value 0, Parameter 11 is automatically disabled. Default: 99 + + + Double Tap action. When set to Full, turns light on to 100%. If set to Maximum Level, turns light on to % set in Parameter 11. + + + + + Enable or Disable scene control functionality for quick double tap triggers. + + + + + Enables/Disables the double-tap fucntion and assign brightness to single tap. Last level: single tap returns to last brightness level. Full/Max level: single tap returns to full/max level + + + + + + Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles. + + + + + + Set the time it takes to get from 0% to 100% brightness when pressing and holding the paddle (physical dimming). The number entered as value corresponds to the number of seconds. Default: 4 + + + Choose if you want to set the Z-Wave ramp rate independently of the physical ramp rate (using an appropriate command in your hub) or if you want them to match. + + + + + Set the custom brightness level (instead of the last set brightness level) you want the dimmer to come on to when you single tap the upper paddle. Default: 0 - last brightness level + + + Choose the type of 3-way switch you want to use with this dimmer in a 3-way set-up. Changing this setting can allow you to control brightness and dim the light from both 3-way locations. Use a regular momentary switch (like the Zooz ZAC99 accessory switch) if value is set to 2. + + + + + + + Choose how you'd like the dimmer to report when paddles are tapped and held and physical / Z-Wave control is enabled or disabled. + + + + + Set reporting behavior for disabled physical control. + + + + + Set the brightness level the dimmer will turn on to when off and when lower paddle is held DOWN for a second. Default: 20 + + +``` + Zen26 (On/Off Switch): ```xml - - - - Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse will reverse those functions. Any will toggle the light regardless of which button is pushed. - - - - - - LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. - - - - - - - Enable or disable the auto turn-off timer function. - - - - - Time, in seconds, for auto-off timer delay. 60 (default). - - - Enable or disable the auto turn-on timer function. - - - - - Time, in minutes, for auto-on timer delay. 60 (default). - - - Status after power on after power failure. OFF will always turn light off. ON will always turn light on. Restore will remember the latest state and restore that state. - - - - - - Enable or disable scene control functionality for quick double tap triggers. - - - - - Enable or disable local on/off control. If enabled, you'll only be able to control the connected light via Z-Wave. - - - + + + + Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse mode: Upper paddle turns the light off, lower paddle turns the light on. Toggle mode: Either paddle toggles the light. + + + + + + LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. + + + + + + + + + + + Time, in minutes, for auto-off timer delay. + + + + + + + Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off. + + + Choose which physical and Z-Wave triggers should prompt the switch to send a status change report to associated devices. + + + + + + + + + + + + + + + + + + + Status after power failure. Off: always turn light off. On: always turn light on. Restore: remember the latest state and restore that state. + + + + + + Enable or Disable scene control functionality for quick double tap triggers (Available for select hubs only). + + + + + Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles. + + + + + + Set reporting behavior for disabled physical control. + + + ``` Zen27 (Dimmer): ```xml - - - - Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse will reverse those functions. Any will toggle the light regardless of which button is pushed. - - - - - - LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. - - - - - - - - - - - Time, in minutes, for auto-off timer delay. - - - - - - - Time, in minutes, for auto-off timer delay. - - - Status after power on after power failure. OFF will always turn light off. ON will always turn light on. Restore will remember the latest state and restore that state. - - - - - - Adjust the ramp rate for your dimmer (fade-in / fade-out effect for on / off operation). Values correspond to the number of seconds it take for the dimmer to reach full brightness or turn off when operated manually. - - - Set the minimum brightness level for your dimmer. You won't be able to dim the light below the set value. - - - Set the maximum brightness level for your dimmer. You won't be able to add brightness to the light beyond the set value. Note: if Parameter 12 is set to value "Full", Parameter 11 is automatically disabled. - - - Double Tap action. When set to Full, turns light on to 100%. If set to Maximum Level, turns light on to % set in Parameter 11. - - - - - Enable or disable scene control functionality for quick double tap triggers. - - - - - Enable the double tap or disable the double tap function and assign brightness level to single tap. - - - - - - Enable or disable local on/off control. If enabled, light will only be able to be controlled via Z-Wave. - - - + + + + Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse mode: Upper paddle turns the light off, lower paddle turns the light on. Toggle mode: Either paddle toggles the light. + + + + + + LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. + + + + + + + + + + + Time, in minutes, for auto-off timer delay. + + + + + + + Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off. + + + Choose which physical and Z-Wave triggers should prompt the switch to send a status change report to associated devices. + + + + + + + + + + + + + + + + + + + Status after power failure. Off: always turn light off. On: always turn light on. Restore: remember the latest state and restore that state. + + + + + + Adjust the physical ramp rate for your dimmer (fade-in / fade-out effect for on / off operation). Values correspond to the number of seconds it take for the dimmer to reach full brightness or turn off when operated manually. This setting is for physical taps only, see parameter 17 to adjust Z-Wave ramp rate. + + + Set the minimum brightness level (in %) for your dimmer. You won't be able to dim the light below the set value. + + + Set the maximum brightness level (in %) for your dimmer. You won't be able to add brightness to the light beyond the set value. Note: if Parameter 12 is set to value "Full", Parameter 11 is automatically disabled. + + + Double Tap action. When set to Full, turns light on to 100%. If set to Maximum Level, turns light on to % set in Parameter 11. + + + + + Enable or Disable scene control functionality for quick double tap triggers. + + + + + Enables/Disables the double-tap function and assign brightness to single tap. Last level: single tap returns to last brightness level. Full/Max level: single tap returns to full/max level + + + + + + Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles. + + + + + + Set the time it takes to get from 0% to 100% brightness when pressing and holding the paddle (physical dimming). The number entered as value corresponds to the number of seconds. Default: 4 + + + Choose if you want to set the Z-Wave ramp rate independently of the physical ramp rate (using an appropriate command in your hub) or if you want them to match. + + + + + Set the custom brightness level (instead of the last set brightness level) you want the dimmer to come on to when you single tap the upper paddle. Default: 0 - last brightness level + + + Choose how you'd like the dimmer to report when paddles are tapped and held and physical / Z-Wave control is enabled or disabled. + + + + + Set reporting behavior for disabled physical control. + + + + + Set the brightness level the dimmer will turn on to when off and when lower paddle is held DOWN for a second. Default: 20 + ``` diff --git a/source/_docs/z-wave/installation.markdown b/source/_docs/z-wave/installation.markdown index e3effd00110..fbe0e4ce6c0 100644 --- a/source/_docs/z-wave/installation.markdown +++ b/source/_docs/z-wave/installation.markdown @@ -101,6 +101,13 @@ zwave: network_key: "0x2e, 0xcc, 0xab, 0x1c, 0xa3, 0x7f, 0x0e, 0xb5, 0x70, 0x71, 0x2d, 0x98, 0x25, 0x43, 0xee, 0x0c" ``` +In addition to modifying the `configuration.yaml` file, the `options.xml` file network key must be set as well: + +```xml + +