Skip to content

Commit 194b8b8

Browse files
author
Paulus Schoutsen
committed
Merge remote-tracking branch 'origin/current' into next
2 parents 3f4f298 + 4e60e4d commit 194b8b8

33 files changed

+330
-105
lines changed

‎_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ social:
128128
# Home Assistant release details
129129
current_major_version: 0
130130
current_minor_version: 39
131-
current_patch_version: 2
132-
date_released: 2017-03-01
131+
current_patch_version: 3
132+
date_released: 2017-03-04
133133

134134
# Either # or the anchor link to latest release notes in the blog post.
135135
# Must be prefixed with a # and have double quotes around it.
136-
patch_version_notes: "#release-0392---march-1"
136+
patch_version_notes: "#release-0393---march-4"

‎source/_components/binary_sensor.nx584.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@ binary_sensor:
4848
2: opening
4949
4: motion
5050
6: moisture
51+
```

‎source/_components/climate.honeywell.markdown

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ climate:
2121
platform: honeywell
2222
username: YOUR_USERNAME
2323
password: YOUR_PASSWORD
24+
scan_interval: 600
2425
```
26+
<p class='note'>
27+
Scan interval is expressed in seconds. Omitting scan_interval may result in too-frequent polling and cause you to rate-limited by Honeywell.
28+
</p>
2529
2630
Configuration variables:
2731
2832
- **username** (*Required*): The username of an user with access.
2933
- **password** (*Required*): The password for your given admin account.
30-
- **away_temperature** (*optional*): Heating setpoint when away mode is on. If omitted it defaults to 16.0 deg C.
31-
- **region** (*optional*): Region identifier (either 'eu' or 'us'). Defaults to 'eu' if not provided.
34+
- **away_temperature** (*Optional*): Heating setpoint when away mode is on. If omitted it defaults to 16.0 deg C.
35+
- **region** (*Optional*): Region identifier (either 'eu' or 'us'). Defaults to 'eu' if not provided.
36+
- **scan_interval**(*Optional*): Scan interval is expressed in seconds. Recommended value of 600 seconds. Default value is 120 seconds. Omitting scan_interval may result in too-frequent polling and cause you to rate-limited by Honeywell.

