|
|
@ -35,7 +35,14 @@ static inline __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb |
|
|
|
* See table 198 (sec 27.4, p809) in STM document RM0008 rev 15. |
|
|
|
* We enable RXNEIE. |
|
|
|
*/ |
|
|
|
if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) { |
|
|
|
uint32_t srflags = regs->SR, cr1its = regs->CR1; |
|
|
|
|
|
|
|
if ((cr1its & USART_CR1_RXNEIE) && (srflags & USART_SR_RXNE)) { |
|
|
|
if (srflags & USART_SR_FE || srflags & USART_SR_PE ) { |
|
|
|
// framing error or parity error
|
|
|
|
regs->DR; // Read and throw away the data, which also clears FE and PE
|
|
|
|
} |
|
|
|
else { |
|
|
|
uint8_t c = (uint8)regs->DR; |
|
|
|
#ifdef USART_SAFE_INSERT |
|
|
|
// If the buffer is full and the user defines USART_SAFE_INSERT,
|
|
|
@ -49,8 +56,16 @@ static inline __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb |
|
|
|
emergency_parser.update(serial.emergency_state, c); |
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
else if (srflags & USART_SR_ORE) { |
|
|
|
// overrun and empty data, just do a dummy read to clear ORE
|
|
|
|
// and prevent a raise condition where a continous interrupt stream (due to ORE set) occurs
|
|
|
|
// (see chapter "Overrun error" ) in STM32 reference manual
|
|
|
|
regs->DR; |
|
|
|
} |
|
|
|
|
|
|
|
// TXE signifies readiness to send a byte to DR.
|
|
|
|
if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) { |
|
|
|
if ((cr1its & USART_CR1_TXEIE) && (srflags & USART_SR_TXE)) { |
|
|
|
if (!rb_is_empty(wb)) |
|
|
|
regs->DR=rb_remove(wb); |
|
|
|
else |
|
|
|