Upstream/esphome-docs
1
0
Fork 0
mirror of https://github.com/esphome/esphome-docs.git synced 2024-12-28 17:48:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'current' into next

Browse Source
This commit is contained in:
Otto Winter 2019-01-06 19:02:37 +01:00
commit 0dd0833937
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esphomeyaml/components/binary_sensor/index.rst
View File

@ -269,7 +269,6 @@ presses.
then: then:
- logger.log: "Double Clicked" - logger.log: "Double Clicked"
- timing: - timing:
- OFF for 1s to 2s
- ON for 1s to 2s - ON for 1s to 2s
- OFF for at least 0.5s - OFF for at least 0.5s
then: then:

1
esphomeyaml/components/sensor/total_daily_energy.rst
View File

@ -17,7 +17,6 @@ daily energy usage in ``Wh`` or ``kWh``.
# Example configuration entry # Example configuration entry
sensor: sensor:
- platform: total_daily_energy - platform: total_daily_energy
pin: 12
name: "Total Daily Energy" name: "Total Daily Energy"
power_id: my_power power_id: my_power

2
esphomeyaml/components/sensor/xiaomi_miflora.rst
View File

@ -69,6 +69,8 @@ Configuration variables:
Setting Up Devices Setting Up Devices
------------------ ------------------
Before you can even scan for the MiFlora sensor, you need to activate it using the Flower Care app. Set it up there and you'll be able to discover it.
To set up Xiaomi MiFlora devices you first need to find their MAC Address so that esphomelib can To set up Xiaomi MiFlora devices you first need to find their MAC Address so that esphomelib can
identify them. So first, create a simple configuration without any ``xiaomi_miflora`` entries like so: identify them. So first, create a simple configuration without any ``xiaomi_miflora`` entries like so:

2
esphomeyaml/guides/getting_started_command_line.rst
View File

@ -41,7 +41,7 @@ file called ``livingroom.yaml``:
esphomeyaml livingroom.yaml wizard esphomeyaml livingroom.yaml wizard
# On Docker: # On Docker:
docker run --rm -v "`pwd`":/config -it ottowinter/esphomeyaml livingroom.yaml wizard docker run --rm -v ${PWD}:/config -it ottowinter/esphomeyaml livingroom.yaml wizard
.. note:: .. note::

5
esphomeyaml/guides/getting_started_hassio.rst
View File

@ -59,7 +59,8 @@ there are three basic actions you can perform:
The Hass.io Add-On is currently not capable of discovering new USB ports after the add-on The Hass.io Add-On is currently not capable of discovering new USB ports after the add-on
has started due to some docker restrictions. Please go to the add-on details page has started due to some docker restrictions. Please go to the add-on details page
and restart the add-on if a new USB device is not automatically found. and restart the add-on if a new USB device is not automatically found. If the USB device
is still not found, try changing the USB cable and restarting the add-on.
- **COMPILE**: This command compiles the firmware and gives you the option of downloading the generated - **COMPILE**: This command compiles the firmware and gives you the option of downloading the generated
binary so that you can upload it yourself from your computer. binary so that you can upload it yourself from your computer.
@ -106,7 +107,7 @@ to the configuration like this:
name: "Living Room Dehumidifier" name: "Living Room Dehumidifier"
pin: 5 pin: 5
In above example, we're simply adding a switch that's called "Living Room Relay" (could control In above example, we're simply adding a switch that's called "Living Room Dehumidifier" (could control
anything really, for example lights) and is connected to the pin ``GPIO5``. anything really, for example lights) and is connected to the pin ``GPIO5``.
Now if you have `MQTT Now if you have `MQTT