zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix STM32 HW Serial + EP compile (#19990)

Browse source
This commit is contained in:
Victor Oliveira 2020-11-01 23:38:10 -03:00 committed by Scott Lahteine
parent 3c512648da
commit 172996f2b3
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,9 @@ void HAL_init() {
SetTimerInterruptPriorities(); SetTimerInterruptPriorities();
TERN_(EMERGENCY_PARSER, USB_Hook_init()); #if ENABLED(EMERGENCY_PARSER) && USBD_USE_CDC
USB_Hook_init();
#endif
} }
void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); } void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
@ -128,8 +130,12 @@ uint16_t HAL_adc_get_result() { return HAL_adc_result; }
void flashFirmware(const int16_t) { NVIC_SystemReset(); } void flashFirmware(const int16_t) { NVIC_SystemReset(); }
// Maple Compatibility // Maple Compatibility
volatile uint32_t systick_uptime_millis = 0;
systickCallback_t systick_user_callback; systickCallback_t systick_user_callback;
void systick_attach_callback(systickCallback_t cb) { systick_user_callback = cb; } void systick_attach_callback(systickCallback_t cb) { systick_user_callback = cb; }
void HAL_SYSTICK_Callback() { if (systick_user_callback) systick_user_callback(); } void HAL_SYSTICK_Callback() {
systick_uptime_millis++;
if (systick_user_callback) systick_user_callback();
}
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

1
Marlin/src/HAL/STM32/HAL.h
View file

@ -184,3 +184,4 @@ void flashFirmware(const int16_t);
typedef void (*systickCallback_t)(void); typedef void (*systickCallback_t)(void);
void systick_attach_callback(systickCallback_t cb); void systick_attach_callback(systickCallback_t cb);
void HAL_SYSTICK_Callback(); void HAL_SYSTICK_Callback();
extern volatile uint32_t systick_uptime_millis;

2
Marlin/src/HAL/STM32/usb_serial.cpp
View file

@ -21,7 +21,7 @@
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER) && USBD_USE_CDC
#include "usb_serial.h" #include "usb_serial.h"
#include "../../feature/e_parser.h" #include "../../feature/e_parser.h"