Update UART selection for Boot ROM ets_putc, when debug port is selected. #6489
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
::printf, ets_printf_P in core_esp_postmortem.cpp and others. ets_putc is a wrapper for uart_tx_one_char. uart_tx_one_char uses the element buff_uart_no in UartDev (A structure in data area of the Boot ROM) to select UART0 or UART1. uart_buff_switch is used to set that entry. The structure for UartDev can be found in uart.h from the ESP8266_NONOS_SDK. As best I can tell the Boot ROM always defaults to UART0.
|
Sorry - I need to rethink the placement of this call. I am now thinking it should be in function |
This addresses an issue of UART selection for ROM function ets_putc, which is used by ::printf, ets_printf_P in core_esp_postmortem.cpp and others. Currently ets_putc stays on UART0 after Serial1.setDebugOutput(true) is called. ets_putc() is not affected by calls to ets_install_putc1. Its UART selection is controlled by the ROM function uart_buff_switch. Updated uart_set_debug() to call uart_buff_switch whenever debug is enabled on an UART. For the case of disabling, a call to select UART0 is made, because there is no disable option for this print method.
|
Fixes debug UART selection for ets_putc This addresses an issue of UART selection for ROM function ets_putc,
Updated |
…/Arduino into pr_uart_select_for_ets_putc
earlephilhower
approved these changes
Sep 17, 2019
mhightower83
added a commit
to mhightower83/Arduino
that referenced
this pull request
Sep 23, 2019
Replaced relevent usage of `(void *)` with `fn_putc1_t`. Correct usage of `ets_putc()`, returning 0, in libc_replacement.cpp This PR assumes PR esp8266#6489 (comment) has merged and removes `uart_buff_switch` from `umm_performance.cpp` Updated method of defining `_rom_putc1` to be more acceptable (I hope) to the new compiler.
d-a-v
approved these changes
Sep 23, 2019
earlephilhower
pushed a commit
that referenced
this pull request
Sep 27, 2019
* Add typedef for putc1, fn_putc1_t. Replaced relevant usage of `(void *)` with `fn_putc1_t`. Correct usage of `ets_putc()`, returning 0, in libc_replacement.cpp This PR assumes PR #6489 (comment) has merged and removes `uart_buff_switch` from `umm_performance.cpp` Updated method of defining `_rom_putc1` to be more acceptable (I hope) to the new compiler. * Use PROVIDE to expose ROM function entry point, ets_uart_putc1. Added comments to ets_putc() and ets_uart_putc1() to explain their differences. Change prototype of ets_putc() to conform with fp_putc_t. Updated _isr_safe_printf_P to use new definition, ets_uart_putc1.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add code to select the UART for Boot ROM
ets_putcwhich is used by::printf,ets_printf_Pincore_esp_postmortem.cppand others.This only applies to a debug build where Debug Port has been selected.
ets_putcis a wrapper foruart_tx_one_char.uart_tx_one_charusesthe element
buff_uart_noinUartDev(A structure in the data area of theBoot ROM) to select UART0 or UART1. uart_buff_switch is used to set
that entry.
The structure for
UartDevcan be found inuart.hfrom theESP8266_NONOS_SDK. As best I can tell the Boot ROM always
defaults to UART0.