mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stm32/uart: Make sure user IRQs are handled even with a keyboard intr.

This commit is contained in:
Damien George 2018-12-30 01:03:22 +11:00
parent 7bdbea9a0c
commit f334816df0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/stm32/uart.c
View File

@ -729,17 +729,17 @@ void uart_irq_handler(mp_uint_t uart_id) {
int data = self->uartx->DR; // clears UART_FLAG_RXNE int data = self->uartx->DR; // clears UART_FLAG_RXNE
#endif #endif
data &= self->char_mask; data &= self->char_mask;
// Handle interrupt coming in on a UART REPL
if (self->attached_to_repl && data == mp_interrupt_char) { if (self->attached_to_repl && data == mp_interrupt_char) {
// Handle interrupt coming in on a UART REPL
pendsv_kbd_intr(); pendsv_kbd_intr();
return;
}
if (self->char_width == CHAR_WIDTH_9BIT) {
((uint16_t*)self->read_buf)[self->read_buf_head] = data;
} else { } else {
self->read_buf[self->read_buf_head] = data; if (self->char_width == CHAR_WIDTH_9BIT) {
((uint16_t*)self->read_buf)[self->read_buf_head] = data;
} else {
self->read_buf[self->read_buf_head] = data;
}
self->read_buf_head = next_head;
} }
self->read_buf_head = next_head;
} else { // No room: leave char in buf, disable interrupt } else { // No room: leave char in buf, disable interrupt
UART_RXNE_IT_DIS(self->uartx); UART_RXNE_IT_DIS(self->uartx);
} }