Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2016-10-02 15:05:41 -07:00
commit 636e5c12f2
116 changed files with 335 additions and 2935 deletions

View file

@ -29,18 +29,10 @@ sensor:
- 'temperature'
- 'target'
- 'humidity'
- 'mode'
- 'last_ip'
- 'local_ip'
- 'operation_mode'
- 'last_connection'
- 'battery_level'
- 'weather_condition'
- 'weather_temperature'
- 'weather_humidity'
- 'wind_speed'
- 'wind_direction'
- 'co_status'
- 'smoke_status'
- 'co_status' # Nest Protect only
- 'smoke_status' # Nest Protect only
```
Configuration variables:
@ -49,7 +41,7 @@ Configuration variables:
- 'temperature'
- 'target'
- 'humidity'
- 'mode'
- 'operation_mode'
- 'last_ip'
- 'local_ip'
- 'last_connection'