Merge upstream changes from Marlin 2.1.2.1
This commit is contained in:
@@ -95,7 +95,7 @@ extern "C" {
|
||||
|
||||
// Timer Definitions
|
||||
#define TIMER_TONE TIM2 // TIMER_TONE must be defined in this file
|
||||
#define TIMER_SERVO TIM5 // TIMER_SERVO must be defined in this file
|
||||
#define TIMER_SERVO TIM3 // TIMER_SERVO must be defined in this file
|
||||
#define TIMER_SERIAL TIM11 // TIMER_SERIAL must be defined in this file
|
||||
|
||||
// UART Definitions
|
||||
@@ -110,7 +110,7 @@ extern "C" {
|
||||
#define PIN_SERIAL_RX PA10
|
||||
#define PIN_SERIAL_TX PA9
|
||||
|
||||
// Used when user instantiate a hardware Serial using its peripheral name.
|
||||
// Used when the user instantiates a hardware Serial using its peripheral name.
|
||||
// Example: HardwareSerial mySerial(USART3);
|
||||
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
|
||||
#define PIN_SERIAL1_RX PA10
|
||||
@@ -121,6 +121,7 @@ extern "C" {
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
/*----------------------------------------------------------------------------
|
||||
* Arduino objects - C++ only
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
Reference in New Issue
Block a user