Merge branch 'espressif:master' into pioarduino

Author: Jason2866

.gitlab-ci.yml

@@ -93,6 +93,7 @@ host_tests:
     - coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_merge_bin.py
     - coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_image_info.py
     - coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_modules.py
+    - coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_logger.py
     # some .coverage files in sub-directories are not collected on some runners, move them firs
     - find . -mindepth 2 -type f -name ".coverage*" -print -exec mv --backup=numbered {} . \;
 
@@ -109,15 +110,12 @@ host_tests_espefuse:
         - esp32c2
         - esp32c3
         - esp32c5
-        - esp32c5beta3
         - esp32c6
         - esp32c61
         - esp32h2
-        - esp32h2beta1
         - esp32p4
         - esp32s2
         - esp32s3
-        - esp32s3beta2
         - esp32h21
   script:
     - coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_espefuse.py --chip ${TARGET}
@@ -135,6 +133,7 @@ host_tests_latest_python:
     -  pytest ${CI_PROJECT_DIR}/test/test_merge_bin.py
     -  pytest ${CI_PROJECT_DIR}/test/test_image_info.py
     -  pytest ${CI_PROJECT_DIR}/test/test_modules.py
+    -  pytest ${CI_PROJECT_DIR}/test/test_logger.py
     -  pytest ${CI_PROJECT_DIR}/test/test_espefuse.py --chip esp32
 
 # A new job "host_test_hsm" is created for the test "test_espsecure_hsm.py" which runs an ubuntu image,
@@ -471,6 +470,7 @@ host_tests_windows:
     - python -m coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_image_info.py
     - python -m coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_modules.py
     - python -m coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_merge_bin.py
+    - python -m coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_logger.py
 
 target_tests_windows:
   extends: .windows_test

.pre-commit-config.yaml

@@ -25,9 +25,11 @@ repos:
       additional_dependencies:
         - tomli
   - repo: https://github.com/espressif/conventional-precommit-linter
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: conventional-precommit-linter
         stages: [commit-msg]
+        args:
+          - --allow-breaking
 default_stages: [commit]
 default_install_hook_types: [pre-commit, commit-msg]

ci/download_flasher_stubs.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 import glob
@@ -18,17 +18,12 @@
             "esp32c2",
             "esp32c3",
             "esp32c5",
-            "esp32c5beta3",
             "esp32c6",
             "esp32c61",
-            "esp32c6beta",
             "esp32h2",
-            "esp32h2beta1",
-            "esp32h2beta2",
             "esp32p4",
             "esp32s2",
             "esp32s3",
-            "esp32s3beta2",
             "esp8266",
         ),
         "LICENSE": "released as Free Software under GNU General Public License Version 2 or later",

docs/en/advanced-topics/boot-mode-selection.rst

@@ -53,7 +53,7 @@ This guide explains how to select the boot mode correctly and describes the boot
 
       The {IDF_TARGET_NAME} has a 45k ohm internal pull-up/pull-down resistor at {IDF_TARGET_STRAP_BOOT_GPIO} (and other pins). If you want to connect a switch button to enter the boot mode, this has to be a strong pull-down. For example a 10k resistor to GND.
 
-   Information about {IDF_TARGET_NAME} strapping pins can also be found in the `{IDF_TARGET_NAME} Datasheet <https://www.espressif.com/en/support/documents/technical-documents?keys={IDF_TARGET_NAME}+datasheet>`__, section "Strapping Pins".
+   Information about {IDF_TARGET_NAME} strapping pins can also be found in the `{IDF_TARGET_NAME} Datasheet <{IDF_TARGET_DATASHEET_EN_URL}>`__, section "Strapping Pins".
 
    On many development boards with built-in USB/Serial, ``esptool.py`` can automatically reset the board into bootloader mode. For other configurations or custom hardware, you will need to check the orientation of some "strapping pins" to get the correct boot mode:
 
@@ -99,7 +99,7 @@ This guide explains how to select the boot mode correctly and describes the boot
 
    .. only:: not esp32
 
-      As well as the above mentioned pins, other ones influence the serial bootloader, please consult the `{IDF_TARGET_NAME} Datasheet <https://www.espressif.com/en/support/documents/technical-documents?keys={IDF_TARGET_NAME}+datasheet>`__, section "Strapping Pins".
+         As well as the above mentioned pins, other ones influence the serial bootloader, please consult the `{IDF_TARGET_NAME} Datasheet <{IDF_TARGET_DATASHEET_EN_URL}>`__, section "Strapping Pins".
 
    .. only:: esp32
 
@@ -113,7 +113,7 @@ This guide explains how to select the boot mode correctly and describes the boot
       | 15 (MTDO)   | If driven Low, silences boot messages printed by the ROM bootloader. Has an internal pull-up, so unconnected = High = normal output.                                                                                                                                                       |
       +-------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-      For more information, consult the `{IDF_TARGET_NAME} Datasheet <https://www.espressif.com/en/support/documents/technical-documents?keys={IDF_TARGET_NAME}+datasheet>`__, section "Strapping Pins".
+      For more information, consult the `{IDF_TARGET_NAME} Datasheet <{IDF_TARGET_DATASHEET_EN_URL}>`__, section "Strapping Pins".
 
 .. _automatic-bootloader:
 

docs/en/advanced-topics/firmware-image-format.rst

@@ -189,4 +189,4 @@ The file is padded with zeros until its size is one byte less than a multiple of
 Analyzing a Binary Image
 ------------------------
 
