Merge branch 'current' into next

Doxygen

@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.13.0
+PROJECT_NUMBER         = 1.13.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Makefile

@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = v1.13.0
+ESPHOME_REF = v1.13.1
 
 .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png
 

_static/version

@@ -1 +1 @@
-1.13.0
+1.13.1

changelog/v1.13.0.rst

@@ -126,6 +126,14 @@ you what has changed.
 - Because of some internal changes, some ID names are used internally and can no longer be used.
   See validation errors.
 
+Release 1.13.1 - May 30
+-----------------------
+
+- esphome: Fix validation TypeError :esphomepr:`574`
+- esphome: Fix Sun Trigger :esphomepr:`572`
+- esphome: Dashboard work around Hass.io bug :esphomepr:`575`
+- esphome: Fix waveshare 7.5in model :esphomepr:`576`
+
 All changes
 -----------
 

components/deep_sleep.rst

@@ -10,9 +10,7 @@ ESP8266/ESP32 after a certain amount of time. This is especially useful with nod
 on batteries and therefore need to conserve as much energy as possible.
 
 To use ``deep_sleep`` first specify how long the node should be active, i.e. how long it should
-check sensor values and report them, using the ``run_duration`` options. If you
-use both in your configuration, any time either one of them is finished, the node will go into deep
-sleep mode.
+check sensor values and report them, using the ``run_duration`` option.
 
 Next, tell the node how it should wakeup. On the ESP8266, you can only put the node into deep sleep
 for a duration using ``sleep_duration``, note that on the ESP8266 ``GPIO16`` must be connected to

components/sensor/ntc.rst

@@ -81,6 +81,43 @@ Configuration variables:
 - **id** (*Optional*, :ref:`config-id`): Set the ID of this sensor for use in lambdas.
 - All other options from :ref:`Sensor <config-sensor>`.
 
+Self-Heating
+------------
+
+A constant voltage supply to the NTC sensor causes it to heat up and therefore creates unreliable temperature values.
+So it's recommended to only supply the NTC sensor (and voltage divider) during the actual measurement.
+More info `here <https://learn.adafruit.com/thermistor/using-a-thermistor#self-heating-3-22>`__.
+
+To do this, replace the 3.3V side of the voltage divider with a connection to a GPIO pin. This GPIO pin will
+be switched HIGH (3.3V) only during the measurement, thus preventing the sensor from heating up.
+In the example below, the pin ``D0`` is the "top" side of the voltage divider:
+
+.. code-block:: yaml
+
+    sensor:
+      # Same as before:
+      - platform: ntc
+        sensor: resistance_sensor
+        # ...
+
+      - platform: adc
+        pin: A0
+        id: source_sensor
+        # Added:
+        update_interval: never
+
+    switch:
+      - platform: gpio
+        pin: D0
+        id: ntc_vcc
+
+    interval:
+      - interval: 60s
+        then:
+          - switch.turn_on: ntc_vcc
+          - component.update: source_sensor
+          - switch.turn_off: ntc_vcc
+
 See Also
 --------
 

components/servo.rst

@@ -30,6 +30,7 @@ only operate in this frequency range.
         output: pwm_output
 
     # Example output platform
+    # On ESP32, use ledc output
     output:
       - platform: esp8266_pwm
         id: pwm_output
@@ -39,7 +40,8 @@ only operate in this frequency range.
 Configuration variables:
 ------------------------
 
-- **output** (**Required**, :ref:`config-id`): The ID of the output component to use for this servo.
+- **output** (**Required**, :ref:`config-id`): The ID of the :doc:`output component </components/output/index>`
+  to use for this servo.
 - **id** (**Required**, :ref:`config-id`): The ID of this servo so that it can be controlled.
 
 Advanced Options:

conf.py

@@ -72,7 +72,7 @@ author = 'Otto Winter'
 # The short X.Y version.
 version = '1.13'
 # The full version, including alpha/beta/rc tags.
-release = '1.13.0'
+release = '1.13.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

guides/supporters.rst

@@ -41,10 +41,12 @@ You guys are awesome!
 - Anders
 - Andrea Donno
 - Book of the Future
+- Clayton
 - Daan Damhuis
 - Dattas Moonchaser
 - Dennis Münchgesang
 - DrZzs
+- E. Phenix
 - fabi
 - Franck Nijhof
 - Intermittent Technology
@@ -71,7 +73,7 @@ that have made it into the `ESPHome organization's <https://github.com/esphome>`
 Author & Main Developer
 ***********************
 
-- `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__ - 1728 contributions
+- `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__ - 1747 contributions
 
 Contributors
 ************
@@ -122,7 +124,7 @@ Contributors
 - `Anders Persson (@emwap) <https://github.com/emwap>`__ - 4 contributions
 - `Nico Weichbrodt (@envy) <https://github.com/envy>`__ - 1 contribution
 - `erazor666 (@erazor666) <https://github.com/erazor666>`__ - 1 contribution
-- `escoand (@escoand) <https://github.com/escoand>`__ - 5 contributions
+- `escoand (@escoand) <https://github.com/escoand>`__ - 6 contributions
 - `Malte Franken (@exxamalte) <https://github.com/exxamalte>`__ - 2 contributions
 - `Fabian Affolter (@fabaff) <https://github.com/fabaff>`__ - 10 contributions
 - `gitolicious (@gitolicious) <https://github.com/gitolicious>`__ - 10 contributions
@@ -184,4 +186,4 @@ Contributors
 - `Vladimir Eremin (@yottatsa) <https://github.com/yottatsa>`__ - 1 contribution
 - `YuanL.Lee (@yuanl) <https://github.com/yuanl>`__ - 1 contribution
 
-*This page was last updated Thu May 30 19:07:58 2019 UTC.*
+*This page was last updated Fri May 31 14:35:19 2019 UTC.*