Skip to content

Commit

Permalink
Merge branch 'current' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
balloob committed Aug 26, 2017
2 parents a1efe5b + 7d3a472 commit a05af2b
Show file tree
Hide file tree
Showing 22 changed files with 563 additions and 176 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.4.1
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
sudo: false
cache: bundler
script: bundle exec rake generate
script: travis_wait bundle exec rake generate
after_success:
- '[ "${TRAVIS_BRANCH}" = "current" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && bundle exec rake deploy || false'
10 changes: 0 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,9 @@ source "https://rubygems.org"
group :development do
gem 'rake', '~> 10.0'
gem 'jekyll', '~> 3.0'
gem 'pygments.rb', '~> 1.1.2'
gem 'rdiscount', '~> 2.0'
gem 'RedCloth', '~> 4.2'
gem 'haml', '~> 4.0'
gem 'compass', '~> 0.12'
gem 'sass-globbing', '~> 1.0'
gem 'rubypants', '~> 0.2'
gem 'rb-fsevent', '~> 0.9'
gem 'stringex', '~> 1.4'
gem 'execjs'
gem 'therubyracer', :platforms => :ruby
gem 'coderay'
gem 'pry'
end

Expand All @@ -24,7 +15,6 @@ group :jekyll_plugins do
gem 'jekyll-sitemap'
gem 'jekyll-time-to-read'
gem 'octopress', '~> 3.0'
gem 'octopress-filters'
gem 'octopress-include-tag'
end

