Merge branch 'current' into next

jesserockz · jesserockz · commit a7458777b06e · 2025-08-13T14:23:50.000+12:00
diff --git a/.github/workflows/auto-label-pr.yml b/.github/workflows/auto-label-pr.yml
@@ -26,11 +26,11 @@ jobs:
     if: github.event.action != 'labeled' || github.event.sender.type != 'Bot'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
 
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@v2.0.6
+        uses: actions/create-github-app-token@v2.1.1
         with:
           app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,7 +30,7 @@ jobs:
           repo: cloudcannon/pagefind
       -
         name: Checkout source code
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,7 +23,7 @@ jobs:
       uses: jaxxstorm/action-install-gh-release@v2.1.0
       with:
           repo: cloudcannon/pagefind
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v5.0.0
     - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
diff --git a/components/display/index.rst b/components/display/index.rst
@@ -629,6 +629,11 @@ To help the graphics display team determine the best way to help you, **a pictur
 Should you `create an issue <https://github.com/esphome/esphome/issues>`__ in GitHub regarding your display, please
 be sure to **include a link to where you purchased the display** so that we can validate the configuration you've used.
 
+.. note::
+
+    If you set `update_interval: never` in your config you will not see the test card because the `display:` component will not update the display with the test card. If you want to see a test card, set `update_interval:` to something other than `never`.
+
+
 .. note::
 
     For displays in 8 bit mode you will see distinct color blocks rather than a smooth gradient.
diff --git a/components/globals.rst b/components/globals.rst
@@ -1,7 +1,7 @@
 Global Variables
 ----------------
 
-In some cases you might need to share a global variable across multiple lambdas. For example, global variables can be
+In some cases you might need to share a global variable across multiple lambdas, or to remember between periods of deep_sleep. For example, global variables can be
 used to store the state of a garage door.
 
 .. code-block:: yaml
@@ -46,6 +46,8 @@ Configuration variables:
   can not be restored or if state restoration is not enabled. This needs to be wrapped in quotes! Defaults to
   the C++ default value for this type (for example ``0`` for integers).
 
+Within lambdas globals don’t have a state attribute, just a value. Note in the example above the use of id(my_global_int) where other components would require id(my_component).state.
+
 .. _globals-set_action:
 
 ``globals.set`` Action
