Skip to content

Implement invert for HardwareSerial #6816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
earlephilhower merged 6 commits into from
Nov 20, 2019
Merged

Implement invert for HardwareSerial #6816

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efa35a8
Simple i/f to turn on inverted logic on UART0.
dok-net Nov 20, 2019
3c754c2
Refactor invert from HardwareSerial to uart
dok-net Nov 20, 2019
dccc005
Final refactoring of invert bits into config bitmap.
dok-net Nov 20, 2019
7be11ce
Overload instead of default arg for subclassing.
dok-net Nov 20, 2019
ae75059
Prevent unwanted effects if setting invert on other than UART0 - only…
dok-net Nov 20, 2019
30b22b3
Merge branch 'master' into hwserial_invert
earlephilhower Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Final refactoring of invert bits into config bitmap.
  • Loading branch information
@dok-net
dok-net committed Nov 20, 2019
commit dccc005ac5d1bfb09d64edbf8472e2fec08426f5
8 changes: 4 additions & 4 deletions cores/esp8266/uart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,10 @@ uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx
}

uart_set_baudrate(uart, baudrate);
if(invert)
{
config |= BIT(UCDTRI) | BIT(UCRTSI) | BIT(UCTXI) | BIT(UCDSRI) | BIT(UCCTSI) | BIT(UCRXI);
}
USC0(uart->uart_nr) = config;

if(!gdbstub_has_uart_isr_control() || uart->uart_nr != UART0) {
Expand All @@ -669,10 +673,6 @@ uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx
if(uart->rx_enabled) {
uart_start_isr(uart);
}
if(invert)
{
U0C0 |= BIT(UCDTRI) | BIT(UCRTSI) | BIT(UCTXI) | BIT(UCDSRI) | BIT(UCCTSI) | BIT(UCRXI);
}
if(gdbstub_has_uart_isr_control()) {
ETS_UART_INTR_ENABLE(); // Undo the disable in the switch() above
}
Expand Down