Skip to content

Commit 8a8e6e9

Browse files
balloobballoob
committed
Merge branch 'current' into next
2 parents c1873a3 + 071f90b commit 8a8e6e9

Some content is hidden

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

52 files changed

+304
-108
lines changed

‎source/_components/automation.markdown

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ logo: home-assistant.png
1111
ha_category: Automation
1212
---
1313

14-
Please see the [getting started section] for in-depth documentation on how to use the automation component.
14+
Please see the [getting started section](/getting-started/automation/) for in-depth documentation on how to use the automation component.
1515

16-
[getting started section]: /getting-started/automation/
16+
Starting with 0.28 your automation rules can be controlled with the frontend.
17+
18+
<p class='img'>
19+
<img src='{{site_root}}/images/screenshots/automation-switches.png' />
20+
</p>
21+
22+
This allows one to reload the automation without restarting Home Assistant itself.

‎source/_components/binary_sensor.ffmpeg.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To enable your FFmpeg with noise detection in your installation, add the followi
2222

2323
```yaml
2424
# Example configuration.yaml entry
25-
camera:
25+
binary_sensor:
2626
- platform: ffmpeg
2727
tool: noise
2828
input: FFMPEG_SUPPORTED_INPUT
@@ -57,7 +57,7 @@ To enable your FFmpeg with motion detection in your installation, add the follow
5757

5858
```yaml
5959
# Example configuration.yaml entry
60-
camera:
60+
binary_sensor:
6161
- platform: ffmpeg
6262
tool: motion
6363
input: FFMPEG_SUPPORTED_INPUT

‎source/_components/binary_sensor.knx.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ footer: true
1010
logo: knx.png
1111
ha_category: Binary Sensor
1212
ha_release: 0.24
13+
ha_iot_class: "Local Polling"
1314
---
1415

1516
To get your KNX binary sensors working with Home Assistant, follow the instructions for the [KNX component](/components/knx/).

‎source/_components/bloomsky.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ha_iot_class: "Cloud Polling"
1616

