alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feat/tools_monitor_console_baud' into 'master'

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

Closes IDF-1866

See merge request espressif/esp-idf!16878
This commit is contained in:
Roland Dobai 2022-01-25 11:17:56 +00:00
commit 019be31a6c
7 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
components/esptool_py/Kconfig.projbuild
View File

@ -174,50 +174,8 @@ menu "Serial flasher config"
default "hard_reset" if ESPTOOLPY_AFTER_RESET
default "no_reset" if ESPTOOLPY_AFTER_NORESET
choice ESPTOOLPY_MONITOR_BAUD
prompt "'idf.py monitor' baud rate"
default ESPTOOLPY_MONITOR_BAUD_115200B
help
Baud rate to use when running 'idf.py monitor' or 'make 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.
Can override by setting the MONITORBAUD environment variable.
config ESPTOOLPY_MONITOR_BAUD_CONSOLE
bool "Same as UART console baud rate"
config ESPTOOLPY_MONITOR_BAUD_9600B
bool "9600 bps"
config ESPTOOLPY_MONITOR_BAUD_57600B
bool "57600 bps"
config ESPTOOLPY_MONITOR_BAUD_115200B
bool "115200 bps"
config ESPTOOLPY_MONITOR_BAUD_230400B
bool "230400 bps"
config ESPTOOLPY_MONITOR_BAUD_921600B
bool "921600 bps"
config ESPTOOLPY_MONITOR_BAUD_2MB
bool "2 Mbps"
config ESPTOOLPY_MONITOR_BAUD_OTHER
bool "Custom baud rate"
endchoice
config ESPTOOLPY_MONITOR_BAUD_OTHER_VAL
int "Custom baud rate value" if ESPTOOLPY_MONITOR_BAUD_OTHER
default 115200
config ESPTOOLPY_MONITOR_BAUD
int
default ESP_CONSOLE_UART_BAUDRATE if 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 230400 if ESPTOOLPY_MONITOR_BAUD_230400B
default 921600 if ESPTOOLPY_MONITOR_BAUD_921600B
default 2000000 if ESPTOOLPY_MONITOR_BAUD_2MB
default ESPTOOLPY_MONITOR_BAUD_OTHER_VAL if ESPTOOLPY_MONITOR_BAUD_OTHER
default ESP_CONSOLE_UART_BAUDRATE if ESP_CONSOLE_UART
default 115200 if !ESP_CONSOLE_UART
endmenu

8
components/esptool_py/sdkconfig.rename
View File

@ -7,11 +7,3 @@ CONFIG_FLASHMODE_DIO CONFIG_ESPTOOLPY_FLASHMODE_DIO
CONFIG_FLASHMODE_DOUT CONFIG_ESPTOOLPY_FLASHMODE_DOUT
CONFIG_MONITOR_BAUD CONFIG_ESPTOOLPY_MONITOR_BAUD
CONFIG_MONITOR_BAUD_9600B CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B
CONFIG_MONITOR_BAUD_57600B CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B
CONFIG_MONITOR_BAUD_115200B CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B
CONFIG_MONITOR_BAUD_230400B CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B
CONFIG_MONITOR_BAUD_921600B CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B
CONFIG_MONITOR_BAUD_2MB CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB
CONFIG_MONITOR_BAUD_OTHER CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER
CONFIG_MONITOR_BAUD_OTHER_VAL CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL

4
components/mdns/test_afl_fuzz_host/sdkconfig.h
View File

@ -32,9 +32,6 @@
#define CONFIG_ESPTOOLPY_BEFORE "default_reset"
#define CONFIG_ESPTOOLPY_AFTER_RESET 1
#define CONFIG_ESPTOOLPY_AFTER "hard_reset"
#define CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B 1
#define CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL 115200
#define CONFIG_ESPTOOLPY_MONITOR_BAUD 115200
#define CONFIG_PARTITION_TABLE_SINGLE_APP 1
#define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
@ -384,7 +381,6 @@
#define CONFIG_MB_TIMER_GROUP CONFIG_FMB_TIMER_GROUP
#define CONFIG_MB_TIMER_INDEX CONFIG_FMB_TIMER_INDEX
#define CONFIG_MB_TIMER_PORT_ENABLED CONFIG_FMB_TIMER_PORT_ENABLED
#define CONFIG_MONITOR_BAUD_115200B CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B
#define CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE
#define CONFIG_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEFAULT
#define CONFIG_POST_EVENTS_FROM_IRAM_ISR CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR

9
docs/en/migration-guides/index.rst
View File

@ -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>

7
docs/en/migration-guides/tools.rst Normal file
View File

@ -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. Setting a custom baud rate is not supported from menuconfig anymore. A custom baud-rate can be specified from command line with the ``idf.py monitor -B <baud>`` command or through setting environment variables. Run ``idf.py monitor --help`` for more information.

1
docs/zh_CN/migration-guides/index.rst
View File

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

1
docs/zh_CN/migration-guides/tools.rst Normal file
View File

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