Merge branch 'current' into beta

components/display/st7789v.rst

@@ -120,7 +120,7 @@ Wi-Fi, API, and OTA configuration. It defines:
 - time, for display...on the display
 - the SPI configuration for communicating with the display
 - the display component itself, for use on the TTGO module
-- a lambada which paints the screen as shown in the picture above:
+- a lambda which paints the screen as shown in the picture above:
 
   - blue borders, with a sort of "title bar" along the top
   - "ESPHome" in yellow in the top left corner
@@ -130,7 +130,7 @@ Wi-Fi, API, and OTA configuration. It defines:
 To use this example, you need only to provide the font file, "Helvetica.ttf" (or update it to
 a font of your choosing) and an image file, "image.png" (it may also be a ".jpg"). Place these
 into the same directory as the YAML configuration file itself. Comment/Uncomment/Modify the
-appropriate lines of C code in the lambada to hide or show the image or text as you wish.
+appropriate lines of C code in the lambda to hide or show the image or text as you wish.
 
 .. code-block:: yaml
 
@@ -222,7 +222,7 @@ appropriate lines of C code in the lambada to hide or show the image or text as
       - file: "image.png"
         id: my_image
         resize: 200x200
-        type: RGB565
+        type: RGB24
 
     time:
       - platform: homeassistant

components/light/tuya.rst

@@ -81,8 +81,8 @@ Configuration variables:
   change the brightness and would have to toggle the light using the physical buttons.
 - **min_value** (*Optional*, int, default 0): The lowest dimmer value allowed.  My dimmer had a
   minimum of 25 and wouldn't even accept anything lower, but this option is available if necessary.
-- **max_value** (*Optional*, int, default 255): The highest dimmer value allowed.  My dimmer had a
-  maximum of 255 which seems like it would be the typical value.
+- **max_value** (*Optional*, int, default 255): The highest dimmer value allowed.  Most dimmers have a
+  maximum of 255, but dimmers with a maximum of 1000 can also be found. Try what works best.
 - All other options from :ref:`Light <config-light>`.
 - At least one of *dimmer_datapoint* or *switch_datapoint* must be provided.
 

components/sensor/uptime.rst

@@ -41,14 +41,14 @@ with human readable output.
     sensor:
       - platform: uptime
         name: Uptime Sensor
-        id: uptime
+        id: uptime_sensor
         update_interval: 60s
         on_raw_value:
           then:
             - text_sensor.template.publish:
                 id: uptime_human
                 state: !lambda |-
-                  int seconds = round(id(uptime).raw_state);
+                  int seconds = round(id(uptime_sensor).raw_state);
                   int days = seconds / (24 * 3600);
                   seconds = seconds % (24 * 3600);
                   int hours = seconds / 3600;

guides/diy.rst

@@ -44,6 +44,7 @@ Blog Posts & Videos
 - `Sonoff L1 LED Strip <https://emorydunn.com/blog/2020/08/10/sonoff-l1-home-assistant/>`__ by :ghuser:`emorydunn`
 - `ESPHome for SP501E LED Controller <https://margau.net/posts/2020-11-21-2h-led-hack/>`__ by `margau <https://margau.net>`__
 - `4$ Xiaomi mijia thermometer LYWSD03MMC + ESP32 + ESPhome <https://omarghader.github.io/how-to-monitor-your-home-temperature-with-esp32-and-xiaomi-mijia-using-esphome/>`__ by `Omar GHADER <https://omarghader.github.io/post>`__
+- `Baseboard (Line Voltage) Thermostat from Smart Switch <https://github.com/rjmurph2241/baseboard-heating-thermostat>`__ by :ghuser:`rjmurph2241`
 
 Custom Components & Code
 ------------------------

web-api/index.rst

@@ -156,7 +156,9 @@ the state of a light, send a GET request to ``/light/<id>``, for example ``light
    -  **b**: The blue channel of this light. From 0 to 255.
 
 -  **effect**: The currently active effect, only if the light supports effects.
--  **white_value**: The white value of RGBW lights. From 0 to 255.
+-  **white_value**: The white value of RGBW lights. From 0 to 255. Only if the light supports white value.
+-  **color_temp**: The color temperature of the RGBWW light. Between minimum mireds and maximum mireds of the light.
+   Only if the light support color temperature. 
 
 Setting light state can happen through three POST method calls: ``turn_on``, ``turn_off`` and ``toggle``.
 Turn on and off have additional URL encoded parameters that can be used to set other properties. For example