Skip to content

Commit d3627d6

Browse files
balloobballoob
committed
Merge branch 'current' into next
2 parents 3d6c06c + de374b2 commit d3627d6

Some content is hidden

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

54 files changed

+1116
-377
lines changed

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ end
2020

2121
group :jekyll_plugins do
2222
gem 'jekyll-paginate'
23+
gem 'jekyll-redirect-from'
2324
gem 'jekyll-sitemap'
2425
gem 'jekyll-time-to-read'
2526
gem 'octopress', '~> 3.0'

‎Gemfile.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ GEM
2727
rouge (~> 1.7)
2828
safe_yaml (~> 1.0)
2929
jekyll-paginate (1.1.0)
30+
jekyll-redirect-from (0.11.0)
31+
jekyll (>= 2.0)
3032
jekyll-sass-converter (1.3.0)
3133
sass (~> 3.2)
3234
jekyll-sitemap (0.11.0)
@@ -118,6 +120,7 @@ DEPENDENCIES
118120
haml (~> 4.0)
119121
jekyll (~> 3.0)
120122
jekyll-paginate
123+
jekyll-redirect-from
121124
jekyll-sitemap
122125
jekyll-time-to-read
123126
octopress (~> 3.0)

‎_config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ kramdown:
4949
highlighter: rouge
5050

5151
gems:
52+
- jekyll-redirect-from
5253
- jekyll-time-to-read
5354
- octopress-filters
5455
- octopress-include-tag
@@ -131,9 +132,9 @@ social:
131132
# Home Assistant release details
132133
current_major_version: 0
133134
current_minor_version: 37
134-
current_patch_version: 0
135-
date_released: 2017-01-29
135+
current_patch_version: 1
136+
date_released: 2017-02-02
136137

137138
# Either # or the anchor link to latest release notes in the blog post.
138139
# Must be prefixed with a # and have double quotes around it.
139-
patch_version_notes: ""
140+
patch_version_notes: "#release-0371---february-2"

‎sass/custom/_paulus.scss

Lines changed: 53 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,6 @@
1515
display: inline-block;
1616
font-weight: 500;
1717
}
18-
19-
.front-install {
20-
border: none;
21-
font-size: 1em;
22-
background-color: #333;
23-
margin-bottom: 16px;
24-
display: inline-block;
25-
padding: 8px;
26-
color: #DDD;
27-
28-
div:before {
29-
content: '$';
30-
color: #c82829;
31-
margin-right: 6px;
32-
}
33-
}
3418
}
3519

3620
.material-card {
@@ -320,56 +304,6 @@ p.note {
320304
-moz-transition-property: -moz-transform, opacity;
321305
transition-property: transform, opacity;
322306
}
323-
324-
#componentContainer {
325-
a {
326-
display: inline-block;
327-
width: 202px;
328-
height: 142px;
329-
background-color: #fefefe;
330-
margin-right: 4px;
331-
margin-bottom: 8px;
332-
border-radius: 2px;
333-
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
334-
padding: 8px;
335-
text-align: center;
336-
text-decoration: none;
337-
338-
.img-container {
339-
height: 50px;
340-
margin: 8px 0;
341-
font: 0/0 a;
342-
343-
&:before { /* create a full-height inline block pseudo=element */
344-
content: ' ';
345-
display: inline-block;
346-
vertical-align: middle; /* vertical alignment of the inline element */
347-
height: 100%;
348-
}
349-
350-
img {
351-
max-width: 100%;
352-
max-height: 50px;
353-
box-shadow: none;
354-
border: none;
355-
vertical-align: middle;
356-
}
357-
}
358-
359-
.title {
360-
text-decoration: none;
361-
font-size: 18px;
362-
color: #000;
363-
line-height: 1.3em;
364-
height: 2.6em;
365-
}
366-
367-
.category {
368-
font-size: 14px;
369-
color: #AAA;
370-
}
371-
}
372-
}
373307
}
374308

375309
@media only screen and (max-width: $lap-end) {
@@ -422,6 +356,55 @@ p.note {
422356
}
423357
}
424358

359+
.hass-option-cards {
360+
.option-card {
361+
display: inline-block;
362+
width: 202px;
363+
height: 142px;
364+
background-color: #fefefe;
365+
margin-right: 4px;
366+
margin-bottom: 8px;
367+
border-radius: 2px;
368+
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
369+
padding: 8px;
370+
text-align: center;
371+
text-decoration: none;
372+
373+
.img-container {
374+
height: 50px;
375+
margin: 8px 0;
376+
font: 0/0 a;
377+
378+
&:before { /* create a full-height inline block pseudo=element */
379+
content: ' ';
380+
display: inline-block;
381+
vertical-align: middle; /* vertical alignment of the inline element */
382+
height: 100%;
383+
}
384+
385+
img {
386+
max-width: 100%;
387+
max-height: 50px;
388+
box-shadow: none;
389+
border: none;
390+
vertical-align: middle;
391+
}
392+
}
393+
394+
.title {
395+
text-decoration: none;
396+
font-size: 18px;
397+
color: #000;
398+
line-height: 1.3em;
399+
height: 2.6em;
400+
}
401+
402+
.category {
403+
font-size: 14px;
404+
color: #AAA;
405+
}
406+
}
407+
}
425408

