arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Implement invert for HardwareSerial (#6816)

Browse Source 
* Simple i/f to turn on inverted logic on UART0.

* Refactor invert from HardwareSerial to uart

* Final refactoring of invert bits into config bitmap.

* Overload instead of default arg for subclassing.

* Prevent unwanted effects if setting invert on other than UART0 - only that has these flags defined and documented.
This commit is contained in:
Dirk O. Kaar 2019-11-20 17:17:42 +01:00 committed by Earle F. Philhower, III
parent b478429fe4
commit 007e495e0d
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cores/esp8266/HardwareSerial.cpp
View File

@ -36,10 +36,10 @@ HardwareSerial::HardwareSerial(int uart_nr)
: _uart_nr(uart_nr), _rx_size(256) : _uart_nr(uart_nr), _rx_size(256)
{} {}
void HardwareSerial::begin(unsigned long baud, SerialConfig config, SerialMode mode, uint8_t tx_pin) void HardwareSerial::begin(unsigned long baud, SerialConfig config, SerialMode mode, uint8_t tx_pin, bool invert)
{ {
end(); end();
_uart = uart_init(_uart_nr, baud, (int) config, (int) mode, tx_pin, _rx_size); _uart = uart_init(_uart_nr, baud, (int) config, (int) mode, tx_pin, _rx_size, invert);
#if defined(DEBUG_ESP_PORT) && !defined(NDEBUG) #if defined(DEBUG_ESP_PORT) && !defined(NDEBUG)
if (static_cast<void*>(this) == static_cast<void*>(&DEBUG_ESP_PORT)) if (static_cast<void*>(this) == static_cast<void*>(&DEBUG_ESP_PORT))
{ {

13
cores/esp8266/HardwareSerial.h
View File

@ -73,18 +73,23 @@ public:
void begin(unsigned long baud) void begin(unsigned long baud)
{ {
begin(baud, SERIAL_8N1, SERIAL_FULL, 1); begin(baud, SERIAL_8N1, SERIAL_FULL, 1, false);
} }
void begin(unsigned long baud, SerialConfig config) void begin(unsigned long baud, SerialConfig config)
{ {
begin(baud, config, SERIAL_FULL, 1); begin(baud, config, SERIAL_FULL, 1, false);
} }
void begin(unsigned long baud, SerialConfig config, SerialMode mode) void begin(unsigned long baud, SerialConfig config, SerialMode mode)
{ {
begin(baud, config, mode, 1); begin(baud, config, mode, 1, false);
} }
void begin(unsigned long baud, SerialConfig config, SerialMode mode, uint8_t tx_pin); void begin(unsigned long baud, SerialConfig config, SerialMode mode, uint8_t tx_pin)
{
begin(baud, config, mode, tx_pin, false);
}
void begin(unsigned long baud, SerialConfig config, SerialMode mode, uint8_t tx_pin, bool invert);
void end(); void end();

6
cores/esp8266/uart.cpp
View File

@ -577,7 +577,7 @@ uart_get_baudrate(uart_t* uart)
} }
uart_t* uart_t*
uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx_size) uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx_size, bool invert)
{ {
uart_t* uart = (uart_t*) malloc(sizeof(uart_t)); uart_t* uart = (uart_t*) malloc(sizeof(uart_t));
if(uart == NULL) if(uart == NULL)
@ -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); uart_set_baudrate(uart, baudrate);
if(uart->uart_nr == UART0 && invert)
{
config |= BIT(UCDTRI) | BIT(UCRTSI) | BIT(UCTXI) | BIT(UCDSRI) | BIT(UCCTSI) | BIT(UCRXI);
}
USC0(uart->uart_nr) = config; USC0(uart->uart_nr) = config;
if(!gdbstub_has_uart_isr_control() || uart->uart_nr != UART0) { if(!gdbstub_has_uart_isr_control() || uart->uart_nr != UART0) {

2
cores/esp8266/uart.h
View File

@ -113,7 +113,7 @@ extern "C" {
struct uart_; struct uart_;
typedef struct uart_ uart_t; typedef struct uart_ uart_t;
uart_t* uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx_size); uart_t* uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx_size, bool invert);
void uart_uninit(uart_t* uart); void uart_uninit(uart_t* uart);
void uart_swap(uart_t* uart, int tx_pin); void uart_swap(uart_t* uart, int tx_pin);

3
tests/host/common/MockUART.cpp
View File

@ -323,10 +323,11 @@ uart_get_bit_length(const int uart_nr)
} }
uart_t* uart_t*
uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx_size) uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, size_t rx_size, bool invert)
{ {
(void) config; (void) config;
(void) tx_pin; (void) tx_pin;
(void) invert;
uart_t* uart = (uart_t*) malloc(sizeof(uart_t)); uart_t* uart = (uart_t*) malloc(sizeof(uart_t));
if(uart == NULL) if(uart == NULL)
return NULL; return NULL;