-To analyze a binary image and get a complete summary of its headers and segments, use the :ref:`image_info <image-info>` command with the ``--version 2`` option.
+To analyze a binary image and get a complete summary of its headers and segments, use the :ref:`image_info <image-info>` command.

docs/en/espefuse/index.rst

@@ -9,7 +9,7 @@ espefuse.py
 
     Because eFuse is one-time-programmable, it is possible to permanently damage or "brick" your {IDF_TARGET_NAME} using this tool. Use it with great care.
 
-For more details about Espressif chips eFuse features, see the `Technical Reference Manual <https://www.espressif.com/en/support/documents/technical-documents>`__.
+For more details about Espressif chips eFuse features, see the `{IDF_TARGET_NAME} Technical Reference Manual <{IDF_TARGET_TRM_EN_URL}>`__.
 
 ``espefuse.py`` is installed alongside ``esptool.py``, so if ``esptool.py`` (v2.0 or newer) is available on the PATH then ``espefuse.py`` should be as well.
 
@@ -169,7 +169,7 @@ For more details on the structure and usage of the CSV file, refer to the `eFuse
 Recommendations
 ---------------
 
-1. The `Technical Reference Manual <https://www.espressif.com/en/support/documents/technical-documents>`__ has a recommendation for reducing the number of burn operations as much as possible. The tool supports several ways to do this:
+1. The `{IDF_TARGET_NAME} Technical Reference Manual <{IDF_TARGET_TRM_EN_URL}>`__ has a recommendation for reducing the number of burn operations as much as possible. The tool supports several ways to do this:
 
     - Combine multiple commands into one with this :ref:`perform-multiple-operations` feature.
     - Most commands support getting a list of arguments (eFuse names, keys).

docs/en/esptool/basic-commands.rst

@@ -3,6 +3,8 @@
 Basic Commands
 ==============
 
+.. _write-flash:
+
 Write Binary Data to Flash: write_flash
 ----------------------------------------
 
@@ -225,15 +227,13 @@ By default, ``elf2image`` uses the sections in the ELF file to generate each seg
 Output .bin Image Details: image_info
 -------------------------------------
 
-The ``image_info`` command outputs some information (load addresses, sizes, etc) about a ``.bin`` file created by ``elf2image``. Command also supports ``.hex`` file created by ``merge_bin`` command from supported ``.bin`` files.
-
-To view more information about the image, such as set flash size, frequency and mode, or extended header information, use the ``--version 2`` option. This extended output will become the default in a future major release.
+The ``image_info`` command outputs some information (load addresses, segment sizes, set flash size, frequency, and mode, extended header information, etc) about a ``.bin`` file created by ``elf2image``. Command also supports ``.hex`` file created by ``merge_bin`` command from supported ``.bin`` files.
 
 This information corresponds to the headers described in :ref:`image-format`.
 
 ::
 
-    esptool.py image_info --version 2 my_esp_app.bin
+    esptool.py image_info my_esp_app.bin
 
 .. only:: not esp8266
 

docs/en/esptool/configuration-file.rst

@@ -72,8 +72,8 @@ Sample configuration file:
     connect_attempts = 7
     write_block_attempts = 2
     reset_delay = 0.75
-    # Overriding the default reset sequence to work in an abnormal environment
-    custom_reset_sequence = D0|R1|W0.1|D1|R0|W0.5|D0
+    # Overriding the default reset sequence to work in an abnormal environment (prolonged delay):
+    custom_reset_sequence = D0|R1|W1.3|D1|R0|W0.5|D0
 
 Options
 -------
@@ -142,7 +142,7 @@ A sequence is defined with a string in the following format:
 +------+-----------------------------------------------------------+-----------------+
 
 
-For example: ``D0|R1|W0.1|D1|R0|W0.5|D0`` represents the following classic reset sequence:
+For example: ``D0|R1|W0.1|D1|R0|W0.05|D0`` represents the following classic reset sequence:
 
 .. code-block:: python
 

docs/en/esptool/flash-modes.rst

@@ -36,7 +36,7 @@ These set Quad Flash I/O or Dual Flash I/O modes. Valid values are ``keep``, ``q
 
     Most {IDF_TARGET_NAME} modules use ``qio``, but are also dual I/O.
 
-In ``qio`` mode, two additional GPIOs are used for SPI flash communications. If flash mode is set to ``dio`` then these pins are available for other purposes. Search for ``SPIWP`` and ``SPIHD`` pins in the `{IDF_TARGET_NAME} Technical Reference Manual <https://www.espressif.com/en/support/documents/technical-documents?keys={IDF_TARGET_NAME}+Technical+Reference+Manual>`__ to learn more.
+In ``qio`` mode, two additional GPIOs are used for SPI flash communications. If flash mode is set to ``dio`` then these pins are available for other purposes. Search for ``SPIWP`` and ``SPIHD`` pins in the `{IDF_TARGET_NAME} Technical Reference Manual <{IDF_TARGET_TRM_EN_URL}>`__ to learn more.
 
 For a full explanation of these modes, see the :ref:`SPI Flash Modes page <spi-flash-modes>`.
 

docs/en/esptool/flashing-firmware.rst

@@ -100,8 +100,6 @@ Change ``PORT`` to the name of :ref:`actually used serial port <serial-port>` an
     Compressed 169232 bytes to 89490...
     Wrote 169232 bytes (89490 compressed) at 0x00010000 in 2.6 seconds (effective 513.0 kbit/s)...
     Hash of data verified.
-
-    Leaving...
     Hard resetting via RTS pin...
 
 It is now possible to unplug the flashed device and repeat the process by connecting another one and running the command again.