1717
The `bloomsky` component allows you to access your [BloomSky](https://www.bloomsky.com/) weather station's [sensors](/components/sensor.bloomsky), [binary sensors](/components/binary_sensor.bloomsky), and [camera](/components/camera.bloomsky) from Home Assistant.
1818

19-
Obtain your PI key from your [BloomSky dashboard](https://dashboard.bloomsky.com). Click `developers` in the bottom left of the screen.
19+
Obtain your API key from your [BloomSky dashboard](https://dashboard.bloomsky.com). Click `developers` in the bottom left of the screen.
2020

2121
To integrate your BloomSky hub with Home Assistant, add the following section to your `configuration.yaml` file:
2222

‎source/_components/climate.eq3btsmart.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ to the start function of /etc/init.d/hass-daemon.
5858
# Example configuration.yaml entry
5959
climate:
6060
platform: eq3btsmart
61-
devices:
62-
room1:
63-
mac: '00:11:22:33:44:55'
61+
devices:
62+
room1:
63+
mac: '00:11:22:33:44:55'
6464
```

‎source/_components/climate.generic_thermostat.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ Configuration variables:
4040
- **target_sensor** (*Required*): `entity_id` for a temperature sensor, target_sensor.state must be temperature.
4141
- **min_temp** (*Optional*): Set minimum set point available (default: 7)
4242
- **max_temp** (*Optional*): Set maximum set point available (default: 35)
43-
- **target_temp** (*Required*): Set intital target temperature. Failure to set this variable will result in target temperature being set to null on startup.
43+
- **target_temp** (*Optional*): Set intital target temperature. Failure to set this variable will result in target temperature being set to null on startup.
4444
- **ac_mode** (*Optional*): Set the switch specified in the *heater* option to be treated as a cooling device instead of a heating device.
4545
- **min_cycle_duration** (*Optional*): Set a minimum amount of time that the switch specified in the *heater* option must be in it's current state prior to being switched either off or on.

‎source/_components/climate.knx.markdown

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ footer: true
1010
logo: knx.png
1111
ha_category: DIY
1212
ha_release: 0.25
13+
ha_iot_class: "Local Polling"
1314
---
1415

1516

@@ -20,16 +21,18 @@ KNX thermostats use at least 2 group addresses: one for the current temperature
2021
To use your KNX thermostats in your installation, add the following to your `configuration.yaml` file:
2122

2223
```yaml
24+
# Example configuration.yaml entry
2325
climate:
2426
- platform: knx
2527
name: KNX Thermostat
28+
address : KNX_ADDRESS
2629
temperature_address: 0/1/1
2730
setpoint_address: 0/1/0
2831
```
2932
3033
- **name** (*Optional*): A name for this devices used within Home assistant
3134
- **address** (*Required*): The KNX group address that is used to turn on/off this actuator channel
32-
- **temperature_address** (*Required*): The group address that is used to communicate the current temperature. Data format must be datapoint type 9.001 DPT_Value_Temp (2-Octet float value) (see http://www.knx.org/fileadmin/template/documents/downloads_support_menu/KNX_tutor_seminar_page/Advanced_documentation/05_Interworking_E1209.pdf)
35+
- **temperature_address** (*Required*): The group address that is used to communicate the current temperature. Data format must be datapoint type 9.001 DPT_Value_Temp (2-Octet float value), check [details](http://www.knx.org/fileadmin/template/documents/downloads_support_menu/KNX_tutor_seminar_page/Advanced_documentation/05_Interworking_E1209.pdf).
3336
- **setpoint_address** (*Required*): The group address that is used to set/read the target temperature. Data format must be datapoint type 9.001 DPT_Value_Temp (2-Octet float value). Make sure, you set the read-flag for the thermostat to allow Home Assistant to read the target temperature.
3437
3538
With the current version of the module, no advanced KNX thermostat functionalities (e.g. HVAC mode) are supported.

‎source/_components/cover.mqtt.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cover:
3333
qos: 0
3434
retain: true
3535
payload_open: "PAYLOAD_OPEN"
36-
payload_close: "PAYLOD__CLOSE"
36+
payload_close: "PAYLOAD_CLOSE"
3737
payload_stop: "PAYLOAD_STOP"
3838
state_open: "STATE_OPEN"
3939
state_closed: "STATE_CLOSED"
@@ -60,6 +60,6 @@ Configuration variables:
6060
For a quick check you can use the commandline tools shipped with `mosquitto` to send MQTT messages. Set the state of your sensor manually:
6161

6262
```bash
63-
$ mosquitto_pub -h 127.0.0.1 -t home-assistant/cover/set -m "OFF"
63+
$ mosquitto_pub -h 127.0.0.1 -t home-assistant/cover/set -m "PAYLOAD_CLOSE"
6464
```
6565

‎source/_components/device_tracker.bluetooth_le_tracker.markdown

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,13 @@ Some BTLE devices (e.g. fitness trackers) are only visible to the devices that t
3232
3333
BTLE tracking requires root privileges.
3434
35+
For running Home Assistant as non root user we can give python3 the missing capabilities to access the bluetooth stack. Quite like setting the setuid bit (see [Stack Exchange](http://unix.stackexchange.com/questions/96106/bluetooth-le-scan-as-non-root) for more information).
36+
37+
```bash
38+
sudo apt-get install libcap2-bin
39+
sudo setcap 'cap_net_raw,cap_net_admin+eip' `readlink -f \`which python3\``
40+
```
41+
42+
A restart of Home Assistant is required.
43+
3544
For additional configuration variables check the [Device tracker page](/components/device_tracker/).

‎source/_components/device_tracker.nmap_scanner.markdown renamed to ‎source/_components/device_tracker.nmap_tracker.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ device_tracker:
2525
platform: nmap_tracker
2626
hosts: 192.168.1.1/24
2727
home_interval: 10
28+
exclude:
29+
- 192.168.1.12
30+
- 192.168.1.13
2831
```
2932
3033
Configuration variables:
3134
3235
- **hosts** (*Required*): The network range to scan in CIDR notation, eg. 192.168.1.1/24
3336
- **home_interval** (*Optional*): The number of minutes nmap will not scan this device, assuming it is home, in order to preserve the device battery.
37+
- **exclude** (*Optional*): Hosts not to include in nmap scanning.
3438
3539
See the [device tracker component page](/components/device_tracker/) for instructions how to configure the people to be tracked.

0 commit comments

Comments
 (0)