Merge pull request #960 from esphome/bump-1.16.0b5

1.16.0b5
esphome · Jan 26, 2021 · 171c38c · 171c38c
2 parents aecbe05 + 6bfaf56
commit 171c38c
Show file tree

Hide file tree

Showing 13 changed files with 284 additions and 213 deletions.
diff --git a/Doxygen b/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.16.0b4
+PROJECT_NUMBER         = 1.16.0b5
 
 # 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

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = v1.16.0b4
+ESPHOME_REF = v1.16.0b5
 
 .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png
 

diff --git a/_static/version b/_static/version
@@ -1 +1 @@
-1.16.0b4
+1.16.0b5
diff --git a/changelog/v1.16.0.rst b/changelog/v1.16.0.rst
@@ -258,3 +258,14 @@ All changes
 - docs: Add docs for pn532 NDEF functionality :docspr:`936` by :ghuser:`jesserockz`
 - esphome: Inkplate 6 support for ESPHome :esphomepr:`1283` by :ghuser:`davidzovko` (new-integration)
 - docs: Adding Inkplate 6 docs :docspr:`778` by :ghuser:`nitko12`
+- esphome: time sync notification :esphomepr:`1442` by :ghuser:`badbadc0ffee`
+- docs: update time (sync) documentation :docspr:`924` by :ghuser:`badbadc0ffee`
+- esphome: rename read/write to read/time/write_time :esphomepr:`1468` by :ghuser:`badbadc0ffee`
+- docs: Add directions for handling text strings :docspr:`955` by :ghuser:`poldim`
+- esphome: Improve ccs811 precision :esphomepr:`1428` by :ghuser:`TheNetAdmin`
+- esphome: make fade_to*, lighten, and darken const :esphomepr:`1450` by :ghuser:`toelke`
+- docs: fix typo 5062 => 6052 :docspr:`956` by :ghuser:`Scarbous`
+- docs: Fix of typo in documentation of SPS30 :docspr:`954` by :ghuser:`teffcz`
+- docs: Remove reference to measuring humidity :docspr:`953` by :ghuser:`tomlut`
+- docs: Fix human-readable uptime example so it compiles :docspr:`949` by :ghuser:`oddsockmachine`
+- esphome: SPI wasnt being disabled after display update :esphomepr:`1493` by :ghuser:`SenexCrenshaw`
diff --git a/components/display/index.rst b/components/display/index.rst
@@ -277,7 +277,16 @@ arguments after the format string in the right order.
           // %% - literal % sign
           it.printf(0, 0, id(my_font), "Temperature: %.1f°C, Humidity: %.1f%%", id(temperature).state, id(humidity).state);
 
+To display a text string from a ``text_sensor``, append ``.c_str()`` to the end of your variable.
 
+.. code-block:: yaml
+
+    display:
+      - platform: ...
+        # ...
+        lambda: |-
+          it.printf(0, 0, id(my_font), "Text to follow: %s", id(template_text).state.c_str());
+          
 The last printf tip for use in displays I will discuss here is how to display binary sensor values. You
 *could* of course just check the state with an ``if`` statement as the first few lines in the example below, but if
 you want to be efficient you can use an *inline if* too. With the ``%s`` print specifier you can tell it to

diff --git a/components/sensor/sps30.rst b/components/sensor/sps30.rst
@@ -118,7 +118,7 @@ Wiring:
 -------
 
 The sensor has a 5 pin JST ZHR type connector, with a 1.5mm pitch. (`Matching connector housing <https://octopart.com/zhr-5-jst-279203>`__, `datasheet <http://www.farnell.com/datasheets/1393424.pdf>`__)
-To force the force the sensor into I²C mode, the SEL pin (Interface Select pin no.5) should be shorted to ground (pin no.4)
+To force the sensor into I²C mode, the SEL pin (Interface Select pin no.5) should be shorted to ground (pin no.4)
 
 .. figure:: images/sps30-wiring.png
     :align: center

diff --git a/components/sensor/tmp117.rst b/components/sensor/tmp117.rst
@@ -6,7 +6,7 @@ TMP117 Temperature Sensor
     :image: tmp117.jpg
     :keywords: TMP117
 
-The TMP117 Temperature+Humidity sensor allows you to use your TMP117
+The TMP117 Temperature sensor allows you to use your TMP117
 (`datasheet <https://www.ti.com/lit/ds/symlink/tmp117.pdf>`__,
 `sparkfun <https://www.sparkfun.com/products/15805>`__)
 sensors with ESPHome.

diff --git a/components/sensor/uptime.rst b/components/sensor/uptime.rst
@@ -58,7 +58,7 @@ with human readable output.
                   return (
                     (days ? String(days) + "d " : "") +
                     (hours ? String(hours) + "h " : "") +
-                    (minutes ? String(minutes + "m " : "") +
+                    (minutes ? String(minutes) + "m " : "") +
                     (String(seconds) + "s") 
                   ).c_str();