Merge upstream changes from Marlin 2.1.1
This commit is contained in:
@@ -255,9 +255,9 @@ extern "C" {
|
||||
|
||||
// Timer Definitions
|
||||
// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
|
||||
#define TIMER_TONE TIM10
|
||||
#define TIMER_SERVO TIM5
|
||||
#define TIMER_SERIAL TIM7
|
||||
#define TIMER_TONE TIM10 // TIMER_TONE must be defined in this file
|
||||
#define TIMER_SERVO TIM5 // TIMER_SERVO must be defined in this file
|
||||
#define TIMER_SERIAL TIM7 // TIMER_SERIAL must be defined in this file
|
||||
|
||||
// UART Definitions
|
||||
//#define ENABLE_HWSERIAL1 done automatically by the #define SERIAL_UART_INSTANCE below
|
||||
|
Reference in New Issue
Block a user