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

Enable Serial RX/TX Only mode (needed by I2S)

Browse Source
This commit is contained in:
John Doe 2015-06-20 23:26:26 +03:00
parent 80d5508b73
commit ca8ebdbb97
2 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
cores/esp8266/HardwareSerial.cpp
View File

@ -42,12 +42,12 @@ extern "C" {
#define UART_TX_FIFO_SIZE 0x80
struct uart_ {
int uart_nr;
int uart_nr;
int baud_rate;
bool rxEnabled;
bool txEnabled;
uint8_t rxPin;
uint8_t txPin;
uint8_t rxPin;
uint8_t txPin;
};
static const int UART0 = 0;
@ -271,7 +271,7 @@ int uart_get_baudrate(uart_t* uart) {
return uart->baud_rate;
}
uart_t* uart_init(int uart_nr, int baudrate, byte config) {
uart_t* uart_init(int uart_nr, int baudrate, byte config, byte mode) {
uint32_t conf1 = 0x00000000;
uart_t* uart = (uart_t*) os_malloc(sizeof(uart_t));
@ -284,24 +284,25 @@ uart_t* uart_init(int uart_nr, int baudrate, byte config) {
switch(uart->uart_nr) {
case UART0:
pinMode(1, SPECIAL);
pinMode(3, SPECIAL);
uart->rxEnabled = true;
uart->txEnabled = true;
uart->rxPin = 3;
uart->txPin = 1;
uart->rxEnabled = (mode != SERIAL_TX_ONLY);
uart->txEnabled = (mode != SERIAL_RX_ONLY);
uart->rxPin = (uart->rxEnabled)?3:255;
uart->txPin = (uart->txEnabled)?1:255;
if(uart->rxEnabled) pinMode(uart->rxPin, SPECIAL);
if(uart->txEnabled) pinMode(uart->txPin, SPECIAL);
break;
case UART1:
pinMode(2, SPECIAL);
uart->rxEnabled = false;
uart->txEnabled = true;
uart->txEnabled = (mode != SERIAL_RX_ONLY);
uart->rxPin = 255;
uart->txPin = 2;
uart->txPin = (uart->txEnabled)?2:255;
if(uart->txEnabled) pinMode(uart->txPin, SPECIAL);
break;
case UART_NO:
default:
// big fail!
break;
os_free(uart);
return 0;
}
uart_set_baudrate(uart, baudrate);
USC0(uart->uart_nr) = config;
@ -356,22 +357,30 @@ void uart_swap(uart_t* uart) {
return;
switch(uart->uart_nr) {
case UART0:
if(uart->txPin == 1 && uart->rxPin == 3) {
pinMode(15, FUNCTION_4); //TX
pinMode(13, FUNCTION_4); //RX
if((uart->txPin == 1 && uart->txEnabled) || (uart->rxPin == 3 && uart->rxEnabled)) {
if(uart->txEnabled) pinMode(15, FUNCTION_4); //TX
if(uart->rxEnabled) pinMode(13, FUNCTION_4); //RX
IOSWAP |= (1 << IOSWAPU0);
pinMode(1, INPUT); //TX
pinMode(3, INPUT); //RX
uart->rxPin = 13;
uart->txPin = 15;
if(uart->txEnabled){ //TX
pinMode(1, INPUT);
uart->txPin = 15;
}
if(uart->rxEnabled){ //RX
pinMode(3, INPUT);
uart->rxPin = 13;
}
} else {
pinMode(1, SPECIAL); //TX
pinMode(3, SPECIAL); //RX
if(uart->txEnabled) pinMode(1, SPECIAL); //TX
if(uart->rxEnabled) pinMode(3, SPECIAL); //RX
IOSWAP &= ~(1 << IOSWAPU0);
pinMode(15, INPUT); //TX
pinMode(13, INPUT); //RX
uart->rxPin = 3;
uart->txPin = 1;
if(uart->txEnabled){ //TX
pinMode(15, INPUT);
uart->txPin = 1;
}
if(uart->rxEnabled){ //RX
pinMode(13, INPUT); //RX
uart->rxPin = 3;
}
}
break;
@ -471,14 +480,14 @@ HardwareSerial::HardwareSerial(int uart_nr) :
_uart_nr(uart_nr), _uart(0), _tx_buffer(0), _rx_buffer(0), _written(false) {
}
void HardwareSerial::begin(unsigned long baud, byte config) {
void HardwareSerial::begin(unsigned long baud, byte config, byte mode) {
// disable debug for this interface
if(uart_get_debug() == _uart_nr) {
uart_set_debug(UART_NO);
}
_uart = uart_init(_uart_nr, baud, config);
_uart = uart_init(_uart_nr, baud, config, mode);
if(_uart == 0) {
return;
@ -518,7 +527,10 @@ void HardwareSerial::setDebugOutput(bool en) {
if(_uart == 0)
return;
if(en) {
uart_set_debug(_uart->uart_nr);
if(_uart->txEnabled)
uart_set_debug(_uart->uart_nr);
else
uart_set_debug(UART_NO);
} else {
// disable debug for this interface
if(uart_get_debug() == _uart_nr) {

11
cores/esp8266/HardwareSerial.h
View File

@ -60,6 +60,10 @@
#define SERIAL_7O2 0x3b
#define SERIAL_8O2 0x3f
#define SERIAL_FULL 0
#define SERIAL_RX_ONLY 1
#define SERIAL_TX_ONLY 2
class cbuf;
struct uart_;
@ -70,9 +74,12 @@ class HardwareSerial: public Stream {
HardwareSerial(int uart_nr);
void begin(unsigned long baud) {
begin(baud, SERIAL_8N1);
begin(baud, SERIAL_8N1, SERIAL_FULL);
}
void begin(unsigned long, uint8_t);
void begin(unsigned long baud, uint8_t config) {
begin(baud, config, SERIAL_FULL);
}
void begin(unsigned long, uint8_t, uint8_t);
void end();
void swap(); //toggle between use of GPIO13/GPIO15 or GPIO3/GPIO1 as RX and TX
int available(void) override;