Expand Down
73 changes: 23 additions & 50 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,51 +1,47 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
addressable (2.4.0)
chunky_png (1.3.6)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
chunky_png (1.3.8)
coderay (1.1.1)
colorator (1.1.0)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
execjs (2.7.0)
ffi (1.9.14)
ffi (1.9.18)
forwardable-extended (2.6.0)
fssm (0.2.10)
haml (4.0.7)
tilt
jekyll (3.2.1)
jekyll (3.5.2)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.11.0)
jekyll (>= 2.0)
jekyll-redirect-from (0.12.1)
jekyll (~> 3.3)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-sitemap (0.11.0)
addressable (~> 2.4.0)
jekyll-sitemap (1.1.1)
jekyll (~> 3.3)
jekyll-time-to-read (0.1.2)
jekyll
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
kramdown (1.12.0)
libv8 (3.16.14.15)
liquid (3.0.6)
kramdown (1.14.0)
liquid (4.0.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
method_source (0.8.2)
multi_json (1.12.1)
octopress (3.0.11)
jekyll (>= 2.0)
mercenary (~> 0.3.2)
Expand All @@ -58,12 +54,7 @@ GEM
colorator
octopress-escape-code (2.1.1)
jekyll (~> 3.0)
octopress-filters (1.4.0)
jekyll
octopress-hooks (~> 2.0)
rubypants-unicode
titlecase
octopress-hooks (2.6.1)
octopress-hooks (2.6.2)
jekyll (>= 2.0)
octopress-include-tag (1.1.3)
jekyll (>= 2.0)
Expand All @@ -76,64 +67,46 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pygments.rb (1.1.2)
multi_json (>= 1.0.0)
rack (1.6.4)
public_suffix (3.0.0)
rack (1.6.8)
rack-protection (1.5.3)
rack
rake (10.5.0)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdiscount (2.2.0.1)
redcarpet (3.3.4)
ref (2.0.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redcarpet (3.4.0)
rouge (1.11.1)
rubypants (0.5.0)
rubypants-unicode (0.2.5)
safe_yaml (1.0.4)
sass (3.2.19)
sass-globbing (1.1.5)
sass (>= 3.1)
sinatra (1.4.7)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
slop (3.6.0)
stringex (1.5.1)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
tilt (2.0.5)
tilt (2.0.8)
titlecase (0.1.1)

PLATFORMS
ruby

DEPENDENCIES
RedCloth (~> 4.2)
coderay
compass (~> 0.12)
execjs
haml (~> 4.0)
jekyll (~> 3.0)
jekyll-paginate
jekyll-redirect-from
jekyll-sitemap
jekyll-time-to-read
octopress (~> 3.0)
octopress-filters
octopress-include-tag
pry
pygments.rb (~> 1.1.2)
rake (~> 10.0)
rb-fsevent (~> 0.9)
rdiscount (~> 2.0)
rubypants (~> 0.2)
sass-globbing (~> 1.0)
sinatra (~> 1.4.2)
stringex (~> 1.4)
therubyracer

BUNDLED WITH
1.14.6
1.15.4
13 changes: 5 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ category_dir: blog/categories
markdown: kramdown
timezone: UTC

# highlighter: coderay

kramdown:
input: GFM
auto_ids: false
Expand All @@ -48,10 +46,9 @@ kramdown:

highlighter: rouge

gems:
plugins:
- jekyll-redirect-from
- jekyll-time-to-read
- octopress-filters
- octopress-include-tag

paginate: 10 # Posts per page on the blog index
Expand Down Expand Up @@ -142,12 +139,12 @@ social:

# Home Assistant release details
current_major_version: 0
current_minor_version: 51
current_patch_version: 2
date_released: 2017-08-14
current_minor_version: 52
current_patch_version: 0
date_released: 2017-08-26

# Either # or the anchor link to latest release notes in the blog post.
# Must be prefixed with a # and have double quotes around it.
# Major release:
patch_version_notes: "#release-0512--august-14"
patch_version_notes: "#"
# Minor release (Example #release-0431---april-25):
8 changes: 4 additions & 4 deletions source/_addons/mariadb.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ sharing: true
footer: true
---

Set up a [mariadb](https://mariadb.org/) SQL server. It support multible database, users and permission. If you want only connect from inside use `172.17.0.1` as host address.
Set up a [mariadb](https://mariadb.org/) SQL server. It support multible database, users and permission. If you want only connect from inside use `core-mariadb` as host address.

```json
{
"databases": ["homeassistant"],
"logins": [
{
"username": "hass",
"host": "172.17.0.1",
"host": "homeassistant",
"password": "securePassword"
}
],
"rights": [
{
"username": "hass",
"host": "172.17.0.1",
"host": "homeassistant",
"database": "homeassistant",
"grant": "ALL PRIVILEGES ON"
}
Expand All @@ -51,5 +51,5 @@ Use the following configuration in Home Assistant to use the database above:

```yaml
recorder:
db_url: mysql://hass:securePassword@127.0.0.1/homeassistant
db_url: mysql://hass:securePassword@core-mariadb/homeassistant
```
3 changes: 1 addition & 2 deletions source/_addons/nginx_proxy.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ Configuration variables:
- **domain** (*Required*): Domain they will proxy run with it.

<p class='note'>
It is possible to deactive port 80 if you need this for things like `emulate_hue`. It exists a the moment no UI function for that, so you need call Hass.io API with SSH addon:
`curl -d '{"network": {"443/tcp": 443}}' http://172.17.0.2/addons/core_nginx_proxy/options`
It is possible to deactive port 80 if you need this for things like `emulate_hue`. Remove the host port from Network option of this add-on.
</p>
2 changes: 1 addition & 1 deletion source/_components/abode.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: page
title: "Abode Home Security"
description: "Instructions on integrating Abode home security with Home Assistant."
date: 2017-08-26 13:28
date: 2017-08-26 0:28
sidebar: true
comments: false
sharing: true
Expand Down
2 changes: 1 addition & 1 deletion source/_components/alarm_control_panel.abode.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: page
title: "Abode Alarm Control Panel"
description: "Instructions how to setup the Abode Alarm control panel within Home Assistant."
date: 2017-08-26 13:28
date: 2017-08-26 0:28
sidebar: true
comments: false
sharing: true
Expand Down
2 changes: 1 addition & 1 deletion source/_components/binary_sensor.abode.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: page
title: "Abode Binary Sensor"
description: "Instructions how to integrate Abode binary sensors into Home Assistant."
date: 2017-08-26 13:28
date: 2017-08-26 0:28
sidebar: true
comments: false
sharing: true
Expand Down
18 changes: 9 additions & 9 deletions source/_components/discovery.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ha_category: Other
---


Home Assistant can discover and automatically configure zeroconf/mDNS and uPnP devices on your network. Currently the `discovery` component can detect:
Home Assistant can discover and automatically configure [zeroconf](https://en.wikipedia.org/wiki/Zero-configuration_networking)/[mDNS](https://en.wikipedia.org/wiki/Multicast_DNS) and [uPnP](https://en.wikipedia.org/wiki/Universal_Plug_and_Play) devices on your network. Currently the `discovery` component can detect:

* Google Chromecast
* Belkin WeMo switches
Expand Down Expand Up @@ -54,39 +54,39 @@ Configuration variables:
Valid values for ignore are:

* `apple_tv`: Apple TV
* `axis`: (Axis Communications security devices)
* `axis`: Axis Communications security devices
* `bose_soundtouch`: Bose Soundtouch speakers
* `denonavr`: Denon Network Receivers
* `directv`: DirecTV
* `flux_led`: Flux Led/MagicLight
* `google_cast`: Google Chromecast
* `ikea_tradfri`: IKEA Trådfri
* `logitech_mediaserver`: Logitech media server - Squeezebox player
* `openhome`: Linn / Openhome
* `openhome`: Linn/Openhome
* `panasonic_viera`: Panasonic Viera
* `philips_hue`: Philips Hue
* `plex_mediaserver`: Plex media server
* `roku`: Roku media player
* `samsung_tv`: (Samsung TV
* `samsung_tv`: Samsung TV
* `sonos`: Sonos Speakers
* `yamaha`: Yamaha media player
* `yeelight`: Yeelight Sunflower Bulb

<p class='note'>
Home Assistant must be on the same network as the devices for uPnP discovery to work.
If running Home Assistant in a Docker container use switch `--net=host` to put it on the host's network.
If running Home Assistant in a [Docker container](/docs/installation/docker/) use switch `--net=host` to put it on the host's network.
</p>

If you are developing a new platform, please read [how to make your platform discoverable]({{site_root}}/developers/add_new_platform/#discovery).

<p class='note warning'>
There is currently a <a href='https://bitbucket.org/al45tair/netifaces/issues/17/dll-fails-to-load-windows-81-64bit'>known issue</a> with running this platform on a 64-bit version of Python and Windows.
There is currently a <a href='https://bitbucket.org/al45tair/netifaces/issues/17/dll-fails-to-load-windows-81-64bit'>known issue</a> with running this component on a 64-bit version of Python and Windows.
</p>

<p class='note'>
If you are on Windows and you're using Python 3.5, download the Netifaces dependency <a href='http://www.lfd.uci.edu/~gohlke/pythonlibs/#netifaces'>here</a>.
If you are on Windows and you're using Python 3.5, download the [Netifaces](http://www.lfd.uci.edu/~gohlke/pythonlibs/#netifaces) dependency.
</p>

<p class='note'>
If you see `Not initializing discovery because could not install dependency netdisco==0.6.1` in the logs, you will need to install the `python3-dev` or `python3-devel` package on your system manually (eg. `sudo apt-get install python3-dev` or `sudo dnf -y install python3-devel`). On the next restart of home-assistant, discovery should work. If you still get an error, check if you have a compiler (`gcc`) available on your system.
</p>

If you are developing a new platform, please read [how to make your platform discoverable](/developers/component_discovery/) for further details.
20 changes: 18 additions & 2 deletions source/_components/mysensors.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ mysensors:
optimistic: false
persistence: true
retain: true
version: 2.0
version: '2.0'
```
Configuration variables:
Expand Down Expand Up @@ -172,7 +172,23 @@ void receive(const MyMessage &message) {

### {% linkable_title Heartbeats %}

Sending a heartbeat from the MySensors device to Home Assistant activates the SmartSleep functionality in Home Assistant. This means that messages are buffered and only sent to the device upon receiving a heartbeat from the device. State changes are stored so that only the last requested state change is sent to the device. Other types of messages are queued in a FIFO queue. SmartSleep is useful for battery powered actuators that are waiting for commands. See the MySensors library API for information on how to send heartbeats and sleep device.
Sending a heartbeat from the MySensors device to Home Assistant activates the SmartSleep functionality in Home Assistant. This means that messages are buffered and only sent to the device upon receiving a heartbeat from the device. State changes are stored so that only the last requested state change is sent to the device. Other types of messages are queued in a FIFO queue. SmartSleep is useful for battery powered actuators that are waiting for commands. See the MySensors library API for information on how to send heartbeats and sleep device.

### {% linkable_title Message validation %}

Messages sent to or from Home Assistant from or to a MySensors device will be validated according to the MySensors [serial API](https://www.mysensors.org/download/serial_api_20). If a message doesn't pass validation, it will be dropped and not be passed forward either to or from home assistant. Make sure you follow the serial API for your version of MySensors when writing your Arduino sketch.

If you experience dropped messages or that a device is not added to Home Assistant, please turn on debug logging for the `mysensors` component and the `mysensors` package.
```yaml
logger:
default: info
logs:
homeassistant.components.mysensors: debug
mysensors: debug
```
The log should inform you of messages that failed validation or if a child value is missing that is required for a certain child type. Note that the log will log all possible combinations of platforms for a child type that failed validation. It is normal to see some platforms fail validation if the child type supports multiple platforms and your sketch doesn't send all corresponding value types. Eg. the S_BARO child type supports both V_PRESSURE and V_FORECAST value types. If you only send a V_PRESSURE value, an S_BARO entity with V_PRESSURE value will be set up for the sensor platform. But the log will inform of a sensor platform that failed validation due to missing V_FORECAST value type for the S_BARO child. Home Assistant will log failed validations of child values at warning level if one required value type for a platform has been received, but other required value types are missing. Most failed validations are logged at debug level.

Message validation was introduced in version 0.52 of Home Assistant.


Visit the [library api][MySensors library api] of MySensors for more information.
Expand Down
Loading

0 comments on commit a05af2b

Please sign in to comment.