bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Raise STM32F1 UART IRQ Priority, add error handling (#19301)

Browse Source 
(Error handling for Overrun, Framing and Parity.)
This commit is contained in:
Victor Oliveira 2020-09-10 00:46:50 -03:00 committed by Scott Lahteine
parent 13f2915b65
commit 8393c6a63d
3 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/HAL/STM32/MarlinSerial.cpp
View File

@ -55,10 +55,8 @@
void MarlinSerial::begin(unsigned long baud, uint8_t config) { void MarlinSerial::begin(unsigned long baud, uint8_t config) {
HardwareSerial::begin(baud, config); HardwareSerial::begin(baud, config);
// replace the IRQ callback with the one we have defined // Replace the IRQ callback with the one we have defined
#if ENABLED(EMERGENCY_PARSER) TERN_(EMERGENCY_PARSER, _serial.rx_callback = _rx_callback);
_serial.rx_callback = _rx_callback;
#endif
} }
// This function is Copyright (c) 2006 Nicholas Zambetti. // This function is Copyright (c) 2006 Nicholas Zambetti.

55
Marlin/src/HAL/STM32F1/MarlinSerial.cpp
View File

@ -29,28 +29,43 @@
// Copied from ~/.platformio/packages/framework-arduinoststm32-maple/STM32F1/system/libmaple/usart_private.h // Copied from ~/.platformio/packages/framework-arduinoststm32-maple/STM32F1/system/libmaple/usart_private.h
// Changed to handle Emergency Parser // Changed to handle Emergency Parser
static inline __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb, usart_reg_map *regs, MarlinSerial &serial) { static inline __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb, usart_reg_map *regs, MarlinSerial &serial) {
/* Handle RXNEIE and TXEIE interrupts. /* Handle RXNEIE and TXEIE interrupts.
* RXNE signifies availability of a byte in DR. * RXNE signifies availability of a byte in DR.
* *
* See table 198 (sec 27.4, p809) in STM document RM0008 rev 15. * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
* We enable RXNEIE. * We enable RXNEIE.
*/ */
if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) { uint32_t srflags = regs->SR, cr1its = regs->CR1;
uint8_t c = (uint8)regs->DR;
#ifdef USART_SAFE_INSERT if ((cr1its & USART_CR1_RXNEIE) && (srflags & USART_SR_RXNE)) {
// If the buffer is full and the user defines USART_SAFE_INSERT, if (srflags & USART_SR_FE || srflags & USART_SR_PE ) {
// ignore new bytes. // framing error or parity error
rb_safe_insert(rb, c); regs->DR; // Read and throw away the data, which also clears FE and PE
#else }
// By default, push bytes around in the ring buffer. else {
rb_push_insert(rb, c); uint8_t c = (uint8)regs->DR;
#endif #ifdef USART_SAFE_INSERT
#if ENABLED(EMERGENCY_PARSER) // If the buffer is full and the user defines USART_SAFE_INSERT,
emergency_parser.update(serial.emergency_state, c); // ignore new bytes.
#endif rb_safe_insert(rb, c);
#else
// By default, push bytes around in the ring buffer.
rb_push_insert(rb, c);
#endif
#if ENABLED(EMERGENCY_PARSER)
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. // 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)) if (!rb_is_empty(wb))
regs->DR=rb_remove(wb); regs->DR=rb_remove(wb);
else else

15
Marlin/src/HAL/STM32F1/MarlinSerial.h
View File

@ -22,6 +22,7 @@
#pragma once #pragma once
#include <HardwareSerial.h> #include <HardwareSerial.h>
#include <libmaple/usart.h>
#include <WString.h> #include <WString.h>
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
@ -29,6 +30,8 @@
#include "../../feature/e_parser.h" #include "../../feature/e_parser.h"
#endif #endif
#define UART_IRQ_PRIO 1
class MarlinSerial : public HardwareSerial { class MarlinSerial : public HardwareSerial {
public: public:
MarlinSerial(struct usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin) : MarlinSerial(struct usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin) :
@ -38,6 +41,18 @@ public:
#endif #endif
{ } { }
#ifdef UART_IRQ_PRIO
// shadow the parent methods to set irq priority after the begin
void begin(uint32 baud) {
MarlinSerial::begin(baud, SERIAL_8N1);
}
void begin(uint32 baud, uint8_t config) {
HardwareSerial::begin(baud, config);
nvic_irq_set_priority(c_dev()->irq_num, UART_IRQ_PRIO);
}
#endif
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)
EmergencyParser::State emergency_state; EmergencyParser::State emergency_state;
#endif #endif