Skip to content

Commit cc8d13f

Browse files
committed
Merge branch 'bugfix/uart1_intr_and_pwm' into 'master'
bugfix(uart): fix uart1 interrupt See merge request sdk/ESP8266_RTOS_SDK!680
2 parents cdd32ad + def1edc commit cc8d13f

File tree

1 file changed

+1
-1
lines changed
  • components/esp8266/driver

1 file changed

+1
-1
lines changed

components/esp8266/driver/uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ static void uart_intr_service(void *arg)
381381
}
382382

383383
do {
384+
uart_intr_status = UART[uart_num]->int_st.val;
384385
if (uart_intr_status != 0) {
385386
if (uart_isr_func[uart_num].fn != NULL) {
386387
uart_isr_func[uart_num].fn(uart_isr_func[uart_num].args);
@@ -878,7 +879,6 @@ esp_err_t uart_driver_install(uart_port_t uart_num, int rx_buffer_size, int tx_b
878879
{
879880
esp_err_t r;
880881
UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", ESP_ERR_INVALID_ARG);
881-
UART_CHECK((uart_num == UART_NUM_1) ? (tx_buffer_size == 0) : 1, "uart1 cannot use tx_buffer", ESP_ERR_INVALID_ARG);
882882
UART_CHECK((rx_buffer_size > UART_FIFO_LEN) || ((uart_num == UART_NUM_1) && (rx_buffer_size == 0)), "uart rx buffer length error(>128)", ESP_ERR_INVALID_ARG);
883883
UART_CHECK((tx_buffer_size > UART_FIFO_LEN) || (tx_buffer_size == 0), "uart tx buffer length error(>128 or 0)", ESP_ERR_INVALID_ARG);
884884
UART_CHECK((queue_size >= 0), "queue_size error(>=0)", ESP_ERR_INVALID_ARG);

0 commit comments

Comments
 (0)