426409
.aside-module {
427410
.section {
@@ -481,3 +464,7 @@ twitterwidget {
481464
margin-left: auto;
482465
margin-right: auto;
483466
}
467+
468+
.text-center {
469+
text-align: center;
470+
}

‎source/_components/camera.mjpeg.markdown

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ha_release: pre 0.7
1515

1616
The `mjpeg` camera platform allows you to integrate IP cameras which are capable to stream their video with MJPEG into Home Assistant.
1717

18-
Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]?time=[timestamp]`.
19-
2018
To enable this camera in your installation, add the following to your `configuration.yaml` file:
2119

2220
```yaml

‎source/_components/device_tracker.nmap_tracker.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ device_tracker:
6060
- 10.0.0.2
6161
- 10.0.0.15
6262
```
63+
In the above example, Nmap will be call with the process:
64+
`nmap -oX - 192.168.1.1/24 10.0.0.2 10.0.0.15 -F --host-timeout 5s`
6365

6466
An example of how the Nmap scanner can be customized:
6567

‎source/_components/emulated_hue.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ You can verify that the `emulated_hue` component has been loaded and is respondi
103103
- `http://<HA IP Address>:8300/description.xml` - This URL should return a descriptor file in the form of an XML file.
104104
- `http://<HA IP Address>:8300/api/pi/lights` - This will return a list of devices, lights, scenes, groups, etc.. that `emulated_hue` is exposing to Alexa.
105105

106+
An additional step is required to run Home Assistant as non-root user and use port 80 when using the AiO script. Execute the following command to allow `emulated_hue` to use port 80 as non-root user.
107+
108+
```bash
109+
sudo setcap 'cap_net_bind_service=+ep' /srv/homeassistant/homeassistant_venv/bin/python3
110+
```
106111

107112
### {% linkable_title License %}
108113

‎source/_components/ffmpeg.markdown

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ Configuration variables:
3030

3131
### {% linkable_title Raspbian Debian Jessie Lite Installations %}
3232
To get the binary on Raspbian Debian Jessie Lite on a RPi you need to perform the following:
33-
```
34-
$ sudo apt-get install libav-tools
35-
```
36-
This will get a forked version of ffmpeg called avconv, once this is installed you need to use the following in the configuration:
3733

34+
```bash
35+
$ sudo echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
36+
$ sudo apt-get update
37+
$ sudo apt-get -t jessie-backports install ffmpeg
38+
```
39+
We can use now following in the configuration:
3840
```
3941
ffmpeg:
40-
ffmpeg_bin: /usr/bin/avconv
42+
ffmpeg_bin: /usr/bin/ffmpeg
4143
```
4244

4345
### {% linkable_title Troubleshooting %}

‎source/_components/hdmi_cec.markdown

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,23 @@ The computer running Home Assistant must support CEC, and of course be connected
2727

2828
#### {% linkable_title Symlinking into virtual environment %}
2929

30-
Create a symlink to the `cec` installation.
30+
Create a symlink to the `cec` installation. Keep in mind different installation methods will result in different locations of cec.
3131

3232
```bash
33-
$ ln -s /usr/local/lib/python3.4/dist-packages/cec /path/to/your/venv/lib/python3.4/site-packages
33+
$ ln -s /path/to/your/installation/of/cec /path/to/your/venv/lib/python3.4/site-packages
34+
```
35+
##### {% linkable_title Symlinking examples: %}
36+
37+
For the default virtual environment of a [HASSbian Image for Raspberry Pi](/getting-started/installation-raspberry-pi-image/) the command would be as follows.
38+
39+
```bash
40+
$ ln -s /usr/local/lib/python3.4/dist-packages/cec /srv/homeassistant/lib/python3.4/site-packages
3441
```
3542

3643
For the default virtual environment of a [Raspberry Pi All-In-One installation](/getting-started/installation-raspberry-pi-all-in-one/) the command would be as follows.
3744

3845
```bash
39-
$ ln -s /usr/local/lib/python3.4/dist-packages/cec /srv/hass/hass_venv/lib/python3.4/site-packages
46+
$ ln -s /usr/local/lib/python3.4/site-packages/cec /srv/homeassistant/homeassistant_venv/lib/python3.4/site-packages
4047
```
4148

4249
For the default virtual environment of a [Manual installation](/getting-started/installation-raspberry-pi/) the command would be as follows.

‎source/_components/image_processing.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Image processing enables Home Assistant to process images from [cameras](/compon
1414

1515
For interval control, use `scan_interval` in platform.
1616

17+
<p class='note'>
18+
If you are running Home Assistant over SSL or from within a container, you will have to setup a base url inside the [http component](/components/http/).
19+
</p>
20+
1721
## {% linkable_title ALPR %}
1822

1923
Alpr entities attribute have a vehicle counter `vehicles` and all found plates as `plates`.

‎source/_components/image_processing.microsoft_face_identify.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: microsoft.png
11-
ha_category: Image_Processing
11+
ha_category: Image Processing
1212
featured: false
1313
ha_release: 0.37
1414
---

‎source/_components/light.hue.markdown

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ light:
3232
Configuration variables:
3333
3434
- **host** (*Optional*): IP address of the device, eg. 192.168.1.10. Required if not using the `discovery` component to discover Hue bridges.
35-
- **allow_unreachable** (*Optional*): This will allow unreachable bulbs to report their state correctly. By default *name* from the device is used.
35+
36+
- **allow_unreachable** (*Optional*): (true/false) This will allow unreachable bulbs to report their state correctly.
3637
- **filename** (*Optional*): Make this unique if specifying multiple Hue hubs.
37-
- **allow_in_emulated_hue** (*Optional*): Enable this to block all Hue entities from being added to the `emulated_hue` component.
38-
- **allow_hue_groups** (*Optional*): Enable this to stop Home Assistant from importing the groups defined on the Hue bridge.
38+
- **allow_in_emulated_hue** (*Optional*): )true/false) Enable this to block all Hue entities from being added to the `emulated_hue` component.
39+
- **allow_hue_groups** (*Optional*): (true/false) Enable this to stop Home Assistant from importing the groups defined on the Hue bridge.
3940