‎source/_components/device_tracker.asuswrt.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Configuration variables:
3535
- **username** (*Required*: The username of an user with administrative privileges, usually `admin`.
3636
- **password** (*Optional*): The password for your given admin account (use this if no SSH key is given).
3737
- **protocol** (*Optional*): The protocol (`ssh` or `telnet`) to use. Defaults to `ssh`.
38+
- **port** (*Optional*): SSH port to use. Defaults to `22`.
3839
- **mode** (*Optional*): The operating mode of the router (`router` or `ap`). Defaults to `router`.
3940
- **ssh_key** (*Optional*): The path to your SSH private key file associated with your given admin account (instead of password).
4041

‎source/_components/sensor.pocketcasts.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sidebar: true
77
comments: false
88
sharing: true
99
footer: true
10+
logo: pocketcasts.png
1011
ha_category: Sensor
1112
ha_release: 0.39
1213
---

‎source/_components/switch.broadlink.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ First get or learn all the remotes you want to add on HA in E-Control
150150
151151
1. Download
152152
153-
Get the script from [here](https://github.com/NightRang3r/Broadlink-e-control-db-dump5).
153+
Get the script from [here](https://github.com/NightRang3r/Broadlink-e-control-db-dump).
154154
155155
2. Dump the data from the app
156156

‎source/_components/switch.tplink.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To use your TPLink switch in your installation, add the following to your `confi
2828
# Example configuration.yaml entry
2929
switch:
3030
- platform: tplink
31-
host: IP_ADRRESS
31+
host: IP_ADDRESS
3232
```
3333
3434
Configuration variables:

‎source/_components/telegram_webhooks.markdown

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ telegram_webhooks:
6565

6666
Telegram webhooks raise an event `telegram.command` with a payload.
6767

68-
```json{
68+
```json
69+
{
6970
'command': '/thecommand'
7071
'args': 'strings after command'
7172
'user_id': 12345
7273
}
74+
```
7375

7476
Automation example that realize simple test to command/notify interaction.
7577

‎source/_docs/automation/templating.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ redirect_from: /getting-started/automation-templating/
1212

1313
In Home Assistant 0.19 we introduced a new powerful feature: variables in scripts and automations. This makes it possible to adjust your condition and action based on the information of the trigger.
1414

15-
The trigger data made is available during [template](/configuration/templating/) rendering as the `trigger` variable.
15+
The trigger data made is available during [template](/docs/configuration/templating/) rendering as the `trigger` variable.
1616

1717
```yaml
1818
# Example configuration.yaml entries
@@ -128,4 +128,4 @@ The following tables show the available trigger data per platform.
128128
| `trigger.zone` | State object of zone
129129
| `trigger.event` | Event that trigger observed: `enter` or `leave`.
130130

131-
[state object]: /configuration/state_object/
131+
[state object]: /docs/configuration/state_object/

‎source/_docs/autostart/systemd.markdown

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ $ ps -p 1 -o comm=
1818

1919
If the preceding command returns the string `systemd`, you are likely using `systemd`.
2020

21-
If you want Home Assistant to be launched automatically, an extra step is needed to setup `systemd`. You need a service file to control Home Assistant with `systemd`. If you are using a Raspberry Pi with Raspbian then replace the `[your user]` with `pi` otherwise use your user you want to run Home Assistant. `ExecStart` contains the path to `hass` and this may vary. Check with `whereis hass` for the location.
21+
If you want Home Assistant to be launched automatically, an extra step is needed to setup `systemd`. A service file is needed to control Home Assistant with `systemd`. The template below should be created using a text editor. Note, root permissions via 'sudo' will likely be needed. The following should be noted to modify the template:
2222

23-
```bash
24-
$ su -c 'cat <<EOF >> /etc/systemd/system/home-assistant@.service
23+
+ `ExecStart` contains the path to `hass` and this may vary. Check with `whereis hass` for the location.
24+
+ If running Home Assistant in a python virtual environment or a docker, please skip to section below.
25+
+ For most systems, the file is `/etc/systemd/system/home-assistant@[your user].service` with [your user] replaced by the user account that Home Assistant will run as - normally `homeassistant`. For Ubuntu 16.04, the file is `/lib/systemd/system/home-assistant.service` and requires running this command `sudo ln -s /lib/systemd/system/home-assistant.service /etc/systemd/system/home-assistant.service` after file is created.
26+
+ If unfamiliar with command line text editors, `sudo nano -w [filename]` can be used with `[filename]` replaced with the full path to the file. Ex. `sudo nano -w /etc/systemd/system/home-assistant@homeassistant.service`. After text entered, press CTRL-X then press Y to save and exit.
27+
28+
```
2529
[Unit]
2630
Description=Home Assistant
2731
After=network.target
@@ -33,10 +37,9 @@ ExecStart=/usr/bin/hass
3337
3438
[Install]
3539
WantedBy=multi-user.target
36-
EOF'
3740
```
3841

39-
If you've setup Home Assistant in `virtualenv` following our [python installation guide](https://home-assistant.io/getting-started/installation-virtualenv/) or [manual installation guide for raspberry pi](https://home-assistant.io/getting-started/installation-raspberry-pi/), the following template should work for you.
42+
If you've setup Home Assistant in `virtualenv` following our [python installation guide](https://home-assistant.io/getting-started/installation-virtualenv/) or [manual installation guide for raspberry pi](https://home-assistant.io/getting-started/installation-raspberry-pi/), the following template should work for you. If Home Assistant install is not located at `/srv/homeassistant`, please modify the `Enviroment=` and `ExecStart=` lines appropriately.
4043

4144
```
4245
[Unit]
@@ -74,18 +77,33 @@ ExecStopPost=/usr/bin/docker rm -f home-assistant-%i
7477
WantedBy=multi-user.target
7578
```
7679

77-
You need to reload `systemd` to make the daemon aware of the new configuration. Enable and launch Home Assistant after that.
80+
You need to reload `systemd` to make the daemon aware of the new configuration.
7881

7982
```bash
8083
$ sudo systemctl --system daemon-reload
84+
```
85+
86+
To have Home Assistant start automatically at boot, enable the service.
87+
88+
```bash
8189
$ sudo systemctl enable home-assistant@[your user]
90+
```
91+
92+
To disable the automatic start, use this command.
93+
94+
```bash
95+
$ sudo systemctl disable home-assistant@[your user]
96+
```
97+
98+
To start Home Assistant now, use this command.
99+
```bash
82100
$ sudo systemctl start home-assistant@[your user]
83101
```
84102

85-
If everything went well, `sudo systemctl start home-assistant@[your user]` should give you a positive feedback.
103+
You can also substitute the `start` above with `stop` to stop Home Assistant, `restart` to restart Home Assistant, and 'status' to see a brief status report as seen below.
86104

87105
```bash
88-
$ sudo systemctl status home-assistant@[your user] -l
106+
$ sudo systemctl status home-assistant@[your user]
89107
● home-assistant@fab.service - Home Assistant for [your user]
90108
Loaded: loaded (/etc/systemd/system/home-assistant@[your user].service; enabled; vendor preset: disabled)
91109
Active: active (running) since Sat 2016-03-26 12:26:06 CET; 13min ago
@@ -99,10 +117,10 @@ $ sudo systemctl status home-assistant@[your user] -l
99117
To get Home Assistant's logging output, simple use `journalctl`.
100118

101119
```bash
102-
$ journalctl -f -u home-assistant@[your user]
120+
$ sudo journalctl -f -u home-assistant@[your user]
103121
```
104122

105-
Because the log can scroll quite quickly, you might want to open a second terminal to view only the errors:
123+
Because the log can scroll quite quickly, you can select to view only the error lines:
106124
```bash
107-
$ journalctl -f -u home-assistant@[your user] | grep -i 'error'
125+
$ sudo journalctl -f -u home-assistant@[your user] | grep -i 'error'
108126
```

0 commit comments

Comments
 (0)