Merge upstream changes from Marlin 2.1.1

2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
@@ -177,8 +177,8 @@ extern "C" {

 // Timer Definitions (optional)
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#define TIMER_TONE              TIM6
-#define TIMER_SERVO             TIM7
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM7  // TIMER_SERVO must be defined in this file

 // UART Definitions
 // Define here Serial instance number to map on Serial generic name