Tools: IDF Monitor follows the UART console baud rate by default

components/esptool_py/Kconfig.projbuild

@@ -176,13 +176,13 @@ menu "Serial flasher config"
 
     choice ESPTOOLPY_MONITOR_BAUD
         prompt "'idf.py monitor' baud rate"
-        default ESPTOOLPY_MONITOR_BAUD_115200B
+        default ESPTOOLPY_MONITOR_BAUD_CONSOLE
         help
-            Baud rate to use when running 'idf.py monitor' or 'make monitor'
+            Baud rate to use when running 'idf.py monitor'
             to view serial output from a running chip.
 
-            If "Same as UART Console baud rate" is chosen then the value will
-            follow the "UART Console baud rate" config item.
+            The default is the "Same as UART Console baud rate" and it follows
+            the "UART Console baud rate" config item.
 
             Can override by setting the MONITORBAUD environment variable.
 
@@ -211,10 +211,10 @@ menu "Serial flasher config"
 
     config ESPTOOLPY_MONITOR_BAUD
         int
-        default ESP_CONSOLE_UART_BAUDRATE if ESPTOOLPY_MONITOR_BAUD_CONSOLE
+        default ESP_CONSOLE_UART_BAUDRATE if ESP_CONSOLE_UART && ESPTOOLPY_MONITOR_BAUD_CONSOLE
         default 9600 if ESPTOOLPY_MONITOR_BAUD_9600B
         default 57600 if ESPTOOLPY_MONITOR_BAUD_57600B
-        default 115200 if ESPTOOLPY_MONITOR_BAUD_115200B
+        default 115200 if ESPTOOLPY_MONITOR_BAUD_115200B || !ESP_CONSOLE_UART
         default 230400 if ESPTOOLPY_MONITOR_BAUD_230400B
         default 921600 if ESPTOOLPY_MONITOR_BAUD_921600B
         default 2000000 if ESPTOOLPY_MONITOR_BAUD_2MB

docs/en/migration-guides/index.rst

@@ -5,10 +5,11 @@ ESP-IDF 5.0 Migration Guides
 .. toctree::
     :maxdepth: 1
 
-    Environment Setup on Windows <windows-env>
-    Peripherals <peripherals>
     Build System <build-system>
-    System <system>
-    FreeRTOS <freertos>
+    Environment Setup on Windows <windows-env>
     Ethernet <ethernet>
+    FreeRTOS <freertos>
+    Peripherals <peripherals>
     Removed or deprecated components <removed-components>
+    System <system>
+    Tools <tools>

docs/en/migration-guides/tools.rst

@@ -0,0 +1,7 @@
+Migrate Tools to ESP-IDF 5.0
+============================
+
+IDF Monitor
+-----------
+
+IDF Monitor follows the custom console baud-rate (:ref:`CONFIG_ESP_CONSOLE_UART_BAUDRATE`) by default instead of 115200. That means if a custom UART baud-rate is set then one doesn't have to change the monitor baud-rate (:ref:`CONFIG_ESPTOOLPY_MONITOR_BAUD`) to match it.

docs/zh_CN/migration-guides/index.rst

@@ -12,3 +12,4 @@ ESP-IDF 5.0 迁移指南
     FreeRTOS <freertos>
     以太网 <ethernet>
     Removed or deprecated components <removed-components>
+    Tools <tools>

docs/zh_CN/migration-guides/tools.rst

@@ -0,0 +1 @@
+.. include:: ../../en/migration-guides/tools.rst