Merge branch 'current' into beta

esphome · Jun 19, 2024 · 3c97a0e · 3c97a0e
2 parents 64dd403 + 148a365
commit 3c97a0e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -47,7 +47,7 @@ jobs:
  -
  name: Build and push
  id: docker_build
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: .
  push: true

diff --git a/components/logger.rst b/components/logger.rst
@@ -83,8 +83,8 @@ Default UART GPIO Pins
  * - ESP32
  - TX: 1, RX: 3
  - N/A
- - TX: 9, RX: 10
- - TX: 16, RX: 17
+ - TX: 10, RX: 9
+ - TX: 17, RX: 16
  - N/A
  - N/A
  * - ESP32-C3

diff --git a/components/sensor/bme680.rst b/components/sensor/bme680.rst
@@ -132,9 +132,10 @@ Add indoor air quality (IAQ) calculation and IAQ label, based on the values in t
  name: "BME680 Indoor Air Quality"
  id: iaq
  icon: "mdi:gauge"
- # caulculation: comp_gas = log(R_gas[ohm]) + 0.04 log(Ohm)/%rh * hum[%rh] 
+ # calculation: comp_gas = log(R_gas[ohm]) + 0.04 log(Ohm)/%rh * hum[%rh] 
  lambda: |-
  return log(id(gas_resistance).state) + 0.04 * id(humidity).state;
+ state_class: "measurement"
  text_sensor:
  - platform: template
  name: "BME680 IAQ Classification"

diff --git a/guides/configuration-types.rst b/guides/configuration-types.rst
@@ -554,8 +554,8 @@ For example to set a specific update interval on a common uptime sensor that is
  common: !include common.yaml
 
  sensor:
- - id: !extend uptime_sensor
- update_interval: 10s
+  - id: !extend uptime_sensor
+  update_interval: 10s
 
 Remove
 ------

diff --git a/guides/diy.rst b/guides/diy.rst
@@ -58,6 +58,7 @@ Blog Posts & Videos
 - `Converting a Carro Home DC Fan to ESPHome <https://1projectaweek.com/blog/2022/2/8/converting-a-carro-home-dc-fan-to-esp-home>`__ by `Bill Church <https://1projectaweek.com>`__
 - `Automated Coffee Bean Roaster <https://hackaday.io/project/186852-automated-coffee-bean-roaster>`__ by `brooksben11 <https://hackaday.io/brooksben11>`__
 - `Droplet Smart Irrigation System <https://github.com/PricelessToolkit/Droplet>`__ by `PricelessToolkit <https://github.com/PricelessToolkit>`__
+- `Garage door opener controller for devices with optical encoder <https://github.com/serg987/ESPHomeGarageDoorOpener>`__ by :ghuser:`serg987`
 
 Custom Components & Code
 ------------------------