diff --git a/components/host.rst b/components/host.rst
@@ -14,8 +14,11 @@ configuration to Home Assistant (the native MAC address is not readily available
 .. note::
 
     HA will not automatically discover an ESPHome instance running on ``host`` using mDNS, and you will need
-    to add it explicitly using the IP address of your host computer.
-
+    to add it explicitly using the IP address of your host computer. If HA cannot establish a connection when
+    adding the device manually, the firewall settings of the local host computer may be the cause. The
+    ESPHome *API* port (``6053``) must be allowed through the firewall.
+    See :doc:`/components/api` for details.
+ 
 Many components, especially those interfacing to actual hardware, will not be available when using ``host``. Do not
 configure wifi - network will automatically be available using the host computer.
 
diff --git a/components/light/esp32_rmt_led_strip.rst b/components/light/esp32_rmt_led_strip.rst
@@ -17,14 +17,6 @@ This is a component using the ESP32 RMT peripheral to drive most addressable LED
         chipset: ws2812
         name: "My Light"
 
-Only for Arduino platforms (and ESP-IDF <5 which was used until ESPHome 2025), the RMT channel must be defined.
-
-.. code-block:: yaml
-
-    light:
-      - platform: esp32_rmt_led_strip
-        ...
-
 Configuration variables
 -----------------------
 
diff --git a/components/logger.rst b/components/logger.rst
@@ -233,18 +233,10 @@ Possible log levels are (sorted by severity):
 Manual Tag-Specific Log Levels
 ------------------------------
 
-If some component is spamming the logs and you want to manually set the
-log level for it, first identify the tag of the log messages in question
-and then disable them in your configuration.
+If some component is spamming the logs and you want to adjust its log
+level, you can set its level in your configuration, by identifiying its tag.
 
-Suppose we want to have verbose log messages globally, but the MQTT
-client spams too much. In the following example, we'd first see that the
-tag of the MQTT client is ``mqtt.client`` (before the first colon) and
-the tag for MQTT components is ``mqtt.component``.
-
-.. figure:: images/logger-manual_log_level.png
-
-Next, we can manually set the log levels in the configuration like this:
+Example: verbose logs globally, but reduce MQTT noise:
 
 .. code-block:: yaml
 
@@ -254,11 +246,22 @@ Next, we can manually set the log levels in the configuration like this:
         mqtt.component: DEBUG
         mqtt.client: ERROR
 
-Please note that the global log level determines what log messages are
-saved in the binary. So for example an ``INFO`` global log message will
-purge all ``DEBUG`` log statements from the binary in order to conserve
-space. This however means that you cannot set tag-specific log levels
-that have a lower severity than the global log level.
+The `level` option controls which log statements are included in the
+firmware. You cannot set a tag to a more detailed level than
+the global one, because log statements with lower severity than that level are not compiled in.  
+However, you can suppress them using `initial_level`, and enable them for specific tags:
+
+.. code-block:: yaml
+
+    logger:
+      level: VERBOSE
+      initial_level: ERROR
+      logs:
+        wifi: VERBOSE
+
+Here, `VERBOSE` logs are compiled, but not shown (because of `initial_level: ERROR`)
+However, the `wifi` tag has `VERBOSE` level enabled, and shown.
+
 
 .. _logger-log_action:
 
diff --git a/components/sensor/hlw8012.rst b/components/sensor/hlw8012.rst
@@ -154,29 +154,29 @@ Calibration values on the ESP:
 .. raw:: html
 
     <table>
-    <tr><td>voltage_divider:</td><td><input type="text" inputmode="numeric" value="2351" id="voltage-divider" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"></td></tr>
-    <tr><td>current_resistor:</td><td><input type="text" inputmode="numeric" value="0.001" id="current-resistor" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"></td></tr>
-    <tr><td>current_multiply:</td><td><input type="text" inputmode="numeric" value="1" id="current-multiply" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"></td></tr>
+    <tr><td>voltage_divider:</td><td><input type="text" inputmode="decimal" value="2351" id="voltage-divider" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"></td></tr>
+    <tr><td>current_resistor:</td><td><input type="text" inputmode="decimal" value="0.001" id="current-resistor" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"></td></tr>
+    <tr><td>current_multiply:</td><td><input type="text" inputmode="decimal" value="1" id="current-multiply" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"></td></tr>
     </table>
 
 ESP measurements:
 
 .. raw:: html
 
     <table>
-    <tr><td>Voltage:</td><td><input type="text" inputmode="numeric" id="sensor-voltage" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> V</td></tr>
-    <tr><td>Power:</td><td><input type="text" inputmode="numeric" id="sensor-power" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> W</td></tr>
-    <tr><td>Current:</td><td><input type="text" inputmode="numeric" id="sensor-current" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> A</td></tr>
+    <tr><td>Voltage:</td><td><input type="text" inputmode="decimal" id="sensor-voltage" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> V</td></tr>
+    <tr><td>Power:</td><td><input type="text" inputmode="decimal" id="sensor-power" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> W</td></tr>
+    <tr><td>Current:</td><td><input type="text" inputmode="decimal" id="sensor-current" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> A</td></tr>
     </table>
 
 Power meter measurements:
 
 .. raw:: html
 
     <table>
-    <tr><td>Voltage:</td><td><input type="text" inputmode="numeric" id="real-voltage" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> V</td></tr>
-    <tr><td>Power:</td><td><input type="text" inputmode="numeric" id="real-power" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> W</td></tr>
-    <tr><td>Current:</td><td><input type="text" inputmode="numeric" id="real-current" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> A</td></tr>
+    <tr><td>Voltage:</td><td><input type="text" inputmode="decimal" id="real-voltage" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> V</td></tr>
+    <tr><td>Power:</td><td><input type="text" inputmode="decimal" id="real-power" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> W</td></tr>
+    <tr><td>Current:</td><td><input type="text" inputmode="decimal" id="real-current" onchange="calc()" onkeypress="calc()" onpaste="calc()" oninput="calc()" style="width: 100px; max-width: 75vw;"> A</td></tr>
     </table>
 
 New calibration values:
diff --git a/components/sensor/ld2450.rst b/components/sensor/ld2450.rst
@@ -336,7 +336,7 @@ Configuration variables:
 Button
 ------
 
-The ``ld2450`` button allows you to perfrom ``restart`` and ``factory reset`` actions on your :doc:`ld2450`.
+The ``ld2450`` button allows you to perform ``restart`` and ``factory reset`` actions on your :doc:`ld2450`.
 
 .. code-block:: yaml
 
diff --git a/components/touchscreen/index.rst b/components/touchscreen/index.rst
@@ -83,8 +83,8 @@ The integer members for the touch positions below are in relation to the display
 - ``state`` indicates the state of the touch. This can be **1**, indicating it is an initial touch, or **2** indicating the touch position has changed/moved.
 
 - ``x`` and ``y`` are the current position.
-- ``x_last`` and ``y_last`` are the previous position.
-- ``x_first`` and ``y_first`` are the position of the touch when it was first detected.
+- ``x_prev`` and ``y_prev`` are the previous position.
+- ``x_org`` and ``y_org`` are the position of the touch when it was first detected.
 - ``x_raw`` and ``y_raw`` are for calibrating the touchscreen in relation of the display. This replaces the properties with the same name in the touchscreen classes.
 
 .. _touchscreen-calibration:
diff --git a/guides/installing_esphome.rst b/guides/installing_esphome.rst
@@ -22,29 +22,39 @@ In the terminal that comes up, check that Python is installed:
 
 .. code-block:: console
 
-    > python --version
-    Python 3.11.13
+    python --version
 
-.. note::
+It should show something like:
 
-    Don't copy the ``>``. That's used to show that this is a command that goes
-    in the console, and to let you see what the expected results are (shown on
-    the next line without a ``>``)
+.. code-block:: console
+
+    Python 3.11.13
 
 Looks good? You can go ahead and install ESPHome:
 
 .. code-block:: console
 
-    > pip3 install wheel
-    > pip3 install esphome
+    pip3 install wheel
+    pip3 install esphome
 
 And you should be good to go! You can test that things are properly installed
-with the following:
+with:
+
+.. code-block:: console
+
+    esphome version
+
+It should show something like:
 
 .. code-block:: console
 
-    > esphome version
-    Version: 2025.7.0
+    Version: 2025.8.0
+
+
+.. note::
+
+    You may additionally need to install git for the external components feature.
+    Download git from `the official link <https://git-scm.com/downloads>`_
 
 Mac
 ---
@@ -62,24 +72,30 @@ An easy way for installation is via `Homebrew <https://brew.sh/>`_:
 
 .. code-block:: console
 
-    $ brew install esphome
+    brew install esphome
 
 Verify the installation:
 
 .. code-block:: console
 
-    $ esphome version
-    Version: 2025.7.0
+    esphome version
+
+It should show something like:
+
+.. code-block:: console
+
+    Version: 2025.8.0
+
 
-If you encounter any issues with Homebrew installation, please check the
-`ESPHome Homebrew Formula <https://formulae.brew.sh/formula/esphome>`_ page
-for additional information.
 
 .. note::
 
-    Homebrew may not always provide the latest version immediately. Updating Homebrew will
-    automatically update ESPHome. If this is ok for you, Homebrew is the easiest way to
-    install ESPHome.
+    - If you encounter any issues with Homebrew installation, please check the
+      `ESPHome Homebrew Formula <https://formulae.brew.sh/formula/esphome>`_ page
+      for additional information.
+    - Homebrew may not always provide the latest version immediately. Updating Homebrew will
+      automatically update ESPHome. If this is ok for you, Homebrew is the easiest way to
+      install ESPHome.
 
 **pip**
 
@@ -114,15 +130,20 @@ least version 3.11:
 
 .. code-block:: console
 
-    $ python3 --version
+    python3 --version
+
+It should show something like:
+
+.. code-block:: console
+
     Python 3.11.13
 
 Looks good? Now create a virtual environment to contain ESPHome and it's dependencies.
 
 .. code-block:: console
 
-    $ python3 -m venv venv
-    $ source venv/bin/activate
+    python3 -m venv venv
+    source venv/bin/activate
 
 You may or may not see ``(venv)`` at the beginning of your prompt depending on your shell configuration. This indicates that you are in the virtual environment.
 
@@ -135,22 +156,27 @@ You can go ahead and install ESPHome:
 .. caution::
 
     Don't use ``sudo`` with pip. If you do, you'll run into trouble updating
-    your OS down the road.
+    your Distro down the road.
 
     For details, see `DontBreakDebian
     <https://wiki.debian.org/DontBreakDebian#A.27make_install.27_can_conflict_with_packages>`_.
     ``pip install`` is equivalent to ``make install`` in this context. The
     advice in the article applies to all Linux distributions, not just Debian.
 
     Some people install ESPHome without the virtual environment, which can lead to issues with PATHs etc.
-    Non virtual environment installations are considered not "supported" as people end up having to know your exact system setup.
+    Installations without `venv` are considered not "supported" as people end up having to know your exact system setup.
+
+At this point, you should be able to confirm that ESPHome has been successfully installed:
+
+.. code-block:: console
+
+    esphome version
 
-At this point, you should be able confirm that ESPHome has been successfully installed:
+It should show something like:
 
 .. code-block:: console
 
-    $ esphome version
-    Version: 2025.7.0
+    Version: 2025.8.0
 
 If you get an error like "Command not found", you need to add the binary to
 your ``PATH`` using ``export PATH=$PATH:$HOME/.local/bin``.

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ jobs:`
`30`	`30`	`repo: cloudcannon/pagefind`
`31`	`31`	`-`
`32`	`32`	`name: Checkout source code`
`33`		`- uses: actions/checkout@v4.2.2`
	`33`	`+ uses: actions/checkout@v5.0.0`
`34`	`34`	`-`
`35`	`35`	`name: Set up QEMU`
`36`	`36`	`uses: docker/setup-qemu-action@v3`