scratch/libretiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Add configure() for SerialClass

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2023-05-25 14:29:35 +02:00
parent e5f98ff41f
commit c0cc602c9a
6 changed files with 125 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
cores/realtek-ambz/arduino/libraries/Serial/Serial.cpp
View File

@@ -3,51 +3,17 @@
#include "SerialPrivate.h"
#if HAS_SERIAL0
SerialClass Serial0(0);
SerialClass Serial0(0, PIN_SERIAL0_RX, PIN_SERIAL0_TX);
#endif
#if HAS_SERIAL1
SerialClass Serial1(1);
SerialClass Serial1(1, PIN_SERIAL1_RX, PIN_SERIAL1_TX);
#endif
#if HAS_SERIAL2
SerialClass Serial2(2);
SerialClass Serial2(2, PIN_SERIAL2_RX, PIN_SERIAL2_TX);
#endif
static UART_TypeDef *PORT_UART[3] = {UART0_DEV, UART1_DEV, UART2_DEV};
static const IRQn PORT_IRQ[3] = {UART0_IRQ, UART1_IRQ, UART_LOG_IRQ};
static const pin_size_t PORT_RX[3] = {
#ifdef PIN_SERIAL0_RX
PIN_SERIAL0_RX,
#else
PIN_INVALID,
#endif
#ifdef PIN_SERIAL1_RX
PIN_SERIAL1_RX,
#else
PIN_INVALID,
#endif
#ifdef PIN_SERIAL2_RX
PIN_SERIAL2_RX,
#else
PIN_INVALID,
#endif
};
static const pin_size_t PORT_TX[3] = {
#ifdef PIN_SERIAL0_TX
PIN_SERIAL0_TX,
#else
PIN_INVALID,
#endif
#ifdef PIN_SERIAL1_TX
PIN_SERIAL1_TX,
#else
PIN_INVALID,
#endif
#ifdef PIN_SERIAL2_TX
PIN_SERIAL2_TX,
#else
PIN_INVALID,
#endif
};
static UART_TypeDef *PORT_UART[3] = {UART0_DEV, UART1_DEV, UART2_DEV};
static const IRQn PORT_IRQ[3] = {UART0_IRQ, UART1_IRQ, UART_LOG_IRQ};
static uint32_t callback(void *param) {
UART_TypeDef *uart = pdUART;
@@ -58,7 +24,7 @@ static uint32_t callback(void *param) {
uint8_t c;
while (UART_Readable(uart)) {
UART_CharGet(uart, &c);
#if LT_AUTO_DOWNLOAD_REBOOT && defined(LT_UART_ADR_PATTERN) && defined(PIN_SERIAL2_RX)
#if LT_AUTO_DOWNLOAD_REBOOT && defined(LT_UART_ADR_PATTERN) && PIN_SERIAL2_RX != PIN_INVALID
// parse UART protocol commands on UART2
if (uart == UART2_DEV)
SerialClass::adrParse(c);
@@ -71,12 +37,45 @@ static uint32_t callback(void *param) {
}
void SerialClass::begin(unsigned long baudrate, uint16_t config) {
this->data = new SerialData();
this->buf = &BUF;
DATA->uart = PORT_UART[this->port];
DATA->irq = PORT_IRQ[this->port];
DATA->rx = PORT_RX[this->port];
DATA->tx = PORT_TX[this->port];
if (!this->data) {
this->data = new SerialData();
this->buf = &BUF;
DATA->uart = PORT_UART[this->port];
DATA->irq = PORT_IRQ[this->port];
switch ((uint32_t)DATA->uart) {
case UART0_REG_BASE:
RCC_PeriphClockCmd(APBPeriph_UART0, APBPeriph_UART0_CLOCK, ENABLE);
break;
case UART1_REG_BASE:
RCC_PeriphClockCmd(APBPeriph_UART1, APBPeriph_UART1_CLOCK, ENABLE);
break;
}
if (this->tx != PIN_INVALID) {
Pinmux_Config(this->tx, PINMUX_FUNCTION_UART);
}
if (this->rx != PIN_INVALID) {
Pinmux_Config(this->rx, PINMUX_FUNCTION_UART);
PAD_PullCtrl(this->rx, GPIO_PuPd_UP);
}
}
if (this->baudrate != baudrate || this->config != config)
this->configure(baudrate, config);
if (this->rx != PIN_INVALID) {
VECTOR_IrqUnRegister(DATA->irq);
VECTOR_IrqRegister(callback, DATA->irq, (uint32_t)this->data, 10);
VECTOR_IrqEn(DATA->irq, 10);
UART_RxCmd(UART, ENABLE);
UART_INTConfig(UART, RUART_IER_ERBI, ENABLE);
}
}
void SerialClass::configure(unsigned long baudrate, uint16_t config) {
if (!this->data)
return;
// RUART_WLS_7BITS / RUART_WLS_8BITS
uint8_t dataWidth = (config & SERIAL_DATA_MASK) == SERIAL_DATA_8;
@@ -87,23 +86,6 @@ void SerialClass::begin(unsigned long baudrate, uint16_t config) {
// RUART_STOP_BIT_1 / RUART_STOP_BIT_2
uint8_t stopBits = (config & SERIAL_STOP_BIT_MASK) == SERIAL_STOP_BIT_2;
switch ((uint32_t)DATA->uart) {
case UART0_REG_BASE:
RCC_PeriphClockCmd(APBPeriph_UART0, APBPeriph_UART0_CLOCK, ENABLE);
break;
case UART1_REG_BASE:
RCC_PeriphClockCmd(APBPeriph_UART1, APBPeriph_UART1_CLOCK, ENABLE);
break;
}
if (DATA->tx != PIN_INVALID) {
Pinmux_Config(DATA->tx, PINMUX_FUNCTION_UART);
}
if (DATA->rx != PIN_INVALID) {
Pinmux_Config(DATA->rx, PINMUX_FUNCTION_UART);
PAD_PullCtrl(DATA->rx, GPIO_PuPd_UP);
}
UART_InitTypeDef cfg;
UART_StructInit(&cfg);
cfg.WordLen = dataWidth;
@@ -113,29 +95,39 @@ void SerialClass::begin(unsigned long baudrate, uint16_t config) {
UART_Init(UART, &cfg);
UART_SetBaud(UART, baudrate);
if (DATA->rx != PIN_INVALID) {
VECTOR_IrqUnRegister(DATA->irq);
VECTOR_IrqRegister(callback, DATA->irq, (uint32_t)&data, 10);
VECTOR_IrqEn(DATA->irq, 10);
UART_RxCmd(UART, ENABLE);
UART_INTConfig(UART, RUART_IER_ERBI, ENABLE);
}
this->baudrate = baudrate;
this->config = config;
}
void SerialClass::end() {
if (!this->data)
return;
UART_INTConfig(UART, RUART_IER_ERBI, DISABLE);
UART_RxCmd(UART, DISABLE);
VECTOR_IrqDis(DATA->irq);
VECTOR_IrqUnRegister(DATA->irq);
UART_DeInit(UART);
if (UART == UART2_DEV) {
// restore command line mode
DIAG_UartReInit((IRQ_FUN)UartLogIrqHandle);
}
this->buf = NULL;
this->buf = NULL;
this->baudrate = 0;
delete DATA;
}
void SerialClass::flush() {
if (!this->data)
return;
UART_WaitBusy(UART, 10);
}
size_t SerialClass::write(uint8_t c) {
if (!this->data)
return 0;
while (UART_Writable(UART) == 0) {}
UART_CharPut(UART, c);
return 1;

2
cores/realtek-ambz/arduino/libraries/Serial/SerialPrivate.h
View File

@@ -8,8 +8,6 @@
typedef struct {
UART_TypeDef *uart;
IRQn irq;
pin_size_t rx;
pin_size_t tx;
RingBuffer buf;
} SerialData;