From e051ae919c4bd1c1730372f332f6204a3fb4e3e3 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 13 Apr 2022 00:07:12 -0700
Subject: [PATCH 1/6] Help people that want to attach a button (#2015)

---
 components/button/index.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/button/index.rst b/components/button/index.rst
index 81d9d41b2..e8054733a 100644
--- a/components/button/index.rst
+++ b/components/button/index.rst
@@ -5,9 +5,14 @@ Button Component
     :description: Instructions for setting up button components in ESPHome.
     :image: folder-open.svg
 
-ESPHome has support for components to create a button entity. A button entity is
-basically a momentary switch with no state and can be triggered by either YAML or
-the user/frontend.
+.. note::
+
+    To attach a physical buttons to ESPHome, see
+    :doc:`GPIO Binary Sensor </components/binary_sensor/gpio>`.
+
+ESPHome has support for components to create button entities in Home Assistant. A button entity is
+represented in ESPHome as a momentary switch with no state and can be triggered in Home Assistant
+via the UI or automations.
 
 .. note::
 
@@ -96,8 +101,8 @@ Configuration variables:
 
 .. note::
 
-    Buttons are designed to trigger an action on a device from Home Assistant, and have an unidirectional flow from 
-    Home Assistant to ESPHome. If you press a button using this action, no button press event will be triggered in Home 
+    Buttons are designed to trigger an action on a device from Home Assistant, and have an unidirectional flow from
+    Home Assistant to ESPHome. If you press a button using this action, no button press event will be triggered in Home
     Assistant. If you want to trigger an automation in Home Assistant, you should use a
     :ref:`Home Assistant event <api-homeassistant_event_action>` instead.
 

From 851c2605ab4e4e50d2590da2e4eaeaf9c44d3852 Mon Sep 17 00:00:00 2001
From: rnauber <7414650+rnauber@users.noreply.github.com>
Date: Thu, 14 Apr 2022 03:14:02 +0200
Subject: [PATCH 2/6] Add documentation for Shelly Dimmer 2 (#1753)

Co-authored-by: Richard Nauber <richard@nauber.dev>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 components/light/shelly_dimmer.rst |  99 +++++++++++++++++++++++++++++
 images/shellydimmer2.jpg           | Bin 0 -> 7987 bytes
 index.rst                          |   1 +
 3 files changed, 100 insertions(+)
 create mode 100644 components/light/shelly_dimmer.rst
 create mode 100644 images/shellydimmer2.jpg

diff --git a/components/light/shelly_dimmer.rst b/components/light/shelly_dimmer.rst
new file mode 100644
index 000000000..8313290fe
--- /dev/null
+++ b/components/light/shelly_dimmer.rst
@@ -0,0 +1,99 @@
+Shelly Dimmer
+=============
+
+.. seo::
+    :description: Instructions for setting up a Shelly Dimmer 2.
+    :image: shellydimmer2.jpg
+    
+The ``shelly_dimmer`` component adds support for the dimming and power-metering functionality that can be found the `Shelly Dimmer 2 <https://shelly.cloud/knowledge-base/devices/shelly-dimmer-2/>`_. The interaction with mains is done via an STM32 microcontroller that is flashed with an `open source firmware <https://github.com/jamesturton/shelly-dimmer-stm32>`_.
+A detailed analysis of the Shelly Dimmer 2 hardware is given `here <https://github.com/arendst/Tasmota/issues/6914>`_.
+
+.. figure:: ../../images/shellydimmer2.jpg
+    :align: center
+    :width: 40.0%
+
+
+An example of a configuration of this component:
+
+.. code-block:: yaml
+
+    logger:
+        baud_rate: 0
+
+    uart:
+        tx_pin: 1
+        rx_pin: 3
+        baud_rate: 115200
+    sensor:
+
+    light:
+        - platform: shelly_dimmer
+          name: Shelly Dimmer 2 Light
+          id: thislight
+          power:
+            name: Shelly Dimmer 2 Light Power
+          voltage:
+            name: Shelly Dimmer 2 Light Voltage
+          current:
+            name: Shelly Dimmer 2 Light Current
+          max_brightness: 500
+          firmware:
+            version: "51.6"
+            update: true
+
+
+Configuration variables:
+------------------------
+
+- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
+- **uart_id** (*Optional*, :ref:`config-id`): Manually specify the ID of the UART hub. 
+
+.. note::
+
+    Currently, only the first hardware UART of the ESP is supported, which has to be configured like this:  
+
+    .. code-block:: yaml
+
+        uart:
+            tx_pin: 1
+            rx_pin: 3
+            baud_rate: 115200
+
+
+- **name** (**Required**, string): The name of the light.
+- **leading_edge** (**Optional**, boolean): `Dimming mode <https://en.wikipedia.org/wiki/Dimmer#Solid-state_dimmer>`_: "true" means leading edge, "false" (default) is trailing edge.
+- **min_brightness** (**Optional**, int): Minimum brightness value on a scale from 0..1000, the default is 0.
+- **max_brightness** (**Optional**, int): Maximum brightness value on a scale from 0..1000, the default is 1000.
+- **warmup_brightness** (**Optional**, int): Brightness threshold below which the dimmer switches on later in mains current cycle. `This might help with dimming LEDs <https://github.com/jamesturton/shelly-dimmer-stm32/pull/23>`_. The value is from 0..1000 with an default of 0.
+- **nrst_pin** (**Optional**, :ref:`config-pin`): Pin connected with "NRST" of STM32. The  default is "GPIO5".
+- **boot0_pin** (**Optional**, :ref:`config-pin`): Pin connected with "BOOT0" of STM32. The  default is "GPIO4".
+- **current** (**Optional**): Sensor of the current in Amperes. All options from
+  :ref:`Sensor <config-sensor>`.
+- **voltage** (**Optional**): Sensor of the voltage in Volts. Only accurate if neutral is connected. All options from :ref:`Sensor <config-sensor>`.
+- **power** (**Optional**): Sensor of the active power in Watts. Only accurate if neutral is connected. All options from :ref:`Sensor <config-sensor>`.
+- **firmware**  (**Optional**):
+    - **version**  (**Optional**): Version string of the `firmware <https://github.com/jamesturton/shelly-dimmer-stm32>`_ that will be expected on the microcontroller. The default is "51.6", another known-good firmware is "51.5".
+    - **url** (**Optional**): An URL to download the firmware from. Defaults to github for known firmware versions.
+    - **sha256** (**Optional**):  A hash to compare the downloaded firmware against. Defaults a proper hash of known firmware versions.
+    - **update** (**Optional**):  Should the firmware of the STM be updated if necessary? The default is false.
+
+.. note::
+
+    When flashing Shelly Dimmer with esphome for the first time, flashing the STM firmware is necessary too for the dimmer to work:
+
+    .. code-block:: yaml
+
+        firmware:
+          version: "51.6" #<-- set version here
+          update: true
+
+
+- All other options from :ref:`Light <config-light>`.
+
+
+See Also
+--------
+
+- :doc:`/components/light/index`
+- :apiref:`shelly_dimmer/light/shelly_dimmer.h`
+- :ghedit:`Edit`
diff --git a/images/shellydimmer2.jpg b/images/shellydimmer2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0d9186234702ca338167109b493a947fc32add27
GIT binary patch
literal 7987
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
PA4^_DQTOLzy{P{KZphyN

literal 0
HcmV?d00001

diff --git a/index.rst b/index.rst
index 090b21ef6..c75a4cb58 100644
--- a/index.rst
+++ b/index.rst
@@ -465,6 +465,7 @@ Light Components
     Light Partition, components/light/partition, color_lens.svg
 
     Tuya Dimmer, components/light/tuya, tuya.png
+    Shelly Dimmer, components/light/shelly_dimmer, shellydimmer2.jpg    
     Custom Light, components/light/custom, language-cpp.svg
 
     H-bridge Light, components/light/hbridge, brightness-medium.svg

From b6383166af4966d98698351da0937abffbbf9826 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 14 Apr 2022 13:48:37 +1200
Subject: [PATCH 3/6] Bump version to 2022.4.0b2

---
 Doxygen         | 2 +-
 Makefile        | 2 +-
 _static/version | 2 +-
 conf.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doxygen b/Doxygen
index 7325891db..5442a097f 100644
--- 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         = 2022.4.0b1
+PROJECT_NUMBER         = 2022.4.0b2
 
 # 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
index 1e5b40f1d..21e038fec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2022.4.0b1
+ESPHOME_REF = 2022.4.0b2
 
 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index 80f43d706..03b7a814b 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2022.4.0b1
\ No newline at end of file
+2022.4.0b2
\ No newline at end of file
diff --git a/conf.py b/conf.py
index 8012a059f..b05cdbe81 100644
--- a/conf.py
+++ b/conf.py
@@ -68,7 +68,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2022.4"
 # The full version, including alpha/beta/rc tags.
-release = "2022.4.0b1"
+release = "2022.4.0b2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From f9c0fce2da7892ed01a451a750ddf6ff543e33e6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 14 Apr 2022 13:49:57 +1200
Subject: [PATCH 4/6] Update changelog for 2022.4.0b2

---
 changelog/2022.4.0.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/changelog/2022.4.0.rst b/changelog/2022.4.0.rst
index 34fb232ea..12509e968 100644
--- a/changelog/2022.4.0.rst
+++ b/changelog/2022.4.0.rst
@@ -130,6 +130,13 @@ Notable Changes
 
 - Font allow using google fonts directly :esphomepr:`3243` by :ghuser:`OttoWinter` (new-feature) (notable-change)
 
+Beta Changes
+^^^^^^^^^^^^
+
+- Changes accuracy of single cell voltage :esphomepr:`3387` by :ghuser:`matthias882`
+- Add support for Shelly Dimmer 2 :esphomepr:`2954` by :ghuser:`rnauber` (new-integration)
+- Allocate smaller amount of buffer for JSON :esphomepr:`3384` by :ghuser:`dz0ny`
+
 All changes
 ^^^^^^^^^^^
 
@@ -185,6 +192,9 @@ All changes
 - Fix silent config errors :esphomepr:`3380` by :ghuser:`jesserockz`
 - Move PN532OnTagTrigger to nfc::NfcOnTagTrigger :esphomepr:`3379` by :ghuser:`jesserockz`
 - Allow specifying deep sleep wakup clock time :esphomepr:`3312` by :ghuser:`jesserockz` (new-feature)
+- Changes accuracy of single cell voltage :esphomepr:`3387` by :ghuser:`matthias882`
+- Add support for Shelly Dimmer 2 :esphomepr:`2954` by :ghuser:`rnauber` (new-integration)
+- Allocate smaller amount of buffer for JSON :esphomepr:`3384` by :ghuser:`dz0ny`
 
 Past Changelogs
 ---------------

From 49bf3524a9b47540de6c58a10add8d4e259682f0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 14 Apr 2022 13:50:29 +1200
Subject: [PATCH 5/6] Update supporters for 2022.4.0b2

---
 changelog/2022.4.0.rst | 1 +
 guides/supporters.rst  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog/2022.4.0.rst b/changelog/2022.4.0.rst
index 12509e968..bd2384e1c 100644
--- a/changelog/2022.4.0.rst
+++ b/changelog/2022.4.0.rst
@@ -119,6 +119,7 @@ New Components
 - Add Xiaomi RTCGQ02LM - Mi Motion Sensor 2 :esphomepr:`3186` by :ghuser:`jesserockz` (new-integration)
 - Add Sonoff D1 Dimmer support :esphomepr:`2775` by :ghuser:`anatoly-savchenkov` (new-integration)
 - Refactor Sensirion Sensors :esphomepr:`3374` by :ghuser:`martgras` (new-integration)
+- Add support for Shelly Dimmer 2 :esphomepr:`2954` by :ghuser:`rnauber` (new-integration)
 
 Breaking Changes
 ^^^^^^^^^^^^^^^^
diff --git a/guides/supporters.rst b/guides/supporters.rst
index f441bdb81..13ce75cb0 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -364,6 +364,7 @@ Contributors
 - `Jérôme Laban (@jeromelaban) <https://github.com/jeromelaban>`__
 - `Jesse Hills (@jesserockz) <https://github.com/jesserockz>`__
 - `Yuval Brik (@jhamhader) <https://github.com/jhamhader>`__
+- `Joe (@jhansche) <https://github.com/jhansche>`__
 - `Jim Bauwens (@jimbauwens) <https://github.com/jimbauwens>`__
 - `Jérémy JOURDIN (@JJK801) <https://github.com/JJK801>`__
 - `Jonathan Jefferies (@jjok) <https://github.com/jjok>`__
@@ -478,6 +479,7 @@ Contributors
 - `matt123p (@matt123p) <https://github.com/matt123p>`__
 - `Matteo Franceschini (@matteofranceschini) <https://github.com/matteofranceschini>`__
 - `Matthew Mazzanti (@matthewmazzanti) <https://github.com/matthewmazzanti>`__
+- `matthias882 (@matthias882) <https://github.com/matthias882>`__
 - `Maurice Schleußinger (@maurice-schleussinger) <https://github.com/maurice-schleussinger>`__
 - `mbo18 (@mbo18) <https://github.com/mbo18>`__
 - `mckaymatthew (@mckaymatthew) <https://github.com/mckaymatthew>`__
@@ -727,7 +729,6 @@ Contributors
 - `Tempura San (@tempura-san) <https://github.com/tempura-san>`__
 - `testbughub (@testbughub) <https://github.com/testbughub>`__
 - `Greg Lincoln (@tetious) <https://github.com/tetious>`__
-- `Thane Gill (@thanegill) <https://github.com/thanegill>`__
 - `Nejc (@thedexboy) <https://github.com/thedexboy>`__
 - `Thomas Eckerstorfer (@TheEggi) <https://github.com/TheEggi>`__
 - `TheGroundZero (@TheGroundZero) <https://github.com/TheGroundZero>`__
@@ -817,4 +818,4 @@ Contributors
 - `Michael Labuschke (@zigman79) <https://github.com/zigman79>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated April 13, 2022.*
+*This page was last updated April 14, 2022.*

From 80faba6cc99fa826e39382f9d095e1b4e2979c4c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 14 Apr 2022 13:54:50 +1200
Subject: [PATCH 6/6] Add block about shelly dimmer

---
 changelog/2022.4.0.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog/2022.4.0.rst b/changelog/2022.4.0.rst
index bd2384e1c..3f65dc270 100644
--- a/changelog/2022.4.0.rst
+++ b/changelog/2022.4.0.rst
@@ -15,7 +15,7 @@ ESPHome 2022.4.0 - 20th April 2022
     Mi Motion Sensor 2, components/sensor/xiaomi_ble, xiaomi_rtcgq02lm.jpg
     Sonoff D1 Dimmer, components/light/sonoff_d1, sonoff_d1.jpg
     MCP3208, components/sensor/mcp3204, mcp3204.jpg
-
+    Shelly Dimmer, components/light/shelly_dimmer, shellydimmer2.jpg
 
 
 Home Assistant Addon Repo
@@ -56,6 +56,11 @@ Please upgrade your local python if you are unable to update ESPHome further.
 This is taken care of automatically if you are using the Home Assistant Add-on, or the
 ESPHome docker container.
 
+Shelly Dimmer 2
+---------------
+
+Support for the STM32 chip of the Shelly Dimmer has been added in this release. The component also supports flashing custom firmware to the
+stm32 via ESPHome which is required to use the component. See the :doc:`documentation </components/light/shelly_dimmer>` for more details.
 
 Google Fonts
 ------------