Merge branch 'current' into next

This commit is contained in:
Otto winter 2021-08-04 17:45:47 +02:00
commit a7a9f297ae
No known key found for this signature in database
GPG Key ID: 48ED2DDB96D7682C
14 changed files with 41 additions and 27 deletions

View File

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

View File

@ -87,6 +87,11 @@ Release 1.20.2 - July 29
- HLW8012 - Dump energy sensor config :esphomepr:`2082` by :ghuser:`jesserockz`
- Use sensor_schema for total_daily_energy :esphomepr:`2090` by :ghuser:`jesserockz`
Release 1.20.3 - July 30
------------------------
- Set pulse meter total to use state class measurement and last reset type auto :esphomepr:`2097` by :ghuser:`jesserockz`
Full list of changes
--------------------

View File

@ -47,9 +47,7 @@ Configuration variables:
- **component_id** (*Optional*, string): The ID (the number, not name!) of the component to track.
- **update_interval** (*Optional*, :ref:`config-time`): The duration to update the sensor. If using a :ref:`nextion_custom_binary_sensor_protocol` this should not be used
- **background_color** (*Optional*, :ref:`config-color`): The background color
- **background_pressed_color** (*Optional*, :ref:`config-color`): The background color when pressed
- **foreground_color** (*Optional*, :ref:`config-color`): The foreground color
- **foreground_pressed_color** (*Optional*, :ref:`config-color`): The foreground color when pressed
- **visible** (*Optional*, boolean ): Visible or not
- All other options from :ref:`Binary Sensor <config-binary_sensor>`.

View File

@ -38,7 +38,7 @@ There are numerous board types out there. Some initialize differently as well. T
device_height: 160
col_start: 0
row_start: 0
eightbitcolor: true
eight_bit_color: true
update_interval: 5s
Configuration variables:

View File

@ -309,10 +309,10 @@ Configuration variables:
- **id** (**Required**, :ref:`config-id`): The ID of the addressable light to control.
- **range_from** (*Optional*, :ref:`templatable <config-templatable>`, int): The beginning
of the range of LEDs to control. 0-based indexing. Defaults to 0 (the beginning of the strip).
of the range of LEDs to control, inclusive, using zero-based indexing. Defaults to 0 (the beginning of the strip).
- **range_to** (*Optional*, :ref:`templatable <config-templatable>`, int): The end of the
range of LEDs to control - this is a half-open interval. 0-based indexing.
Defaults to the end of the strip (``num_leds``).
range of LEDs to control, inclusive, using zero-based indexing.
Defaults to the end of the strip (``num_leds`` - 1).
- **color_brightness** (*Optional*, :ref:`templatable <config-templatable>`, percentage): The brightness to
set the color channel to.
- **red** (*Optional*, :ref:`templatable <config-templatable>`, percentage): The value to

View File

