jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'current' into release-0-59

Browse source
This commit is contained in:
Fabian Affolter 2017-12-03 13:45:52 +01:00
commit 3138315fd7
No known key found for this signature in database
GPG key ID: DDF3D6F44AAB1336
5 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/_components/binary_sensor.template.markdown
View file

@ -158,7 +158,7 @@ binary_sensor:
This example creates a washing machine "load running" sensor by monitoring an
energy meter connected to the washer. During the washer's operation, the energy
meter will fluctuate wildly, hitting zero frequently even before the load is
finished. By utilizing `off_delay`, we can have this sensor only turn off if
finished. By utilizing `delay_off`, we can have this sensor only turn off if
there has been no washer activity for 5 minutes.
{% raw %}

2
source/_components/ecobee.markdown
View file

@ -61,3 +61,5 @@ Configuration variables:
<img src='{{site_root}}/images/screenshots/ecobee-sensor-badges.png' />
<img src='{{site_root}}/images/screenshots/ecobee-thermostat-card.png' />
</p>
If for whatever reason you delete and re-create your ecobee app at ecobee.com such that your developer API key changes, you will need to delete your `/conf/ecobee.conf file`. You will also need to update the `api_key:` in the `configuration.yaml` or `secrets.yaml` file.

2
source/_components/satel_integra.markdown
View file

@ -13,7 +13,7 @@ ha_release: 0.54
ha_iot_class: "Local Push"
---
The `satel_integra` component will allow Home Assistant users who own a Satel Integra alarm panel to leverage their alarm system and its sensors to provide Home Assistant with information about their homes. Connectivity between Home Assistant and the alarm is accomplished through a ETHM extension module that must be installed in the alarm.
The `satel_integra` component will allow Home Assistant users who own a Satel Integra alarm panel to leverage their alarm system and its sensors to provide Home Assistant with information about their homes. Connectivity between Home Assistant and the alarm is accomplished through a ETHM extension module that must be installed in the alarm. Compatible with ETHM-1 Plus module with firmware version > 2.00 (version 2.04 confirmed).
There is currently support for the following device types within Home Assistant: