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

Fix STM32 + SoftwareSerial compile (#17831)

Browse Source
This commit is contained in:
Jason Smith
2020-05-02 15:24:51 -07:00
committed by GitHub
parent 52f3f3b5ab
commit 208af8cb15
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/HAL/STM32/HAL.cpp
View File

@ -27,10 +27,6 @@
#include "../../inc/MarlinConfig.h"
#include "../shared/Delay.h"
#if HAS_TMC_SW_SERIAL
#include "SoftwareSerial.h"
#endif
#if ENABLED(SRAM_EEPROM_EMULATION)
#if STM32F7xx
#include <stm32f7xx_ll_pwr.h>
@ -82,11 +78,7 @@ void HAL_init() {
while (!LL_PWR_IsActiveFlag_BRR()); // Wait until backup regulator is initialized
#endif
#if HAS_TMC_SW_SERIAL
SoftwareSerial::setInterruptPriority(SWSERIAL_TIMER_IRQ_PRIO, 0);
#endif
TERN_(HAS_TMC_SW_SERIAL, SoftwareSerial::setInterruptPriority(SWSERIAL_TIMER_IRQ_PRIO, 0));
SetSoftwareSerialTimerInterruptPriority();
}
void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }

14
Marlin/src/HAL/STM32/timers.cpp
View File

@ -31,9 +31,6 @@
#define NUM_HARDWARE_TIMERS 2
#ifndef SWSERIAL_TIMER_IRQ_PRIO
#define SWSERIAL_TIMER_IRQ_PRIO 1
#endif
#ifndef STEP_TIMER_IRQ_PRIO
#define STEP_TIMER_IRQ_PRIO 2
#endif
@ -41,6 +38,13 @@
#define TEMP_TIMER_IRQ_PRIO 14 // 14 = after hardware ISRs
#endif
#if HAS_TMC_SW_SERIAL
#include <SoftwareSerial.h>
#ifndef SWSERIAL_TIMER_IRQ_PRIO
#define SWSERIAL_TIMER_IRQ_PRIO 1
#endif
#endif
#ifdef STM32F0xx
#define HAL_TIMER_RATE (F_CPU) // Frequency of timer peripherals
#define MCU_STEP_TIMER 16
@ -175,4 +179,8 @@ TIM_TypeDef * HAL_timer_device(const uint8_t timer_num) {
return nullptr;
}
void SetSoftwareSerialTimerInterruptPriority() {
TERN_(HAS_TMC_SW_SERIAL, SoftwareSerial::setInterruptPriority(SWSERIAL_TIMER_IRQ_PRIO, 0));
}
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

3
Marlin/src/HAL/STM32/timers.h
View File

@ -75,6 +75,9 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
void HAL_timer_disable_interrupt(const uint8_t timer_num);
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
// Exposed here to allow all timer priority information to reside in timers.cpp
void SetSoftwareSerialTimerInterruptPriority();
//TIM_TypeDef* HAL_timer_device(const uint8_t timer_num); no need to be public for now. not public = not used externally
// FORCE_INLINE because these are used in performance-critical situations