@ -86,10 +86,10 @@ Configuration variables:
- **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.
- **color_temperature_max_value** (*Optional*, int, default 255): The highest color temperature
value allowed. Some ceiling fans have a value of 100 (also for `max_value`).
- **cold_white_color_temperature** (**Optional**, float): The color temperate (in `mireds
value allowed. Some ceiling fans have a value of 100 (also for ``max_value``).
- **cold_white_color_temperature** (*Optional*, float): The color temperate (in `mireds
<https://en.wikipedia.org/wiki/Mired>`__ or Kelvin) of the cold white channel.
- **warm_white_color_temperature** (**Optional**, float): The color temperate (in `mireds
- **warm_white_color_temperature** (*Optional*, float): The color temperate (in `mireds
<https://en.wikipedia.org/wiki/Mired>`__ or Kelvin) of the warm white channel.
- All other options from :ref:`Light <config-light>`.
- At least one of *dimmer_datapoint* or *switch_datapoint* must be provided.

View File

@ -1,5 +1,5 @@
Havells Inverter
================
Havells Solar
=============
.. seo::
:description: Instructions for setting up Havells inverter reading on modbus.
@ -28,12 +28,12 @@ to some pins on your board and the baud rate set to 9600.
baud_rate: 9600
tx_pin: GPIO1
rx_pin: GPIO3
modbus:
uart_id: uart1
flow_control_pin: GPIO4
sensor:
- platform: havells_solar
update_interval: 60s
@ -79,7 +79,7 @@ to some pins on your board and the baud rate set to 9600.
reactive_power:
name: "HAVELLS Reactive Power"
frequency:
name: "HAVELLS Frequency"
name: "HAVELLS Frequency"
energy_production_day:
name: "HAVELLS Today's Generation"
total_energy_production:
@ -104,9 +104,9 @@ to some pins on your board and the baud rate set to 9600.
name: "HAVELLS DCI Of S"
dci_of_t:
name: "HAVELLS DCI Of T"
Configuration variables:
------------------------
@ -145,7 +145,7 @@ Configuration variables:
- **active_power** (*Optional*): Use the (active) power value of the sensor in watts. All options
from :ref:`Sensor <config-sensor>`.
- **reactive_power** (*Optional*): Use the reactive power value of the sensor in VAR. All
options from :ref:`Sensor <config-sensor>`.
options from :ref:`Sensor <config-sensor>`.
- **frequency** (*Optional*): Use the frequency value of the sensor in hertz.
All options from :ref:`Sensor <config-sensor>`.
- **energy_production_day** (*Optional*): Use the export active energy value for same day of the
@ -162,7 +162,7 @@ Configuration variables:
degree celsius. All options from :ref:`Sensor <config-sensor>`.
- **inverter_bus_voltage** (*Optional*): Use the inverter bus voltage value of the sensor in volts.
All options from :ref:`Sensor <config-sensor>`.
- **insulation_of_pv_n_to_ground** (*Optional*): Use the insulation of photo voltiacs's
- **insulation_of_pv_n_to_ground** (*Optional*): Use the insulation of photo voltiacs's
-ve terminal to ground value of the sensor in kilo ohms. All options from :ref:`Sensor <config-sensor>`.
- **gfci_value** (*Optional*): Use the GFCI value of the sensor.
All options from :ref:`Sensor <config-sensor>`.

View File

@ -60,7 +60,7 @@ Configuration variables:
- **component_name** (*Optional*, string): Manually specify the name of the Nextion component.
- **variable_name** (*Optional*, string): Manually specify the name of the Nextion variable.
- **update_interval** (*Optional*, :ref:`config-time`): The duration to update the sensor
- **nextion_precision** (*Optional*, uint8_t): This is for Nextion float components. This sets
- **precision** (*Optional*, uint8_t): This is for Nextion float components. This sets
the precision that the component is set to. This typically is the ``vvs1`` setting of the component.
- **background_color** (*Optional*, :ref:`config-color`): The background color
- **foreground_color** (*Optional*, :ref:`config-color`): The foreground color

View File

@ -27,7 +27,7 @@ for more information.
This page refers to version V3 of the PZEM004T.
For using the older V1 variant of this sensor please see :doc:`pzem004t <pzem004t>`.
The communication with this integration is done over a :ref:`UART bus <uart>`.
The communication with this integration is done over a :ref:`UART bus <uart>` using :ref:`Modbus <modbus>`.
You must therefore have a ``uart:`` entry in your configuration with both the TX and RX pins set
to some pins on your board and the baud rate set to 9600.
@ -38,6 +38,8 @@ to some pins on your board and the baud rate set to 9600.
rx_pin: D1
tx_pin: D2
baud_rate: 9600
modbus:
sensor:
- platform: pzemac
@ -74,6 +76,7 @@ Configuration variables:
sensor. Defaults to ``60s``.
- **address** (*Optional*, int): The address of the sensor if multiple sensors are attached to
the same UART bus. You will need to set the address of each device manually. Defaults to ``1``.
- **modbus_id** (*Optional*, :ref:`config-id`): Manually specify the ID of the Modbus hub.
See Also
--------

View File

@ -6,7 +6,10 @@ Teleinformation from Linky electrical counter.
:image: teleinfo.jpg
:keywords: teleinfo
The ``teleinfo`` component allows you to retrieve data from a
Component/Hub
-------------
The ``teleinfo`` component allows you to retrieve data from a
French electrical counter using Teleinformation (`datasheet <https://www.enedis.fr/sites/default/files/Enedis-NOI-CPT_54E.pdf>`__). It works with Linky electrical
counter but also legacy EDF electrical counter.

View File

@ -35,7 +35,6 @@ Configuration variables:
- **name** (**Required**, string): The name of the sensor.
- **nextion_id** (*Optional*, :ref:`config-id`): The ID of the Nextion display.
- **component_name** (*Optional*, string): The name of the Nextion component.
- **variable_name** (*Optional*, string): The name of the Nextion variable. Any value over ``0`` is considered to be **on**
- **update_interval** (*Optional*, :ref:`config-time`): The duration to update the sensor. If using a :ref:`nextion_custom_text_sensor_protocol` this should not be used
- **background_color** (*Optional*, :ref:`config-color`): The background color
- **foreground_color** (*Optional*, :ref:`config-color`): The foreground color

View File

@ -65,5 +65,8 @@ See Also
- :doc:`/components/fan/tuya`
- :doc:`/components/light/tuya`
- :doc:`/components/switch/tuya`
- :doc:`/components/climate/tuya`
- :doc:`/components/binary_sensor/tuya`
- :apiref:`tuya/tuya.h`
- :ghedit:`Edit`

View File

@ -332,6 +332,7 @@ Contributors
- `Kevin Pelzel (@kpelzel) <https://github.com/kpelzel>`__
- `Karl Q. (@kquinsland) <https://github.com/kquinsland>`__
- `krahabb (@krahabb) <https://github.com/krahabb>`__
- `Kodey Converse (@krconv) <https://github.com/krconv>`__
- `krikk (@krikk) <https://github.com/krikk>`__
- `KristopherMackowiak (@KristopherMackowiak) <https://github.com/KristopherMackowiak>`__
- `kroimon (@kroimon) <https://github.com/kroimon>`__
@ -428,6 +429,7 @@ Contributors
- `Nebula (@nebula-it) <https://github.com/nebula-it>`__
- `needspeed (@needspeed) <https://github.com/needspeed>`__
- `nepozs (@nepozs) <https://github.com/nepozs>`__
- `Mike Meessen (@netmikey) <https://github.com/netmikey>`__
- `nickrout (@nickrout) <https://github.com/nickrout>`__
- `Nick Whyte (@nickw444) <https://github.com/nickw444>`__
- `nicuh (@nicuh) <https://github.com/nicuh>`__
@ -621,6 +623,7 @@ Contributors
- `Alexey Vlasov (@turbulator) <https://github.com/turbulator>`__
- `Seppel Hardt (@tuxBurner) <https://github.com/tuxBurner>`__
- `Thorsten von Eicken (@tve) <https://github.com/tve>`__
- `Tyler Menezes (@tylermenezes) <https://github.com/tylermenezes>`__
- `tyomikh (@tyomikh) <https://github.com/tyomikh>`__
- `ukewea (@ukewea) <https://github.com/ukewea>`__
- `Vc (@Valcob) <https://github.com/Valcob>`__
@ -659,4 +662,4 @@ Contributors
- `San (@zhujunsan) <https://github.com/zhujunsan>`__
- `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
*This page was last updated July 29, 2021.*
*This page was last updated July 30, 2021.*

View File

@ -174,7 +174,7 @@ Sensor Components
Duty Cycle, components/sensor/duty_cycle, percent.svg
ESP32 Hall Sensor, components/sensor/esp32_hall, magnet.svg
EZO sensor circuits, components/sensor/ezo, ezo-ph-circuit.png
Havells Inverter, components/sensor/havells_inverter, havellsgti5000d_s.jpg
Havells Solar, components/sensor/havells_solar, havellsgti5000d_s.jpg
HDC1080, components/sensor/hdc1080, hdc1080.jpg
HLW8012, components/sensor/hlw8012, hlw8012.svg
HMC5883L, components/sensor/hmc5883l, hmc5883l.jpg