Merge branch 'current' of https://github.com/OttoWinter/esphomedocs into current

This commit is contained in:
Otto Winter 2018-12-16 11:09:24 +01:00
commit 124a9934a5
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
3 changed files with 12 additions and 2 deletions

View File

@ -26,7 +26,7 @@ measured in decibels. These values are always negative and the closer they are t
Configuration variables: Configuration variables:
------------------------ ------------------------
- **name** (**Required**, string): The name of the hall effect sensor. - **name** (**Required**, string): The name of the WiFi signal sensor.
- **update_interval** (*Optional*, :ref:`config-time`): The interval - **update_interval** (*Optional*, :ref:`config-time`): The interval
to check the sensor. Defaults to ``15s``. See :ref:`sensor-default_filter`. to check the sensor. Defaults to ``15s``. See :ref:`sensor-default_filter`.
- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation. - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.

View File

@ -25,7 +25,7 @@ Configuration variables:
- **id** (**Required**, :ref:`config-id`): Specify the ID of the time for use in lambdas. - **id** (**Required**, :ref:`config-id`): Specify the ID of the time for use in lambdas.
- **timezone** (*Optional*, string): Manually tell esphomelib what timezone to use with `this format - **timezone** (*Optional*, string): Manually tell esphomelib what timezone to use with `this format
<https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html>`__ (warning: the format is quite complicated). <https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html>`__ (warning: the format is quite complicated) or the simpler `TZ database name <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>`__ in the form <Region>/<City>.
esphomeyaml tries to automatically infer the timezone string based on the timezone of the computer that is running esphomeyaml tries to automatically infer the timezone string based on the timezone of the computer that is running
esphomeyaml, but this might not always be accurate. esphomeyaml, but this might not always be accurate.
- **servers** (*Optional*, list of strings): Choose up to 3 NTP servers that are used for the clock source. - **servers** (*Optional*, list of strings): Choose up to 3 NTP servers that are used for the clock source.

View File

@ -286,6 +286,16 @@ Shelly 1
GPIO4, Relay, GPIO4, Relay,
GPIO5, SW Input, GPIO5, SW Input,
Shelly 2
--------
.. pintable::
GPIO4, Relay #1,
GPIO5, Relay #2,
GPIO12, SW Input #1,
GPIO14, SW Input #2,
See Also See Also
-------- --------