4041
### {% linkable_title Using Hue Groups in Home Assistant %}
4142

‎source/_components/light.yeelight.markdown

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ ha_release: 0.32
1414

1515
The `yeelight` light platform allows you to control your Yeelight Wifi bulbs with Home Assistant.
1616

17+
### {% linkable_title Example configuration %}
18+
1719
To enable those lights, add the following lines to your `configuration.yaml` file:
1820

1921
```yaml
@@ -22,24 +24,34 @@ light:
2224
- platform: yeelight
2325
devices:
2426
192.168.1.25:
25-
name: Front Door
26-
192.168.1.13:
2727
name: Living Room
28+
transition: 1000
29+
use_music_mode: True (defaults to False)
30+
save_on_change: False (defaults to True)
31+
192.168.1.13:
32+
name: Front Door
2833
```
2934
3035
Configuration variables:
3136
3237
- **ip** (*Required*): IP(s) of your wifi bulbs
3338
- **name** (*Optional*): A friendly name for the device.
39+
- **transition** (*Optional*, default 350): Smooth transitions over time (in ms).
40+
- **use_music_mode** (*Optional*, default False): Enable music mode.
41+
- **save_on_change** (*Optional*, default True): Saves the bulb state when changed from Home Assistant.
42+
43+
#### {% linkable_title Music mode %}
44+
Per default the bulb limits the amount of requests per minute to 60, a limitation which can be bypassed by enabling the music mode. In music mode the bulb is commanded to connect back to a socket provided by the component and it tries to keep the connection open, which may not be wanted in all use-cases.
3445
46+
### {% linkable_title Initial setup %}
3547
<p class='note'>
3648
Before trying to control your light through Home Assistant, you have to setup your bulb using Yeelight app. ( [Android](https://play.google.com/store/apps/details?id=com.yeelight.cherry&hl=fr), [IOS](https://itunes.apple.com/us/app/yeelight/id977125608?mt=8) ).
3749
In the bulb property, you have to enable "Developer Mode" Developer mode may only be available with the latest firmware installed on your bulb. Firmware can be updated in the application after connecting the bulb.
3850
Determine your bulb ip (using router, software, ping ...)
3951
</p>
4052
4153
<p class='note warning'>
42-
Tests are only made with a YLDP03YL model. Because it's the only hardware developer owns. If you have bugs with another kind of model, you could open an issue on [Home Assistant Github](https://github.com/home-assistant/home-assistant)
54+
This component is tested to work with models YLDP01YL and YLDP03YL. If you have a different model and it is working please let us know.
4355
</p>
4456
4557

‎source/_components/lock.wink.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ The requirement is that you have setup [Wink](/components/wink/).
2424
- Schlage
2525
- Generic Z-wave
2626

27+
<p class='note'>
28+
If supported by your lock, a binary sensor will be created for each user key code you have defined. These key codes will turn on when the code is entered and automatically turn off after a few seconds.
29+
</p>

0 commit comments

Comments
 (0)