Merge upstream changes from Marlin 2.1.1

This commit is contained in:
Stefan Kalscheuer
2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions

View File

@@ -61,7 +61,7 @@ _Min_Stack_Size = 0x400;; /* required amount of stack */
/* Specify the memory areas */
MEMORY
{
FLASH (rx) : ORIGIN = 0x800C000, LENGTH = 256K
FLASH (rx) : ORIGIN = 0x8008000, LENGTH = 256K - 32K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 64K
}

View File

@@ -93,17 +93,15 @@ extern "C" {
#define PIN_SPI_MISO PA6
#define PIN_SPI_SCK PA5
// Timer Definitions
#define TIMER_TONE TIM2
#define TIMER_SERVO TIM5
#define TIMER_SERIAL TIM11
#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_SERIAL TIM11 // TIMER_SERIAL must be defined in this file
// UART Definitions
//#define ENABLE_HWSERIAL1 done automatically by the #define SERIAL_UART_INSTANCE below
#define ENABLE_HWSERIAL2
// Define here Serial instance number to map on Serial generic name (if not already used by SerialUSB)
#define SERIAL_UART_INSTANCE 1 //1 for Serial = Serial1 (USART1)
@@ -148,4 +146,4 @@ extern "C" {
#define SERIAL_PORT_HARDWARE_OPEN Serial2
#endif
#endif /* _VARIANT_ARDUINO_STM32_ */
#endif /* _VARIANT_ARDUINO_STM32_ */