Merge branch 'master' of https://github.com/balloob/home-assistant.io
* 'master' of https://github.com/balloob/home-assistant.io: Added some supported brands images. Put in recomendations for some clarifications. Added documentation about ISY994 platform. Also added documentation about creating entities by using the Entity base class. Conflicts: source/components/index.markdown
This commit is contained in:
commit
5e3995562c
12 changed files with 202 additions and 3 deletions
|
@ -94,8 +94,25 @@ Entities are things that you want to observe within Home Assistant. Support for
|
|||
<td>Track what is being played and control playback. (temporarely disabled awaiting protobuf 3 release)</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><a href='/components/isy994.html'><img src='/images/supported_brands/insteon.png' class='brand overview' /></a></td>
|
||||
<td><a href='/components/isy994.html'>Insteon Devices</a></td>
|
||||
<td>Insteon devices can be controlled with the ISY994 controller.</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><a href='/components/isy994.html'><img src='/images/supported_brands/x10.gif' class='brand overview' /></a></td>
|
||||
<td><a href='/components/isy994.html'>X10 Devices</a></td>
|
||||
<td>X10 devices can be controlled with the ISY994 controller.</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
<p class='note'>
|
||||
Support for these devices is provided by the Home Assistant community and not
|
||||
the manufacturers of these devices.
|
||||
</p>
|
||||
|
||||
## {% linkable_title Organization %}
|
||||
| Type | Description
|
||||
| ---- | -----------
|
||||
|
@ -110,8 +127,13 @@ Home Assistant integrates with a variety of third party Home Automation hubs and
|
|||
[<img src='/images/supported_brands/telldus_tellstick.png' class='brand' />](/components/tellstick.html)
|
||||
[<img src='/images/supported_brands/vera.png' class='brand' />](/components/vera.html)
|
||||
[<img src='/images/supported_brands/wink.png' class='brand' />](/components/wink.html)
|
||||
[<img src='/images/supported_brands/universal_devices.png' class='brand' />](/components/isy994.html)
|
||||
[<img src='/images/supported_brands/modbus.png' class='brand' />](/components/modbus.html)
|
||||
|
||||
<p class='note'>
|
||||
Support for these devices is provided by the Home Assistant community and not
|
||||
the manufacturers of these devices.
|
||||
</p>
|
||||
|
||||
## {% linkable_title Services %}
|
||||
|
||||
|
@ -171,6 +193,11 @@ Home Assistant integrates with a variety of third party Home Automation hubs and
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<p class='note'>
|
||||
Support for these services is provided by the Home Assistant community and not
|
||||
the service providers.
|
||||
</p>
|
||||
|
||||
## {% linkable_title Automation %}
|
||||
|
||||
| Type | Description
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue