From 9fde415d2a09fa4cab801a73e1a7603a3e8b8886 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 21 Nov 2019 16:53:11 +0300
Subject: [PATCH 001/565] Update Configuration.h

---
 Marlin/Configuration.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 00ea29d7c2bf..ca61c84a96b2 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -419,7 +419,7 @@
  *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
  *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
  */
-#define TEMP_SENSOR_0 1
+#define TEMP_SENSOR_0 13
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_3 0
@@ -693,14 +693,14 @@
  *          TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
  * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
  */
-//#define X_DRIVER_TYPE  A4988
-//#define Y_DRIVER_TYPE  A4988
-//#define Z_DRIVER_TYPE  A4988
+#define X_DRIVER_TYPE  TMC2208
+#define Y_DRIVER_TYPE  TMC2208
+#define Z_DRIVER_TYPE  TMC2208
 //#define X2_DRIVER_TYPE A4988
 //#define Y2_DRIVER_TYPE A4988
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
-//#define E0_DRIVER_TYPE A4988
+#define E0_DRIVER_TYPE TMC2208
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
@@ -1070,7 +1070,7 @@
 
 //#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
 
-//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
+#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
 
 //#define Z_HOMING_HEIGHT 4  // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
                              // Be sure you have this distance over your Z_MAX_POS in case.

From 1e5558c829587f6b3dde4241585997a8b3099ca5 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 21 Nov 2019 17:14:01 +0300
Subject: [PATCH 002/565] Update Configuration_adv.h

---
 Marlin/Configuration_adv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b1a6766cd6f6..181fb841a388 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2028,7 +2028,7 @@
    * M912 - Clear stepper driver overtemperature pre-warn condition flag.
    * M122 - Report driver parameters (Requires TMC_DEBUG)
    */
-  //#define MONITOR_DRIVER_STATUS
+  #define MONITOR_DRIVER_STATUS
 
   #if ENABLED(MONITOR_DRIVER_STATUS)
     #define CURRENT_STEP_DOWN     50  // [mA]
@@ -2115,7 +2115,7 @@
    * Enable M122 debugging command for TMC stepper drivers.
    * M122 S0/1 will enable continous reporting.
    */
-  //#define TMC_DEBUG
+  #define TMC_DEBUG
 
   /**
    * You can set your own advanced settings by filling in predefined functions.

From 8162938f04610fd49055bc3c20f76268c995654c Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 27 Nov 2019 16:06:12 +0300
Subject: [PATCH 003/565] 1

---
 Marlin/Configuration.h     |  3 ++-
 Marlin/Configuration_adv.h | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f619c5791f59..65a5a087cf25 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -761,7 +761,8 @@
  * Override with M92
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 }
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 408.16 } //BMG EXTRUDER 408.16 не проверено
 
 /**
  * Default Max Feed Rate (mm/s)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2214e5b2fc00..c17c90742538 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -377,14 +377,14 @@
 /**
  * M355 Case Light on-off / brightness
  */
-//#define CASE_LIGHT_ENABLE
+#define CASE_LIGHT_ENABLE
 #if ENABLED(CASE_LIGHT_ENABLE)
-  //#define CASE_LIGHT_PIN 4                  // Override the default pin if needed
+  #define CASE_LIGHT_PIN P1_26                  // Override the default pin if needed //SKR 1.3 PIN Y+ SWITCH
   #define INVERT_CASE_LIGHT false             // Set true if Case Light is ON when pin is LOW
   #define CASE_LIGHT_DEFAULT_ON true          // Set default power-up state on
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105   // Set default power-up brightness (0-255, requires PWM pin)
   //#define CASE_LIGHT_MAX_PWM 128            // Limit pwm
-  //#define CASE_LIGHT_MENU                   // Add Case Light options to the LCD menu
+  #define CASE_LIGHT_MENU                   // Add Case Light options to the LCD menu
   //#define CASE_LIGHT_NO_BRIGHTNESS          // Disable brightness control. Enable for non-PWM lighting.
   //#define CASE_LIGHT_USE_NEOPIXEL           // Use Neopixel LED as case light, requires NEOPIXEL_LED.
   #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
@@ -2034,7 +2034,7 @@
    * M912 - Clear stepper driver overtemperature pre-warn condition flag.
    * M122 - Report driver parameters (Requires TMC_DEBUG)
    */
-  #define MONITOR_DRIVER_STATUS
+  //#define MONITOR_DRIVER_STATUS
 
   #if ENABLED(MONITOR_DRIVER_STATUS)
     #define CURRENT_STEP_DOWN     50  // [mA]
@@ -2121,7 +2121,7 @@
    * Enable M122 debugging command for TMC stepper drivers.
    * M122 S0/1 will enable continous reporting.
    */
-  #define TMC_DEBUG
+  //#define TMC_DEBUG
 
   /**
    * You can set your own advanced settings by filling in predefined functions.

From e386bad42854b376de7ba98dc2002675528a703b Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 27 Nov 2019 22:47:38 +0300
Subject: [PATCH 004/565] 1

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c17c90742538..e749ea25b098 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -385,7 +385,7 @@
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105   // Set default power-up brightness (0-255, requires PWM pin)
   //#define CASE_LIGHT_MAX_PWM 128            // Limit pwm
   #define CASE_LIGHT_MENU                   // Add Case Light options to the LCD menu
-  //#define CASE_LIGHT_NO_BRIGHTNESS          // Disable brightness control. Enable for non-PWM lighting.
+  #define CASE_LIGHT_NO_BRIGHTNESS          // Disable brightness control. Enable for non-PWM lighting.
   //#define CASE_LIGHT_USE_NEOPIXEL           // Use Neopixel LED as case light, requires NEOPIXEL_LED.
   #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
     #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }

From 99549f07f39925d59338e99ffefc03720bb469f1 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 27 Nov 2019 22:52:56 +0300
Subject: [PATCH 005/565] 3

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e749ea25b098..78abd8711d13 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -382,7 +382,7 @@
   #define CASE_LIGHT_PIN P1_26                  // Override the default pin if needed //SKR 1.3 PIN Y+ SWITCH
   #define INVERT_CASE_LIGHT false             // Set true if Case Light is ON when pin is LOW
   #define CASE_LIGHT_DEFAULT_ON true          // Set default power-up state on
-  #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105   // Set default power-up brightness (0-255, requires PWM pin)
+  #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255   // Set default power-up brightness (0-255, requires PWM pin)
   //#define CASE_LIGHT_MAX_PWM 128            // Limit pwm
   #define CASE_LIGHT_MENU                   // Add Case Light options to the LCD menu
   #define CASE_LIGHT_NO_BRIGHTNESS          // Disable brightness control. Enable for non-PWM lighting.

From a32f6af0870c5e27f71b815d18a2feb27198760d Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 1 Dec 2019 21:24:51 +0300
Subject: [PATCH 006/565] 111

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ae61bda63bfd..c4fd3899a345 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -711,7 +711,7 @@
 //#define Y2_DRIVER_TYPE A4988
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
-#define E0_DRIVER_TYPE TMC2208_STANDALONE
+#define E0_DRIVER_TYPE A4988  
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index dce5978397aa..ef8b55b4e302 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1488,8 +1488,8 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MINIMUM_STEPPER_POST_DIR_DELAY 20
-#define MINIMUM_STEPPER_PRE_DIR_DELAY 20
+#define MINIMUM_STEPPER_POST_DIR_DELAY 200
+#define MINIMUM_STEPPER_PRE_DIR_DELAY 200
 
 /**
  * Minimum stepper driver pulse width (in µs)

From 3f6077f3eb8ce98e41cc04ab0c6499bfe0f018f4 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 2 Dec 2019 17:18:05 +0300
Subject: [PATCH 007/565] =?UTF-8?q?=D0=9F=D0=9E=D0=9C=D0=95=D0=9D=D0=AF?=
 =?UTF-8?q?=D0=9B=20=D0=9C=D0=95=D0=A1=D0=A2=D0=90=D0=9C=D0=98=20=D0=AD?=
 =?UTF-8?q?=D0=9A=D0=A1=D0=A2=D0=A0=D0=A3=D0=94=D0=95=D0=A0=D0=AB=20=D0=98?=
 =?UTF-8?q?=D0=97=D0=97=D0=90=20=D0=9D=D0=95=D0=9F=D0=9E=D0=9B=D0=90=D0=94?=
 =?UTF-8?q?=D0=9A=D0=98=20=D0=9D=D0=90=20=D0=9F=D0=9B=D0=90=D0=A2=D0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
index c7396887f475..5de4eecdad21 100644
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
+++ b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
@@ -84,19 +84,19 @@
 #ifndef Z_CS_PIN
   #define Z_CS_PIN         P1_10
 #endif
-
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+//поменял местами пины экструдеров E0 E1, так как e0 поломан
+#define E0_STEP_PIN        P0_01//P2_13 
+#define E0_DIR_PIN         P0_00//P0_11
+#define E0_ENABLE_PIN      P0_10//P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_08
+  #define E0_CS_PIN        P1_01//P1_08
 #endif
 
-#define E1_STEP_PIN        P0_01
-#define E1_DIR_PIN         P0_00
-#define E1_ENABLE_PIN      P0_10
+#define E1_STEP_PIN        P2_13//P0_01
+#define E1_DIR_PIN         P0_11//P0_00
+#define E1_ENABLE_PIN      P2_12//P0_10
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN        P1_08//P1_01
 #endif
 
 //

From dc1f6f43a3fa7e6b493406b9583d7e802e672cbf Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 2 Dec 2019 17:23:41 +0300
Subject: [PATCH 008/565] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=202208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 3d529a09614e..b67f090c65c9 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -711,7 +711,7 @@
 //#define Y2_DRIVER_TYPE A4988
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
-#define E0_DRIVER_TYPE A4988  
+#define E0_DRIVER_TYPE TMC2208_STANDALONE  
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9722519e3456..78abd8711d13 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1488,8 +1488,8 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MINIMUM_STEPPER_POST_DIR_DELAY 200
-#define MINIMUM_STEPPER_PRE_DIR_DELAY 200
+#define MINIMUM_STEPPER_POST_DIR_DELAY 20
+#define MINIMUM_STEPPER_PRE_DIR_DELAY 20
 
 /**
  * Minimum stepper driver pulse width (in µs)

From 44c5ffed91b5986a2ff7e06531b45bdebef11cf9 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 2 Dec 2019 20:24:46 +0300
Subject: [PATCH 009/565] EXTRUDE_MINTEMP 170

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b67f090c65c9..881884167b40 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -592,7 +592,7 @@
  * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
  */
 #define PREVENT_COLD_EXTRUSION
-#define EXTRUDE_MINTEMP 185
+#define EXTRUDE_MINTEMP 170
 
 /**
  * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH.

From d5ab9f07e633986ec9a90a07d3980e256d8d62a9 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 2 Dec 2019 21:18:23 +0300
Subject: [PATCH 010/565] =?UTF-8?q?INVERT=5FE0=5FDIR=20true=20INVERT=5FE1?=
 =?UTF-8?q?=5FDIR=20true=20=20=20-=20=D0=B4=D0=BB=D1=8F=20BMG=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=81=D1=82=D1=80=D1=83=D0=B4=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 881884167b40..94c250c2e29f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1071,8 +1071,8 @@
 // @section extruder
 
 // For direct drive extruder v9 set to true, for geared extruder set to false.
-#define INVERT_E0_DIR false
-#define INVERT_E1_DIR false
+#define INVERT_E0_DIR true
+#define INVERT_E1_DIR true
 #define INVERT_E2_DIR false
 #define INVERT_E3_DIR false
 #define INVERT_E4_DIR false

From b0b7ece9792533cc615b0ba7f3948f0b249eafdf Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 2 Dec 2019 22:38:41 +0300
Subject: [PATCH 011/565] Revert "111"

This reverts commit a32f6af0870c5e27f71b815d18a2feb27198760d.
---
 Marlin/Configuration.h                          |  2 +-
 Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 94c250c2e29f..982270a42bb8 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -150,7 +150,7 @@
 #endif
 
 // Name displayed in the LCD "Ready" message and Info menu
-#define CUSTOM_MACHINE_NAME "UlTi Steel"
+#define CUSTOM_MACHINE_NAME "UlTi Steel RE"
 
 // Printer's unique ID, used by some programs to differentiate between machines.
 // Choose your own or use a service like http://www.uuidgenerator.net/version4
diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
index 5de4eecdad21..1b406fbcab4f 100644
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
+++ b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
@@ -85,18 +85,18 @@
   #define Z_CS_PIN         P1_10
 #endif
 //поменял местами пины экструдеров E0 E1, так как e0 поломан
-#define E0_STEP_PIN        P0_01//P2_13 
-#define E0_DIR_PIN         P0_00//P0_11
-#define E0_ENABLE_PIN      P0_10//P2_12
+#define E0_STEP_PIN        P2_13//P0_01
+#define E0_DIR_PIN         P0_11//P0_00
+#define E0_ENABLE_PIN      P2_12//P0_10
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_01//P1_08
+  #define E0_CS_PIN        P1_08//P1_01
 #endif
 
-#define E1_STEP_PIN        P2_13//P0_01
-#define E1_DIR_PIN         P0_11//P0_00
-#define E1_ENABLE_PIN      P2_12//P0_10
+#define E1_STEP_PIN        P0_01//P2_13 
+#define E1_DIR_PIN         P0_00//P0_11
+#define E1_ENABLE_PIN      P0_10//P2_12
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_08//P1_01
+  #define E1_CS_PIN        P1_01//P1_08
 #endif
 
 //

From 92aed3537cc82ef9ba846dff73071bd0cc7628c0 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 2 Dec 2019 23:07:05 +0300
Subject: [PATCH 012/565] =?UTF-8?q?=D0=9F=D0=9E=D0=9C=D0=95=D0=9D=D0=AF?=
 =?UTF-8?q?=D0=9B=20=D0=A1=D0=9D=D0=9E=D0=92=D0=90=20=D0=BF=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BD=D0=B0=20E1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h  | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
index 1b406fbcab4f..a7b2e5e7c4fe 100644
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
+++ b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
@@ -85,19 +85,33 @@
   #define Z_CS_PIN         P1_10
 #endif
 //поменял местами пины экструдеров E0 E1, так как e0 поломан
-#define E0_STEP_PIN        P2_13//P0_01
-#define E0_DIR_PIN         P0_11//P0_00
-#define E0_ENABLE_PIN      P2_12//P0_10
+#define E0_STEP_PIN        P0_01
+#define E0_DIR_PIN         P0_00
+#define E0_ENABLE_PIN      P0_10
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_08//P1_01
+  #define E0_CS_PIN        P1_01
 #endif
 
-#define E1_STEP_PIN        P0_01//P2_13 
-#define E1_DIR_PIN         P0_00//P0_11
-#define E1_ENABLE_PIN      P0_10//P2_12
+#define E1_STEP_PIN        P2_13 
+#define E1_DIR_PIN         P0_11
+#define E1_ENABLE_PIN      P2_12
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01//P1_08
+  #define E1_CS_PIN        P1_08
 #endif
+//ДЕФОЛТНЫЕ
+//#define E0_STEP_PIN        P2_13
+//#define E0_DIR_PIN         P0_11
+//#define E0_ENABLE_PIN      P2_12
+//#ifndef E0_CS_PIN
+//  #define E0_CS_PIN        P1_08
+//#endif
+
+//#define E1_STEP_PIN        P0_01
+//#define E1_DIR_PIN         P0_00
+//#define E1_ENABLE_PIN      P0_10
+//#ifndef E1_CS_PIN
+//  #define E1_CS_PIN        P1_01
+//#endif
 
 //
 // Software SPI pins for TMC2130 stepper drivers

From 0b17a545b9abec21ab9710c4d75ba8405e1aee34 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 3 Dec 2019 21:22:22 +0300
Subject: [PATCH 013/565] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=20=D1=88=D0=B0=D0=B3=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B1?=
 =?UTF-8?q?=D0=BC=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 982270a42bb8..7ff1dea26430 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -762,7 +762,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 408.16 } //BMG EXTRUDER 408.16 не проверено
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 413,32 } //BMG EXTRUDER откалибровано по 200мм (подал 200мм, вышло 197,5. формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло (408.16*200) / 197,5 = 413,32)
 
 /**
  * Default Max Feed Rate (mm/s)

From 474032045c503cd58a77e5875469510ec8f2f2a2 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 3 Dec 2019 21:23:50 +0300
Subject: [PATCH 014/565] =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=B0=20=D0=BD=D0=B0=20=D0=B3?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=B2=D0=BD=D1=8B=D0=B9=20=D1=8D=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=20=D0=B8=D0=B7=20=D1=81=D1=83=D0=B1=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 78abd8711d13..442dd85da942 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -902,7 +902,7 @@
 //#define LCD_DECIMAL_SMALL_XY
 
 // The timeout (in ms) to return to the status screen from sub-menus
-//#define LCD_TIMEOUT_TO_STATUS 15000
+#define LCD_TIMEOUT_TO_STATUS 60000
 
 // Add an 'M73' G-code to set the current percentage
 //#define LCD_SET_PROGRESS_MANUALLY

From c0c8f9b0bb74c29c3c3f3c69d910346fe47f3d78 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 3 Dec 2019 21:59:52 +0300
Subject: [PATCH 015/565] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B3=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D0=B1?=
 =?UTF-8?q?=D0=BC=D0=B3=20412,29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7ff1dea26430..5076aeaf3d25 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -762,7 +762,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 413,32 } //BMG EXTRUDER откалибровано по 200мм (подал 200мм, вышло 197,5. формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло (408.16*200) / 197,5 = 413,32)
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 412.29 } //BMG EXTRUDER откалибровано по 200мм (подал 200мм, вышло 197,5. формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло (408.16*200) / 197,5 = 413,32)
 
 /**
  * Default Max Feed Rate (mm/s)

From a44aede476fc123f770b9d904ed2b1a13e557a20 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 4 Dec 2019 18:45:09 +0300
Subject: [PATCH 016/565] =?UTF-8?q?NO=5FMOTION=5FBEFORE=5FHOMING=20=20//?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=B1=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BE=20=D1=85=D0=BE=D0=BC=D0=B0,=20=D0=BD=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=BE?=
 =?UTF-8?q?=20=D0=BE=D1=81=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5076aeaf3d25..a49f40d56915 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1080,7 +1080,7 @@
 
 // @section homing
 
-//#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
+#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
 
 #define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
 

From 4a6eed200f9e80336a3e6525d39725268a87ca0f Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 4 Dec 2019 20:42:52 +0300
Subject: [PATCH 017/565] =?UTF-8?q?=D0=9F=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B8=D0=B4=D1=8B=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=20=D1=81=D0=B5=D0=B1=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a49f40d56915..4baae452cd95 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -505,10 +505,10 @@
  #define DEFAULT_Ki 3.12
  #define DEFAULT_Kd 56.17
 #else
-  // Ultimaker
-  #define DEFAULT_Kp 22.2
-  #define DEFAULT_Ki 1.08
-  #define DEFAULT_Kd 114
+  // автопид 4.12.2019
+  #define DEFAULT_Kp 14.42
+  #define DEFAULT_Ki 0.84
+  #define DEFAULT_Kd 61.55
 #endif
 
   // MakerGear
@@ -561,10 +561,10 @@
   #define DEFAULT_bedKp 32.27
   #define DEFAULT_bedKi 6.45
   #define DEFAULT_bedKd 107.67
-#else
-  #define DEFAULT_bedKp 97.56
-  #define DEFAULT_bedKi 8.51
-  #define DEFAULT_bedKd 279.73
+#else //ПЕРЕПИДОАВТЬ ПРИ КОМНАТНОЙ ТЕМПЕРАТУРЕ M303 E-1 C8 S90 U
+  #define DEFAULT_bedKp 56.11
+  #define DEFAULT_bedKi 11.21
+  #define DEFAULT_bedKd 187.23
 #endif
 
   //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)

From 6a50cbdb93a721af79972d16c2f4ac4b1ca24c43 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 12 Dec 2019 23:05:42 +0300
Subject: [PATCH 018/565] pid bed edit

---
 Marlin/Configuration.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 59d5278f1150..338a290e4a4b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -563,10 +563,10 @@
   #define DEFAULT_bedKp 32.27
   #define DEFAULT_bedKi 6.45
   #define DEFAULT_bedKd 107.67
-#else //ПЕРЕПИДОАВТЬ ПРИ КОМНАТНОЙ ТЕМПЕРАТУРЕ M303 E-1 C8 S90 U
-  #define DEFAULT_bedKp 56.11
-  #define DEFAULT_bedKi 11.21
-  #define DEFAULT_bedKd 187.23
+#else //ПЕРЕПИДОАВТЬ ПРИ КОМНАТНОЙ ТЕМПЕРАТУРЕ M303 E-1 C8 S60
+  #define DEFAULT_bedKp 46.80
+  #define DEFAULT_bedKi 8.77
+  #define DEFAULT_bedKd 166.47
 #endif
 
   //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)

From a06783055bfad23bc55f78726216ce61130cc22e Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 13 Dec 2019 00:13:13 +0300
Subject: [PATCH 019/565] Update Configuration.h

---
 Marlin/Configuration.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 338a290e4a4b..ea04c9fb75a2 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -507,7 +507,7 @@
  #define DEFAULT_Ki 3.12
  #define DEFAULT_Kd 56.17
 #else
-  // автопид 4.12.2019
+  //M303 E0 S180 C8
   #define DEFAULT_Kp 14.42
   #define DEFAULT_Ki 0.84
   #define DEFAULT_Kd 61.55
@@ -563,7 +563,7 @@
   #define DEFAULT_bedKp 32.27
   #define DEFAULT_bedKi 6.45
   #define DEFAULT_bedKd 107.67
-#else //ПЕРЕПИДОАВТЬ ПРИ КОМНАТНОЙ ТЕМПЕРАТУРЕ M303 E-1 C8 S60
+#else //M303 E-1 C8 S60
   #define DEFAULT_bedKp 46.80
   #define DEFAULT_bedKi 8.77
   #define DEFAULT_bedKd 166.47

From 3f38c779d81930301b3b25196d8b3611cc903b41 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 13 Dec 2019 00:14:37 +0300
Subject: [PATCH 020/565] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=BA=20=D0=BF=D0=B8=D0=BD=D1=8B=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=8D=D0=BA=D1=81=D1=82=D1=80=D1=83=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 26 +++++----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 4e0b9b4d197f..96211576537c 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -97,31 +97,17 @@
 #ifndef Z_CS_PIN
   #define Z_CS_PIN         P1_10
 #endif
-//поменял местами пины экструдеров E0 E1, так как e0 поломан
-#define E0_STEP_PIN        P0_01
-#define E0_DIR_PIN         P0_00
-#define E0_ENABLE_PIN      P0_10
+
+#define E0_STEP_PIN        P2_13
+#define E0_DIR_PIN         P0_11
+#define E0_ENABLE_PIN      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_01
+  #define E0_CS_PIN        P1_08
 #endif
 
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_08
+  #define E1_CS_PIN        P1_01
 #endif
-//ДЕФОЛТНЫЕ
-//#define E0_STEP_PIN        P2_13
-//#define E0_DIR_PIN         P0_11
-//#define E0_ENABLE_PIN      P2_12
-//#ifndef E0_CS_PIN
-//  #define E0_CS_PIN        P1_08
-//#endif
-
-//#define E1_STEP_PIN        P0_01
-//#define E1_DIR_PIN         P0_00
-//#define E1_ENABLE_PIN      P0_10
-//#ifndef E1_CS_PIN
-//  #define E1_CS_PIN        P1_01
-//#endif
 
 //
 // Software SPI pins for TMC2130 stepper drivers

From f58be55ef0ad0e7456078702502a7a5b83fa2a60 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 5 Jan 2020 18:42:02 +0300
Subject: [PATCH 021/565] Update Configuration.h

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9e7dcbc55935..7762657b3bbc 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -764,7 +764,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 412.29 } //BMG EXTRUDER откалибровано по 200мм (подал 200мм, вышло 197,5. формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло (408.16*200) / 197,5 = 413,32)
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 409.87 } //BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
 
 /**
  * Default Max Feed Rate (mm/s)

From 5eecf3b98344070d57341db8de4447eb5927a586 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 15 Jan 2020 16:23:54 +0300
Subject: [PATCH 022/565] =?UTF-8?q?lcd=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B0=2012864=20fysetc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7762657b3bbc..c0bcc0e0c2a5 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1791,7 +1791,8 @@
 //
 // Note: Usually sold with a white PCB.
 //
-#define REPRAP_DISCOUNT_SMART_CONTROLLER
+// default_ulti
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
@@ -2000,7 +2001,7 @@
 //
 //#define FYSETC_MINI_12864_X_X  // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
-//#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
+#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 //#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
 
 //

From 6db4cc249e05627911f63fddee2f83f5ed16841d Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 15 Jan 2020 16:36:06 +0300
Subject: [PATCH 023/565] lcd

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c0bcc0e0c2a5..1ecfeea3d21c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1792,7 +1792,7 @@
 // Note: Usually sold with a white PCB.
 //
 // default_ulti
-//#define REPRAP_DISCOUNT_SMART_CONTROLLER
+#define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader

From 9a26b01d104dff1e86300922a2a09b92875d50c1 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 15 Jan 2020 23:52:14 +0300
Subject: [PATCH 024/565] lcd

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 1ecfeea3d21c..a4642f5c849d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2001,7 +2001,7 @@
 //
 //#define FYSETC_MINI_12864_X_X  // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
-#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
+//#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 //#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
 
 //

From 7cb6e67d37a2b0ead0ef1de45965d4d6e91808dc Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 15 Jan 2020 23:52:32 +0300
Subject: [PATCH 025/565] 111

---
 Marlin/Configuration.h             | 15 ++++++++++++---
 Marlin/Configuration_adv.h         |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h | 21 ++++++++++++---------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a4642f5c849d..a453af3afc66 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1792,7 +1792,7 @@
 // Note: Usually sold with a white PCB.
 //
 // default_ulti
-#define REPRAP_DISCOUNT_SMART_CONTROLLER
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
@@ -2001,7 +2001,7 @@
 //
 //#define FYSETC_MINI_12864_X_X  // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
-//#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
+#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 //#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
 
 //
@@ -2206,8 +2206,17 @@
  * LED Type. Enable only one of the following two options.
  *
  */
-//#define RGB_LED
+#define RGB_LED
 //#define RGBW_LED
+#if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
+/************ 2.change the 3 line for mini12864 V1.2 and V2.0 **************/
+  #define RGB_LED_R_PIN 25
+  #define RGB_LED_G_PIN 27
+  #define RGB_LED_B_PIN 29
+  #define RGB_LED_W_PIN -1
+#endif
+
+
 
 #if EITHER(RGB_LED, RGBW_LED)
   //#define RGB_LED_R_PIN 34
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f15d9e882a05..907158cb46b0 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -930,7 +930,7 @@
    * LED Control Menu
    * Add LED Control to the LCD menu
    */
-  //#define LED_CONTROL_MENU
+  #define LED_CONTROL_MENU
   #if ENABLED(LED_CONTROL_MENU)
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
     #if ENABLED(LED_COLOR_PRESETS)
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 676197b84d0c..422933b47e5c 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -631,12 +631,13 @@
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN        37
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
+      #define LCD_BACKLIGHT_PIN -1   // backlight LED on A11/D65
+      #define LCD_RESET_PIN  23
+      #define SDSS   53
+      #define DOGLCD_A0         16
+      #define DOGLCD_CS         17
 
       // GLCD features
       // Uncomment screen orientation
@@ -644,12 +645,14 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1           31
+      #define BTN_EN2           33
+      #define BTN_ENC           35
 
       #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define KILL_PIN          -1
+      #define LCD_CONTRAST 200
+      #define SD_DETECT_PIN 49
 
     #elif ENABLED(ZONESTAR_LCD)
 

From b6708cb5b4a3f6bb32fec7dd5d3f25aa8bca2134 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 16 Jan 2020 00:25:55 +0300
Subject: [PATCH 026/565] Revert "Merge branch 'bugfix-2.0.x-UltiSteel' into
 ssavickiy"

This reverts commit 7a9c569bf59228363f8c09288993b470ae3bf9b8, reversing
changes made to f58be55ef0ad0e7456078702502a7a5b83fa2a60.
---
 Marlin/src/feature/pause.cpp        |  2 +-
 Marlin/src/gcode/sdcard/M21_M22.cpp | 11 +----------
 Marlin/src/lcd/menu/menu_main.cpp   | 22 +++++++++++-----------
 SyncOnboard/Program.cs              | 18 ++++++------------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 7d3fdc4cfa41..4c4f3aa0d4fc 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -422,7 +422,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
       }
     #endif
 
-    //return false; // unable to reach safe temperature, but need pause
+    return false; // unable to reach safe temperature
   }
 
   // Indicate that the printer is paused
diff --git a/Marlin/src/gcode/sdcard/M21_M22.cpp b/Marlin/src/gcode/sdcard/M21_M22.cpp
index 6ec1ef2bff32..9362db0808e9 100644
--- a/Marlin/src/gcode/sdcard/M21_M22.cpp
+++ b/Marlin/src/gcode/sdcard/M21_M22.cpp
@@ -26,7 +26,6 @@
 
 #include "../gcode.h"
 #include "../../sd/cardreader.h"
-#include "../../lcd/ultralcd.h"
 
 /**
  * M21: Init SD Card
@@ -36,14 +35,6 @@ void GcodeSuite::M21() { card.mount(); }
 /**
  * M22: Release SD Card
  */
-void GcodeSuite::M22() { 
-    if(card.isPrinting()) {
-      SERIAL_ERROR_MSG("No M22 while print");
-    } else {
-      card.release();
-      void menu_media();
-      if(MarlinUI::currentScreen == menu_media) MarlinUI::return_to_status();
-    }
-}
+void GcodeSuite::M22() { card.release(); }
 
 #endif // SDSUPPORT
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index b4bafd195991..3087067c8da1 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -90,17 +90,6 @@ void menu_main() {
     #endif
   ;
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      if (thermalManager.targetHotEnoughToExtrude(active_extruder))
-        GCODES_ITEM(MSG_FILAMENTCHANGE, PSTR("M600 B0"));
-      else
-        SUBMENU(MSG_FILAMENTCHANGE, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
-    #else
-      SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
-    #endif
-  #endif
-
   if (busy) {
     #if MACHINE_CAN_PAUSE
       ACTION_ITEM(MSG_PAUSE_PRINT, ui.pause_print);
@@ -183,6 +172,17 @@ void menu_main() {
     #endif
   #endif
 
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      if (thermalManager.targetHotEnoughToExtrude(active_extruder))
+        GCODES_ITEM(MSG_FILAMENTCHANGE, PSTR("M600 B0"));
+      else
+        SUBMENU(MSG_FILAMENTCHANGE, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
+    #else
+      SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
+    #endif
+  #endif
+
   #if ENABLED(LCD_INFO_MENU)
     SUBMENU(MSG_INFO_MENU, menu_info);
   #endif
diff --git a/SyncOnboard/Program.cs b/SyncOnboard/Program.cs
index f90f6d94a118..4c1614d1f8f9 100644
--- a/SyncOnboard/Program.cs
+++ b/SyncOnboard/Program.cs
@@ -85,7 +85,7 @@ private static void EnsureDestination() {
                             if (client.DefaultRequestHeaders.Count() == 0)
                                 client.DefaultRequestHeaders.Add("X-Api-Key", OctoprintApiKey);
                             //Octoprint M22
-                            Console.Write($"EnsureDestination: {server} M22:");
+                            Console.Write($"EnsureDestination: {server} M22...");
                             do {
                                 var content = new StringContent("{\"command\":\"release\"}", Encoding.UTF8, "application/json");
                                 var response = client.PostAsync(server, content);
@@ -103,21 +103,15 @@ private static void EnsureDestination() {
                         }
                     }
                     // Local COM port M22
-                    Console.Write($"EnsureDestination: {ComPort} M22:");
-                    using (var mySerialPort = new SerialPort(ComPort, 250000, Parity.None, 8, StopBits.One)) {
-                        mySerialPort.ReadTimeout = 1000;
-                        mySerialPort.DtrEnable = true;
+                    Console.Write($"EnsureDestination: {ComPort} M22");
+                    using (var mySerialPort = new SerialPort(ComPort, 250000)) {
                         mySerialPort.Open();
+                        mySerialPort.ReadTimeout = 1000;
                         byte[] data = Encoding.ASCII.GetBytes("M22\r\n");
                         var before = mySerialPort.ReadExisting();
                         mySerialPort.Write(data, 0, data.Length);
-                        var after = mySerialPort.ReadExisting().Replace("\n", "<cr>");
-                        if (before.Length + after.Length > 0) {
-                            Console.ForegroundColor = (after == "ok<cr>") ? ConsoleColor.Green : ConsoleColor.Red;
-                            Console.Write($".{before}.{after}");
-                            Console.ResetColor(); 
-                        }
-                        Console.WriteLine($". Pause 5 sec...");
+                        var after = mySerialPort.ReadExisting();
+                        Console.WriteLine($".{before}.{after} OK. Pause 5 sec...");
                         Thread.Sleep(5000);
                     }
                 } catch(Exception ex) { 

From 891b30a76da3879aed637241185e1693120d6939 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 16 Jan 2020 00:29:43 +0300
Subject: [PATCH 027/565] =?UTF-8?q?Revert=20"lcd=20=D0=B8=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=BB=20=D0=BD=D0=B0=2012864=20fysetc"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5eecf3b98344070d57341db8de4447eb5927a586.
---
 Marlin/Configuration.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a453af3afc66..c0d1f5a35aa3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1791,8 +1791,7 @@
 //
 // Note: Usually sold with a white PCB.
 //
-// default_ulti
-//#define REPRAP_DISCOUNT_SMART_CONTROLLER
+#define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
@@ -2001,7 +2000,7 @@
 //
 //#define FYSETC_MINI_12864_X_X  // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
-#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
+//#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 //#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
 
 //

From 6b44e0b8252980d7fac722bd557eb200fdf82f59 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 16 Jan 2020 00:31:17 +0300
Subject: [PATCH 028/565] Revert "lcd"

This reverts commit 9a26b01d104dff1e86300922a2a09b92875d50c1.
---
 Marlin/Configuration.h             | 15 +++++----------
 Marlin/Configuration_adv.h         |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h | 21 +++++++++------------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c0d1f5a35aa3..02efc4631202 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1791,6 +1791,10 @@
 //
 // Note: Usually sold with a white PCB.
 //
+<<<<<<< HEAD
+=======
+// default_ulti
+>>>>>>> parent of 7cb6e67d3... 111
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //
@@ -2205,17 +2209,8 @@
  * LED Type. Enable only one of the following two options.
  *
  */
-#define RGB_LED
+//#define RGB_LED
 //#define RGBW_LED
-#if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
-/************ 2.change the 3 line for mini12864 V1.2 and V2.0 **************/
-  #define RGB_LED_R_PIN 25
-  #define RGB_LED_G_PIN 27
-  #define RGB_LED_B_PIN 29
-  #define RGB_LED_W_PIN -1
-#endif
-
-
 
 #if EITHER(RGB_LED, RGBW_LED)
   //#define RGB_LED_R_PIN 34
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 907158cb46b0..f15d9e882a05 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -930,7 +930,7 @@
    * LED Control Menu
    * Add LED Control to the LCD menu
    */
-  #define LED_CONTROL_MENU
+  //#define LED_CONTROL_MENU
   #if ENABLED(LED_CONTROL_MENU)
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
     #if ENABLED(LED_COLOR_PRESETS)
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 422933b47e5c..676197b84d0c 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -631,13 +631,12 @@
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN        42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN -1   // backlight LED on A11/D65
-      #define LCD_RESET_PIN  23
-      #define SDSS   53
-      #define DOGLCD_A0         16
-      #define DOGLCD_CS         17
+      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+
+      #define DOGLCD_A0         44
+      #define DOGLCD_CS         66
 
       // GLCD features
       // Uncomment screen orientation
@@ -645,14 +644,12 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1           40
+      #define BTN_EN2           63
+      #define BTN_ENC           59
 
       #define SD_DETECT_PIN     49
-      #define KILL_PIN          -1
-      #define LCD_CONTRAST 200
-      #define SD_DETECT_PIN 49
+      #define KILL_PIN          64
 
     #elif ENABLED(ZONESTAR_LCD)
 

From 40b2306f9db27275b2660ba524939534f9f390ba Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 16 Jan 2020 00:37:13 +0300
Subject: [PATCH 029/565] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BA=D0=B0=D0=BA=20=D0=B1?=
 =?UTF-8?q?=D1=8B=D0=BB=D0=BE=20=D0=BD=D0=B0=202004=20lcd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 02efc4631202..7762657b3bbc 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1791,10 +1791,6 @@
 //
 // Note: Usually sold with a white PCB.
 //
-<<<<<<< HEAD
-=======
-// default_ulti
->>>>>>> parent of 7cb6e67d3... 111
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //

From 3fe7bb0cb17e7faad84fbf4f56fd7101032030d9 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 17 Jan 2020 02:21:42 +0300
Subject: [PATCH 030/565] lcd 12864

---
 Marlin/Configuration.h     | 4 ++--
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7762657b3bbc..afd3f8759477 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1791,7 +1791,7 @@
 //
 // Note: Usually sold with a white PCB.
 //
-#define REPRAP_DISCOUNT_SMART_CONTROLLER
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
@@ -2000,7 +2000,7 @@
 //
 //#define FYSETC_MINI_12864_X_X  // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
-//#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
+#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 //#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
 
 //
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f15d9e882a05..504bbec292a2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -930,7 +930,7 @@
    * LED Control Menu
    * Add LED Control to the LCD menu
    */
-  //#define LED_CONTROL_MENU
+  #define LED_CONTROL_MENU
   #if ENABLED(LED_CONTROL_MENU)
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
     #if ENABLED(LED_COLOR_PRESETS)
@@ -939,7 +939,7 @@
       #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
       #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
       #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
-      //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
+      #define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
     #endif
   #endif
 

From b8d22222f261de31d4d360933ddc79d81a98fdc1 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 23 Jan 2020 20:34:29 +0300
Subject: [PATCH 031/565] coment

---
 Marlin/Configuration_adv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 504bbec292a2..27ab4ffc9d17 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1159,7 +1159,8 @@
      * LCD_AND_ONBOARD - https://github.com/ursoft/Marlin/issues/5
      *
      * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE', 'LCD_AND_ONBOARD' ]
-     */
+     */ 
+    //#define SDCARD_CONNECTION ONBOARD  -для работы плагина firmware update с октопринта
     #define SDCARD_CONNECTION LCD_AND_ONBOARD
   #endif
 

From 7b229baa80f71eb0c87b7bbd082e533036746fc1 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 02:38:07 +0300
Subject: [PATCH 032/565] LCD 12854 TEST

---
 Marlin/Configuration.h                | 17 ++++++++++++-----
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index afd3f8759477..a35797fc654e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2205,14 +2205,21 @@
  * LED Type. Enable only one of the following two options.
  *
  */
-//#define RGB_LED
+#define RGB_LED
 //#define RGBW_LED
 
 #if EITHER(RGB_LED, RGBW_LED)
-  //#define RGB_LED_R_PIN 34
-  //#define RGB_LED_G_PIN 43
-  //#define RGB_LED_B_PIN 35
-  //#define RGB_LED_W_PIN -1
+ /* #define RGB_LED_R_PIN 21
+  #define RGB_LED_G_PIN 22
+  #define RGB_LED_B_PIN 23
+  #define RGB_LED_W_PIN -1
+*/
+//*ДЕФОЛТ
+  #define RGB_LED_R_PIN 34
+  #define RGB_LED_G_PIN 43
+  #define RGB_LED_B_PIN 35
+  #define RGB_LED_W_PIN -1
+//*/
 #endif
 
 // Support for Adafruit Neopixel LED driver
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index ae9614d67744..05b2bb120d61 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -85,7 +85,7 @@ U8G_CLASS u8g(U8G_PARAM);
 
   void MarlinUI::set_contrast(const int16_t value) {
     contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
-    u8g.setContrast(contrast);
+    u8g.setContrast(255);
   }
 
 #endif

From edd4f2fb00681c0f1d3d76d91b1b537ebf0280fb Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 12:45:51 +0300
Subject: [PATCH 033/565] LCD

---
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 05b2bb120d61..0e05fd91c7f0 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -85,6 +85,7 @@ U8G_CLASS u8g(U8G_PARAM);
 
   void MarlinUI::set_contrast(const int16_t value) {
     contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
+    //ДЛЯ РЕГУЛИРОВКИ ИЗ МЕНЮ ДИСПЛЕЯ u8g.setContrast(value);
     u8g.setContrast(255);
   }
 

From bafbd6ae3fb9978190e66919f7d226751289fa25 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 14:01:32 +0300
Subject: [PATCH 034/565] lcd

---
 Marlin/Configuration.h                | 7 -------
 Marlin/Configuration_adv.h            | 4 ++--
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp | 3 +--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a35797fc654e..6bec66965b78 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2209,17 +2209,10 @@
 //#define RGBW_LED
 
 #if EITHER(RGB_LED, RGBW_LED)
- /* #define RGB_LED_R_PIN 21
-  #define RGB_LED_G_PIN 22
-  #define RGB_LED_B_PIN 23
-  #define RGB_LED_W_PIN -1
-*/
-//*ДЕФОЛТ
   #define RGB_LED_R_PIN 34
   #define RGB_LED_G_PIN 43
   #define RGB_LED_B_PIN 35
   #define RGB_LED_W_PIN -1
-//*/
 #endif
 
 // Support for Adafruit Neopixel LED driver
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 27ab4ffc9d17..6695b76f7459 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -935,8 +935,8 @@
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
     #if ENABLED(LED_COLOR_PRESETS)
       #define LED_USER_PRESET_RED        255  // User defined RED value
-      #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
-      #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
+      #define LED_USER_PRESET_GREEN      255  // User defined GREEN value
+      #define LED_USER_PRESET_BLUE       255  // User defined BLUE value
       #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
       #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
       #define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 0e05fd91c7f0..ae9614d67744 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -85,8 +85,7 @@ U8G_CLASS u8g(U8G_PARAM);
 
   void MarlinUI::set_contrast(const int16_t value) {
     contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
-    //ДЛЯ РЕГУЛИРОВКИ ИЗ МЕНЮ ДИСПЛЕЯ u8g.setContrast(value);
-    u8g.setContrast(255);
+    u8g.setContrast(contrast);
   }
 
 #endif

From 868d138da161bb86799d38c909cd8bbf060b0dc2 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 19:56:12 +0300
Subject: [PATCH 035/565] LCD

---
 Marlin/Configuration.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6bec66965b78..75ca1add961e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2209,10 +2209,16 @@
 //#define RGBW_LED
 
 #if EITHER(RGB_LED, RGBW_LED)
+  /* ДЕФОЛТ
   #define RGB_LED_R_PIN 34
   #define RGB_LED_G_PIN 43
   #define RGB_LED_B_PIN 35
   #define RGB_LED_W_PIN -1
+  */
+  #define RGB_LED_R_PIN 25
+  #define RGB_LED_G_PIN 27
+  #define RGB_LED_B_PIN 29
+  #define RGB_LED_W_PIN -1
 #endif
 
 // Support for Adafruit Neopixel LED driver

From f98bc5237a426a61fb0402c945687ca77f0bb9ca Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 20:05:19 +0300
Subject: [PATCH 036/565] COMENT

---
 Marlin/Configuration_adv.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6695b76f7459..a5d29ff93629 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1160,7 +1160,6 @@
      *
      * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE', 'LCD_AND_ONBOARD' ]
      */ 
-    //#define SDCARD_CONNECTION ONBOARD  -для работы плагина firmware update с октопринта
     #define SDCARD_CONNECTION LCD_AND_ONBOARD
   #endif
 

From de166a7d151cf0f2ee35e7d48b9ec8cab7b2c2de Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 20:23:15 +0300
Subject: [PATCH 037/565] =?UTF-8?q?lcd=2012864=20=D0=BF=D0=BE=20=D1=82?=
 =?UTF-8?q?=D0=B8=D0=BF=D1=83=20=D1=82=D0=B8=D0=B3=D1=80=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h     | 8 +-------
 Marlin/Configuration_adv.h | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 75ca1add961e..2c420b5279f9 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2205,20 +2205,14 @@
  * LED Type. Enable only one of the following two options.
  *
  */
-#define RGB_LED
+//#define RGB_LED
 //#define RGBW_LED
 
 #if EITHER(RGB_LED, RGBW_LED)
-  /* ДЕФОЛТ
   #define RGB_LED_R_PIN 34
   #define RGB_LED_G_PIN 43
   #define RGB_LED_B_PIN 35
   #define RGB_LED_W_PIN -1
-  */
-  #define RGB_LED_R_PIN 25
-  #define RGB_LED_G_PIN 27
-  #define RGB_LED_B_PIN 29
-  #define RGB_LED_W_PIN -1
 #endif
 
 // Support for Adafruit Neopixel LED driver
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a5d29ff93629..6b325ab7f448 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -429,7 +429,7 @@
  */
 #define CASE_LIGHT_ENABLE
 #if ENABLED(CASE_LIGHT_ENABLE)
-  #define CASE_LIGHT_PIN P1_26                  // Override the default pin if needed //SKR 1.3 PIN Y+ SWITCH
+  #define CASE_LIGHT_PIN P1_26                  // включение подсветки кейса с экрана Override the default pin if needed //SKR 1.3 PIN Y+ SWITCH 
   #define INVERT_CASE_LIGHT false             // Set true if Case Light is ON when pin is LOW
   #define CASE_LIGHT_DEFAULT_ON true          // Set default power-up state on
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255   // Set default power-up brightness (0-255, requires PWM pin)

From bb24b4c9570015f049c4ecdbda01c9089920a008 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 20:27:20 +0300
Subject: [PATCH 038/565] =?UTF-8?q?lcd=20=D1=81=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=2012864=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?=
 =?UTF-8?q?=D0=B8=202.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 2c420b5279f9..ba0801f0b7bf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2000,8 +2000,8 @@
 //
 //#define FYSETC_MINI_12864_X_X  // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
-#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
-//#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
+//#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
+#define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
 
 //
 // Factory display for Creality CR-10

From e1cc9e2e4895440a91a6f1b5a75e4f7bba53574d Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 20:35:41 +0300
Subject: [PATCH 039/565] =?UTF-8?q?=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BE=D0=BF=D0=B8=D0=BA=D1=81=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ba0801f0b7bf..86c7ddfed0cc 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2216,7 +2216,7 @@
 #endif
 
 // Support for Adafruit Neopixel LED driver
-//#define NEOPIXEL_LED
+#define NEOPIXEL_LED
 #if ENABLED(NEOPIXEL_LED)
   #define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
   #define NEOPIXEL_PIN     4       // LED driving pin

From 8f8a5a6e3dd8e2123565d124f9ddd08a44f51f35 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 20:37:26 +0300
Subject: [PATCH 040/565] =?UTF-8?q?Revert=20"=D0=BE=D0=BF=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=D0=BE=D0=BF=D0=B8=D0=BA=D1=81=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e1cc9e2e4895440a91a6f1b5a75e4f7bba53574d.
---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 86c7ddfed0cc..ba0801f0b7bf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2216,7 +2216,7 @@
 #endif
 
 // Support for Adafruit Neopixel LED driver
-#define NEOPIXEL_LED
+//#define NEOPIXEL_LED
 #if ENABLED(NEOPIXEL_LED)
   #define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
   #define NEOPIXEL_PIN     4       // LED driving pin

From 9141b6a3d3d30f5375793d547fd2ca7f6aa7c183 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Fri, 24 Jan 2020 20:43:39 +0300
Subject: [PATCH 041/565] =?UTF-8?q?=D1=80=D1=83=D1=81=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D1=8F=D0=B7=D1=8B=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ba0801f0b7bf..6f91404a8744 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1639,7 +1639,7 @@
  *
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
  */
-#define LCD_LANGUAGE en
+#define LCD_LANGUAGE ru
 
 /**
  * LCD Character Set

From 79f17de75ed8e832bf96aac5b36bffe7b38c9c8e Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sat, 25 Jan 2020 21:55:29 +0300
Subject: [PATCH 042/565] UART TMC2208

---
 Marlin/Configuration.h     |  8 +++----
 Marlin/Configuration_adv.h | 44 +++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6f91404a8744..720db83c7866 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -706,14 +706,14 @@
  *          TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
  * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
  */
-#define X_DRIVER_TYPE  TMC2208_STANDALONE
-#define Y_DRIVER_TYPE  TMC2208_STANDALONE
-#define Z_DRIVER_TYPE  TMC2208_STANDALONE
+#define X_DRIVER_TYPE  TMC2208
+#define Y_DRIVER_TYPE  TMC2208
+#define Z_DRIVER_TYPE  TMC2208
 //#define X2_DRIVER_TYPE A4988
 //#define Y2_DRIVER_TYPE A4988
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
-#define E0_DRIVER_TYPE TMC2208_STANDALONE  
+#define E0_DRIVER_TYPE TMC2208  
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6b325ab7f448..d4c092f24717 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -946,7 +946,7 @@
 #endif // HAS_LCD_MENU
 
 // Scroll a longer status message into view
-//#define STATUS_MESSAGE_SCROLLING
+#define STATUS_MESSAGE_SCROLLING
 
 // On the Info Screen, display XY with one decimal place when possible
 //#define LCD_DECIMAL_SMALL_XY
@@ -996,7 +996,7 @@
   // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
   #define SDCARD_RATHERRECENTFIRST
 
-  //#define SD_MENU_CONFIRM_START             // Confirm the selected SD file before printing
+  #define SD_MENU_CONFIRM_START             // Confirm the selected SD file before printing
   #define SD_SHOW_FILES_ON_MEDIA_INSERTED   // https://github.com/ursoft/Marlin/issues/3
   //#define MENU_ADDAUTOSTART               // Add a menu option to run auto#.g files
 
@@ -1070,7 +1070,7 @@
   #endif
  
   // Enable this option to scroll long filenames in the SD card menu
-  //#define SCROLL_LONG_FILENAMES
+  #define SCROLL_LONG_FILENAMES
 
   // Leave the heaters on after Stop Print (not recommended!)
   //#define SD_ABORT_NO_COOLDOWN
@@ -1423,11 +1423,7 @@
  * See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
  * Mention @Sebastianv650 on GitHub to alert the author of any issues.
  */
-#if (GITHUB_USER==URSOFT)
- //#define LIN_ADVANCE
-#else
- //#define LIN_ADVANCE //conflicts with stealthChop (UltiSteel stock) mode of TMC2208 (E stops extruding at ~10 layer)
-#endif
+#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
   //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
   #define LIN_ADVANCE_K 0       // Unit: mm compression per 1mm/s extruder speed
@@ -1558,7 +1554,7 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MINIMUM_STEPPER_PULSE 2
+#define MINIMUM_STEPPER_PULSE 2 // если не работает 2, ставим 4 Если выше включили Linear Advance, необходимо также изменить значение MINIMUM_STEPPER_PULSE для работоспособности экструдера
 
 /**
  * Maximum stepping rate (in Hz) the stepper driver allows
@@ -1891,14 +1887,14 @@
  */
 #if HAS_TRINAMIC
 
-  #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current
-  #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256
+  #define HOLD_MULTIPLIER    0.6  // Scales down the holding current from run current Множитель тока в режиме удержания ШД
+  #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
-    #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current.
+    #define X_CURRENT       500        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
-    #define X_MICROSTEPS     16    // 0..256
-    #define X_RSENSE          0.11
+    #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
+    #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
     #define X_CHAIN_POS      -1    // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ...
   #endif
 
@@ -1911,7 +1907,7 @@
   #endif
 
   #if AXIS_IS_TMC(Y)
-    #define Y_CURRENT       800
+    #define Y_CURRENT       500
     #define Y_CURRENT_HOME  Y_CURRENT
     #define Y_MICROSTEPS     16
     #define Y_RSENSE          0.11
@@ -1927,7 +1923,7 @@
   #endif
 
   #if AXIS_IS_TMC(Z)
-    #define Z_CURRENT       800
+    #define Z_CURRENT       500
     #define Z_CURRENT_HOME  Z_CURRENT
     #define Z_MICROSTEPS     16
     #define Z_RSENSE          0.11
@@ -1951,7 +1947,7 @@
   #endif
 
   #if AXIS_IS_TMC(E0)
-    #define E0_CURRENT      800
+    #define E0_CURRENT      500
     #define E0_MICROSTEPS    16
     #define E0_RSENSE         0.11
     #define E0_CHAIN_POS     -1
@@ -2090,7 +2086,7 @@
    * M912 - Clear stepper driver overtemperature pre-warn condition flag.
    * M122 - Report driver parameters (Requires TMC_DEBUG)
    */
-  //#define MONITOR_DRIVER_STATUS
+  #define MONITOR_DRIVER_STATUS
 
   #if ENABLED(MONITOR_DRIVER_STATUS)
     #define CURRENT_STEP_DOWN     50  // [mA]
@@ -2105,16 +2101,16 @@
    * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD.
    * M913 X/Y/Z/E to live tune the setting
    */
-  //#define HYBRID_THRESHOLD
+  #define HYBRID_THRESHOLD
 
-  #define X_HYBRID_THRESHOLD     100  // [mm/s]
+  #define X_HYBRID_THRESHOLD     120  // [mm/s]
   #define X2_HYBRID_THRESHOLD    100
-  #define Y_HYBRID_THRESHOLD     100
+  #define Y_HYBRID_THRESHOLD     120
   #define Y2_HYBRID_THRESHOLD    100
-  #define Z_HYBRID_THRESHOLD       3
+  #define Z_HYBRID_THRESHOLD      10
   #define Z2_HYBRID_THRESHOLD      3
   #define Z3_HYBRID_THRESHOLD      3
-  #define E0_HYBRID_THRESHOLD     30
+  #define E0_HYBRID_THRESHOLD     15
   #define E1_HYBRID_THRESHOLD     30
   #define E2_HYBRID_THRESHOLD     30
   #define E3_HYBRID_THRESHOLD     30
@@ -2174,7 +2170,7 @@
    * Enable M122 debugging command for TMC stepper drivers.
    * M122 S0/1 will enable continous reporting.
    */
-  //#define TMC_DEBUG
+  #define TMC_DEBUG
 
   /**
    * You can set your own advanced settings by filling in predefined functions.

From 4767f76547d06afa67ea841baddc43fa2613ea1e Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sat, 25 Jan 2020 22:08:43 +0300
Subject: [PATCH 043/565] UART TMC2208 2

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 720db83c7866..e6a54995235f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -128,7 +128,7 @@
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
-//#define SERIAL_PORT_2 -1
+#define SERIAL_PORT_2 0
 
 /**
  * This setting determines the communication speed of the printer.

From 49cdd5af82c5ee7f644124e3e40cf94b28a822c8 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 00:23:15 +0300
Subject: [PATCH 044/565] current tmc

---
 Marlin/Configuration_adv.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 46c4e2d1d329..17bb42c2cbfe 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1891,7 +1891,7 @@
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
-    #define X_CURRENT       500        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
+    #define X_CURRENT       700        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
     #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
     #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
@@ -1907,7 +1907,7 @@
   #endif
 
   #if AXIS_IS_TMC(Y)
-    #define Y_CURRENT       500
+    #define Y_CURRENT       700
     #define Y_CURRENT_HOME  Y_CURRENT
     #define Y_MICROSTEPS     16
     #define Y_RSENSE          0.11
@@ -1923,7 +1923,7 @@
   #endif
 
   #if AXIS_IS_TMC(Z)
-    #define Z_CURRENT       500
+    #define Z_CURRENT       550
     #define Z_CURRENT_HOME  Z_CURRENT
     #define Z_MICROSTEPS     16
     #define Z_RSENSE          0.11
@@ -1947,7 +1947,7 @@
   #endif
 
   #if AXIS_IS_TMC(E0)
-    #define E0_CURRENT      500
+    #define E0_CURRENT      550
     #define E0_MICROSTEPS    16
     #define E0_RSENSE         0.11
     #define E0_CHAIN_POS     -1

From 838a420e27cc740e0891f1a165b66b212ff59dac Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jan 2020 00:06:19 +0000
Subject: [PATCH 045/565] [cron] Bump distribution date (2020-01-26)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 278fa14de135..8d4b2fdc3892 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-24"
+  #define STRING_DISTRIBUTION_DATE "2020-01-26"
 #endif
 
 /**

From fef3b9e58589c3b0068761d352233215c6af01fb Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 03:37:28 +0300
Subject: [PATCH 046/565] Revert "UART TMC2208 2"

This reverts commit 4767f76547d06afa67ea841baddc43fa2613ea1e.
---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e6a54995235f..720db83c7866 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -128,7 +128,7 @@
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
-#define SERIAL_PORT_2 0
+//#define SERIAL_PORT_2 -1
 
 /**
  * This setting determines the communication speed of the printer.

From 5e54568123e3fffa8742ccdc90f2999c872358e7 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 03:42:38 +0300
Subject: [PATCH 047/565] =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=B8=20=D0=BD=D0=B5=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D0=BD=20=D0=B2=20=D0=BE=D0=BA=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 17bb42c2cbfe..8b25578e421b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -715,7 +715,7 @@
 //#define HOME_AFTER_DEACTIVATE  // Require rehoming after steppers are deactivated
 
 // Minimum time that a segment needs to take if the buffer is emptied
-#define DEFAULT_MINSEGMENTTIME        20000   // (ms)
+#define DEFAULT_MINSEGMENTTIME        50000   // (ms)
 
 // If defined the movements slow down when the look ahead buffer is only half full
 #define SLOWDOWN
@@ -955,7 +955,7 @@
 #define LCD_TIMEOUT_TO_STATUS 60000
 
 // Add an 'M73' G-code to set the current percentage
-//#define LCD_SET_PROGRESS_MANUALLY
+#define LCD_SET_PROGRESS_MANUALLY
 
 // Show the E position (filament used) during printing
 //#define LCD_SHOW_E_TOTAL
@@ -1584,7 +1584,7 @@
 // The number of linear motions that can be in the plan at any give time.
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering.
 #if ENABLED(SDSUPPORT)
-  #define BLOCK_BUFFER_SIZE 64 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
+  #define BLOCK_BUFFER_SIZE 32 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
 #else
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
 #endif
@@ -1593,7 +1593,7 @@
 
 // The ASCII buffer for serial input
 #define MAX_CMD_SIZE 96
-#define BUFSIZE 4
+#define BUFSIZE 32
 
 // Transmission to Host Buffer Size
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
@@ -1602,7 +1602,7 @@
 // For debug-echo: 128 bytes for the optimal speed.
 // Other output doesn't need to be that speedy.
 // :[0, 2, 4, 8, 16, 32, 64, 128, 256]
-#define TX_BUFFER_SIZE 0
+#define TX_BUFFER_SIZE 32
 
 // Host Receive Buffer Size
 // Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
@@ -1954,7 +1954,7 @@
   #endif
 
   #if AXIS_IS_TMC(E1)
-    #define E1_CURRENT      800
+    #define E1_CURRENT      550
     #define E1_MICROSTEPS    16
     #define E1_RSENSE         0.11
     #define E1_CHAIN_POS     -1

From 2663da7fef21dcb6368eb87aafac4b853050411b Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 04:02:10 +0300
Subject: [PATCH 048/565] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20lcd=20conrast.=20=D1=82=D0=B0=D0=BA=D0=B6=D0=B5=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=8E=D1=82=D1=81=D1=8F=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B5=D0=B2=20=D0=BD=D0=B0=20=D1=8D=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D1=82=D0=B8,=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B6=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B7=D0=B0=20=20//#define=20LCD=5FSET=5FPROGRESS?=
 =?UTF-8?q?=5FMANUALLY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 720db83c7866..fe064c10def6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2002,7 +2002,7 @@
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 #define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
-
+#define DEFAULT_LCD_CONTRAST 255
 //
 // Factory display for Creality CR-10
 // https://www.aliexpress.com/item/32833148327.html
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 8b25578e421b..95096ed6c0ec 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -955,7 +955,7 @@
 #define LCD_TIMEOUT_TO_STATUS 60000
 
 // Add an 'M73' G-code to set the current percentage
-#define LCD_SET_PROGRESS_MANUALLY
+//#define LCD_SET_PROGRESS_MANUALLY
 
 // Show the E position (filament used) during printing
 //#define LCD_SHOW_E_TOTAL

From 19785423d1490ea9e8f485477040e740020088d4 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 05:26:27 +0300
Subject: [PATCH 049/565] =?UTF-8?q?=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=81=20=D0=BE=D0=BA=D1=82=D0=BE=D0=BF=D1=80=D0=B8=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81?=
 =?UTF-8?q?-=D0=B1=D0=B0=D1=80=20=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 95096ed6c0ec..8b25578e421b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -955,7 +955,7 @@
 #define LCD_TIMEOUT_TO_STATUS 60000
 
 // Add an 'M73' G-code to set the current percentage
-//#define LCD_SET_PROGRESS_MANUALLY
+#define LCD_SET_PROGRESS_MANUALLY
 
 // Show the E position (filament used) during printing
 //#define LCD_SHOW_E_TOTAL

From 63b49f4086eca4be03ba183bf147a7bf8520cf17 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 05:49:56 +0300
Subject: [PATCH 050/565] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BD=D1=8F=D0=BB=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BA=20=D0=BD=D0=B0=20XY=20=D0=B4=D0=BE=20890=20?=
 =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D1=83=D0=B5=D1=82=20vref=201.25,=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=B1=D1=8B=D0=BB=D0=BE=20?=
 =?UTF-8?q?=D1=81=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B5=D0=B8=20=D1=81=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B5=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 8b25578e421b..514ef1b48f3c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1891,7 +1891,7 @@
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
-    #define X_CURRENT       700        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
+    #define X_CURRENT       890        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
     #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
     #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
@@ -1907,7 +1907,7 @@
   #endif
 
   #if AXIS_IS_TMC(Y)
-    #define Y_CURRENT       700
+    #define Y_CURRENT       890
     #define Y_CURRENT_HOME  Y_CURRENT
     #define Y_MICROSTEPS     16
     #define Y_RSENSE          0.11

From 3d4a21e798b9d0744ba8654c1c25f6146be6dcff Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 06:27:00 +0300
Subject: [PATCH 051/565] =?UTF-8?q?=D0=BD=D0=B5=D1=82=20=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index fe064c10def6..b9fb2090bcea 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2002,7 +2002,7 @@
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 #define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
-#define DEFAULT_LCD_CONTRAST 255
+//#define DEFAULT_LCD_CONTRAST 255 изображение на экране пропадает. на команды пример M150 P200 B5 R55 U250 W100 меняется только яркость и цвет. 
 //
 // Factory display for Creality CR-10
 // https://www.aliexpress.com/item/32833148327.html

From 95d5a0c480d655bf96a6989ad3df0f240ae343b2 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sat, 25 Jan 2020 22:02:06 -0800
Subject: [PATCH 052/565] Fix DELTA_CALIBRATION_MENU recursive call (#16656)

---
 Marlin/src/feature/bedlevel/bedlevel.cpp     |  2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp        |  4 ++--
 Marlin/src/gcode/bedlevel/mbl/G29.cpp        |  4 ++--
 Marlin/src/lcd/menu/menu_bed_leveling.cpp    | 10 ++++------
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 12 ++++++++----
 Marlin/src/lcd/ultralcd.cpp                  |  4 ++++
 Marlin/src/lcd/ultralcd.h                    |  8 +++++---
 7 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 547c6af0b32f..9aa3ae0a57c0 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -247,7 +247,7 @@ void reset_bed_level() {
     current_position = pos;
 
     #if ENABLED(LCD_BED_LEVELING)
-      ui.wait_for_bl_move = false;
+      ui.wait_for_move = false;
     #endif
   }
 
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 53c48a62b6e4..7cbaefbf23e9 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -508,7 +508,7 @@ G29_TYPE GcodeSuite::G29() {
       set_bed_leveling_enabled(abl_should_enable);
       g29_in_progress = false;
       #if ENABLED(LCD_BED_LEVELING)
-        ui.wait_for_bl_move = false;
+        ui.wait_for_move = false;
       #endif
     }
 
@@ -810,7 +810,7 @@ G29_TYPE GcodeSuite::G29() {
   #if ENABLED(PROBE_MANUALLY)
     g29_in_progress = false;
     #if ENABLED(LCD_BED_LEVELING)
-      ui.wait_for_bl_move = false;
+      ui.wait_for_move = false;
     #endif
   #endif
 
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 944e8d3a69bf..92d95f169b6f 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -88,7 +88,7 @@ void GcodeSuite::G29() {
     case MeshStart:
       mbl.reset();
       mbl_probe_index = 0;
-      if (!ui.wait_for_bl_move) {
+      if (!ui.wait_for_move) {
         queue.inject_P(PSTR("G28\nG29 S2"));
         return;
       }
@@ -148,7 +148,7 @@ void GcodeSuite::G29() {
         #endif
 
         #if ENABLED(LCD_BED_LEVELING)
-          ui.wait_for_bl_move = false;
+          ui.wait_for_move = false;
         #endif
       }
       break;
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 753aa3d5e18b..6cc40cab6ca4 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -56,8 +56,6 @@
     #endif
   );
 
-  bool MarlinUI::wait_for_bl_move; // = false
-
   //
   // Bed leveling is done. Wait for G29 to complete.
   // A flag is used so that this can release control
@@ -70,7 +68,7 @@
   // ** This blocks the command queue! **
   //
   void _lcd_level_bed_done() {
-    if (!ui.wait_for_bl_move) {
+    if (!ui.wait_for_move) {
       #if MANUAL_PROBE_HEIGHT > 0 && DISABLED(MESH_BED_LEVELING)
         // Display "Done" screen and wait for moves to complete
         line_to_z(MANUAL_PROBE_HEIGHT);
@@ -103,7 +101,7 @@
         //
         // The last G29 records the point and enables bed leveling
         //
-        ui.wait_for_bl_move = true;
+        ui.wait_for_move = true;
         ui.goto_screen(_lcd_level_bed_done);
         #if ENABLED(MESH_BED_LEVELING)
           queue.inject_P(PSTR("G29 S2"));
@@ -146,7 +144,7 @@
       MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_LEVEL_BED_NEXT_POINT), msg);
     }
     ui.refresh(LCDVIEW_CALL_NO_REDRAW);
-    if (!ui.wait_for_bl_move) ui.goto_screen(_lcd_level_bed_get_z);
+    if (!ui.wait_for_move) ui.goto_screen(_lcd_level_bed_get_z);
   }
 
   //
@@ -156,7 +154,7 @@
     ui.goto_screen(_lcd_level_bed_moving);
 
     // G29 Records Z, moves, and signals when it pauses
-    ui.wait_for_bl_move = true;
+    ui.wait_for_move = true;
     #if ENABLED(MESH_BED_LEVELING)
       queue.inject_P(manual_probe_index ? PSTR("G29 S2") : PSTR("G29 S1"));
     #elif ENABLED(PROBE_MANUALLY)
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 75c427bafaac..e26a0966c2cb 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -41,10 +41,14 @@
 #endif
 
 void _man_probe_pt(const xy_pos_t &xy) {
-  do_blocking_move_to_xy_z(xy, Z_CLEARANCE_BETWEEN_PROBES);
-  ui.synchronize();
-  move_menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / float(DEFAULT_XYZ_STEPS_PER_UNIT));
-  ui.goto_screen(lcd_move_z);
+  if (!ui.wait_for_move) {
+    ui.wait_for_move = true;
+    do_blocking_move_to_xy_z(xy, Z_CLEARANCE_BETWEEN_PROBES);
+    ui.wait_for_move = false;
+    ui.synchronize();
+    move_menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / float(DEFAULT_XYZ_STEPS_PER_UNIT));
+    ui.goto_screen(lcd_move_z);
+  }
 }
 
 #if ENABLED(DELTA_AUTO_CALIBRATION)
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 380b18a07cf3..04ebd5079f6d 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -45,6 +45,10 @@ MarlinUI ui;
   #endif
 #endif
 
+#if LCD_HAS_WAIT_FOR_MOVE
+  bool MarlinUI::wait_for_move; // = false
+#endif
+
 #if HAS_SPI_LCD
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
     uint8_t MarlinUI::status_scroll_offset; // = 0
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index c56f0b8350bc..c98d3d562788 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -532,10 +532,12 @@ class MarlinUI {
 
   #endif
 
-  #if ENABLED(LCD_BED_LEVELING) && EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)
-    static bool wait_for_bl_move;
+  #define LCD_HAS_WAIT_FOR_MOVE EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION) || (ENABLED(LCD_BED_LEVELING) && EITHER(PROBE_MANUALLY, MESH_BED_LEVELING))
+
+  #if LCD_HAS_WAIT_FOR_MOVE
+    static bool wait_for_move;
   #else
-    static constexpr bool wait_for_bl_move = false;
+    static constexpr bool wait_for_move = false;
   #endif
 
   #if HAS_LCD_MENU && EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)

From e3611ad209582a222562ec88332c8ad9f85e2937 Mon Sep 17 00:00:00 2001
From: 0r31 <37673727+0r31@users.noreply.github.com>
Date: Sun, 26 Jan 2020 08:08:40 +0100
Subject: [PATCH 053/565] Fix MKS Base + Digipot compile error (#16636)

---
 .../HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c    | 1 -
 .../HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h    | 1 +
 Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h             | 8 ++++++++
 Marlin/src/feature/digipot/digipot_mcp4451.cpp            | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
index 8dc8c61b453d..dd83c7a97193 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
+++ b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
@@ -36,7 +36,6 @@
 #endif
 
 #include "digipot_mcp4451_I2C_routines.h"
-#include "i2c_util.h"
 
 // These two routines are exact copies of the lpc17xx_i2c.c routines.  Couldn't link to
 // to the lpc17xx_i2c.c routines so had to copy them into this file & rename them.
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
index 6d6fafa8bb78..db6715e2b67e 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
@@ -33,6 +33,7 @@
 #include <lpc17xx_i2c.h>
 #include <lpc17xx_pinsel.h>
 #include <lpc17xx_libcfg_default.h>
+#include "i2c_util.h"
 
 uint8_t digipot_mcp4451_start(uint8_t sla);
 uint8_t digipot_mcp4451_send_byte(uint8_t data);
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h b/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
index 671a1e3746f3..1ca3fc184452 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
@@ -45,4 +45,12 @@
 #include <lpc17xx_pinsel.h>
 #include <lpc17xx_libcfg_default.h>
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
 void configure_i2c(const uint8_t clock_option);
+
+#ifdef __cplusplus
+  }
+#endif
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index 13022abad1d0..48b4d154be2a 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -77,7 +77,7 @@ void digipot_i2c_set_current(const uint8_t channel, const float current) {
 
 void digipot_i2c_init() {
   #if MB(MKS_SBASE)
-    configure_i2c();
+    configure_i2c(16); // Setting clock_option to 16 ensure the I2C bus is initialized at 400kHz
   #else
     Wire.begin();
   #endif

From 6357619ab29d2e03db883a1ebe8ee16b2714c55c Mon Sep 17 00:00:00 2001
From: Luc <8822552+luc-github@users.noreply.github.com>
Date: Sun, 26 Jan 2020 15:11:30 +0800
Subject: [PATCH 054/565] Add ESP3DLib idletask entry point (#16658)

---
 Marlin/src/HAL/HAL_ESP32/HAL.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
index 73e60c17800e..7bc007f3c4c1 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
@@ -111,6 +111,9 @@ void HAL_idletask() {
   #if BOTH(WIFISUPPORT, OTASUPPORT)
     OTA_handle();
   #endif
+  #if ENABLED(ESP3D_WIFISUPPORT)
+    esp3dlib.idletask();
+  #endif
 }
 
 void HAL_clear_reset_source() { }

From 4a71285c34e161b9f38079e40d8bac2861f8ff78 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 26 Jan 2020 22:05:34 +1300
Subject: [PATCH 055/565] Fix Serial defines for M43 on AVR (#16649)

---
 Marlin/src/pins/pinsDebug.h | 52 +++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index d53b65583796..1972c3ba94f4 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -137,31 +137,33 @@ const PinInfo pin_array[] PROGMEM = {
     #endif
   #endif
 
-  #if SERIAL_PORT_2 == 0
-    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
-      { RXD_NAME_0, 0, true },
-      { TXD_NAME_0, 1, true },
-    #elif AVR_ATmega1284_FAMILY
-      { RXD_NAME_0, 8, true },
-      { TXD_NAME_0, 9, true },
-    #endif
-  #elif SERIAL_PORT_2 == 1
-    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
-      { RXD_NAME_1, 19, true },
-      { TXD_NAME_1, 18, true },
-    #elif AVR_ATmega1284_FAMILY
-      { RXD_NAME_1, 10, true },
-      { TXD_NAME_1, 11, true },
-    #endif
-  #elif SERIAL_PORT_2 == 2
-    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
-      { RXD_NAME_2, 17, true },
-      { TXD_NAME_2, 16, true },
-    #endif
-  #elif SERIAL_PORT_2 == 3
-    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
-      { RXD_NAME_3, 15, true },
-      { TXD_NAME_3, 14, true },
+  #ifdef SERIAL_PORT_2
+    #if SERIAL_PORT_2 == 0
+      #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
+        { RXD_NAME_0, 0, true },
+        { TXD_NAME_0, 1, true },
+      #elif AVR_ATmega1284_FAMILY
+        { RXD_NAME_0, 8, true },
+        { TXD_NAME_0, 9, true },
+      #endif
+    #elif SERIAL_PORT_2 == 1
+      #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
+        { RXD_NAME_1, 19, true },
+        { TXD_NAME_1, 18, true },
+      #elif AVR_ATmega1284_FAMILY
+        { RXD_NAME_1, 10, true },
+        { TXD_NAME_1, 11, true },
+      #endif
+    #elif SERIAL_PORT_2 == 2
+      #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
+        { RXD_NAME_2, 17, true },
+        { TXD_NAME_2, 16, true },
+      #endif
+    #elif SERIAL_PORT_2 == 3
+      #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
+        { RXD_NAME_3, 15, true },
+        { TXD_NAME_3, 14, true },
+      #endif
     #endif
   #endif
 

From 44d400db83e2efe9d4544aa49f4ab8f0042ba00c Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 26 Jan 2020 01:16:03 -0800
Subject: [PATCH 056/565] Fix HOMING_BACKOFF_MM for DELTA (#16657)

---
 Marlin/src/module/delta.cpp  | 10 +++++++++-
 Marlin/src/module/motion.cpp | 10 ++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index bc547f615927..bed5cd24cf48 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -254,7 +254,7 @@ void home_delta() {
       - probe_offset.z
     #endif
   );
-  line_to_current_position(homing_feedrate(X_AXIS));
+  line_to_current_position(homing_feedrate(Z_AXIS));
   planner.synchronize();
 
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
@@ -280,6 +280,14 @@ void home_delta() {
 
   sync_plan_position();
 
+  #if DISABLED(DELTA_HOME_TO_SAFE_ZONE) && defined(HOMING_BACKOFF_MM)
+    constexpr xyz_float_t endstop_backoff = HOMING_BACKOFF_MM;
+    if (endstop_backoff.z) {
+      current_position.z -= ABS(endstop_backoff.z) * Z_HOME_DIR;
+      line_to_current_position(homing_feedrate(Z_AXIS));
+    }
+  #endif
+
   if (DEBUGGING(LEVELING)) DEBUG_POS("<<< home_delta", current_position);
 }
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 4c1b5340df09..9d0422c4a62b 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1748,15 +1748,9 @@ void homeaxis(const AxisEnum axis) {
     if (axis == Z_AXIS && STOW_PROBE()) return;
   #endif
 
-  #ifdef HOMING_BACKOFF_MM
+  #if DISABLED(DELTA) && defined(HOMING_BACKOFF_MM)
     constexpr xyz_float_t endstop_backoff = HOMING_BACKOFF_MM;
-    const float backoff_mm = endstop_backoff[
-      #if ENABLED(DELTA)
-        Z_AXIS
-      #else
-        axis
-      #endif
-    ];
+    const float backoff_mm = endstop_backoff[axis];
     if (backoff_mm) {
       current_position[axis] -= ABS(backoff_mm) * axis_home_dir;
       line_to_current_position(

From bbfbcb8a5d938df2f2da0baca128046a0eb4792d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 26 Jan 2020 03:20:02 -0600
Subject: [PATCH 057/565] Clean up PID language defines

---
 Marlin/src/lcd/language/language_cz.h      | 8 --------
 Marlin/src/lcd/language/language_de.h      | 8 --------
 Marlin/src/lcd/language/language_el_gr.h   | 8 --------
 Marlin/src/lcd/language/language_en.h      | 2 ++
 Marlin/src/lcd/language/language_it.h      | 8 --------
 Marlin/src/lcd/language/language_jp_kana.h | 8 --------
 Marlin/src/lcd/language/language_pl.h      | 8 --------
 Marlin/src/lcd/language/language_ru.h      | 8 --------
 Marlin/src/lcd/language/language_sk.h      | 8 --------
 Marlin/src/lcd/language/language_uk.h      | 8 --------
 Marlin/src/lcd/language/language_vi.h      | 8 --------
 Marlin/src/lcd/language/language_zh_CN.h   | 8 --------
 Marlin/src/lcd/language/language_zh_TW.h   | 8 --------
 13 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 6703d300dee9..6a65f094078c 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -266,14 +266,6 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Vyp");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID automatika");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID automatika *");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Vybrat");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vybrat *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Zrychl");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 008cb6f924ad..6d5b665dbf3b 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -245,14 +245,6 @@ namespace Language_de {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto Temperatur");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("an");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("aus");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Auswählen");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Auswählen *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Beschleunigung");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 3e6e07f0bbbf..c2acbf400a68 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -102,14 +102,6 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Αυτομ. ρύθμιση θερμοκρασίας");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Ενεργοποιημένο");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Απενεργοποιημένο");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Επιτάχυνση");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Vαντίδραση");
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 363aff4820da..a0e54b5b31e3 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -265,6 +265,8 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
   PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
   PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
+  PROGMEM Language_Str MSG_PID_F                           = _UxGT("PID-F");
+  PROGMEM Language_Str MSG_PID_F_E                         = _UxGT("PID-F *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Select");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Select *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index ea17a076b6a9..66b45f298700 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -255,14 +255,6 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Off");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autotune");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Seleziona");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seleziona *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index adb39dfe4094..81580b71ed39 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -110,14 +110,6 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("ジドウオンドセイギョ");               // "Autotemp"
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("オン");                         // "On"
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("オフ");                         // "Off"
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("センタク");                     // "Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("センタク *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("カソクド mm/s²");               // "Accel"
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index b9bb9541e788..972f5044b1bb 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -254,14 +254,6 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Wył.");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autostrojenie");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autostrojenie *");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Wybierz");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Wybierz *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Przyspieszenie");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 00b351b0307b..d7e4de5dd203 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -222,14 +222,6 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Автотемпература");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Вкл.");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Выкл.");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Выбор");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Выбор *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Ускорение");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 348751949835..acb829870204 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -257,14 +257,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Vyp");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID kalibrácia");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID kalibrácia *");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Vybrať");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vybrať *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Zrýchlenie");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 78e0cf7cfb21..f7234fb83f2d 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -102,14 +102,6 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Автотемпер.");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Увімк.");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Вимк.");
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Вибрати");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Вибрати *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Приск.");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 6a42933c1931..b5ecd019acf2 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -222,14 +222,6 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Nhiệt độ tự động");                     // Autotemp
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Bật");                                  // on
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Tắt");                                  // off
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Lựa");                                  // Select
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Lựa *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Tăng Tốc");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 9a52ac2f8299..4e730924e2c6 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -199,14 +199,6 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自动控温");     //"Autotemp"
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("开");     //"On"
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("关");     //"Off"
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");     //"PID-P"
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");     //"PID-I"
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");     //"PID-D"
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");     //"PID-C"
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("选择");     //"Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("选择 *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 92343b3efaf8..f260836916f8 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -199,14 +199,6 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自動控溫");     //"Autotemp"
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開");     //"On"
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關");     //"Off"
-  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");     //"PID-P"
-  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
-  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");     //"PID-I"
-  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
-  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");     //"PID-D"
-  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
-  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");     //"PID-C"
-  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     //"Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("選擇 *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration

From 1d1dc8e33934c0f837d0c590e8fe8d2a61a1c64b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 26 Jan 2020 03:20:11 -0600
Subject: [PATCH 058/565] More 8 extruder defines

---
 Marlin/Configuration_adv.h           | 12 ++++++++++++
 Marlin/src/inc/SanityCheck.h         |  4 ++++
 Marlin/src/module/stepper/TMC26X.cpp | 12 ++++++++++++
 Marlin/src/module/temperature.h      |  2 +-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7d453e1dae02..51fcd1f4b64c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1957,6 +1957,18 @@
     #define E5_MICROSTEPS       16
   #endif
 
+  #if AXIS_DRIVER_TYPE_E6(TMC26X)
+    #define E6_MAX_CURRENT    1000
+    #define E6_SENSE_RESISTOR   91
+    #define E6_MICROSTEPS       16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_E7(TMC26X)
+    #define E7_MAX_CURRENT    1000
+    #define E7_SENSE_RESISTOR   91
+    #define E7_MICROSTEPS       16
+  #endif
+
 #endif // TMC26X
 
 // @section tmc_smart
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 58c284746baf..a91131e083f9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2140,6 +2140,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   INVALID_TMC_ADDRESS(E4);
 #elif AXIS_DRIVER_TYPE_E5(TMC2209)
   INVALID_TMC_ADDRESS(E5);
+#elif AXIS_DRIVER_TYPE_E6(TMC2209)
+  INVALID_TMC_ADDRESS(E6);
+#elif AXIS_DRIVER_TYPE_E7(TMC2209)
+  INVALID_TMC_ADDRESS(E7);
 #endif
 #undef INVALID_TMC_ADDRESS
 
diff --git a/Marlin/src/module/stepper/TMC26X.cpp b/Marlin/src/module/stepper/TMC26X.cpp
index b8aeb9cb5646..58d9463a2d13 100644
--- a/Marlin/src/module/stepper/TMC26X.cpp
+++ b/Marlin/src/module/stepper/TMC26X.cpp
@@ -78,6 +78,12 @@
 #if AXIS_DRIVER_TYPE_E5(TMC26X)
   _TMC26X_DEFINE(E5);
 #endif
+#if AXIS_DRIVER_TYPE_E6(TMC26X)
+  _TMC26X_DEFINE(E6);
+#endif
+#if AXIS_DRIVER_TYPE_E7(TMC26X)
+  _TMC26X_DEFINE(E7);
+#endif
 
 #define _TMC26X_INIT(A) do{ \
   stepper##A.setMicrosteps(A##_MICROSTEPS); \
@@ -127,6 +133,12 @@ void tmc26x_init_to_defaults() {
   #if AXIS_DRIVER_TYPE_E5(TMC26X)
     _TMC26X_INIT(E5);
   #endif
+  #if AXIS_DRIVER_TYPE_E6(TMC26X)
+    _TMC26X_INIT(E6);
+  #endif
+  #if AXIS_DRIVER_TYPE_E7(TMC26X)
+    _TMC26X_INIT(E7);
+  #endif
 }
 
 #endif // TMC26X
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 5273104503ee..0bf67ed41b82 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -49,7 +49,7 @@
 typedef enum : int8_t {
   INDEX_NONE = -5,
   H_PROBE, H_REDUNDANT, H_CHAMBER, H_BED,
-  H_E0, H_E1, H_E2, H_E3, H_E4, H_E5
+  H_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
 } heater_ind_t;
 
 // PID storage

From 3572fa22a03aee050ec301e9acb41b16e83b8ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= <roman.moravcik@gmail.com>
Date: Sun, 26 Jan 2020 10:27:08 +0100
Subject: [PATCH 059/565] Update Slovak language (#16646)

---
 Marlin/src/lcd/language/language_sk.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index acb829870204..b21e8d05bc0c 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -244,6 +244,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Komora");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Rýchlosť vent.");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Rýchlosť vent. ~");
+  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Ulož. vent. ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Rýchlosť ex. vent.");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Rýchlosť ex. vent. ~");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Prietok");
@@ -379,13 +380,16 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("POZOR: Zlé nastav. môže spôsobiť poškoden. Pokračovať?");
   PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
   PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Inicializ. TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test ofsetu Z");
+  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test Z ofsetu");
   PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Uložiť");
   PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Zasunúť TouchMI");
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Zasunúť sondu Z");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Vysunúť sondu Z");
   PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Najskôr os %s%s%s domov");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Ofset sondy Z");
+  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Ofsety sondy Z");
+  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X ofset");
+  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y ofset");
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z ofset");
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Babystep X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Babystep Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Babystep Z");

From c49e987b1e9eb2f38eb80e1c405676032a053008 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 26 Jan 2020 22:33:35 +1300
Subject: [PATCH 060/565] Fix M43 timer report on AVR (#16645)

---
 Marlin/src/HAL/HAL_AVR/pinsDebug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug.h b/Marlin/src/HAL/HAL_AVR/pinsDebug.h
index 13c8a42b07de..0787076fb7e8 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_AVR/pinsDebug.h
@@ -231,10 +231,10 @@ static void err_is_interrupt()   { SERIAL_ECHOPGM("   compare interrupt enabled"
 static void err_prob_interrupt() { SERIAL_ECHOPGM("   overflow interrupt enabled"); }
 static void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin"); SERIAL_ECHO_SP(14); }
 
-void com_print(uint8_t N, uint8_t Z) {
+inline void com_print(const uint8_t N, const uint8_t Z) {
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
   SERIAL_ECHOPGM("    COM");
-  SERIAL_CHAR('0' + N, 'A' + Z);
+  SERIAL_CHAR('0' + N, Z);
   SERIAL_ECHOPAIR(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
 }
 

From 81f31efaee0120a297d3b35fe1a13dca5cf321f2 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 26 Jan 2020 10:34:58 +0100
Subject: [PATCH 061/565] Fix Spanish (swapped BLTouch strings) (#16637)

---
 Marlin/src/lcd/language/language_es.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 83ec5e43315e..1a54244c1696 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -345,8 +345,8 @@ namespace Language_es {
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Cmd: Auto-Prueba");
   PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Cmd: Reiniciar");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Cmd: Bajar pistón");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Cmd: Subir pistón");
+  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Cmd: Subir pistón");
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Cmd: Bajar pistón");
   PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Cmd: Modo Software");
   PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Cmd: Modo 5V");
   PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Cmd: Modo OD");

From 0949c0f326a8baf0af5a23c1545fa34f418295ce Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 26 Jan 2020 22:49:11 +1300
Subject: [PATCH 062/565] SKR 1.3 sensorless endstops hack (#16659)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 29 ++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 9b0ff5293af3..7f74456a486c 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -25,32 +25,31 @@
 
 /**
  * Limit Switches
- *
- * For Stallguard homing to max swap the min / max pins so
- * the MAX physical connectors can be used for other things.
  */
-#if X_HOME_DIR == -1 || !X_STALL_SENSITIVITY
+#if X_HOME_DIR > 0 && X_STALL_SENSITIVITY && !defined(USE_XMAX_PLUG)
+  // For StallGuard homing to MAX swap the MIN / MAX pins
+  // so the MAX physical connectors may be used for other things.
+  #define X_MIN_PIN          P1_28   // X_MAX (free)
+  #define X_MAX_PIN          P1_29   // X_MIN
+#else                                // else, non-endstop is free and appears in M43 output
   #define X_MIN_PIN          P1_29   // X_MIN
   #define X_MAX_PIN          P1_28   // X_MAX
-#else
-  #define X_MIN_PIN          P1_28   // X_MAX
-  #define X_MAX_PIN          P1_29   // X_MIN
 #endif
 
-#if Y_HOME_DIR == -1 || !Y_STALL_SENSITIVITY
+#if Y_HOME_DIR > 0 && Y_STALL_SENSITIVITY && !defined(USE_YMAX_PLUG)
+  #define Y_MIN_PIN          P1_26   // Y_MAX (free)
+  #define Y_MAX_PIN          P1_27   // Y_MIN
+#else
   #define Y_MIN_PIN          P1_27   // Y_MIN
   #define Y_MAX_PIN          P1_26   // Y_MAX
-#else
-  #define Y_MIN_PIN          P1_26   // Y_MAX
-  #define Y_MAX_PIN          P1_27   // Y_MIN
 #endif
 
-#if Z_HOME_DIR == -1 || !Z_STALL_SENSITIVITY
+#if Z_HOME_DIR > 0 && Z_STALL_SENSITIVITY && !defined(USE_ZMAX_PLUG)
+  #define Z_MIN_PIN          P1_24   // Z_MAX (free)
+  #define Z_MAX_PIN          P1_25   // Z_MIN
+#else
   #define Z_MIN_PIN          P1_25   // Z_MIN
   #define Z_MAX_PIN          P1_24   // Z_MAX
-#else
-  #define Z_MIN_PIN          P1_24   // Z_MAX
-  #define Z_MAX_PIN          P1_25   // Z_MIN
 #endif
 
 #define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups

From 0282acae1abbbbfbd90c0bb239cd73a512cee497 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sun, 26 Jan 2020 21:39:16 +0300
Subject: [PATCH 063/565] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 84a5565698b8..a1f2c03fd6cf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2019,7 +2019,7 @@
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 #define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
-//#define DEFAULT_LCD_CONTRAST 255 изображение на экране пропадает. на команды пример M150 P200 B5 R55 U250 W100 меняется только яркость и цвет. 
+#define DEFAULT_LCD_CONTRAST 255 изображение на экране пропадает. помогло сначала M250 C255 затем M150 P255 B255 R255 U255 W255
 //
 // Factory display for Creality CR-10
 // https://www.aliexpress.com/item/32833148327.html

From 5e3e8fcdb9b2ee634489519c4ea81242acf68c2e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 26 Jan 2020 17:07:13 -0600
Subject: [PATCH 064/565] Fix PID F menu label

---
 Marlin/src/lcd/menu/menu_advanced.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index e24b415155a2..ec03a0066cbf 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -306,7 +306,7 @@ void menu_cancelobject();
       #if ENABLED(PID_FAN_SCALING)
         #define _PID_EDIT_MENU_ITEMS(N) \
           _PID_BASE_MENU_ITEMS(N); \
-          EDIT_ITEM(float3, PID_LABEL(MSG_PID_F,N), &PID_PARAM(Kf, N), 1, 9990)
+          EDIT_ITEM_N(float3, N, MSG_PID_F_E, &PID_PARAM(Kf, N), 1, 9990)
       #else
         #define _PID_EDIT_MENU_ITEMS(N) _PID_BASE_MENU_ITEMS(N)
       #endif

From f6a6704b66db7a0d9164e8136fd08d7e05814e2b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Jan 2020 00:06:35 +0000
Subject: [PATCH 065/565] [cron] Bump distribution date (2020-01-27)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8d4b2fdc3892..f120d87571f8 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-26"
+  #define STRING_DISTRIBUTION_DATE "2020-01-27"
 #endif
 
 /**

From 48098b1675a7e2ac0412b66328e3ad6a6eaeb9c8 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Mon, 27 Jan 2020 07:34:17 +0700
Subject: [PATCH 066/565] Preserve CWD for write/remove file (#16667)

---
 Marlin/src/sd/cardreader.cpp | 33 +++++++++++++++++++--------------
 Marlin/src/sd/cardreader.h   |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index cb8310f17932..538a744e46fb 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -504,7 +504,7 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
   stopSDPrint();
 
   SdFile *curDir;
-  const char * const fname = diveToFile(curDir, path);
+  const char * const fname = diveToFile(true, curDir, path);
   if (!fname) return;
 
   if (file.open(curDir, fname, O_READ)) {
@@ -532,7 +532,7 @@ void CardReader::openFileWrite(char * const path) {
   stopSDPrint();
 
   SdFile *curDir;
-  const char * const fname = diveToFile(curDir, path);
+  const char * const fname = diveToFile(false, curDir, path);
   if (!fname) return;
 
   if (file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
@@ -557,7 +557,7 @@ void CardReader::removeFile(const char * const name) {
   //stopSDPrint();
 
   SdFile *curDir;
-  const char * const fname = diveToFile(curDir, name);
+  const char * const fname = diveToFile(false, curDir, name);
   if (!fname) return;
 
   if (file.remove(curDir, fname)) {
@@ -704,26 +704,28 @@ uint16_t CardReader::countFilesInWorkDir() {
  *
  * A nullptr result indicates an unrecoverable error.
  */
-const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, const bool echo/*=false*/) {
+const char* CardReader::diveToFile(const bool update_cwd, SdFile*& curDir, const char * const path, const bool echo/*=false*/) {
   // Track both parent and subfolder
   static SdFile newDir1, newDir2;
   SdFile *sub = &newDir1, *startDir;
 
+  // Parsing the path string
   const char *item_name_adr = path;
-  if (path[0] == '/') {
+
+  if (path[0] == '/') {               // Starting at the root directory?
     curDir = &root;
-    workDirDepth = 0;
+    if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
     item_name_adr++;
   }
   else
-    curDir = &workDir;
+    curDir = &workDir;                // Dive from workDir (as set by the UI)
 
   startDir = curDir;
-
-  // Start dive
   while (item_name_adr) {
-    // Find next sub
+    // Find next subdirectory delimiter
     char * const name_end = strchr(item_name_adr, '/');
+
+    // Last atom in the path? Item found.
     if (name_end <= item_name_adr) break;
 
     // Set subDirName
@@ -746,13 +748,16 @@ const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, con
     // curDir now subDir
     curDir = sub;
 
-    // Update workDirParents and workDirDepth
-    if (workDirDepth < MAX_DIR_DEPTH) workDirParents[workDirDepth++] = *curDir;
+    // Update workDirParents, workDirDepth, and workDir
+    if (update_cwd) {
+      if (workDirDepth < MAX_DIR_DEPTH) workDirParents[workDirDepth++] = *curDir;
+      workDir = *curDir;
+    }
 
-    // Point sub pointer to unused newDir
+    // Point sub at the other scratch object
     sub = (curDir != &newDir1) ? &newDir1 : &newDir2;
 
-    // item_name_adr point to next sub
+    // Next path atom address
     item_name_adr = name_end + 1;
   }
   return item_name_adr;
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index f7081b95b3da..5d3a2e71b376 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -125,7 +125,7 @@ class CardReader {
   static inline uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }
 
   // Helper for open and remove
-  static const char* diveToFile(SdFile*& curDir, const char * const path, const bool echo=false);
+  static const char* diveToFile(const bool update_cwd, SdFile*& curDir, const char * const path, const bool echo=false);
 
   #if ENABLED(SDCARD_SORT_ALPHA)
     static void presort();

From 56cd747c8be868b21619001aeebbecd3827a7e93 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 26 Jan 2020 17:39:45 -0600
Subject: [PATCH 067/565] Rename some temperature members

---
 Marlin/src/module/temperature.cpp | 22 +++++++++++-----------
 Marlin/src/module/temperature.h   |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index eba7afd81a94..559b3d5a1ee7 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -287,7 +287,7 @@ Temperature thermalManager;
   float Temperature::redundant_temperature = 0.0;
 #endif
 
-volatile bool Temperature::temp_meas_ready = false;
+volatile bool Temperature::raw_temps_ready = false;
 
 #if ENABLED(PID_EXTRUSION_SCALING)
   int32_t Temperature::last_e_position, Temperature::lpq[LPQ_MAX_LEN];
@@ -435,7 +435,7 @@ volatile bool Temperature::temp_meas_ready = false;
 
       const millis_t ms = millis();
 
-      if (temp_meas_ready) { // temp sample ready
+      if (raw_temps_ready) { // temp sample ready
         updateTemperaturesFromRawValues();
 
         // Get the current temperature and constrain it
@@ -1053,7 +1053,7 @@ void Temperature::manage_heater() {
     if (emergency_parser.killed_by_M112) kill();
   #endif
 
-  if (!temp_meas_ready) return;
+  if (!raw_temps_ready) return;
 
   updateTemperaturesFromRawValues(); // also resets the watchdog
 
@@ -1090,10 +1090,10 @@ void Temperature::manage_heater() {
 
       #if WATCH_HOTENDS
         // Make sure temperature is increasing
-        if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) { // Time to check this extruder?
-          if (degHotend(e) < watch_hotend[e].target)                             // Failed to increase enough?
+        if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) {  // Time to check this extruder?
+          if (degHotend(e) < watch_hotend[e].target)                            // Failed to increase enough?
             _temp_error((heater_ind_t)e, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
-          else                                                                 // Start again if the target is still far off
+          else                                                                  // Start again if the target is still far off
             start_watching_hotend(e);
         }
       #endif
@@ -1625,7 +1625,7 @@ void Temperature::updateTemperaturesFromRawValues() {
   // Reset the watchdog on good temperature measurement
   watchdog_refresh();
 
-  temp_meas_ready = false;
+  raw_temps_ready = false;
 }
 
 #if MAX6675_SEPARATE_SPI
@@ -2304,9 +2304,9 @@ void Temperature::disable_all_heaters() {
 #endif // HAS_MAX6675
 
 /**
- * Get raw temperatures
+ * Update raw temperatures
  */
-void Temperature::set_current_temp_raw() {
+void Temperature::update_raw_temperatures() {
 
   #if HAS_TEMP_ADC_0 && DISABLED(HEATER_0_USES_MAX6675)
     temp_hotend[0].update();
@@ -2360,13 +2360,13 @@ void Temperature::set_current_temp_raw() {
     joystick.z.update();
   #endif
 
-  temp_meas_ready = true;
+  raw_temps_ready = true;
 }
 
 void Temperature::readings_ready() {
 
   // Update the raw values if they've been read. Else we could be updating them during reading.
-  if (!temp_meas_ready) set_current_temp_raw();
+  if (!raw_temps_ready) update_raw_temperatures();
 
   // Filament Sensor - can be read any time since IIR filtering is used
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 0bf67ed41b82..da73ed37a4b9 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -360,7 +360,7 @@ class Temperature {
       static bool inited;   // If temperature controller is running
     #endif
 
-    static volatile bool temp_meas_ready;
+    static volatile bool raw_temps_ready;
 
     #if WATCH_HOTENDS
       static heater_watch_t watch_hotend[HOTENDS];
@@ -805,7 +805,7 @@ class Temperature {
     #endif
 
   private:
-    static void set_current_temp_raw();
+    static void update_raw_temperatures();
     static void updateTemperaturesFromRawValues();
 
     #define HAS_MAX6675 EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675)

From 2325bede8a079845dd19ce8020350c1d8f8a18f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 26 Jan 2020 21:08:44 -0600
Subject: [PATCH 068/565] Fix Trigorilla 1.4 limit switches

See #16612
---
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 031ab8e16bcb..987d2a07561c 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -37,6 +37,12 @@
   #define SERVO3_PIN        6
 #endif
 
+//
+// Limit Switches
+//
+#define X_MAX_PIN          43
+#define Y_MIN_PIN          19
+
 // Labeled pins
 #define TRIGORILLA_HEATER_BED_PIN  8
 #define TRIGORILLA_HEATER_0_PIN   10

From a0a93e35ae4275c1f99d776b5cc32d91ee7160d2 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Mon, 27 Jan 2020 11:46:26 +0700
Subject: [PATCH 069/565] =?UTF-8?q?Fix=20serial=20port=20redirection=20(in?=
 =?UTF-8?q?dex=20=E2=89=A0=20port=20num)=20(#16687)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/serial.cpp |  2 +-
 Marlin/src/gcode/queue.cpp | 17 ++++++++---------
 Marlin/src/gcode/queue.h   |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 534d94f00ae0..2c37d681eeda 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -29,7 +29,7 @@ static const char errormagic[] PROGMEM = "Error:";
 static const char echomagic[]  PROGMEM = "echo:";
 
 #if NUM_SERIAL > 1
-  int8_t serial_port_index = SERIAL_PORT;
+  int8_t serial_port_index = 0;
 #endif
 
 void serialprintPGM(PGM_P str) {
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index ff35b553a853..b1673f57f3a9 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -191,7 +191,6 @@ bool GCodeQueue::process_injected_command() {
   // Execute command if non-blank
   if (i) {
     parser.parse(cmd);
-    PORT_REDIRECT(SERIAL_PORT);
     gcode.process_parsed_command();
   }
   return true;
@@ -243,7 +242,7 @@ void GCodeQueue::ok_to_send() {
   #if NUM_SERIAL > 1
     const int16_t pn = port[index_r];
     if (pn < 0) return;
-    PORT_REDIRECT(pn);
+    PORT_REDIRECT(pn);                    // Reply to the serial port that sent the command
   #endif
   if (!send_ok[index_r]) return;
   SERIAL_ECHOPGM(MSG_OK);
@@ -267,9 +266,9 @@ void GCodeQueue::ok_to_send() {
  */
 void GCodeQueue::flush_and_request_resend() {
   #if NUM_SERIAL > 1
-    const int16_t p = port[index_r];
-    if (p < 0) return;
-    PORT_REDIRECT(p);
+    const int16_t pn = port[index_r];
+    if (pn < 0) return;
+    PORT_REDIRECT(pn);                    // Reply to the serial port that sent the command
   #endif
   SERIAL_FLUSH();
   SERIAL_ECHOPGM(MSG_RESEND);
@@ -296,14 +295,14 @@ inline int read_serial(const uint8_t index) {
   }
 }
 
-void GCodeQueue::gcode_line_error(PGM_P const err, const int8_t port) {
-  PORT_REDIRECT(port);
+void GCodeQueue::gcode_line_error(PGM_P const err, const int8_t pn) {
+  PORT_REDIRECT(pn);                      // Reply to the serial port that sent the command
   SERIAL_ERROR_START();
   serialprintPGM(err);
   SERIAL_ECHOLN(last_N);
-  while (read_serial(port) != -1);           // clear out the RX buffer
+  while (read_serial(pn) != -1);          // Clear out the RX buffer
   flush_and_request_resend();
-  serial_count[port] = 0;
+  serial_count[pn] = 0;
 }
 
 FORCE_INLINE bool is_M29(const char * const cmd) {  // matches "M29" & "M29 ", but not "M290", etc
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 173cadc68ebc..d7f30d1bac93 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -150,7 +150,7 @@ class GCodeQueue {
    */
   static bool enqueue_one(const char* cmd);
 
-  static void gcode_line_error(PGM_P const err, const int8_t port);
+  static void gcode_line_error(PGM_P const err, const int8_t pn);
 
 };
 

From e2eef1256a6feaceb8f4c7f02188e8d6d6d43519 Mon Sep 17 00:00:00 2001
From: Hans007a <32525735+Hans007a@users.noreply.github.com>
Date: Tue, 7 Jan 2020 20:52:19 +0100
Subject: [PATCH 070/565] G60/G61 Position Save/Restore (#16557)

---
 Marlin/Configuration_adv.h             |  5 ++
 Marlin/src/HAL/HAL_STM32/timers.h      | 10 ++--
 Marlin/src/core/language.h             |  4 ++
 Marlin/src/gcode/feature/pause/G60.cpp | 59 +++++++++++++++++++++
 Marlin/src/gcode/feature/pause/G61.cpp | 71 ++++++++++++++++++++++++++
 Marlin/src/gcode/gcode.cpp             | 22 +++++---
 Marlin/src/gcode/gcode.h               |  7 +++
 Marlin/src/inc/Conditionals_adv.h      |  5 ++
 Marlin/src/module/motion.cpp           |  8 ++-
 Marlin/src/module/motion.h             |  6 +++
 10 files changed, 183 insertions(+), 14 deletions(-)
 create mode 100644 Marlin/src/gcode/feature/pause/G60.cpp
 create mode 100644 Marlin/src/gcode/feature/pause/G61.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 51fcd1f4b64c..db5ad52abfcf 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1576,6 +1576,11 @@
 
 // @section extras
 
+//
+// G60/G61 Position Save and Return
+//
+//#define SAVED_POSITIONS 1         // Each saved position slot costs 12 bytes
+
 //
 // G2/G3 Arc Support
 //
diff --git a/Marlin/src/HAL/HAL_STM32/timers.h b/Marlin/src/HAL/HAL_STM32/timers.h
index aa85836bd543..f1dce173e48b 100644
--- a/Marlin/src/HAL/HAL_STM32/timers.h
+++ b/Marlin/src/HAL/HAL_STM32/timers.h
@@ -61,8 +61,6 @@
 
   #define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
 
-  // STM32F401 only has timers 1-5 & 9-11 with timers 4 & 5 usually assigned to TIMER_SERVO and TIMER_TONE
-
   #ifndef STEP_TIMER
     #define STEP_TIMER 9
   #endif
@@ -76,19 +74,19 @@
   #define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
 
   #ifndef STEP_TIMER
-    #define STEP_TIMER 6
+    #define STEP_TIMER 6  // STM32F401 has no TIM6, TIM7, or TIM8
   #endif
 
   #ifndef TEMP_TIMER
-    #define TEMP_TIMER 14
+    #define TEMP_TIMER 14 // TIM7 is consumed by Software Serial if used.
   #endif
 
 #elif defined(STM32F7xx)
 
-  #define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals
+  #define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
 
   #ifndef STEP_TIMER
-    #define STEP_TIMER 6
+    #define STEP_TIMER 6  // the RIGHT timer!
   #endif
 
   #ifndef TEMP_TIMER
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index fe279bae8947..ecafd49a8298 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -222,6 +222,10 @@
 #define MSG_SOFT_MIN                        "  Min: "
 #define MSG_SOFT_MAX                        "  Max: "
 
+#define MSG_SAVED_POS                       "Position saved"
+#define MSG_RESTORING_POS                   "Restoring position"
+#define MSG_INVALID_POS_SLOT                "Invalid slot. Total: "
+
 #define MSG_SD_CANT_OPEN_SUBDIR             "Cannot open subdir "
 #define MSG_SD_INIT_FAIL                    "SD init fail"
 #define MSG_SD_VOL_INIT_FAIL                "volume.init failed"
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
new file mode 100644
index 000000000000..94b73cd7d92b
--- /dev/null
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -0,0 +1,59 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if SAVED_POSITIONS
+
+#include "../../../core/language.h"
+#include "../../gcode.h"
+#include "../../../module/motion.h"
+
+#define DEBUG_OUT ENABLED(SAVED_POSITIONS_DEBUG)
+#include "../../../core/debug_out.h"
+
+/**
+ * G60: Save current position
+ *
+ *   S<slot> - Memory slot # (0-based) to save into (default 0)
+ */
+void GcodeSuite::G60() {
+  const uint8_t slot = parser.byteval('S');
+
+  if (slot >= SAVED_POSITIONS) {
+    SERIAL_ERROR_MSG(MSG_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
+    return;
+  }
+
+  stored_position[slot] = current_position;
+  SBI(saved_slots, slot);
+
+  #if ENABLED(SAVED_POSITIONS_DEBUG)
+    const xyze_pos_t &pos = stored_position[slot];
+    DEBUG_ECHOPAIR_F(MSG_SAVED_POS " S", slot);
+    DEBUG_ECHOPAIR_F(" : X", pos.x);
+    DEBUG_ECHOPAIR_F_P(SP_Y_STR, pos.y);
+    DEBUG_ECHOLNPAIR_F_P(SP_Z_STR, pos.z);
+  #endif
+}
+
+#endif // SAVED_POSITIONS
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
new file mode 100644
index 000000000000..5d854dfab482
--- /dev/null
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -0,0 +1,71 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if SAVED_POSITIONS
+
+#include "../../../core/language.h"
+#include "../../module/planner.h"
+#include "../../gcode.h"
+#include "../../../module/motion.h"
+
+/**
+ * G61: Return to saved position
+ *
+ *   F<rate>  - Feedrate (optional) for the move back.
+ *   S<slot>  - Slot # (0-based) to restore from (default 0).
+ *   X Y Z    - Axes to restore. At least one is required.
+ */
+void GcodeSuite::G61(void) {
+
+  const uint8_t slot = parser.byteval('S');
+
+  #if SAVED_POSITIONS < 256
+    if (slot >= SAVED_POSITIONS) {
+      SERIAL_ERROR_MSG(MSG_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
+      return;
+    }
+  #endif
+
+  // No saved position? No axes being restored?
+  if (!TEST(saved_slots, slot) || !parser.seen("XYZ")) return;
+
+  // Apply any given feedrate over 0.0
+  const float fr = parser.linearval('F');
+  if (fr > 0.0) feedrate_mm_s = MMM_TO_MMS(fr);
+
+  SERIAL_ECHOPAIR(MSG_RESTORING_POS " S", int(slot));
+  LOOP_XYZ(i) {
+    destination[i] = parser.seen(axis_codes[i])
+      ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
+      : current_position[i];
+    SERIAL_CHAR(' ', axis_codes[i]);
+    SERIAL_ECHO_F(destination[i]);
+  }
+  SERIAL_EOL();
+
+  // Move to the saved position
+  prepare_move_to_destination();
+}
+
+#endif // SAVED_POSITIONS
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7ff86f3149b1..955e62e80e11 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -314,19 +314,27 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       #endif
 
       #if ENABLED(CNC_COORDINATE_SYSTEMS)
-        case 53: G53(); break;
-        case 54: G54(); break;
-        case 55: G55(); break;
-        case 56: G56(); break;
-        case 57: G57(); break;
-        case 58: G58(); break;
-        case 59: G59(); break;
+        case 53: G53(); break;                                    // G53: (prefix) Apply native workspace
+        case 54: G54(); break;                                    // G54: Switch to Workspace 1
+        case 55: G55(); break;                                    // G55: Switch to Workspace 2
+        case 56: G56(); break;                                    // G56: Switch to Workspace 3
+        case 57: G57(); break;                                    // G57: Switch to Workspace 4
+        case 58: G58(); break;                                    // G58: Switch to Workspace 5
+        case 59: G59(); break;                                    // G59.0 - G59.3: Switch to Workspace 6-9
+      #endif
+
+      #if SAVED_POSITIONS
+        case 60: G60(); break;                                    // G60:  save current position
+        case 61: G61(); break;                                    // G61:  Apply/restore saved coordinates.
       #endif
 
       #if ENABLED(PROBE_TEMP_COMPENSATION)
         case 76: G76(); break;                                    // G76: Calibrate first layer compensation values
       #endif
 
+      case 60: G60(); break;                                      // G60:  save current position
+      case 61: G61(); break;                                      // G61:  Apply/restore saved coordinates.
+
       #if ENABLED(GCODE_MOTION_MODES)
         case 80: G80(); break;                                    // G80: Reset the current motion mode
       #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index f7111c6eeca9..5bbc5e862cff 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -67,6 +67,8 @@
  * G34  - Z Stepper automatic alignment using probe: I<iterations> T<accuracy> A<amplification> (Requires Z_STEPPER_AUTO_ALIGN)
  * G38  - Probe in any direction using the Z_MIN_PROBE (Requires G38_PROBE_TARGET)
  * G42  - Coordinated move to a mesh point (Requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BLINEAR, or AUTO_BED_LEVELING_UBL)
+ * G60  - Save current position. (Requires SAVED_POSITIONS)
+ * G61  - Apply/restore saved coordinates. (Requires SAVED_POSITIONS)
  * G76  - Calibrate first layer temperature offsets. (Requires PROBE_TEMP_COMPENSATION)
  * G80  - Cancel current motion mode (Requires GCODE_MOTION_MODES)
  * G90  - Use Absolute Coordinates
@@ -471,6 +473,11 @@ class GcodeSuite {
     static void G76();
   #endif
 
+  #if SAVED_POSITIONS
+    static void G60();
+    static void G61();
+  #endif
+
   #if ENABLED(GCODE_MOTION_MODES)
     static void G80();
   #endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 00be08433d08..7ac2d167ada8 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -142,3 +142,8 @@
 #if ENABLED(JOYSTICK)
   #define POLL_JOG
 #endif
+
+// G60/G61 Position Save
+#if SAVED_POSITIONS > 256
+  #error "SAVED_POSITIONS must be an integer from 0 to 256."
+#endif
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 9d0422c4a62b..6dbf940addca 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -109,9 +109,15 @@ xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
  */
 xyze_pos_t destination; // {0}
 
+// G60/G61 Position Save and Return
+#if SAVED_POSITIONS
+  uint8_t saved_slots;
+  xyz_pos_t stored_position[SAVED_POSITIONS];
+#endif
+
 // The active extruder (tool). Set with T<extruder> command.
 #if EXTRUDERS > 1
-  uint8_t active_extruder; // = 0
+  uint8_t active_extruder = 0; // = 0
 #endif
 
 #if ENABLED(LCD_SHOW_E_TOTAL)
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 43ae2b23035d..a30573e7973f 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -65,6 +65,12 @@ extern bool relative_mode;
 extern xyze_pos_t current_position,  // High-level current tool position
                   destination;       // Destination for a move
 
+// G60/G61 Position Save and Return
+#if SAVED_POSITIONS
+  extern uint8_t saved_slots;
+  extern xyz_pos_t stored_position[SAVED_POSITIONS];
+#endif
+
 // Scratch space for a cartesian result
 extern xyz_pos_t cartes;
 

From 8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 27 Jan 2020 15:40:08 -0600
Subject: [PATCH 071/565] Remove extraneous G60/G61 lines

---
 Marlin/src/gcode/gcode.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 955e62e80e11..0c0ab4c24c61 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -332,9 +332,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 76: G76(); break;                                    // G76: Calibrate first layer compensation values
       #endif
 
-      case 60: G60(); break;                                      // G60:  save current position
-      case 61: G61(); break;                                      // G61:  Apply/restore saved coordinates.
-
       #if ENABLED(GCODE_MOTION_MODES)
         case 80: G80(); break;                                    // G80: Reset the current motion mode
       #endif

From 131acf304b4d09466e916cbe31ff3cf3f2913804 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Mon, 27 Jan 2020 13:57:22 -0800
Subject: [PATCH 072/565] Fix Manual Bed Leveling with multiple extruders
 (#16688)

---
 Marlin/src/lcd/menu/menu_filament.cpp | 2 +-
 Marlin/src/module/tool_change.cpp     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 894d8de238b0..5248cbbab1aa 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -119,7 +119,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
           SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
         else {
           ACTION_ITEM_N_P(s, msg, []{
-            char cmd[12];
+            char cmd[13];
             sprintf_P(cmd, PSTR("M600 B0 T%i"), int(MenuItemBase::itemIndex));
             lcd_enqueue_one_now(cmd);
           });
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 45c5805f4daf..324b979570e0 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -821,10 +821,6 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)");
     }
 
-    #if HAS_LCD_MENU
-      ui.return_to_status();
-    #endif
-
     #if ENABLED(DUAL_X_CARRIAGE)
       const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
     #else

From 0c3cae59d9e323aa5cd39faae18e08d0ec2341fc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Jan 2020 00:06:59 +0000
Subject: [PATCH 073/565] [cron] Bump distribution date (2020-01-28)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f120d87571f8..cf531930af15 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-27"
+  #define STRING_DISTRIBUTION_DATE "2020-01-28"
 #endif
 
 /**

From e4eaf32b4da705c924087bcb1d9f720fb8beb731 Mon Sep 17 00:00:00 2001
From: felixstorm <felix.storm@glueckkanja.com>
Date: Tue, 28 Jan 2020 01:16:44 +0100
Subject: [PATCH 074/565] Prevent SD access from resetting ESP32 (#16690)

---
 Marlin/src/sd/SdVolume.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Marlin/src/sd/SdVolume.cpp b/Marlin/src/sd/SdVolume.cpp
index 926dd1c7d456..c51e42108ce3 100644
--- a/Marlin/src/sd/SdVolume.cpp
+++ b/Marlin/src/sd/SdVolume.cpp
@@ -291,6 +291,16 @@ int32_t SdVolume::freeClusterCount() {
       for (uint16_t i = 0; i < n; i++)
         if (cacheBuffer_.fat32[i] == 0) free++;
     }
+    #ifdef ESP32
+      // Needed to reset the idle task watchdog timer on ESP32 as reading the complete FAT may easily 
+      // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
+      static millis_t nextTaskTime = 0;
+      const millis_t ms = millis();
+      if (ELAPSED(ms, nextTaskTime) {
+        vTaskDelay(1);            // delay 1 tick (Minimum. Usually 10 or 1 ms depending on skdconfig.h)
+        nextTaskTime = ms + 1000; // tickle the task manager again in 1 second
+      }
+    #endif // ESP32
   }
   return free;
 }

From 9b45f342ee8ec1765cc564ffb811755c366cc50c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Jan 2020 00:07:02 +0000
Subject: [PATCH 075/565] [cron] Bump distribution date (2020-01-29)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index cf531930af15..9eeb6dbcee23 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-28"
+  #define STRING_DISTRIBUTION_DATE "2020-01-29"
 #endif
 
 /**

From 9bb8176d341e769af5080cc22a45a433d75b8318 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 29 Jan 2020 01:06:06 -0500
Subject: [PATCH 076/565] Fix Toolchange (!no_move) return to status (#16699)

---
 Marlin/src/feature/binary_protocol.h | 2 +-
 Marlin/src/module/tool_change.cpp    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/binary_protocol.h b/Marlin/src/feature/binary_protocol.h
index 0025fbe13809..8e69ab7a752b 100644
--- a/Marlin/src/feature/binary_protocol.h
+++ b/Marlin/src/feature/binary_protocol.h
@@ -242,7 +242,7 @@ class BinaryStream {
       uint8_t protocol() { return (meta >> 4) & 0xF; }
       uint8_t type() { return meta & 0xF; }
       void reset() { token = 0; sync = 0; meta = 0; size = 0; checksum = 0; }
-      uint8_t data[1];
+      uint8_t data[2];
     };
 
     union Footer {
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 324b979570e0..b42722b87cd8 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -821,6 +821,10 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)");
     }
 
+    #if HAS_LCD_MENU
+      if (!no_move) ui.return_to_status();
+    #endif
+
     #if ENABLED(DUAL_X_CARRIAGE)
       const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
     #else

From a5f72330fb760287673b7724f304fdc24b3b90a4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Jan 2020 00:06:48 +0000
Subject: [PATCH 077/565] [cron] Bump distribution date (2020-01-30)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9eeb6dbcee23..4b933d032791 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-29"
+  #define STRING_DISTRIBUTION_DATE "2020-01-30"
 #endif
 
 /**

From e8ed4329ea0a94cc3929c34573882f9c662fb53c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 29 Jan 2020 22:16:09 -0600
Subject: [PATCH 078/565] Cleanup of old includes, add comments

---
 Marlin/Configuration_adv.h               |  2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp           |  8 ++++----
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index db5ad52abfcf..e2bda3f8055d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -819,7 +819,7 @@
   // probing on a screwhead or hollow washer, probe near the edges.
   //#define CALIBRATION_MEASURE_AT_TOP_EDGES
 
-  // Define pin which is read during calibration
+  // Define the pin to read during calibration
   #ifndef CALIBRATION_PIN
     #define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
     #define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 5bf9e94325df..6a6d00ed3411 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -20,12 +20,14 @@
  *
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if HAS_RESUME_CONTINUE
 
 #include "../gcode.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
+
+#include "../../inc/MarlinConfig.h"
 
 #if HAS_LCD_MENU
   #include "../../lcd/ultralcd.h"
@@ -35,8 +37,6 @@
   #include "../../lcd/extensible_ui/ui_api.h"
 #endif
 
-#include "../../sd/cardreader.h"
-
 #if HAS_LEDS_OFF_FLAG
   #include "../../feature/leds/printer_event_leds.h"
 #endif
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 9ca51ac86f38..1cb4cf35663b 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -38,7 +38,7 @@
   #error "You must set ([XYZ]|E0)_DRIVER_TYPE to TMC2130 in Configuration.h for EinsyRetro."
 #endif
 
-// TMC2130 Diag Pins (currently just for reference)
+// TMC2130 Diag Pins
 #define X_DIAG_PIN         64
 #define Y_DIAG_PIN         69
 #define Z_DIAG_PIN         68
@@ -55,27 +55,27 @@
 
 #if DISABLED(SENSORLESS_HOMING)
 
-  #define X_MIN_PIN        12
-  #define Y_MIN_PIN        11
-  #define Z_MIN_PIN        10
-  #define X_MAX_PIN        81
-  #define Y_MAX_PIN        57
+  #define X_MIN_PIN        12   // X-
+  #define Y_MIN_PIN        11   // Y-
+  #define Z_MIN_PIN        10   // Z-
+  #define X_MAX_PIN        81   // X+
+  #define Y_MAX_PIN        57   // Y+
 
 #else
 
   #if X_HOME_DIR < 0
     #define X_MIN_PIN      X_DIAG_PIN
-    #define X_MAX_PIN      81
+    #define X_MAX_PIN      81   // X+
   #else
-    #define X_MIN_PIN      12
+    #define X_MIN_PIN      12   // X-
     #define X_MAX_PIN      X_DIAG_PIN
   #endif
 
   #if Y_HOME_DIR < 0
     #define Y_MIN_PIN      Y_DIAG_PIN
-    #define Y_MAX_PIN      57
+    #define Y_MAX_PIN      57   // Y+
   #else
-    #define Y_MIN_PIN      11
+    #define Y_MIN_PIN      11   // Y-
     #define Y_MAX_PIN      Y_DIAG_PIN
   #endif
 

From 8737c35ded48c639ffded58a587f555da65d6f1a Mon Sep 17 00:00:00 2001
From: 0r31 <37673727+0r31@users.noreply.github.com>
Date: Thu, 30 Jan 2020 05:48:26 +0100
Subject: [PATCH 079/565] Fix HAS_FAN macro (#16717)

---
 Marlin/src/inc/Conditionals_post.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1a2c39ec2588..5b9ba7c68341 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1220,7 +1220,7 @@
 
 // Other fans
 #define HAS_FAN0 (PIN_EXISTS(FAN))
-#define _HAS_FAN(P) (PIN_EXISTS(FAN_##P) && CONTROLLER_FAN_PIN != FAN_##P##_PIN && E0_AUTO_FAN_PIN != FAN_##P##_PIN && E1_AUTO_FAN_PIN != FAN_##P##_PIN && E2_AUTO_FAN_PIN != FAN_##P##_PIN && E3_AUTO_FAN_PIN != FAN_##P##_PIN && E4_AUTO_FAN_PIN != FAN_##P##_PIN && E5_AUTO_FAN_PIN != FAN_##P##_PIN && E6_AUTO_FAN_PIN != FAN_##P##_PIN && E7_AUTO_FAN_PIN != FAN_##P##_PIN)
+#define _HAS_FAN(P) (PIN_EXISTS(FAN##P) && CONTROLLER_FAN_PIN != FAN##P##_PIN && E0_AUTO_FAN_PIN != FAN##P##_PIN && E1_AUTO_FAN_PIN != FAN##P##_PIN && E2_AUTO_FAN_PIN != FAN##P##_PIN && E3_AUTO_FAN_PIN != FAN##P##_PIN && E4_AUTO_FAN_PIN != FAN##P##_PIN && E5_AUTO_FAN_PIN != FAN##P##_PIN && E6_AUTO_FAN_PIN != FAN##P##_PIN && E7_AUTO_FAN_PIN != FAN##P##_PIN)
 #define HAS_FAN1 _HAS_FAN(1)
 #define HAS_FAN2 _HAS_FAN(2)
 #define HAS_FAN3 _HAS_FAN(3)

From 1db9d9f76f43850539437e22745ea7f026e8a361 Mon Sep 17 00:00:00 2001
From: Neskik <axel.gouverneur@gmail.com>
Date: Thu, 30 Jan 2020 10:00:38 +0100
Subject: [PATCH 080/565] Fix probe temp calibration (#16718)

---
 Marlin/src/feature/probe_temp_compensation.h | 6 +++---
 Marlin/src/gcode/calibrate/G76_M871.cpp      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_compensation.h
index 64f8cc7a06e8..91f652980b16 100644
--- a/Marlin/src/feature/probe_temp_compensation.h
+++ b/Marlin/src/feature/probe_temp_compensation.h
@@ -48,10 +48,10 @@ class ProbeTempComp {
   public:
 
     static constexpr temp_calib_t cali_info_init[TSI_COUNT] = {
-        {  30, 10,  5,  30 + 10 *  5 },       // Probe
-        {  60, 10,  5,  60 + 10 *  5 },       // Bed
+        {  10,  5,  30,  30 + 10 *  5 },       // Probe
+        {  10,  5,  60,  60 + 10 *  5 },       // Bed
       #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-        { 180,  5, 20, 180 +  5 * 20 }        // Extruder
+        {  20,  5, 180, 180 +  5 * 20 }        // Extruder
       #endif
     };
     static const temp_calib_t cali_info[TSI_COUNT];
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 0e0899fa7aee..479f13d50c69 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -256,7 +256,7 @@ void GcodeSuite::G76() {
 
     // Initialize temperatures
     uint16_t target_bed = temp_comp.probe_calib_bed_temp,
-             target_probe = temp_comp.cali_info_init[TSI_BED].start_temp;
+             target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
     thermalManager.setTargetBed(target_bed);
     SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
     while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
@@ -332,13 +332,13 @@ void GcodeSuite::G76() {
       else
         SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
 
-      if (target_probe == temp_comp.cali_info_init[TSI_BED].start_temp)
+      if (target_probe == temp_comp.cali_info_init[TSI_PROBE].start_temp)
         temp_comp.prepare_new_calibration(measured_z);
       else
         temp_comp.push_back_new_measurement(TSI_PROBE, measured_z);
 
-      target_probe += temp_comp.cali_info_init[TSI_BED].temp_res;
-      if (target_probe > temp_comp.cali_info_init[TSI_BED].end_temp) break;
+      target_probe += temp_comp.cali_info_init[TSI_PROBE].temp_res;
+      if (target_probe > temp_comp.cali_info_init[TSI_PROBE].end_temp) break;
     }
 
     SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());

From 1bc6509d026e7d3bf853eee729369998c64ce339 Mon Sep 17 00:00:00 2001
From: Mauro <exilaus@hotmail.com>
Date: Thu, 30 Jan 2020 10:06:17 +0100
Subject: [PATCH 081/565] Support for E4d@BOX mainboard (#16716)

---
 Marlin/src/core/boards.h         |  3 +-
 Marlin/src/pins/esp32/pins_E4D.h | 90 ++++++++++++++++++++++++++++++++
 Marlin/src/pins/pins.h           |  2 +
 3 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 Marlin/src/pins/esp32/pins_E4D.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 7a3b413e99bd..f4ada7aaf489 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -332,9 +332,10 @@
 //
 // Espressif ESP32 WiFi
 //
-#define BOARD_ESPRESSIF_ESP32         6000
+#define BOARD_ESPRESSIF_ESP32         6000  // Generic ESP32
 #define BOARD_MRR_ESPA                6001
 #define BOARD_MRR_ESPE                6002
+#define BOARD_E4D_BOX                 6003  // E4d@BOX
 
 //
 // Simulations
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
new file mode 100644
index 000000000000..d457a7be557e
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -0,0 +1,90 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * E4d@Box  pin assignments
+ * E4d@Box is a small factor 3D printer control board based on the ESP32 microcontroller for Laser, CNC and 3d printers
+ * for more info check http://atbox.tech/ and join to Facebook page E4d@box.
+ */
+
+#ifndef ARDUINO_ARCH_ESP32
+  #error "Oops! Select an ESP32 board in 'Tools > Board.'"
+#elif EXTRUDERS > 1 || E_STEPPERS > 1
+  #error "E4d@box only supports one E Stepper. Comment out this line to continue."
+#elif HOTENDS > 2
+  #error "E4d@box currently supports only one hotend. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME       "E4D@BOX"
+#define BOARD_WEBSITE_URL     "github.com/Exilaus/E4d@box"
+#define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN          34
+#define Y_MIN_PIN          35
+#define Z_MIN_PIN          16   // 15
+
+//
+// Steppers
+//
+#define X_STEP_PIN         12   // 34//27
+#define X_DIR_PIN          13   // 35//26
+#define X_ENABLE_PIN       17   // 0//17//25 // used free pin
+//#define X_CS_PIN            0
+
+#define Y_STEP_PIN         32   // 33
+#define Y_DIR_PIN          33   // 32
+#define Y_ENABLE_PIN       X_ENABLE_PIN
+//#define Y_CS_PIN           13
+
+#define Z_STEP_PIN         25   // 14
+#define Z_DIR_PIN          26   // 12
+#define Z_ENABLE_PIN       X_ENABLE_PIN
+//#define Z_CS_PIN            5   // SS_PIN
+
+#define E0_STEP_PIN        27   // 16
+#define E0_DIR_PIN         14   // 17
+#define E0_ENABLE_PIN      X_ENABLE_PIN
+//#define E0_CS_PIN          21
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN         36   // Analog Input
+#define TEMP_BED_PIN       39   // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN        2   // 4//2//(D8)
+#define FAN_PIN             0   // 2//15//13 (D9)
+#define HEATER_BED_PIN     15   // 15//0 //(D10)
+
+// SPI
+#define SDSS                 5
+#define I2S_STEPPER_STREAM
+#define I2S_WS              23
+#define I2S_BCK             22
+#define I2S_DATA            21
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index bd799e5e91f7..3dbbb5e724f4 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -571,6 +571,8 @@
   #include "esp32/pins_MRR_ESPA.h"              // ESP32                                  env:esp32
 #elif MB(MRR_ESPE)
   #include "esp32/pins_MRR_ESPE.h"              // ESP32                                  env:esp32
+#elif MB(E4D_BOX)
+  #include "esp32/pins_E4D.h"                   // ESP32                                  env:esp32
 
 //
 // Linux Native Debug board

From e6a675e6ecaccb5b897bb7c6e4bcf3bf48bfbf6d Mon Sep 17 00:00:00 2001
From: Radek Pietruszewski <radexpl@gmail.com>
Date: Thu, 30 Jan 2020 10:13:32 +0100
Subject: [PATCH 082/565] Fix missing string for M48 build (#16708)

---
 Marlin/src/gcode/calibrate/M48.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index f111de4b17a8..75c5ed9a818c 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -53,6 +53,9 @@
  *
  * This function requires the machine to be homed before invocation.
  */
+
+extern const char SP_Y_STR[];
+
 void GcodeSuite::M48() {
 
   if (axis_unhomed_error()) return;

From 99b6a132bcf5ccf54215ef6962eea3e199ea4c0d Mon Sep 17 00:00:00 2001
From: chgi <chgi@users.noreply.github.com>
Date: Thu, 30 Jan 2020 18:18:45 +0900
Subject: [PATCH 083/565] Fix G60/G61 slots > 8 and compile error (#16715)

---
 Marlin/src/gcode/feature/pause/G60.cpp | 2 +-
 Marlin/src/gcode/feature/pause/G61.cpp | 4 ++--
 Marlin/src/module/motion.cpp           | 2 +-
 Marlin/src/module/motion.h             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 94b73cd7d92b..a0d099ad69b8 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -45,7 +45,7 @@ void GcodeSuite::G60() {
   }
 
   stored_position[slot] = current_position;
-  SBI(saved_slots, slot);
+  SBI(saved_slots[slot >> 3], slot & 0b00000111);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
     const xyze_pos_t &pos = stored_position[slot];
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index 5d854dfab482..d531c15c8004 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -25,7 +25,7 @@
 #if SAVED_POSITIONS
 
 #include "../../../core/language.h"
-#include "../../module/planner.h"
+#include "../../../module/planner.h"
 #include "../../gcode.h"
 #include "../../../module/motion.h"
 
@@ -48,7 +48,7 @@ void GcodeSuite::G61(void) {
   #endif
 
   // No saved position? No axes being restored?
-  if (!TEST(saved_slots, slot) || !parser.seen("XYZ")) return;
+  if (!TEST(saved_slots[slot >> 3], slot & 0b00000111) || !parser.seen("XYZ")) return;
 
   // Apply any given feedrate over 0.0
   const float fr = parser.linearval('F');
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 6dbf940addca..50092406c5e7 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -111,7 +111,7 @@ xyze_pos_t destination; // {0}
 
 // G60/G61 Position Save and Return
 #if SAVED_POSITIONS
-  uint8_t saved_slots;
+  uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3];
   xyz_pos_t stored_position[SAVED_POSITIONS];
 #endif
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index a30573e7973f..eafa5ca8492a 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -67,7 +67,7 @@ extern xyze_pos_t current_position,  // High-level current tool position
 
 // G60/G61 Position Save and Return
 #if SAVED_POSITIONS
-  extern uint8_t saved_slots;
+  extern uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3];
   extern xyz_pos_t stored_position[SAVED_POSITIONS];
 #endif
 

From 50889c0f94778c378357bcc4d4a966fa869bc5c1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Jan 2020 03:24:23 -0600
Subject: [PATCH 084/565] Move L64XX index_to_axis to progmem (#16697)

---
 Marlin/src/MarlinCore.cpp                |  32 +-
 Marlin/src/feature/babystep.cpp          |   2 +-
 Marlin/src/feature/prusa_MMU2/mmu2.cpp   |  16 +-
 Marlin/src/gcode/calibrate/G33.cpp       |   4 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp |  12 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp   | 104 ++--
 Marlin/src/libs/L64XX/L64XX_Marlin.h     |   6 +-
 Marlin/src/module/planner.cpp            |  40 +-
 Marlin/src/module/probe.cpp              |   2 +-
 Marlin/src/module/stepper.cpp            |  16 +-
 Marlin/src/module/stepper/L64xx.h        |  50 ++
 Marlin/src/module/stepper/indirection.h  | 578 +++++++++++++----------
 12 files changed, 498 insertions(+), 364 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 7ec6ffb488d2..6d78190218b1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -291,7 +291,7 @@ void quickstop_stepper() {
 }
 
 void enable_e_steppers() {
-  #define _ENA_E(N) enable_E##N();
+  #define _ENA_E(N) ENABLE_AXIS_E##N();
   REPEAT(E_STEPPERS, _ENA_E)
 }
 
@@ -299,28 +299,28 @@ void enable_all_steppers() {
   #if ENABLED(AUTO_POWER_CONTROL)
     powerManager.power_on();
   #endif
-  enable_X();
-  enable_Y();
-  enable_Z();
+  ENABLE_AXIS_X();
+  ENABLE_AXIS_Y();
+  ENABLE_AXIS_Z();
   enable_e_steppers();
 }
 
 void disable_e_steppers() {
-  #define _DIS_E(N) disable_E##N();
+  #define _DIS_E(N) DISABLE_AXIS_E##N();
   REPEAT(E_STEPPERS, _DIS_E)
 }
 
 void disable_e_stepper(const uint8_t e) {
-  #define _CASE_DIS_E(N) case N: disable_E##N(); break;
+  #define _CASE_DIS_E(N) case N: DISABLE_AXIS_E##N(); break;
   switch (e) {
     REPEAT(EXTRUDERS, _CASE_DIS_E)
   }
 }
 
 void disable_all_steppers() {
-  disable_X();
-  disable_Y();
-  disable_Z();
+  DISABLE_AXIS_X();
+  DISABLE_AXIS_Y();
+  DISABLE_AXIS_Z();
   disable_e_steppers();
 }
 
@@ -461,13 +461,13 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
       if (!already_shutdown_steppers) {
         already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
         #if ENABLED(DISABLE_INACTIVE_X)
-          disable_X();
+          DISABLE_AXIS_X();
         #endif
         #if ENABLED(DISABLE_INACTIVE_Y)
-          disable_Y();
+          DISABLE_AXIS_Y();
         #endif
         #if ENABLED(DISABLE_INACTIVE_Z)
-          disable_Z();
+          DISABLE_AXIS_Z();
         #endif
         #if ENABLED(DISABLE_INACTIVE_E)
           disable_e_steppers();
@@ -542,11 +542,11 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
       #if ENABLED(SWITCHING_EXTRUDER)
         bool oldstatus;
         switch (active_extruder) {
-          default: oldstatus = E0_ENABLE_READ(); enable_E0(); break;
+          default: oldstatus = E0_ENABLE_READ(); ENABLE_AXIS_E0(); break;
           #if E_STEPPERS > 1
-            case 2: case 3: oldstatus = E1_ENABLE_READ(); enable_E1(); break;
+            case 2: case 3: oldstatus = E1_ENABLE_READ(); ENABLE_AXIS_E1(); break;
             #if E_STEPPERS > 2
-              case 4: case 5: oldstatus = E2_ENABLE_READ(); enable_E2(); break;
+              case 4: case 5: oldstatus = E2_ENABLE_READ(); ENABLE_AXIS_E2(); break;
             #endif // E_STEPPERS > 2
           #endif // E_STEPPERS > 1
         }
@@ -554,7 +554,7 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
         bool oldstatus;
         switch (active_extruder) {
           default:
-          #define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); enable_E##N(); break;
+          #define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); ENABLE_AXIS_E##N(); break;
           REPEAT(E_STEPPERS, _CASE_EN);
         }
       #endif
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index 510950095f3e..0b08f8ae4167 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -78,7 +78,7 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
   #endif
 
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
-    #define BSA_ENABLE(AXIS) do{ switch (AXIS) { case X_AXIS: enable_X(); break; case Y_AXIS: enable_Y(); break; case Z_AXIS: enable_Z(); break; default: break; } }while(0)
+    #define BSA_ENABLE(AXIS) do{ switch (AXIS) { case X_AXIS: ENABLE_AXIS_X(); break; case Y_AXIS: ENABLE_AXIS_Y(); break; case Z_AXIS: ENABLE_AXIS_Z(); break; default: break; } }while(0)
   #else
     #define BSA_ENABLE(AXIS) NOOP
   #endif
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/prusa_MMU2/mmu2.cpp
index 0e25c86708b8..d96cbf972080 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp
+++ b/Marlin/src/feature/prusa_MMU2/mmu2.cpp
@@ -448,7 +448,7 @@ void MMU2::tool_change(uint8_t index) {
 
   if (index != extruder) {
 
-    disable_E0();
+    DISABLE_AXIS_E0();
     ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
 
     command(MMU_CMD_T0 + index);
@@ -459,7 +459,7 @@ void MMU2::tool_change(uint8_t index) {
     extruder = index; //filament change is finished
     active_extruder = 0;
 
-    enable_E0();
+    ENABLE_AXIS_E0();
 
     SERIAL_ECHO_START();
     SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(extruder));
@@ -497,13 +497,13 @@ void MMU2::tool_change(const char* special) {
       case 'x': {
         planner.synchronize();
         uint8_t index = mmu2_choose_filament();
-        disable_E0();
+        DISABLE_AXIS_E0();
         command(MMU_CMD_T0 + index);
         manage_response(true, true);
         command(MMU_CMD_C0);
         mmu_loop();
 
-        enable_E0();
+        ENABLE_AXIS_E0();
         extruder = index;
         active_extruder = 0;
       } break;
@@ -697,7 +697,7 @@ void MMU2::filament_runout() {
 
     LCD_MESSAGEPGM(MSG_MMU2_EJECTING_FILAMENT);
 
-    enable_E0();
+    ENABLE_AXIS_E0();
     current_position.e -= MMU2_FILAMENTCHANGE_EJECT_FEED;
     line_to_current_position(2500 / 60);
     planner.synchronize();
@@ -731,7 +731,7 @@ void MMU2::filament_runout() {
 
     BUZZ(200, 404);
 
-    disable_E0();
+    DISABLE_AXIS_E0();
 
     return true;
   }
@@ -776,7 +776,7 @@ void MMU2::filament_runout() {
   void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
 
     planner.synchronize();
-    enable_E0();
+    ENABLE_AXIS_E0();
 
     const E_Step* step = sequence;
 
@@ -794,7 +794,7 @@ void MMU2::filament_runout() {
       step++;
     }
 
-    disable_E0();
+    DISABLE_AXIS_E0();
   }
 
 #endif // HAS_LCD_MENU && MMU2_MENUS
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 1931d226af28..2ce45359d36a 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -439,7 +439,6 @@ void GcodeSuite::G33() {
              _opposite_results    = (_4p_calibration && !towers_set) || probe_points >= 3,
              _endstop_results     = probe_points != 1 && probe_points != -1 && probe_points != 0,
              _angle_results       = probe_points >= 3 && towers_set;
-  static const char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
   int8_t iterations = 0;
   float test_precision,
         zero_std_dev = (verbose_level ? 999.0f : 0.0f), // 0.0 in dry-run mode : forced end
@@ -625,8 +624,7 @@ void GcodeSuite::G33() {
           sprintf_P(&mess[15], PSTR("%03i.x"), (int)LROUND(zero_std_dev_min));
         ui.set_status(mess);
         print_calibration_settings(_endstop_results, _angle_results);
-        serialprintPGM(save_message);
-        SERIAL_EOL();
+        SERIAL_ECHOLNPGM("Save with M500 and/or copy to Configuration.h");
       }
       else { // !end iterations
         char mess[15];
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 081ca18d89a5..4908a64ecbc7 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -34,9 +34,9 @@
  */
 void GcodeSuite::M17() {
   if (parser.seen("XYZE")) {
-    if (parser.seen('X')) enable_X();
-    if (parser.seen('Y')) enable_Y();
-    if (parser.seen('Z')) enable_Z();
+    if (parser.seen('X')) ENABLE_AXIS_X();
+    if (parser.seen('Y')) ENABLE_AXIS_Y();
+    if (parser.seen('Z')) ENABLE_AXIS_Z();
     #if HAS_E_STEPPER_ENABLE
       if (parser.seen('E')) enable_e_steppers();
     #endif
@@ -57,9 +57,9 @@ void GcodeSuite::M18_M84() {
   else {
     if (parser.seen("XYZE")) {
       planner.synchronize();
-      if (parser.seen('X')) disable_X();
-      if (parser.seen('Y')) disable_Y();
-      if (parser.seen('Z')) disable_Z();
+      if (parser.seen('X')) DISABLE_AXIS_X();
+      if (parser.seen('Y')) DISABLE_AXIS_Y();
+      if (parser.seen('Z')) DISABLE_AXIS_Z();
       #if HAS_E_STEPPER_ENABLE
         if (parser.seen('E')) disable_e_steppers();
       #endif
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index cfa28586b61d..645823a126b7 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -39,39 +39,40 @@ L64XX_Marlin L64xxManager;
 
 void echo_yes_no(const bool yes) { serialprintPGM(yes ? PSTR(" YES") : PSTR(" NO ")); }
 
-char L64XX_Marlin::index_to_axis[MAX_L64XX][3] = { "X ", "Y ", "Z ", "X2", "Y2", "Z2", "Z3", "Z4", "E0", "E1", "E2", "E3", "E4", "E5", "E6", "E7" };
+static const char str_X[] PROGMEM = "X ",  str_Y[] PROGMEM = "Y ",  str_Z[] PROGMEM = "Z ",
+                 str_X2[] PROGMEM = "X2", str_Y2[] PROGMEM = "Y2",
+                 str_Z2[] PROGMEM = "Z2", str_Z3[] PROGMEM = "Z3", str_Z4[] PROGMEM = "Z4",
+                 str_E0[] PROGMEM = "E0", str_E1[] PROGMEM = "E1",
+                 str_E2[] PROGMEM = "E2", str_E3[] PROGMEM = "E3",
+                 str_E4[] PROGMEM = "E4", str_E5[] PROGMEM = "E5",
+                 str_E6[] PROGMEM = "E6", str_E7[] PROGMEM = "E7"
+                 ;
+
+PGM_P const L64XX_Marlin::index_to_axis[] PROGMEM = {
+  str_X, str_Y, str_Z, str_X2, str_Y2, str_Z2, str_Z3, str_Z4,
+  str_E0, str_E1, str_E2, str_E3, str_E4, str_E5, str_E6, str_E7
+};
 
 #define DEBUG_OUT ENABLED(L6470_CHITCHAT)
 #include "../../core/debug_out.h"
 
 uint8_t L64XX_Marlin::dir_commands[MAX_L64XX];  // array to hold direction command for each driver
 
-uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = { (INVERT_X_DIR),                         //  0 X
-                                                  (INVERT_Y_DIR),                         //  1 Y
-                                                  (INVERT_Z_DIR),                         //  2 Z
-                                                  #if ENABLED(X_DUAL_STEPPER_DRIVERS)     //  3 X2
-                                                    (INVERT_X_DIR) ^ (INVERT_X2_VS_X_DIR),
-                                                  #else
-                                                    (INVERT_X_DIR),
-                                                  #endif
-                                                  #if ENABLED(Y_DUAL_STEPPER_DRIVERS)     //  4 Y2
-                                                    (INVERT_Y_DIR) ^ (INVERT_Y2_VS_Y_DIR),
-                                                  #else
-                                                    (INVERT_Y_DIR),
-                                                  #endif
-                                                  (INVERT_Z_DIR),                         //  5 Z2
-                                                  (INVERT_Z_DIR),                         //  6 Z3
-                                                  (INVERT_Z_DIR),                         //  7 Z4
-
-                                                  (INVERT_E0_DIR),                        //  8 E0
-                                                  (INVERT_E1_DIR),                        //  9 E1
-                                                  (INVERT_E2_DIR),                        // 10 E2
-                                                  (INVERT_E3_DIR),                        // 11 E3
-                                                  (INVERT_E4_DIR),                        // 12 E4
-                                                  (INVERT_E5_DIR),                        // 13 E5
-                                                  (INVERT_E6_DIR),                        // 14 E6
-                                                  (INVERT_E7_DIR)                         // 15 E7
-                                                };
+const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
+  INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR
+  , (INVERT_X_DIR)                            // X2
+    #if ENABLED(X_DUAL_STEPPER_DRIVERS)
+      ^ (INVERT_X2_VS_X_DIR)
+    #endif
+  , (INVERT_Y_DIR)                            // Y2
+    #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+      ^ (INVERT_Y2_VS_Y_DIR)
+    #endif
+  , INVERT_Z_DIR, INVERT_Z_DIR, INVERT_Z_DIR  // Z2,Z3,Z4
+
+  , INVERT_E0_DIR, INVERT_E1_DIR, INVERT_E2_DIR, INVERT_E3_DIR
+  , INVERT_E4_DIR, INVERT_E5_DIR, INVERT_E6_DIR, INVERT_E7_DIR
+};
 
 volatile uint8_t L64XX_Marlin::spi_abort = false;
 uint8_t L64XX_Marlin::spi_active = false;
@@ -379,35 +380,27 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
     found_displacement = true;
     displacement = _displacement;
     uint8_t axis_offset = parser.byteval('J');
-    axis_mon[0][0] = axis_codes[i];   // axis ASCII value (target character)
+    axis_mon[0][0] = axis_codes[i];         // Axis first character, one of XYZE
+    const bool single_or_e = axis_offset >= 2 || axis_mon[0][0] == 'E',
+               one_or_more = !single_or_e && axis_offset == 0;
     uint8_t driver_count_local = 0;         // Can't use "driver_count" directly as a subscript because it's passed by reference
-    if (axis_offset >= 2 || axis_mon[0][0] == 'E') {  // Single axis, E0, or E1
-      axis_mon[0][1] = axis_offset + '0';
-      for (j = 0; j < MAX_L64XX; j++) {       // See how many drivers on this axis
-        const char * const str = index_to_axis[j];
-        if (axis_mon[0][0] == str[0]) {
-          char * const mon = axis_mon[driver_count_local];
-          mon[0] = str[0];
-          mon[1] = str[1];
-          mon[2] = str[2];   // append end of string
-          axis_index[driver_count_local] = (L64XX_axis_t)j;        // set axis index
-          driver_count_local++;
-        }
-      }
-    }
-    else if (axis_offset == 0) {              // One or more axes
-      for (j = 0; j < MAX_L64XX; j++) {       // See how many drivers on this axis
-        const char * const str = index_to_axis[j];
-        if (axis_mon[0][0] == str[0]) {
-          char * const mon = axis_mon[driver_count_local];
-          mon[0] = str[0];
-          mon[1] = str[1];
-          mon[2] = str[2];   // append end of string
-          axis_index[driver_count_local] = (L64XX_axis_t)j;        // set axis index
+    if (single_or_e)                        // Single axis, E0, or E1
+      axis_mon[0][1] = axis_offset + '0';   // Index given by 'J' parameter
+
+    if (single_or_e || one_or_more) {
+      for (j = 0; j < MAX_L64XX; j++) {     // Count up the drivers on this axis
+        PGM_P str = (PGM_P)pgm_read_ptr(&index_to_axis[j]); // Get a PGM_P from progmem
+        const char c = pgm_read_byte(str);                  // Get a char from progmem
+        if (axis_mon[0][0] == c) {          // For each stepper on this axis...
+          char *mon = axis_mon[driver_count_local];
+          *mon++ = c;                        // Copy the 3 letter axis name
+          *mon++ = pgm_read_byte(&str[1]);   //  to the axis_mon array
+          *mon   = pgm_read_byte(&str[2]);
+          axis_index[driver_count_local] = (L64XX_axis_t)j; // And store the L64XX axis index
           driver_count_local++;
         }
       }
-      driver_count = driver_count_local;
+      if (one_or_more) driver_count = driver_count_local;
     }
     break; // only take first axis found
   }
@@ -494,8 +487,8 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   for (uint8_t k = 0; k < driver_count; k++) {
     uint8_t not_found = true;
     for (j = 1; j <= L64XX::chain[0]; j++) {
-      const char * const ind_axis = index_to_axis[L64XX::chain[j]];
-      if (ind_axis[0] == axis_mon[k][0] && ind_axis[1] == axis_mon[k][1]) { // See if a L6470 driver
+      PGM_P const str = (PGM_P)pgm_read_ptr(&index_to_axis[L64XX::chain[j]]);
+      if (pgm_read_byte(&str[0]) == axis_mon[k][0] && pgm_read_byte(&str[1]) == axis_mon[k][1]) { // See if a L6470 driver
         not_found = false;
         break;
       }
@@ -724,7 +717,8 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
   };
 
   void L64XX_Marlin::append_stepper_err(char* &p, const uint8_t stepper_index, const char * const err/*=nullptr*/) {
-    p += sprintf_P(p, PSTR("Stepper %c%c "), index_to_axis[stepper_index][0], index_to_axis[stepper_index][1]);
+    PGM_P const str = (PGM_P)pgm_read_ptr(&index_to_axis[stepper_index]);
+    p += sprintf_P(p, PSTR("Stepper %c%c "), pgm_read_byte(&str[0]), pgm_read_byte(&str[1]));
     if (err) p += sprintf_P(p, err);
   }
 
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index 9c233fdf0320..08315fc68f6c 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -39,9 +39,10 @@ enum L64XX_axis_t : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E
 
 class L64XX_Marlin : public L64XXHelper {
 public:
-  static char index_to_axis[MAX_L64XX][3];
+  static PGM_P const index_to_axis[MAX_L64XX];
+
+  static const uint8_t index_to_dir[MAX_L64XX];
 
-  static uint8_t index_to_dir[MAX_L64XX];
   static uint8_t dir_commands[MAX_L64XX];
 
   // Flags to guarantee graceful switch if stepper interrupts L6470 SPI transfer
@@ -69,7 +70,6 @@ class L64XX_Marlin : public L64XXHelper {
 
   static void transfer(uint8_t L6470_buf[], const uint8_t length);
 
-  //static char* index_to_axis(const uint8_t index);
   static void say_axis(const L64XX_axis_t axis, const uint8_t label=true);
   #if ENABLED(L6470_CHITCHAT)
     static void error_status_decode(
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 05522063153c..351b089895e8 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1252,13 +1252,13 @@ void Planner::check_axes_activity() {
   // Disable inactive axes
   //
   #if ENABLED(DISABLE_X)
-    if (!axis_active.x) disable_X();
+    if (!axis_active.x) DISABLE_AXIS_X();
   #endif
   #if ENABLED(DISABLE_Y)
-    if (!axis_active.y) disable_Y();
+    if (!axis_active.y) DISABLE_AXIS_Y();
   #endif
   #if ENABLED(DISABLE_Z)
-    if (!axis_active.z) disable_Z();
+    if (!axis_active.z) DISABLE_AXIS_Z();
   #endif
   #if ENABLED(DISABLE_E)
     if (!axis_active.e) disable_e_steppers();
@@ -1905,29 +1905,29 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Enable active axes
   #if CORE_IS_XY
     if (block->steps.a || block->steps.b) {
-      enable_X();
-      enable_Y();
+      ENABLE_AXIS_X();
+      ENABLE_AXIS_Y();
     }
     #if DISABLED(Z_LATE_ENABLE)
-      if (block->steps.z) enable_Z();
+      if (block->steps.z) ENABLE_AXIS_Z();
     #endif
   #elif CORE_IS_XZ
     if (block->steps.a || block->steps.c) {
-      enable_X();
-      enable_Z();
+      ENABLE_AXIS_X();
+      ENABLE_AXIS_Z();
     }
-    if (block->steps.y) enable_Y();
+    if (block->steps.y) ENABLE_AXIS_Y();
   #elif CORE_IS_YZ
     if (block->steps.b || block->steps.c) {
-      enable_Y();
-      enable_Z();
+      ENABLE_AXIS_Y();
+      ENABLE_AXIS_Z();
     }
-    if (block->steps.x) enable_X();
+    if (block->steps.x) ENABLE_AXIS_X();
   #else
-    if (block->steps.x) enable_X();
-    if (block->steps.y) enable_Y();
+    if (block->steps.x) ENABLE_AXIS_X();
+    if (block->steps.y) ENABLE_AXIS_Y();
     #if DISABLED(Z_LATE_ENABLE)
-      if (block->steps.z) enable_Z();
+      if (block->steps.z) ENABLE_AXIS_Z();
     #endif
   #endif
 
@@ -1945,27 +1945,27 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
         #if HAS_DUPLICATION_MODE
           if (extruder_duplication_enabled && extruder == 0) {
-            enable_E1();
+            ENABLE_AXIS_E1();
             g_uc_extruder_last_move[1] = (BLOCK_BUFFER_SIZE) * 2;
           }
         #endif
 
         #define ENABLE_ONE_E(N) do{ \
           if (extruder == N) { \
-            enable_E##N(); \
+            ENABLE_AXIS_E##N(); \
             g_uc_extruder_last_move[N] = (BLOCK_BUFFER_SIZE) * 2; \
           } \
           else if (!g_uc_extruder_last_move[N]) \
-            disable_E##N(); \
+            DISABLE_AXIS_E##N(); \
         }while(0);
 
       #else
 
-        #define ENABLE_ONE_E(N) enable_E##N();
+        #define ENABLE_ONE_E(N) ENABLE_AXIS_E##N();
 
       #endif
 
-      REPEAT(EXTRUDERS, ENABLE_ONE_E);
+      REPEAT(EXTRUDERS, ENABLE_ONE_E); // (ENABLE_ONE_E must end with semicolon)
     }
   #endif // EXTRUDERS
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 31c11283695f..5710614e007d 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -251,7 +251,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
     #if ENABLED(PROBING_STEPPERS_OFF)
       disable_e_steppers();
       #if NONE(DELTA, HOME_AFTER_DEACTIVATE)
-        disable_X(); disable_Y();
+        DISABLE_AXIS_X(); DISABLE_AXIS_Y();
       #endif
     #endif
     if (p) safe_delay(
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 6e4977984f4c..4e46ea56cd4c 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1927,7 +1927,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
         // If delayed Z enable, enable it now. This option will severely interfere with
         // timing between pulses when chaining motion between blocks, and it could lead
         // to lost steps in both X and Y axis, so avoid using it unless strictly necessary!!
-        if (current_block->steps.z) enable_Z();
+        if (current_block->steps.z) ENABLE_AXIS_Z();
       #endif
 
       // Mark the time_nominal as not calculated yet
@@ -2215,12 +2215,12 @@ void Stepper::init() {
 
   #define _STEP_INIT(AXIS) AXIS ##_STEP_INIT()
   #define _WRITE_STEP(AXIS, HIGHLOW) AXIS ##_STEP_WRITE(HIGHLOW)
-  #define _DISABLE(AXIS) disable_## AXIS()
+  #define _DISABLE_AXIS(AXIS) DISABLE_AXIS_## AXIS()
 
   #define AXIS_INIT(AXIS, PIN) \
     _STEP_INIT(AXIS); \
     _WRITE_STEP(AXIS, _INVERT_STEP_PIN(PIN)); \
-    _DISABLE(AXIS)
+    _DISABLE_AXIS(AXIS)
 
   #define E_AXIS_INIT(NUM) AXIS_INIT(E## NUM, E)
 
@@ -2437,7 +2437,7 @@ void Stepper::report_positions() {
   #endif
   #define EXTRA_CYCLES_BABYSTEP (STEP_PULSE_CYCLES - (CYCLES_EATEN_BABYSTEP))
 
-  #define _ENABLE(AXIS) enable_## AXIS()
+  #define _ENABLE_AXIS(AXIS) ENABLE_AXIS_## AXIS()
   #define _READ_DIR(AXIS) AXIS ##_DIR_READ()
   #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
   #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
@@ -2460,7 +2460,7 @@ void Stepper::report_positions() {
 
   #define BABYSTEP_AXIS(AXIS, INVERT, DIR) {            \
       const uint8_t old_dir = _READ_DIR(AXIS);          \
-      _ENABLE(AXIS);                                    \
+      _ENABLE_AXIS(AXIS);                                    \
       DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);              \
       _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT);   \
       DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);              \
@@ -2523,9 +2523,9 @@ void Stepper::report_positions() {
 
           const bool z_direction = direction ^ BABYSTEP_INVERT_Z;
 
-          enable_X();
-          enable_Y();
-          enable_Z();
+          ENABLE_AXIS_X();
+          ENABLE_AXIS_Y();
+          ENABLE_AXIS_Z();
 
           #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
             DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
diff --git a/Marlin/src/module/stepper/L64xx.h b/Marlin/src/module/stepper/L64xx.h
index 35b3d723debd..919e96694026 100644
--- a/Marlin/src/module/stepper/L64xx.h
+++ b/Marlin/src/module/stepper/L64xx.h
@@ -55,6 +55,9 @@
     #define X_DIR_INIT()        NOOP
     #define X_DIR_WRITE(STATE)  L64XX_DIR_WRITE(X, STATE)
     #define X_DIR_READ()        (stepper##X.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_X(L6470)
+      #define DISABLE_STEPPER_X() stepperX.free()
+    #endif
   #endif
 #endif
 
@@ -72,6 +75,9 @@
     #define Y_DIR_INIT()        NOOP
     #define Y_DIR_WRITE(STATE)  L64XX_DIR_WRITE(Y, STATE)
     #define Y_DIR_READ()        (stepper##Y.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_Y(L6470)
+      #define DISABLE_STEPPER_Y() stepperY.free()
+    #endif
   #endif
 #endif
 
@@ -89,6 +95,9 @@
     #define Z_DIR_INIT()        NOOP
     #define Z_DIR_WRITE(STATE)  L64XX_DIR_WRITE(Z, STATE)
     #define Z_DIR_READ()        (stepper##Z.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_Z(L6470)
+      #define DISABLE_STEPPER_Z() stepperZ.free()
+    #endif
   #endif
 #endif
 
@@ -109,6 +118,10 @@
   #endif
 #endif
 
+#if AXIS_DRIVER_TYPE_X2(L6470)
+  #define DISABLE_STEPPER_X2() stepperX2.free()
+#endif
+
 // Y2 Stepper
 #if HAS_Y2_ENABLE && AXIS_IS_L64XX(Y2)
   extern L64XX_CLASS(Y2)         stepperY2;
@@ -126,6 +139,10 @@
   #endif
 #endif
 
+#if AXIS_DRIVER_TYPE_Y2(L6470)
+  #define DISABLE_STEPPER_Y2() stepperY2.free()
+#endif
+
 // Z2 Stepper
 #if HAS_Z2_ENABLE && AXIS_IS_L64XX(Z2)
   extern L64XX_CLASS(Z2)         stepperZ2;
@@ -143,6 +160,10 @@
   #endif
 #endif
 
+#if AXIS_DRIVER_TYPE_Z2(L6470)
+  #define DISABLE_STEPPER_Z2() stepperZ2.free()
+#endif
+
 // Z3 Stepper
 #if HAS_Z3_ENABLE && AXIS_IS_L64XX(Z3)
   extern L64XX_CLASS(Z3)         stepperZ3;
@@ -160,6 +181,10 @@
   #endif
 #endif
 
+#if AXIS_DRIVER_TYPE_Z3(L6470)
+  #define DISABLE_STEPPER_Z3() stepperZ3.free()
+#endif
+
 // Z4 Stepper
 #if HAS_Z4_ENABLE && AXIS_IS_L64XX(Z4)
   extern L64XX_CLASS(Z4)         stepperZ4;
@@ -177,6 +202,10 @@
   #endif
 #endif
 
+#if AXIS_DRIVER_TYPE_Z4(L6470)
+  #define DISABLE_STEPPER_Z4() stepperZ4.free()
+#endif
+
 // E0 Stepper
 #if AXIS_IS_L64XX(E0)
   extern L64XX_CLASS(E0)         stepperE0;
@@ -191,6 +220,9 @@
     #define E0_DIR_INIT()        NOOP
     #define E0_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E0, STATE)
     #define E0_DIR_READ()        (stepper##E0.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E0(L6470)
+      #define DISABLE_STEPPER_E0() do{ stepperE0.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
 
@@ -208,6 +240,9 @@
     #define E1_DIR_INIT()        NOOP
     #define E1_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E1, STATE)
     #define E1_DIR_READ()        (stepper##E1.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E1(L6470)
+      #define DISABLE_STEPPER_E1() do{ stepperE1.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
 
@@ -225,6 +260,9 @@
     #define E2_DIR_INIT()        NOOP
     #define E2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E2, STATE)
     #define E2_DIR_READ()        (stepper##E2.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E2(L6470)
+      #define DISABLE_STEPPER_E2() do{ stepperE2.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
 
@@ -259,6 +297,9 @@
     #define E4_DIR_INIT()        NOOP
     #define E4_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E4, STATE)
     #define E4_DIR_READ()        (stepper##E4.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E4(L6470)
+      #define DISABLE_STEPPER_E4() do{ stepperE4.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
 
@@ -276,6 +317,9 @@
     #define E5_DIR_INIT()        NOOP
     #define E5_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E5, STATE)
     #define E5_DIR_READ()        (stepper##E5.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E5(L6470)
+      #define DISABLE_STEPPER_E5() do{ stepperE5.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
 
@@ -293,6 +337,9 @@
     #define E6_DIR_INIT()        NOOP
     #define E6_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E6, STATE)
     #define E6_DIR_READ()        (stepper##E6.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E6(L6470)
+      #define DISABLE_STEPPER_E6() do{ stepperE6.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
 
@@ -310,5 +357,8 @@
     #define E7_DIR_INIT()        NOOP
     #define E7_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E7, STATE)
     #define E7_DIR_READ()        (stepper##E7.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_E7(L6470)
+      #define DISABLE_STEPPER_E7() do{ stepperE7.free(); CBI(axis_known_position, E_AXIS); }while(0)
+    #endif
   #endif
 #endif
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index d05c7e3db395..55e44fbe046f 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -594,320 +594,412 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #endif
 
 //
-// X, Y, Z Stepper enable / disable
+// Individual stepper enable / disable macros
 //
-#if AXIS_DRIVER_TYPE_X(L6470)
-  extern L6470 stepperX;
-  #define X_enable()  NOOP
-  #define X_disable() stepperX.free()
-#elif HAS_X_ENABLE
-  #define X_enable()  X_ENABLE_WRITE( X_ENABLE_ON)
-  #define X_disable() X_ENABLE_WRITE(!X_ENABLE_ON)
-#else
-  #define X_enable()  NOOP
-  #define X_disable() NOOP
-#endif
 
-#if AXIS_DRIVER_TYPE_X2(L6470)
-  extern L6470 stepperX2;
-  #define X2_enable()  NOOP
-  #define X2_disable() stepperX2.free()
-#elif HAS_X2_ENABLE
-  #define X2_enable()  X2_ENABLE_WRITE( X_ENABLE_ON)
-  #define X2_disable() X2_ENABLE_WRITE(!X_ENABLE_ON)
-#else
-  #define X2_enable()  NOOP
-  #define X2_disable() NOOP
+#ifndef ENABLE_STEPPER_X
+  #if HAS_X_ENABLE
+    #define  ENABLE_STEPPER_X() X_ENABLE_WRITE( X_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_X() NOOP
+  #endif
 #endif
-
-#define  enable_X() do{ X_enable(); X2_enable(); }while(0)
-#define disable_X() do{ X_disable(); X2_disable(); CBI(axis_known_position, X_AXIS); }while(0)
-
-#if AXIS_DRIVER_TYPE_Y(L6470)
-  extern L6470 stepperY;
-  #define Y_enable()  NOOP
-  #define Y_disable() stepperY.free()
-#elif HAS_Y_ENABLE
-  #define Y_enable()  Y_ENABLE_WRITE( Y_ENABLE_ON)
-  #define Y_disable() Y_ENABLE_WRITE(!Y_ENABLE_ON)
-#else
-  #define Y_enable()  NOOP
-  #define Y_disable() NOOP
+#ifndef DISABLE_STEPPER_X
+  #if HAS_X_ENABLE
+    #define DISABLE_STEPPER_X() X_ENABLE_WRITE(!X_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_X() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_Y2(L6470)
-  extern L6470 stepperY2;
-  #define Y2_enable()  NOOP
-  #define Y2_disable() stepperY2.free()
-#elif HAS_Y2_ENABLE
-  #define Y2_enable()  Y2_ENABLE_WRITE( Y_ENABLE_ON)
-  #define Y2_disable() Y2_ENABLE_WRITE(!Y_ENABLE_ON)
-#else
-  #define Y2_enable()  NOOP
-  #define Y2_disable() NOOP
+#ifndef ENABLE_STEPPER_X2
+  #if HAS_X2_ENABLE
+    #define  ENABLE_STEPPER_X2() X2_ENABLE_WRITE( X_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_X2() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_X2
+  #if HAS_X2_ENABLE
+    #define DISABLE_STEPPER_X2() X2_ENABLE_WRITE(!X_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_X2() NOOP
+  #endif
 #endif
 
-#define  enable_Y() do{ Y_enable(); Y2_enable(); }while(0)
-#define disable_Y() do{ Y_disable(); Y2_disable(); CBI(axis_known_position, Y_AXIS); }while(0)
-
-#if AXIS_DRIVER_TYPE_Z(L6470)
-  extern L6470 stepperZ;
-  #define Z_enable()  NOOP
-  #define Z_disable() stepperZ.free()
-#elif HAS_Z_ENABLE
-  #define Z_enable()  Z_ENABLE_WRITE( Z_ENABLE_ON)
-  #define Z_disable() Z_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
-  #define Z_enable()  NOOP
-  #define Z_disable() NOOP
+#ifndef ENABLE_STEPPER_Y
+  #if HAS_Y_ENABLE
+    #define  ENABLE_STEPPER_Y() Y_ENABLE_WRITE( Y_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_Y() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_Y
+  #if HAS_Y_ENABLE
+    #define DISABLE_STEPPER_Y() Y_ENABLE_WRITE(!Y_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_Y() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_Z2(L6470)
-  extern L6470 stepperZ2;
-  #define Z2_enable()  NOOP
-  #define Z2_disable() stepperZ2.free()
-#elif HAS_Z2_ENABLE
-  #define Z2_enable()  Z2_ENABLE_WRITE( Z_ENABLE_ON)
-  #define Z2_disable() Z2_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
-  #define Z2_enable()  NOOP
-  #define Z2_disable() NOOP
+#ifndef ENABLE_STEPPER_Y2
+  #if HAS_Y2_ENABLE
+    #define  ENABLE_STEPPER_Y2() Y2_ENABLE_WRITE( Y_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_Y2() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_Y2
+  #if HAS_Y2_ENABLE
+    #define DISABLE_STEPPER_Y2() Y2_ENABLE_WRITE(!Y_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_Y2() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_Z3(L6470)
-  extern L6470 stepperZ3;
-  #define Z3_enable()  NOOP
-  #define Z3_disable() stepperZ3.free()
-#elif HAS_Z3_ENABLE
-  #define Z3_enable()  Z3_ENABLE_WRITE( Z_ENABLE_ON)
-  #define Z3_disable() Z3_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
-  #define Z3_enable()  NOOP
-  #define Z3_disable() NOOP
+#ifndef ENABLE_STEPPER_Z
+  #if HAS_Z_ENABLE
+    #define  ENABLE_STEPPER_Z() Z_ENABLE_WRITE( Z_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_Z() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_Z
+  #if HAS_Z_ENABLE
+    #define DISABLE_STEPPER_Z() Z_ENABLE_WRITE(!Z_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_Z() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_Z4(L6470)
-  extern L6470 stepperZ4;
-  #define Z4_enable()  NOOP
-  #define Z4_disable() stepperZ4.free()
-#elif HAS_Z4_ENABLE
-  #define Z4_enable()  Z4_ENABLE_WRITE( Z_ENABLE_ON)
-  #define Z4_disable() Z4_ENABLE_WRITE(!Z_ENABLE_ON)
-#else
-  #define Z4_enable()  NOOP
-  #define Z4_disable() NOOP
+#ifndef ENABLE_STEPPER_Z2
+  #if HAS_Z2_ENABLE
+    #define  ENABLE_STEPPER_Z2() Z2_ENABLE_WRITE( Z_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_Z2() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_Z2
+  #if HAS_Z2_ENABLE
+    #define DISABLE_STEPPER_Z2() Z2_ENABLE_WRITE(!Z_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_Z2() NOOP
+  #endif
 #endif
 
-#define  enable_Z() do{ Z_enable();  Z2_enable();  Z3_enable();  Z4_enable(); }while(0)
-#define disable_Z() do{ Z_disable(); Z2_disable(); Z3_disable(); Z4_disable(); CBI(axis_known_position, Z_AXIS); }while(0)
+#ifndef ENABLE_STEPPER_Z3
+  #if HAS_Z3_ENABLE
+    #define  ENABLE_STEPPER_Z3() Z3_ENABLE_WRITE( Z_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_Z3() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_Z3
+  #if HAS_Z3_ENABLE
+    #define DISABLE_STEPPER_Z3() Z3_ENABLE_WRITE(!Z_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_Z3() NOOP
+  #endif
+#endif
 
-//
-// Extruder Stepper enable / disable
-//
+#ifndef ENABLE_STEPPER_Z4
+  #if HAS_Z4_ENABLE
+    #define  ENABLE_STEPPER_Z4() Z4_ENABLE_WRITE( Z_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_Z4() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_Z4
+  #if HAS_Z4_ENABLE
+    #define DISABLE_STEPPER_Z4() Z4_ENABLE_WRITE(!Z_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_Z4() NOOP
+  #endif
+#endif
 
-// define the individual enables/disables
-#if AXIS_DRIVER_TYPE_E0(L6470)
-  extern L6470 stepperE0;
-  #define  E0_enable() NOOP
-  #define E0_disable() do{ stepperE0.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif HAS_E0_ENABLE
-  #define  E0_enable() E0_ENABLE_WRITE( E_ENABLE_ON)
-  #define E0_disable() E0_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E0_enable() NOOP
-  #define E0_disable() NOOP
+#ifndef ENABLE_STEPPER_E0
+  #if HAS_E0_ENABLE
+    #define  ENABLE_STEPPER_E0() E0_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E0() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E0
+  #if HAS_E0_ENABLE
+    #define DISABLE_STEPPER_E0() E0_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E0() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E1(L6470)
-  extern L6470 stepperE1;
-  #define  E1_enable() NOOP
-  #define E1_disable() do{ stepperE1.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 1 && HAS_E1_ENABLE
-  #define  E1_enable() E1_ENABLE_WRITE( E_ENABLE_ON)
-  #define E1_disable() E1_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E1_enable() NOOP
-  #define E1_disable() NOOP
+#ifndef ENABLE_STEPPER_E1
+  #if E_STEPPERS > 1 && HAS_E1_ENABLE
+    #define  ENABLE_STEPPER_E1() E1_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E1() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E1
+  #if E_STEPPERS > 1 && HAS_E1_ENABLE
+    #define DISABLE_STEPPER_E1() E1_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E1() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E2(L6470)
-  extern L6470 stepperE2;
-  #define  E2_enable() NOOP
-  #define E2_disable() do{ stepperE2.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 2 && HAS_E2_ENABLE
-  #define  E2_enable() E2_ENABLE_WRITE( E_ENABLE_ON)
-  #define E2_disable() E2_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E2_enable() NOOP
-  #define E2_disable() NOOP
+#ifndef ENABLE_STEPPER_E2
+  #if E_STEPPERS > 2 && HAS_E2_ENABLE
+    #define  ENABLE_STEPPER_E2() E2_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E2() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E2
+  #if E_STEPPERS > 2 && HAS_E2_ENABLE
+    #define DISABLE_STEPPER_E2() E2_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E2() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E3(L6470)
-  extern L6470 stepperE3;
-  #define  E3_enable() NOOP
-  #define E3_disable() do{ stepperE3.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 3 && HAS_E3_ENABLE
-  #define  E3_enable() E3_ENABLE_WRITE( E_ENABLE_ON)
-  #define E3_disable() E3_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E3_enable() NOOP
-  #define E3_disable() NOOP
+#ifndef ENABLE_STEPPER_E3
+  #if E_STEPPERS > 3 && HAS_E3_ENABLE
+    #define  ENABLE_STEPPER_E3() E3_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E3() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E3
+  #if E_STEPPERS > 3 && HAS_E3_ENABLE
+    #define DISABLE_STEPPER_E3() E3_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E3() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E4(L6470)
-  extern L6470 stepperE4;
-  #define  E4_enable() NOOP
-  #define E4_disable() do{ stepperE4.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 4 && HAS_E4_ENABLE
-  #define  E4_enable() E4_ENABLE_WRITE( E_ENABLE_ON)
-  #define E4_disable() E4_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E4_enable() NOOP
-  #define E4_disable() NOOP
+#ifndef ENABLE_STEPPER_E4
+  #if E_STEPPERS > 4 && HAS_E4_ENABLE
+    #define  ENABLE_STEPPER_E4() E4_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E4() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E4
+  #if E_STEPPERS > 4 && HAS_E4_ENABLE
+    #define DISABLE_STEPPER_E4() E4_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E4() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E5(L6470)
-  extern L6470 stepperE5;
-  #define  E5_enable() NOOP
-  #define E5_disable() do{ stepperE5.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 5 && HAS_E5_ENABLE
-  #define  E5_enable() E5_ENABLE_WRITE( E_ENABLE_ON)
-  #define E5_disable() E5_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E5_enable() NOOP
-  #define E5_disable() NOOP
+#ifndef ENABLE_STEPPER_E5
+  #if E_STEPPERS > 5 && HAS_E5_ENABLE
+    #define  ENABLE_STEPPER_E5() E5_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E5() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E5
+  #if E_STEPPERS > 5 && HAS_E5_ENABLE
+    #define DISABLE_STEPPER_E5() E5_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E5() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E6(L6470)
-  extern L6470 stepperE6;
-  #define  E6_enable() NOOP
-  #define E6_disable() do{ stepperE6.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 6 && HAS_E6_ENABLE
-  #define  E6_enable() E6_ENABLE_WRITE( E_ENABLE_ON)
-  #define E6_disable() E6_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E6_enable() NOOP
-  #define E6_disable() NOOP
+#ifndef ENABLE_STEPPER_E6
+  #if E_STEPPERS > 6 && HAS_E6_ENABLE
+    #define  ENABLE_STEPPER_E6() E6_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E6() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_E6
+  #if E_STEPPERS > 6 && HAS_E6_ENABLE
+    #define DISABLE_STEPPER_E6() E6_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E6() NOOP
+  #endif
 #endif
 
-#if AXIS_DRIVER_TYPE_E7(L6470)
-  extern L6470 stepperE7;
-  #define  E7_enable() NOOP
-  #define E7_disable() do{ stepperE7.free(); CBI(axis_known_position, E_AXIS); }while(0)
-#elif E_STEPPERS > 7 && HAS_E7_ENABLE
-  #define  E7_enable() E7_ENABLE_WRITE( E_ENABLE_ON)
-  #define E7_disable() E7_ENABLE_WRITE(!E_ENABLE_ON)
-#else
-  #define  E7_enable() NOOP
-  #define E7_disable() NOOP
+#ifndef ENABLE_STEPPER_E7
+  #if E_STEPPERS > 7 && HAS_E7_ENABLE
+    #define  ENABLE_STEPPER_E7() E7_ENABLE_WRITE( E_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_E7() NOOP
+  #endif
 #endif
+#ifndef DISABLE_STEPPER_E7
+  #if E_STEPPERS > 7 && HAS_E7_ENABLE
+    #define DISABLE_STEPPER_E7() E7_ENABLE_WRITE(!E_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_E7() NOOP
+  #endif
+#endif
+
+//
+// Axis steppers enable / disable macros
+//
+
+#define  ENABLE_AXIS_X() do{ ENABLE_STEPPER_X(); ENABLE_STEPPER_X2(); }while(0)
+#define DISABLE_AXIS_X() do{ DISABLE_STEPPER_X(); DISABLE_STEPPER_X2(); CBI(axis_known_position, X_AXIS); }while(0)
+
+#define  ENABLE_AXIS_Y() do{ ENABLE_STEPPER_Y(); ENABLE_STEPPER_Y2(); }while(0)
+#define DISABLE_AXIS_Y() do{ DISABLE_STEPPER_Y(); DISABLE_STEPPER_Y2(); CBI(axis_known_position, Y_AXIS); }while(0)
+
+#define  ENABLE_AXIS_Z() do{ ENABLE_STEPPER_Z();  ENABLE_STEPPER_Z2();  ENABLE_STEPPER_Z3();  ENABLE_STEPPER_Z4(); }while(0)
+#define DISABLE_AXIS_Z() do{ DISABLE_STEPPER_Z(); DISABLE_STEPPER_Z2(); DISABLE_STEPPER_Z3(); DISABLE_STEPPER_Z4(); CBI(axis_known_position, Z_AXIS); }while(0)
+
+//
+// Extruder steppers enable / disable macros
+//
 
 #if ENABLED(MIXING_EXTRUDER)
 
   /**
-   * Mixing steppers synchronize their enable (and direction) together
+   * Mixing steppers keep all their enable (and direction) states synchronized
    */
   #if MIXING_STEPPERS > 7
-    #define  enable_E0() { E0_enable();  E1_enable();  E2_enable();  E3_enable();  E4_enable();  E5_enable();  E6_enable();  E7_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); E5_disable(); E6_disable(); E7_disable(); }
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4();  ENABLE_STEPPER_E5();  ENABLE_STEPPER_E6();  ENABLE_STEPPER_E7(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); DISABLE_STEPPER_E6(); DISABLE_STEPPER_E7(); }
   #elif MIXING_STEPPERS > 6
-    #define  enable_E0() { E0_enable();  E1_enable();  E2_enable();  E3_enable();  E4_enable();  E5_enable();  E6_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); E5_disable(); E6_disable(); }
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4();  ENABLE_STEPPER_E5();  ENABLE_STEPPER_E6(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); DISABLE_STEPPER_E6(); }
   #elif MIXING_STEPPERS > 5
-    #define  enable_E0() { E0_enable();  E1_enable();  E2_enable();  E3_enable();  E4_enable();  E5_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); E5_disable(); }
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4();  ENABLE_STEPPER_E5(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); }
   #elif MIXING_STEPPERS > 4
-    #define  enable_E0() { E0_enable();  E1_enable();  E2_enable();  E3_enable();  E4_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); E4_disable(); }
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); }
   #elif MIXING_STEPPERS > 3
-    #define  enable_E0() { E0_enable();  E1_enable();  E2_enable();  E3_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); E3_disable(); }
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); }
   #elif MIXING_STEPPERS > 2
-    #define  enable_E0() { E0_enable();  E1_enable();  E2_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); E2_disable(); }
-  #else
-    #define  enable_E0() { E0_enable();  E1_enable(); }
-    #define disable_E0() { E0_disable(); E1_disable(); }
-  #endif
-  #define  enable_E1() NOOP
-  #define disable_E1() NOOP
-  #define  enable_E2() NOOP
-  #define disable_E2() NOOP
-  #define  enable_E3() NOOP
-  #define disable_E3() NOOP
-  #define  enable_E4() NOOP
-  #define disable_E4() NOOP
-  #define  enable_E5() NOOP
-  #define disable_E5() NOOP
-  #define  enable_E6() NOOP
-  #define disable_E6() NOOP
-  #define  enable_E7() NOOP
-  #define disable_E7() NOOP
-
-#else // !MIXING_EXTRUDER
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); }
+  #else
+    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1(); }
+    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); }
+  #endif
 
-  #if HAS_E0_ENABLE
-    #define  enable_E0() E0_enable()
-    #define disable_E0() E0_disable()
+#endif // !MIXING_EXTRUDER
+
+#ifndef ENABLE_AXIS_E0
+  #if E_STEPPERS > 0 && HAS_E0_ENABLE
+    #define  ENABLE_AXIS_E0() ENABLE_STEPPER_E0()
   #else
-    #define  enable_E0() NOOP
-    #define disable_E0() NOOP
+    #define  ENABLE_AXIS_E0() NOOP
   #endif
+#endif
+#ifndef DISABLE_AXIS_E0
+  #if E_STEPPERS > 0 && HAS_E0_DISABLE
+    #define DISABLE_AXIS_E0() DISABLE_STEPPER_E0()
+  #else
+    #define DISABLE_AXIS_E0() NOOP
+  #endif
+#endif
 
+#ifndef ENABLE_AXIS_E1
   #if E_STEPPERS > 1 && HAS_E1_ENABLE
-    #define  enable_E1() E1_enable()
-    #define disable_E1() E1_disable()
+    #define  ENABLE_AXIS_E1() ENABLE_STEPPER_E1()
   #else
-    #define  enable_E1() NOOP
-    #define disable_E1() NOOP
+    #define  ENABLE_AXIS_E1() NOOP
   #endif
+#endif
+#ifndef DISABLE_AXIS_E1
+  #if E_STEPPERS > 1 && HAS_E1_DISABLE
+    #define DISABLE_AXIS_E1() DISABLE_STEPPER_E1()
+  #else
+    #define DISABLE_AXIS_E1() NOOP
+  #endif
+#endif
 
+#ifndef ENABLE_AXIS_E2
   #if E_STEPPERS > 2 && HAS_E2_ENABLE
-    #define  enable_E2() E2_enable()
-    #define disable_E2() E2_disable()
+    #define  ENABLE_AXIS_E2() ENABLE_STEPPER_E2()
+  #else
+    #define  ENABLE_AXIS_E2() NOOP
+  #endif
+#endif
+#ifndef DISABLE_AXIS_E2
+  #if E_STEPPERS > 2 && HAS_E2_DISABLE
+    #define DISABLE_AXIS_E2() DISABLE_STEPPER_E2()
   #else
-    #define  enable_E2() NOOP
-    #define disable_E2() NOOP
+    #define DISABLE_AXIS_E2() NOOP
   #endif
+#endif
 
+#ifndef ENABLE_AXIS_E3
   #if E_STEPPERS > 3 && HAS_E3_ENABLE
-    #define  enable_E3() E3_enable()
-    #define disable_E3() E3_disable()
+    #define  ENABLE_AXIS_E3() ENABLE_STEPPER_E3()
   #else
-    #define  enable_E3() NOOP
-    #define disable_E3() NOOP
+    #define  ENABLE_AXIS_E3() NOOP
   #endif
+#endif
+#ifndef DISABLE_AXIS_E3
+  #if E_STEPPERS > 3 && HAS_E3_DISABLE
+    #define DISABLE_AXIS_E3() DISABLE_STEPPER_E3()
+  #else
+    #define DISABLE_AXIS_E3() NOOP
+  #endif
+#endif
 
+#ifndef ENABLE_AXIS_E4
   #if E_STEPPERS > 4 && HAS_E4_ENABLE
-    #define  enable_E4() E4_enable()
-    #define disable_E4() E4_disable()
+    #define  ENABLE_AXIS_E4() ENABLE_STEPPER_E4()
+  #else
+    #define  ENABLE_AXIS_E4() NOOP
+  #endif
+#endif
+#ifndef DISABLE_AXIS_E4
+  #if E_STEPPERS > 4 && HAS_E4_DISABLE
+    #define DISABLE_AXIS_E4() DISABLE_STEPPER_E4()
   #else
-    #define  enable_E4() NOOP
-    #define disable_E4() NOOP
+    #define DISABLE_AXIS_E4() NOOP
   #endif
+#endif
 
+#ifndef ENABLE_AXIS_E5
   #if E_STEPPERS > 5 && HAS_E5_ENABLE
-    #define  enable_E5() E5_enable()
-    #define disable_E5() E5_disable()
+    #define  ENABLE_AXIS_E5() ENABLE_STEPPER_E5()
   #else
-    #define  enable_E5() NOOP
-    #define disable_E5() NOOP
+    #define  ENABLE_AXIS_E5() NOOP
   #endif
+#endif
+#ifndef DISABLE_AXIS_E5
+  #if E_STEPPERS > 5 && HAS_E5_DISABLE
+    #define DISABLE_AXIS_E5() DISABLE_STEPPER_E5()
+  #else
+    #define DISABLE_AXIS_E5() NOOP
+  #endif
+#endif
 
+#ifndef ENABLE_AXIS_E6
   #if E_STEPPERS > 6 && HAS_E6_ENABLE
-    #define  enable_E6() E6_enable()
-    #define disable_E6() E6_disable()
+    #define  ENABLE_AXIS_E6() ENABLE_STEPPER_E6()
   #else
-    #define  enable_E6() NOOP
-    #define disable_E6() NOOP
+    #define  ENABLE_AXIS_E6() NOOP
   #endif
+#endif
+#ifndef DISABLE_AXIS_E6
+  #if E_STEPPERS > 6 && HAS_E6_DISABLE
+    #define DISABLE_AXIS_E6() DISABLE_STEPPER_E6()
+  #else
+    #define DISABLE_AXIS_E6() NOOP
+  #endif
+#endif
 
+#ifndef ENABLE_AXIS_E7
   #if E_STEPPERS > 7 && HAS_E7_ENABLE
-    #define  enable_E7() E7_enable()
-    #define disable_E7() E7_disable()
+    #define  ENABLE_AXIS_E7() ENABLE_STEPPER_E7()
   #else
-    #define  enable_E7() NOOP
-    #define disable_E7() NOOP
+    #define  ENABLE_AXIS_E7() NOOP
   #endif
-
-#endif // !MIXING_EXTRUDER
+#endif
+#ifndef DISABLE_AXIS_E7
+  #if E_STEPPERS > 7 && HAS_E7_DISABLE
+    #define DISABLE_AXIS_E7() DISABLE_STEPPER_E7()
+  #else
+    #define DISABLE_AXIS_E7() NOOP
+  #endif
+#endif

From 9caf5c05e7e408c7192e689e4ed5fe2735bb2995 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Jan 2020 03:24:43 -0600
Subject: [PATCH 085/565] Refactor heater watch, job timer auto-start (#16725)

---
 Marlin/src/feature/pause.cpp               |  4 +-
 Marlin/src/gcode/temperature/M104_M109.cpp | 30 +++++------
 Marlin/src/gcode/temperature/M140_M190.cpp | 11 +++-
 Marlin/src/gcode/temperature/M141_M191.cpp |  9 +++-
 Marlin/src/lcd/extensible_ui/ui_api.cpp    |  4 +-
 Marlin/src/module/temperature.cpp          | 61 +++++++++++++---------
 Marlin/src/module/temperature.h            | 51 ++++++++++++++----
 7 files changed, 113 insertions(+), 57 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 10a1ba6a96f6..6a2f148ea394 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -564,7 +564,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       #endif
 
       // Re-enable the heaters if they timed out
-      HOTEND_LOOP() thermalManager.reset_heater_idle_timer(e);
+      HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
 
       // Wait for the heaters to reach the target temperatures
       ensure_safe_temperature();
@@ -633,7 +633,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
   bool nozzle_timed_out = false;
   HOTEND_LOOP() {
     nozzle_timed_out |= thermalManager.hotend_idle[e].timed_out;
-    thermalManager.reset_heater_idle_timer(e);
+    thermalManager.reset_hotend_idle_timer(e);
   }
 
   if (nozzle_timed_out || thermalManager.hotEnoughToExtrude(active_extruder)) // Load the new filament
diff --git a/Marlin/src/gcode/temperature/M104_M109.cpp b/Marlin/src/gcode/temperature/M104_M109.cpp
index 8c5827e83b17..8dbb3af235b1 100644
--- a/Marlin/src/gcode/temperature/M104_M109.cpp
+++ b/Marlin/src/gcode/temperature/M104_M109.cpp
@@ -20,6 +20,12 @@
  *
  */
 
+/**
+ * gcode/temperature/M104_M109.cpp
+ *
+ * Hotend target temperature control
+ */
+
 #include "../../inc/MarlinConfigPre.h"
 
 #if EXTRUDERS
@@ -73,14 +79,11 @@ void GcodeSuite::M104() {
     #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
       /**
        * Stop the timer at the end of print. Start is managed by 'heat and wait' M109.
-       * We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
-       * standby mode, for instance in a dual extruder setup, without affecting
-       * the running print timer.
+       * Hotends use EXTRUDE_MINTEMP / 2 to allow nozzles to be put into hot standby
+       * mode, for instance in a dual extruder setup, without affecting the running
+       * print timer.
        */
-      if (temp <= (EXTRUDE_MINTEMP) / 2) {
-        print_job_timer.stop();
-        ui.reset_status();
-      }
+      thermalManager.check_timer_autostart(false, true);
     #endif
   }
 
@@ -90,8 +93,10 @@ void GcodeSuite::M104() {
 }
 
 /**
- * M109: Sxxx Wait for extruder(s) to reach temperature. Waits only when heating.
- *       Rxxx Wait for extruder(s) to reach temperature. Waits when heating and cooling.
+ * M109: Sxxx Wait for hotend(s) to reach temperature. Waits only when heating.
+ *       Rxxx Wait for hotend(s) to reach temperature. Waits when heating and cooling.
+ *
+ * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating and stop it if turned off.
  */
 void GcodeSuite::M109() {
 
@@ -125,12 +130,7 @@ void GcodeSuite::M109() {
        * standby mode, (e.g., in a dual extruder setup) without affecting
        * the running print timer.
        */
-      if (parser.value_celsius() <= (EXTRUDE_MINTEMP) / 2) {
-        print_job_timer.stop();
-        ui.reset_status();
-      }
-      else
-        startOrResumeJob();
+      thermalManager.check_timer_autostart(true, true);
     #endif
 
     #if HAS_DISPLAY
diff --git a/Marlin/src/gcode/temperature/M140_M190.cpp b/Marlin/src/gcode/temperature/M140_M190.cpp
index d6386cef506a..f5c3d3683299 100644
--- a/Marlin/src/gcode/temperature/M140_M190.cpp
+++ b/Marlin/src/gcode/temperature/M140_M190.cpp
@@ -20,6 +20,12 @@
  *
  */
 
+/**
+ * gcode/temperature/M140_M190.cpp
+ *
+ * Bed target temperature control
+ */
+
 #include "../../inc/MarlinConfig.h"
 
 #if HAS_HEATED_BED
@@ -50,6 +56,8 @@ void GcodeSuite::M140() {
 /**
  * M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating
  *       Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
+ *
+ * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating.
  */
 void GcodeSuite::M190() {
   if (DEBUGGING(DRYRUN)) return;
@@ -58,8 +66,7 @@ void GcodeSuite::M190() {
   if (no_wait_for_cooling || parser.seenval('R')) {
     thermalManager.setTargetBed(parser.value_celsius());
     #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
-      if (parser.value_celsius() > BED_MINTEMP)
-        startOrResumeJob();
+      thermalManager.check_timer_autostart(true, false);
     #endif
   }
   else return;
diff --git a/Marlin/src/gcode/temperature/M141_M191.cpp b/Marlin/src/gcode/temperature/M141_M191.cpp
index 12eaa24bf921..3c9934659940 100644
--- a/Marlin/src/gcode/temperature/M141_M191.cpp
+++ b/Marlin/src/gcode/temperature/M141_M191.cpp
@@ -20,6 +20,12 @@
  *
  */
 
+/**
+ * gcode/temperature/M141_M191.cpp
+ *
+ * Chamber target temperature control
+ */
+
 #include "../../inc/MarlinConfig.h"
 
 #if HAS_HEATED_CHAMBER
@@ -59,8 +65,7 @@ void GcodeSuite::M191() {
   if (no_wait_for_cooling || parser.seenval('R')) {
     thermalManager.setTargetChamber(parser.value_celsius());
     #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
-      if (parser.value_celsius() > CHAMBER_MINTEMP)
-        startOrResumeJob();
+      thermalManager.check_timer_autostart(true, false);
     #endif
   }
   else return;
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 8c8133f22b52..5e053b670a73 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -171,7 +171,7 @@ namespace ExtUI {
 
   void enableHeater(const extruder_t extruder) {
     #if HOTENDS && HEATER_IDLE_HANDLER
-      thermalManager.reset_heater_idle_timer(extruder - E0);
+      thermalManager.reset_hotend_idle_timer(extruder - E0);
     #else
       UNUSED(extruder);
     #endif
@@ -190,7 +190,7 @@ namespace ExtUI {
         #endif
         default:
           #if HOTENDS
-            thermalManager.reset_heater_idle_timer(heater - H0);
+            thermalManager.reset_hotend_idle_timer(heater - H0);
           #endif
           break;
       }
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 559b3d5a1ee7..61ed04aaea46 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -220,10 +220,10 @@ Temperature thermalManager;
 #endif // FAN_COUNT > 0
 
 #if WATCH_HOTENDS
-  heater_watch_t Temperature::watch_hotend[HOTENDS]; // = { { 0 } }
+  hotend_watch_t Temperature::watch_hotend[HOTENDS]; // = { { 0 } }
 #endif
 #if HEATER_IDLE_HANDLER
-  heater_idle_t Temperature::hotend_idle[HOTENDS]; // = { { 0 } }
+  hotend_idle_t Temperature::hotend_idle[HOTENDS]; // = { { 0 } }
 #endif
 
 #if HAS_HEATED_BED
@@ -236,13 +236,13 @@ Temperature thermalManager;
     int16_t Temperature::maxtemp_raw_BED = HEATER_BED_RAW_HI_TEMP;
   #endif
   #if WATCH_BED
-    heater_watch_t Temperature::watch_bed; // = { 0 }
+    bed_watch_t Temperature::watch_bed; // = { 0 }
   #endif
   #if DISABLED(PIDTEMPBED)
     millis_t Temperature::next_bed_check_ms;
   #endif
   #if HEATER_IDLE_HANDLER
-    heater_idle_t Temperature::bed_idle; // = { 0 }
+    hotend_idle_t Temperature::bed_idle; // = { 0 }
   #endif
 #endif // HAS_HEATED_BED
 
@@ -256,7 +256,7 @@ Temperature thermalManager;
       int16_t Temperature::maxtemp_raw_CHAMBER = HEATER_CHAMBER_RAW_HI_TEMP;
     #endif
     #if WATCH_CHAMBER
-      heater_watch_t Temperature::watch_chamber{0};
+      chamber_watch_t Temperature::watch_chamber{0};
     #endif
     millis_t Temperature::next_chamber_check_ms;
   #endif // HAS_HEATED_CHAMBER
@@ -1974,12 +1974,7 @@ void Temperature::init() {
    */
   void Temperature::start_watching_hotend(const uint8_t E_NAME) {
     const uint8_t ee = HOTEND_INDEX;
-    if (degTargetHotend(ee) && degHotend(ee) < degTargetHotend(ee) - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1)) {
-      watch_hotend[ee].target = degHotend(ee) + WATCH_TEMP_INCREASE;
-      watch_hotend[ee].next_ms = millis() + (WATCH_TEMP_PERIOD) * 1000UL;
-    }
-    else
-      watch_hotend[ee].next_ms = 0;
+    watch_hotend[ee].restart(degHotend(ee), degTargetHotend(ee));
   }
 #endif
 
@@ -1990,12 +1985,7 @@ void Temperature::init() {
    * This is called when the temperature is set. (M140, M190)
    */
   void Temperature::start_watching_bed() {
-    if (degTargetBed() && degBed() < degTargetBed() - (WATCH_BED_TEMP_INCREASE + TEMP_BED_HYSTERESIS + 1)) {
-      watch_bed.target = degBed() + WATCH_BED_TEMP_INCREASE;
-      watch_bed.next_ms = millis() + (WATCH_BED_TEMP_PERIOD) * 1000UL;
-    }
-    else
-      watch_bed.next_ms = 0;
+    watch_bed.restart(degBed(), degTargetBed());
   }
 #endif
 
@@ -2006,12 +1996,7 @@ void Temperature::init() {
    * This is called when the temperature is set. (M141, M191)
    */
   void Temperature::start_watching_chamber() {
-    if (degChamber() < degTargetChamber() - (WATCH_CHAMBER_TEMP_INCREASE + TEMP_CHAMBER_HYSTERESIS + 1)) {
-      watch_chamber.target = degChamber() + WATCH_CHAMBER_TEMP_INCREASE;
-      watch_chamber.next_ms = millis() + (WATCH_CHAMBER_TEMP_PERIOD) * 1000UL;
-    }
-    else
-      watch_chamber.next_ms = 0;
+    watch_chamber.restart(degChamber(), degTargetChamber());
   }
 #endif
 
@@ -2154,6 +2139,34 @@ void Temperature::disable_all_heaters() {
   #endif
 }
 
+#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
+
+  bool Temperature::over_autostart_threshold() {
+    #if HOTENDS
+      HOTEND_LOOP() if (degTargetHotend(e) < (EXTRUDE_MINTEMP) / 2) return true;
+    #endif
+    #if HAS_HEATED_BED
+      if (degTargetBed() > BED_MINTEMP) return true;
+    #endif
+    #if HAS_HEATED_CHAMBER
+      if (degTargetChamber() > CHAMBER_MINTEMP) return true;
+    #endif
+    return false;
+  }
+
+  void Temperature::check_timer_autostart(const bool can_start, const bool can_stop) {
+    if (over_autostart_threshold()) {
+      if (can_start) startOrResumeJob();
+    }
+    else if (can_stop) {
+      print_job_timer.stop();
+      ui.reset_status();
+    }
+  }
+
+#endif
+
+
 #if ENABLED(PROBING_HEATERS_OFF)
 
   void Temperature::pause(const bool p) {
@@ -2166,7 +2179,7 @@ void Temperature::disable_all_heaters() {
         #endif
       }
       else {
-        HOTEND_LOOP() reset_heater_idle_timer(e);
+        HOTEND_LOOP() reset_hotend_idle_timer(e);
         #if HAS_HEATED_BED
           reset_bed_idle_timer();
         #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index da73ed37a4b9..a360394f24e6 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -228,15 +228,38 @@ typedef struct {
   inline void start(const millis_t &ms) { timeout_ms = millis() + ms; timed_out = false; }
   inline void reset() { timeout_ms = 0; timed_out = false; }
   inline void expire() { start(0); }
-} heater_idle_t;
+} hotend_idle_t;
 
 // Heater watch handling
-typedef struct {
+template <int INCREASE, int HYSTERESIS, millis_t PERIOD>
+struct HeaterWatch {
   uint16_t target;
   millis_t next_ms;
   inline bool elapsed(const millis_t &ms) { return next_ms && ELAPSED(ms, next_ms); }
   inline bool elapsed() { return elapsed(millis()); }
-} heater_watch_t;
+
+  inline void restart(const int16_t curr, const int16_t tgt) {
+    if (tgt) {
+      const int16_t newtarget = curr + INCREASE;
+      if (newtarget < tgt - HYSTERESIS - 1) {
+        target = newtarget;
+        next_ms = millis() + PERIOD * 1000UL;
+        return;
+      }
+    }
+    next_ms = 0;
+  }
+};
+
+#if WATCH_HOTENDS
+  typedef struct HeaterWatch<WATCH_TEMP_INCREASE, TEMP_HYSTERESIS, WATCH_TEMP_PERIOD> hotend_watch_t;
+#endif
+#if WATCH_BED
+  typedef struct HeaterWatch<WATCH_BED_TEMP_INCREASE, TEMP_BED_HYSTERESIS, WATCH_BED_TEMP_PERIOD> bed_watch_t;
+#endif
+#if WATCH_CHAMBER
+  typedef struct HeaterWatch<WATCH_CHAMBER_TEMP_INCREASE, TEMP_CHAMBER_HYSTERESIS, WATCH_CHAMBER_TEMP_PERIOD> chamber_watch_t;
+#endif
 
 // Temperature sensor read value ranges
 typedef struct { int16_t raw_min, raw_max; } raw_range_t;
@@ -345,12 +368,12 @@ class Temperature {
     FORCE_INLINE static bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); }
 
     #if HEATER_IDLE_HANDLER
-      static heater_idle_t hotend_idle[HOTENDS];
+      static hotend_idle_t hotend_idle[HOTENDS];
       #if HAS_HEATED_BED
-        static heater_idle_t bed_idle;
+        static hotend_idle_t bed_idle;
       #endif
       #if HAS_HEATED_CHAMBER
-        static heater_idle_t chamber_idle;
+        static hotend_idle_t chamber_idle;
       #endif
     #endif
 
@@ -363,7 +386,7 @@ class Temperature {
     static volatile bool raw_temps_ready;
 
     #if WATCH_HOTENDS
-      static heater_watch_t watch_hotend[HOTENDS];
+      static hotend_watch_t watch_hotend[HOTENDS];
     #endif
 
     #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
@@ -382,7 +405,7 @@ class Temperature {
 
     #if HAS_HEATED_BED
       #if WATCH_BED
-        static heater_watch_t watch_bed;
+        static bed_watch_t watch_bed;
       #endif
       #if DISABLED(PIDTEMPBED)
         static millis_t next_bed_check_ms;
@@ -397,7 +420,7 @@ class Temperature {
 
     #if HAS_HEATED_CHAMBER
       #if WATCH_CHAMBER
-        static heater_watch_t watch_chamber;
+        static chamber_watch_t watch_chamber;
       #endif
       static millis_t next_chamber_check_ms;
       #ifdef CHAMBER_MINTEMP
@@ -736,6 +759,14 @@ class Temperature {
      */
     static void disable_all_heaters();
 
+    #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
+      /**
+       * Methods to check if heaters are enabled, indicating an active job
+       */
+      static bool over_autostart_threshold();
+      static void check_timer_autostart(const bool can_start, const bool can_stop);
+    #endif
+
     /**
      * Perform auto-tuning for hotend or bed in response to M303
      */
@@ -768,7 +799,7 @@ class Temperature {
 
     #if HEATER_IDLE_HANDLER
 
-      static void reset_heater_idle_timer(const uint8_t E_NAME) {
+      static void reset_hotend_idle_timer(const uint8_t E_NAME) {
         hotend_idle[HOTEND_INDEX].reset();
         start_watching_hotend(HOTEND_INDEX);
       }

From 5b12627e146cc8b2a61d347ae6608b5c4d4497df Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Jan 2020 03:24:57 -0600
Subject: [PATCH 086/565] Auto assign DIAG pins for multi-endstop (#16723)

---
 Marlin/src/core/macros.h                    |  23 +-
 Marlin/src/inc/Conditionals_post.h          | 430 +++++++++++++++++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h |  58 ++-
 Marlin/src/pins/pins.h                      | 125 +++++-
 Marlin/src/pins/pinsDebug_list.h            |  67 ++-
 5 files changed, 604 insertions(+), 99 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index f3c9f3a81842..e83aa409b96a 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -29,12 +29,23 @@
 
 #define _AXIS(A) (A##_AXIS)
 
-#define _XMIN_ 100
-#define _YMIN_ 200
-#define _ZMIN_ 300
-#define _XMAX_ 101
-#define _YMAX_ 201
-#define _ZMAX_ 301
+#define _XMIN_   100
+#define _YMIN_   200
+#define _ZMIN_   300
+#define _XMAX_   101
+#define _YMAX_   201
+#define _ZMAX_   301
+#define _XDIAG_  102
+#define _YDIAG_  202
+#define _ZDIAG_  302
+#define _E0DIAG_ 400
+#define _E1DIAG_ 401
+#define _E2DIAG_ 402
+#define _E3DIAG_ 403
+#define _E4DIAG_ 404
+#define _E5DIAG_ 405
+#define _E6DIAG_ 406
+#define _E7DIAG_ 407
 
 #define _FORCE_INLINE_ __attribute__((__always_inline__)) __inline__
 #define  FORCE_INLINE  __attribute__((always_inline)) inline
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5b9ba7c68341..85d2557f9390 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -679,48 +679,110 @@
   #if X_HOME_DIR > 0
     #if X2_USE_ENDSTOP == _XMIN_
       #define X2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-      #define X2_MAX_PIN X_MIN_PIN
     #elif X2_USE_ENDSTOP == _XMAX_
       #define X2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-      #define X2_MAX_PIN X_MAX_PIN
     #elif X2_USE_ENDSTOP == _YMIN_
       #define X2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-      #define X2_MAX_PIN Y_MIN_PIN
     #elif X2_USE_ENDSTOP == _YMAX_
       #define X2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-      #define X2_MAX_PIN Y_MAX_PIN
     #elif X2_USE_ENDSTOP == _ZMIN_
       #define X2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-      #define X2_MAX_PIN Z_MIN_PIN
     #elif X2_USE_ENDSTOP == _ZMAX_
       #define X2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #define X2_MAX_PIN Z_MAX_PIN
     #else
       #define X2_MAX_ENDSTOP_INVERTING false
     #endif
+    #ifndef X2_MAX_PIN
+      #if X2_USE_ENDSTOP == _XMIN_
+        #define X2_MAX_PIN X_MIN_PIN
+      #elif X2_USE_ENDSTOP == _XMAX_
+        #define X2_MAX_PIN X_MAX_PIN
+      #elif X2_USE_ENDSTOP == _YMIN_
+        #define X2_MAX_PIN Y_MIN_PIN
+      #elif X2_USE_ENDSTOP == _YMAX_
+        #define X2_MAX_PIN Y_MAX_PIN
+      #elif X2_USE_ENDSTOP == _ZMIN_
+        #define X2_MAX_PIN Z_MIN_PIN
+      #elif X2_USE_ENDSTOP == _ZMAX_
+        #define X2_MAX_PIN Z_MAX_PIN
+      #elif X2_USE_ENDSTOP == _XDIAG_
+        #define X2_MAX_PIN X_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _YDIAG_
+        #define X2_MAX_PIN Y_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _ZDIAG_
+        #define X2_MAX_PIN Z_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E0DIAG_
+        #define X2_MAX_PIN E0_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E1DIAG_
+        #define X2_MAX_PIN E1_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E2DIAG_
+        #define X2_MAX_PIN E2_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E3DIAG_
+        #define X2_MAX_PIN E3_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E4DIAG_
+        #define X2_MAX_PIN E4_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E5DIAG_
+        #define X2_MAX_PIN E5_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E6DIAG_
+        #define X2_MAX_PIN E6_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E7DIAG_
+        #define X2_MAX_PIN E7_DIAG_PIN
+      #endif
+    #endif
     #define X2_MIN_ENDSTOP_INVERTING false
   #else
     #if X2_USE_ENDSTOP == _XMIN_
       #define X2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-      #define X2_MIN_PIN X_MIN_PIN
     #elif X2_USE_ENDSTOP == _XMAX_
       #define X2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-      #define X2_MIN_PIN X_MAX_PIN
     #elif X2_USE_ENDSTOP == _YMIN_
       #define X2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-      #define X2_MIN_PIN Y_MIN_PIN
     #elif X2_USE_ENDSTOP == _YMAX_
       #define X2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-      #define X2_MIN_PIN Y_MAX_PIN
     #elif X2_USE_ENDSTOP == _ZMIN_
       #define X2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-      #define X2_MIN_PIN Z_MIN_PIN
     #elif X2_USE_ENDSTOP == _ZMAX_
       #define X2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #define X2_MIN_PIN Z_MAX_PIN
     #else
       #define X2_MIN_ENDSTOP_INVERTING false
     #endif
+    #ifndef X2_MIN_PIN
+      #if X2_USE_ENDSTOP == _XMIN_
+        #define X2_MIN_PIN X_MIN_PIN
+      #elif X2_USE_ENDSTOP == _XMAX_
+        #define X2_MIN_PIN X_MAX_PIN
+      #elif X2_USE_ENDSTOP == _YMIN_
+        #define X2_MIN_PIN Y_MIN_PIN
+      #elif X2_USE_ENDSTOP == _YMAX_
+        #define X2_MIN_PIN Y_MAX_PIN
+      #elif X2_USE_ENDSTOP == _ZMIN_
+        #define X2_MIN_PIN Z_MIN_PIN
+      #elif X2_USE_ENDSTOP == _ZMAX_
+        #define X2_MIN_PIN Z_MAX_PIN
+      #elif X2_USE_ENDSTOP == _XDIAG_
+        #define X2_MIN_PIN X_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _YDIAG_
+        #define X2_MIN_PIN Y_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _ZDIAG_
+        #define X2_MIN_PIN Z_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E0DIAG_
+        #define X2_MIN_PIN E0_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E1DIAG_
+        #define X2_MIN_PIN E1_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E2DIAG_
+        #define X2_MIN_PIN E2_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E3DIAG_
+        #define X2_MIN_PIN E3_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E4DIAG_
+        #define X2_MIN_PIN E4_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E5DIAG_
+        #define X2_MIN_PIN E5_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E6DIAG_
+        #define X2_MIN_PIN E6_DIAG_PIN
+      #elif X2_USE_ENDSTOP == _E7DIAG_
+        #define X2_MIN_PIN E7_DIAG_PIN
+      #endif
+    #endif
     #define X2_MAX_ENDSTOP_INVERTING false
   #endif
 #endif
@@ -732,48 +794,110 @@
   #if Y_HOME_DIR > 0
     #if Y2_USE_ENDSTOP == _XMIN_
       #define Y2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-      #define Y2_MAX_PIN X_MIN_PIN
     #elif Y2_USE_ENDSTOP == _XMAX_
       #define Y2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-      #define Y2_MAX_PIN X_MAX_PIN
     #elif Y2_USE_ENDSTOP == _YMIN_
       #define Y2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-      #define Y2_MAX_PIN Y_MIN_PIN
     #elif Y2_USE_ENDSTOP == _YMAX_
       #define Y2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-      #define Y2_MAX_PIN Y_MAX_PIN
     #elif Y2_USE_ENDSTOP == _ZMIN_
       #define Y2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-      #define Y2_MAX_PIN Z_MIN_PIN
     #elif Y2_USE_ENDSTOP == _ZMAX_
       #define Y2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #define Y2_MAX_PIN Z_MAX_PIN
     #else
       #define Y2_MAX_ENDSTOP_INVERTING false
     #endif
+    #ifndef Y2_MAX_PIN
+      #if Y2_USE_ENDSTOP == _XMIN_
+        #define Y2_MAX_PIN X_MIN_PIN
+      #elif Y2_USE_ENDSTOP == _XMAX_
+        #define Y2_MAX_PIN X_MAX_PIN
+      #elif Y2_USE_ENDSTOP == _YMIN_
+        #define Y2_MAX_PIN Y_MIN_PIN
+      #elif Y2_USE_ENDSTOP == _YMAX_
+        #define Y2_MAX_PIN Y_MAX_PIN
+      #elif Y2_USE_ENDSTOP == _ZMIN_
+        #define Y2_MAX_PIN Z_MIN_PIN
+      #elif Y2_USE_ENDSTOP == _ZMAX_
+        #define Y2_MAX_PIN Z_MAX_PIN
+      #elif Y2_USE_ENDSTOP == _XDIAG_
+        #define Y2_MAX_PIN X_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _YDIAG_
+        #define Y2_MAX_PIN Y_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _ZDIAG_
+        #define Y2_MAX_PIN Z_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E0DIAG_
+        #define Y2_MAX_PIN E0_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E1DIAG_
+        #define Y2_MAX_PIN E1_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E2DIAG_
+        #define Y2_MAX_PIN E2_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E3DIAG_
+        #define Y2_MAX_PIN E3_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E4DIAG_
+        #define Y2_MAX_PIN E4_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E5DIAG_
+        #define Y2_MAX_PIN E5_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E6DIAG_
+        #define Y2_MAX_PIN E6_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E7DIAG_
+        #define Y2_MAX_PIN E7_DIAG_PIN
+      #endif
+    #endif
     #define Y2_MIN_ENDSTOP_INVERTING false
   #else
     #if Y2_USE_ENDSTOP == _XMIN_
       #define Y2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-      #define Y2_MIN_PIN X_MIN_PIN
     #elif Y2_USE_ENDSTOP == _XMAX_
       #define Y2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-      #define Y2_MIN_PIN X_MAX_PIN
     #elif Y2_USE_ENDSTOP == _YMIN_
       #define Y2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-      #define Y2_MIN_PIN Y_MIN_PIN
     #elif Y2_USE_ENDSTOP == _YMAX_
       #define Y2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-      #define Y2_MIN_PIN Y_MAX_PIN
     #elif Y2_USE_ENDSTOP == _ZMIN_
       #define Y2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-      #define Y2_MIN_PIN Z_MIN_PIN
     #elif Y2_USE_ENDSTOP == _ZMAX_
       #define Y2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #define Y2_MIN_PIN Z_MAX_PIN
     #else
       #define Y2_MIN_ENDSTOP_INVERTING false
     #endif
+    #ifndef Y2_MIN_PIN
+      #if Y2_USE_ENDSTOP == _XMIN_
+        #define Y2_MIN_PIN X_MIN_PIN
+      #elif Y2_USE_ENDSTOP == _XMAX_
+        #define Y2_MIN_PIN X_MAX_PIN
+      #elif Y2_USE_ENDSTOP == _YMIN_
+        #define Y2_MIN_PIN Y_MIN_PIN
+      #elif Y2_USE_ENDSTOP == _YMAX_
+        #define Y2_MIN_PIN Y_MAX_PIN
+      #elif Y2_USE_ENDSTOP == _ZMIN_
+        #define Y2_MIN_PIN Z_MIN_PIN
+      #elif Y2_USE_ENDSTOP == _ZMAX_
+        #define Y2_MIN_PIN Z_MAX_PIN
+      #elif Y2_USE_ENDSTOP == _XDIAG_
+        #define Y2_MIN_PIN X_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _YDIAG_
+        #define Y2_MIN_PIN Y_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _ZDIAG_
+        #define Y2_MIN_PIN Z_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E0DIAG_
+        #define Y2_MIN_PIN E0_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E1DIAG_
+        #define Y2_MIN_PIN E1_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E2DIAG_
+        #define Y2_MIN_PIN E2_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E3DIAG_
+        #define Y2_MIN_PIN E3_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E4DIAG_
+        #define Y2_MIN_PIN E4_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E5DIAG_
+        #define Y2_MIN_PIN E5_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E6DIAG_
+        #define Y2_MIN_PIN E6_DIAG_PIN
+      #elif Y2_USE_ENDSTOP == _E7DIAG_
+        #define Y2_MIN_PIN E7_DIAG_PIN
+      #endif
+    #endif
     #define Y2_MAX_ENDSTOP_INVERTING false
   #endif
 #endif
@@ -786,48 +910,110 @@
   #if Z_HOME_DIR > 0
     #if Z2_USE_ENDSTOP == _XMIN_
       #define Z2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-      #define Z2_MAX_PIN X_MIN_PIN
     #elif Z2_USE_ENDSTOP == _XMAX_
       #define Z2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-      #define Z2_MAX_PIN X_MAX_PIN
     #elif Z2_USE_ENDSTOP == _YMIN_
       #define Z2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-      #define Z2_MAX_PIN Y_MIN_PIN
     #elif Z2_USE_ENDSTOP == _YMAX_
       #define Z2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-      #define Z2_MAX_PIN Y_MAX_PIN
     #elif Z2_USE_ENDSTOP == _ZMIN_
       #define Z2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-      #define Z2_MAX_PIN Z_MIN_PIN
     #elif Z2_USE_ENDSTOP == _ZMAX_
       #define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #define Z2_MAX_PIN Z_MAX_PIN
     #else
       #define Z2_MAX_ENDSTOP_INVERTING false
     #endif
+    #ifndef Z2_MAX_PIN
+      #if Z2_USE_ENDSTOP == _XMIN_
+        #define Z2_MAX_PIN X_MIN_PIN
+      #elif Z2_USE_ENDSTOP == _XMAX_
+        #define Z2_MAX_PIN X_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _YMIN_
+        #define Z2_MAX_PIN Y_MIN_PIN
+      #elif Z2_USE_ENDSTOP == _YMAX_
+        #define Z2_MAX_PIN Y_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _ZMIN_
+        #define Z2_MAX_PIN Z_MIN_PIN
+      #elif Z2_USE_ENDSTOP == _ZMAX_
+        #define Z2_MAX_PIN Z_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _XDIAG_
+        #define Z2_MAX_PIN X_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _YDIAG_
+        #define Z2_MAX_PIN Y_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _ZDIAG_
+        #define Z2_MAX_PIN Z_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E0DIAG_
+        #define Z2_MAX_PIN E0_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E1DIAG_
+        #define Z2_MAX_PIN E1_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E2DIAG_
+        #define Z2_MAX_PIN E2_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E3DIAG_
+        #define Z2_MAX_PIN E3_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E4DIAG_
+        #define Z2_MAX_PIN E4_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E5DIAG_
+        #define Z2_MAX_PIN E5_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E6DIAG_
+        #define Z2_MAX_PIN E6_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E7DIAG_
+        #define Z2_MAX_PIN E7_DIAG_PIN
+      #endif
+    #endif
     #define Z2_MIN_ENDSTOP_INVERTING false
   #else
     #if Z2_USE_ENDSTOP == _XMIN_
       #define Z2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-      #define Z2_MIN_PIN X_MIN_PIN
     #elif Z2_USE_ENDSTOP == _XMAX_
       #define Z2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-      #define Z2_MIN_PIN X_MAX_PIN
     #elif Z2_USE_ENDSTOP == _YMIN_
       #define Z2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-      #define Z2_MIN_PIN Y_MIN_PIN
     #elif Z2_USE_ENDSTOP == _YMAX_
       #define Z2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-      #define Z2_MIN_PIN Y_MAX_PIN
     #elif Z2_USE_ENDSTOP == _ZMIN_
       #define Z2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-      #define Z2_MIN_PIN Z_MIN_PIN
     #elif Z2_USE_ENDSTOP == _ZMAX_
       #define Z2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #define Z2_MIN_PIN Z_MAX_PIN
     #else
       #define Z2_MIN_ENDSTOP_INVERTING false
     #endif
+    #ifndef Z2_MIN_PIN
+      #if Z2_USE_ENDSTOP == _XMIN_
+        #define Z2_MIN_PIN X_MIN_PIN
+      #elif Z2_USE_ENDSTOP == _XMAX_
+        #define Z2_MIN_PIN X_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _YMIN_
+        #define Z2_MIN_PIN Y_MIN_PIN
+      #elif Z2_USE_ENDSTOP == _YMAX_
+        #define Z2_MIN_PIN Y_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _ZMIN_
+        #define Z2_MIN_PIN Z_MIN_PIN
+      #elif Z2_USE_ENDSTOP == _ZMAX_
+        #define Z2_MIN_PIN Z_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _XDIAG_
+        #define Z2_MIN_PIN X_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _YDIAG_
+        #define Z2_MIN_PIN Y_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _ZDIAG_
+        #define Z2_MIN_PIN Z_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E0DIAG_
+        #define Z2_MIN_PIN E0_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E1DIAG_
+        #define Z2_MIN_PIN E1_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E2DIAG_
+        #define Z2_MIN_PIN E2_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E3DIAG_
+        #define Z2_MIN_PIN E3_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E4DIAG_
+        #define Z2_MIN_PIN E4_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E5DIAG_
+        #define Z2_MIN_PIN E5_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E6DIAG_
+        #define Z2_MIN_PIN E6_DIAG_PIN
+      #elif Z2_USE_ENDSTOP == _E7DIAG_
+        #define Z2_MIN_PIN E7_DIAG_PIN
+      #endif
+    #endif
     #define Z2_MAX_ENDSTOP_INVERTING false
   #endif
 
@@ -835,48 +1021,110 @@
     #if Z_HOME_DIR > 0
       #if Z3_USE_ENDSTOP == _XMIN_
         #define Z3_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-        #define Z3_MAX_PIN X_MIN_PIN
       #elif Z3_USE_ENDSTOP == _XMAX_
         #define Z3_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-        #define Z3_MAX_PIN X_MAX_PIN
       #elif Z3_USE_ENDSTOP == _YMIN_
         #define Z3_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-        #define Z3_MAX_PIN Y_MIN_PIN
       #elif Z3_USE_ENDSTOP == _YMAX_
         #define Z3_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-        #define Z3_MAX_PIN Y_MAX_PIN
       #elif Z3_USE_ENDSTOP == _ZMIN_
         #define Z3_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-        #define Z3_MAX_PIN Z_MIN_PIN
       #elif Z3_USE_ENDSTOP == _ZMAX_
         #define Z3_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #define Z3_MAX_PIN Z_MAX_PIN
       #else
         #define Z3_MAX_ENDSTOP_INVERTING false
       #endif
+      #ifndef Z3_MAX_PIN
+        #if Z3_USE_ENDSTOP == _XMIN_
+          #define Z3_MAX_PIN X_MIN_PIN
+        #elif Z3_USE_ENDSTOP == _XMAX_
+          #define Z3_MAX_PIN X_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _YMIN_
+          #define Z3_MAX_PIN Y_MIN_PIN
+        #elif Z3_USE_ENDSTOP == _YMAX_
+          #define Z3_MAX_PIN Y_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _ZMIN_
+          #define Z3_MAX_PIN Z_MIN_PIN
+        #elif Z3_USE_ENDSTOP == _ZMAX_
+          #define Z3_MAX_PIN Z_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _XDIAG_
+          #define Z3_MAX_PIN X_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _YDIAG_
+          #define Z3_MAX_PIN Y_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _ZDIAG_
+          #define Z3_MAX_PIN Z_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E0DIAG_
+          #define Z3_MAX_PIN E0_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E1DIAG_
+          #define Z3_MAX_PIN E1_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E2DIAG_
+          #define Z3_MAX_PIN E2_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E3DIAG_
+          #define Z3_MAX_PIN E3_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E4DIAG_
+          #define Z3_MAX_PIN E4_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E5DIAG_
+          #define Z3_MAX_PIN E5_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E6DIAG_
+          #define Z3_MAX_PIN E6_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E7DIAG_
+          #define Z3_MAX_PIN E7_DIAG_PIN
+        #endif
+      #endif
       #define Z3_MIN_ENDSTOP_INVERTING false
     #else
       #if Z3_USE_ENDSTOP == _XMIN_
         #define Z3_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-        #define Z3_MIN_PIN X_MIN_PIN
       #elif Z3_USE_ENDSTOP == _XMAX_
         #define Z3_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-        #define Z3_MIN_PIN X_MAX_PIN
       #elif Z3_USE_ENDSTOP == _YMIN_
         #define Z3_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-        #define Z3_MIN_PIN Y_MIN_PIN
       #elif Z3_USE_ENDSTOP == _YMAX_
         #define Z3_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-        #define Z3_MIN_PIN Y_MAX_PIN
       #elif Z3_USE_ENDSTOP == _ZMIN_
         #define Z3_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-        #define Z3_MIN_PIN Z_MIN_PIN
       #elif Z3_USE_ENDSTOP == _ZMAX_
         #define Z3_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #define Z3_MIN_PIN Z_MAX_PIN
       #else
         #define Z3_MIN_ENDSTOP_INVERTING false
       #endif
+      #ifndef Z3_MIN_PIN
+        #if Z3_USE_ENDSTOP == _XMIN_
+          #define Z3_MIN_PIN X_MIN_PIN
+        #elif Z3_USE_ENDSTOP == _XMAX_
+          #define Z3_MIN_PIN X_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _YMIN_
+          #define Z3_MIN_PIN Y_MIN_PIN
+        #elif Z3_USE_ENDSTOP == _YMAX_
+          #define Z3_MIN_PIN Y_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _ZMIN_
+          #define Z3_MIN_PIN Z_MIN_PIN
+        #elif Z3_USE_ENDSTOP == _ZMAX_
+          #define Z3_MIN_PIN Z_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _XDIAG_
+          #define Z3_MIN_PIN X_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _YDIAG_
+          #define Z3_MIN_PIN Y_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _ZDIAG_
+          #define Z3_MIN_PIN Z_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E0DIAG_
+          #define Z3_MIN_PIN E0_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E1DIAG_
+          #define Z3_MIN_PIN E1_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E2DIAG_
+          #define Z3_MIN_PIN E2_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E3DIAG_
+          #define Z3_MIN_PIN E3_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E4DIAG_
+          #define Z3_MIN_PIN E4_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E5DIAG_
+          #define Z3_MIN_PIN E5_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E6DIAG_
+          #define Z3_MIN_PIN E6_DIAG_PIN
+        #elif Z3_USE_ENDSTOP == _E7DIAG_
+          #define Z3_MIN_PIN E7_DIAG_PIN
+        #endif
+      #endif
       #define Z3_MAX_ENDSTOP_INVERTING false
     #endif
   #endif
@@ -885,48 +1133,110 @@
     #if Z_HOME_DIR > 0
       #if Z4_USE_ENDSTOP == _XMIN_
         #define Z4_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-        #define Z4_MAX_PIN X_MIN_PIN
       #elif Z4_USE_ENDSTOP == _XMAX_
         #define Z4_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-        #define Z4_MAX_PIN X_MAX_PIN
       #elif Z4_USE_ENDSTOP == _YMIN_
         #define Z4_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-        #define Z4_MAX_PIN Y_MIN_PIN
       #elif Z4_USE_ENDSTOP == _YMAX_
         #define Z4_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-        #define Z4_MAX_PIN Y_MAX_PIN
       #elif Z4_USE_ENDSTOP == _ZMIN_
         #define Z4_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-        #define Z4_MAX_PIN Z_MIN_PIN
       #elif Z4_USE_ENDSTOP == _ZMAX_
         #define Z4_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #define Z4_MAX_PIN Z_MAX_PIN
       #else
         #define Z4_MAX_ENDSTOP_INVERTING false
       #endif
+      #ifndef Z4_MAX_PIN
+        #if Z4_USE_ENDSTOP == _XMIN_
+          #define Z4_MAX_PIN X_MIN_PIN
+        #elif Z4_USE_ENDSTOP == _XMAX_
+          #define Z4_MAX_PIN X_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _YMIN_
+          #define Z4_MAX_PIN Y_MIN_PIN
+        #elif Z4_USE_ENDSTOP == _YMAX_
+          #define Z4_MAX_PIN Y_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _ZMIN_
+          #define Z4_MAX_PIN Z_MIN_PIN
+        #elif Z4_USE_ENDSTOP == _ZMAX_
+          #define Z4_MAX_PIN Z_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _XDIAG_
+          #define Z4_MAX_PIN X_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _YDIAG_
+          #define Z4_MAX_PIN Y_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _ZDIAG_
+          #define Z4_MAX_PIN Z_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E0DIAG_
+          #define Z4_MAX_PIN E0_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E1DIAG_
+          #define Z4_MAX_PIN E1_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E2DIAG_
+          #define Z4_MAX_PIN E2_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E3DIAG_
+          #define Z4_MAX_PIN E3_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E4DIAG_
+          #define Z4_MAX_PIN E4_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E5DIAG_
+          #define Z4_MAX_PIN E5_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E6DIAG_
+          #define Z4_MAX_PIN E6_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E7DIAG_
+          #define Z4_MAX_PIN E7_DIAG_PIN
+        #endif
+      #endif
       #define Z4_MIN_ENDSTOP_INVERTING false
     #else
       #if Z4_USE_ENDSTOP == _XMIN_
         #define Z4_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
-        #define Z4_MIN_PIN X_MIN_PIN
       #elif Z4_USE_ENDSTOP == _XMAX_
         #define Z4_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
-        #define Z4_MIN_PIN X_MAX_PIN
       #elif Z4_USE_ENDSTOP == _YMIN_
         #define Z4_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
-        #define Z4_MIN_PIN Y_MIN_PIN
       #elif Z4_USE_ENDSTOP == _YMAX_
         #define Z4_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
-        #define Z4_MIN_PIN Y_MAX_PIN
       #elif Z4_USE_ENDSTOP == _ZMIN_
         #define Z4_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
-        #define Z4_MIN_PIN Z_MIN_PIN
       #elif Z4_USE_ENDSTOP == _ZMAX_
         #define Z4_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #define Z4_MIN_PIN Z_MAX_PIN
       #else
         #define Z4_MIN_ENDSTOP_INVERTING false
       #endif
+      #ifndef Z4_MIN_PIN
+        #if Z4_USE_ENDSTOP == _XMIN_
+          #define Z4_MIN_PIN X_MIN_PIN
+        #elif Z4_USE_ENDSTOP == _XMAX_
+          #define Z4_MIN_PIN X_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _YMIN_
+          #define Z4_MIN_PIN Y_MIN_PIN
+        #elif Z4_USE_ENDSTOP == _YMAX_
+          #define Z4_MIN_PIN Y_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _ZMIN_
+          #define Z4_MIN_PIN Z_MIN_PIN
+        #elif Z4_USE_ENDSTOP == _ZMAX_
+          #define Z4_MIN_PIN Z_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _XDIAG_
+          #define Z4_MIN_PIN X_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _YDIAG_
+          #define Z4_MIN_PIN Y_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _ZDIAG_
+          #define Z4_MIN_PIN Z_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E0DIAG_
+          #define Z4_MIN_PIN E0_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E1DIAG_
+          #define Z4_MIN_PIN E1_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E2DIAG_
+          #define Z4_MIN_PIN E2_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E3DIAG_
+          #define Z4_MIN_PIN E3_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E4DIAG_
+          #define Z4_MIN_PIN E4_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E5DIAG_
+          #define Z4_MIN_PIN E5_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E6DIAG_
+          #define Z4_MIN_PIN E6_DIAG_PIN
+        #elif Z4_USE_ENDSTOP == _E7DIAG_
+          #define Z4_MIN_PIN E7_DIAG_PIN
+        #endif
+      #endif
       #define Z4_MAX_ENDSTOP_INVERTING false
     #endif
   #endif
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 7f74456a486c..2b6595cd74e0 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -23,33 +23,55 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR 1.3"
 
+/**
+ * Trinamic Stallguard pins
+ */
+#define X_DIAG_PIN           P1_29   // X-
+#define Y_DIAG_PIN           P1_27   // Y-
+#define Z_DIAG_PIN           P1_25   // Z-
+#define E0_DIAG_PIN          P1_28   // X+
+#define E1_DIAG_PIN          P1_26   // Y+
+
 /**
  * Limit Switches
  */
-#if X_HOME_DIR > 0 && X_STALL_SENSITIVITY && !defined(USE_XMAX_PLUG)
-  // For StallGuard homing to MAX swap the MIN / MAX pins
-  // so the MAX physical connectors may be used for other things.
-  #define X_MIN_PIN          P1_28   // X_MAX (free)
-  #define X_MAX_PIN          P1_29   // X_MIN
-#else                                // else, non-endstop is free and appears in M43 output
-  #define X_MIN_PIN          P1_29   // X_MIN
-  #define X_MAX_PIN          P1_28   // X_MAX
+#if X_STALL_SENSITIVITY
+  #if X_HOME_DIR < 0
+    #define X_MIN_PIN        X_DIAG_PIN
+    #define X_MAX_PIN        P1_28   // X+
+  #else
+    #define X_MAX_PIN        X_DIAG_PIN
+    #define X_MIN_PIN        P1_28   // X+
+  #endif
+#else
+  #define X_MIN_PIN          P1_29   // X-
+  #define X_MAX_PIN          P1_28   // X+
 #endif
 
-#if Y_HOME_DIR > 0 && Y_STALL_SENSITIVITY && !defined(USE_YMAX_PLUG)
-  #define Y_MIN_PIN          P1_26   // Y_MAX (free)
-  #define Y_MAX_PIN          P1_27   // Y_MIN
+#if Y_STALL_SENSITIVITY
+  #if Y_HOME_DIR < 0
+    #define Y_MIN_PIN        Y_DIAG_PIN
+    #define Y_MAX_PIN        P1_26   // Y+
+  #else
+    #define Y_MAX_PIN        Y_DIAG_PIN
+    #define Y_MIN_PIN        P1_26   // Y+
+  #endif
 #else
-  #define Y_MIN_PIN          P1_27   // Y_MIN
-  #define Y_MAX_PIN          P1_26   // Y_MAX
+  #define Y_MIN_PIN          P1_27   // Y-
+  #define Y_MAX_PIN          P1_26   // Y+
 #endif
 
-#if Z_HOME_DIR > 0 && Z_STALL_SENSITIVITY && !defined(USE_ZMAX_PLUG)
-  #define Z_MIN_PIN          P1_24   // Z_MAX (free)
-  #define Z_MAX_PIN          P1_25   // Z_MIN
+#if Z_STALL_SENSITIVITY
+  #if Z_HOME_DIR < 0
+    #define Z_MIN_PIN        Z_DIAG_PIN
+    #define Z_MAX_PIN        P1_24   // Z+
+  #else
+    #define Z_MAX_PIN        Z_DIAG_PIN
+    #define Z_MIN_PIN        P1_24   // Z+
+  #endif
 #else
-  #define Z_MIN_PIN          P1_25   // Z_MIN
-  #define Z_MAX_PIN          P1_24   // Z_MAX
+  #define Z_MIN_PIN          P1_25   // Z-
+  #define Z_MAX_PIN          P1_24   // Z+
 #endif
 
 #define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3dbbb5e724f4..736dbdace0c3 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1129,40 +1129,66 @@
 
 #define __EPIN(p,q) E##p##_##q##_PIN
 #define _EPIN(p,q) __EPIN(p,q)
+#define DIAG_REMAPPED(P,Q) (PIN_EXISTS(Q) && (P##_DIAG_PIN == Q##_PIN))
 
 // The X2 axis, if any, should be the next open extruder port
+#define X2_E_INDEX E_STEPPERS
+
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
   #ifndef X2_STEP_PIN
-    #define X2_STEP_PIN   _EPIN(E_STEPPERS, STEP)
-    #define X2_DIR_PIN    _EPIN(E_STEPPERS, DIR)
-    #define X2_ENABLE_PIN _EPIN(E_STEPPERS, ENABLE)
-    #if E_STEPPERS >= MAX_EXTRUDERS || !PIN_EXISTS(X2_STEP)
+    #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
+    #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)
+    #define X2_ENABLE_PIN _EPIN(X2_E_INDEX, ENABLE)
+    #if X2_E_INDEX >= MAX_EXTRUDERS || !PIN_EXISTS(X2_STEP)
       #error "No E stepper plug left for X2!"
     #endif
   #endif
   #ifndef X2_MS1_PIN
-    #define X2_MS1_PIN    _EPIN(E_STEPPERS, MS1)
+    #define X2_MS1_PIN    _EPIN(X2_E_INDEX, MS1)
   #endif
   #ifndef X2_MS2_PIN
-    #define X2_MS2_PIN    _EPIN(E_STEPPERS, MS2)
+    #define X2_MS2_PIN    _EPIN(X2_E_INDEX, MS2)
   #endif
   #ifndef X2_MS3_PIN
-    #define X2_MS3_PIN    _EPIN(E_STEPPERS, MS3)
+    #define X2_MS3_PIN    _EPIN(X2_E_INDEX, MS3)
   #endif
   #if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
-    #define X2_CS_PIN     _EPIN(E_STEPPERS, CS)
+    #define X2_CS_PIN     _EPIN(X2_E_INDEX, CS)
   #endif
   #if AXIS_HAS_UART(X2)
     #ifndef X2_SERIAL_TX_PIN
-      #define X2_SERIAL_TX_PIN _EPIN(E_STEPPERS, SERIAL_TX)
+      #define X2_SERIAL_TX_PIN _EPIN(X2_E_INDEX, SERIAL_TX)
     #endif
     #ifndef X2_SERIAL_RX_PIN
-      #define X2_SERIAL_RX_PIN _EPIN(E_STEPPERS, SERIAL_RX)
+      #define X2_SERIAL_RX_PIN _EPIN(X2_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+
+  //
+  // Auto-assign pins for stallGuard sensorless homing
+  //
+  #if X2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(X2_E_INDEX, DIAG) > 0
+    #if   DIAG_REMAPPED(X2, X_MIN)      // If already remapped in the pins file...
+      #define X2_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(X2, Y_MIN)
+      #define X2_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(X2, Z_MIN)
+      #define X2_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(X2, X_MAX)
+      #define X2_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(X2, Y_MAX)
+      #define X2_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(X2, Z_MAX)
+      #define X2_USE_ENDSTOP _ZMAX_
+    #else                               // Otherwise use the driver DIAG_PIN directly
+      #define _X2_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define X2_USE_ENDSTOP _X2_USE_ENDSTOP(X2_E_INDEX)
     #endif
   #endif
-  #define Y2_E_INDEX INCREMENT(E_STEPPERS)
+
+  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
 #else
-  #define Y2_E_INDEX E_STEPPERS
+  #define Y2_E_INDEX X2_E_INDEX
 #endif
 
 #ifndef X2_CS_PIN
@@ -1208,6 +1234,24 @@
       #define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
     #endif
   #endif
+  #if Y2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Y2_E_INDEX, DIAG) > 0
+    #if   DIAG_REMAPPED(Y2, X_MIN)
+      #define Y2_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(Y2, Y_MIN)
+      #define Y2_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(Y2, Z_MIN)
+      #define Y2_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(Y2, X_MAX)
+      #define Y2_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(Y2, Y_MAX)
+      #define Y2_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(Y2, Z_MAX)
+      #define Y2_USE_ENDSTOP _ZMAX_
+    #else
+      #define _Y2_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Y2_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
+    #endif
+  #endif
   #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
 #else
   #define Z2_E_INDEX Y2_E_INDEX
@@ -1256,6 +1300,24 @@
       #define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
     #endif
   #endif
+  #if Z2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z2_E_INDEX, DIAG) > 0
+    #if   DIAG_REMAPPED(Z2, X_MIN)
+      #define Z2_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(Z2, Y_MIN)
+      #define Z2_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(Z2, Z_MIN)
+      #define Z2_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(Z2, X_MAX)
+      #define Z2_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(Z2, Y_MAX)
+      #define Z2_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(Z2, Z_MAX)
+      #define Z2_USE_ENDSTOP _ZMAX_
+    #else
+      #define _Z2_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Z2_USE_ENDSTOP _Z2_USE_ENDSTOP(Z2_E_INDEX)
+    #endif
+  #endif
   #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
 #else
   #define Z3_E_INDEX Z2_E_INDEX
@@ -1285,7 +1347,7 @@
   #endif
   #if AXIS_HAS_SPI(Z3)
     #ifndef Z3_CS_PIN
-      #define Z3_CS_PIN     _EPIN(Z3_E_INDEX, CS)
+      #define Z3_CS_PIN   _EPIN(Z3_E_INDEX, CS)
     #endif
   #endif
   #ifndef Z3_MS1_PIN
@@ -1305,6 +1367,24 @@
       #define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
     #endif
   #endif
+  #if Z3_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z3_E_INDEX, DIAG) > 0
+    #if   DIAG_REMAPPED(Z3, X_MIN)
+      #define Z3_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(Z3, Y_MIN)
+      #define Z3_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(Z3, Z_MIN)
+      #define Z3_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(Z3, X_MAX)
+      #define Z3_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(Z3, Y_MAX)
+      #define Z3_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(Z3, Z_MAX)
+      #define Z3_USE_ENDSTOP _ZMAX_
+    #else
+      #define _Z3_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Z3_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
+    #endif
+  #endif
   #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
 #endif
 
@@ -1352,6 +1432,24 @@
       #define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
     #endif
   #endif
+  #if Z4_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z4_E_INDEX, DIAG) > 0
+    #if   DIAG_REMAPPED(Z4, X_MIN)
+      #define Z4_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(Z4, Y_MIN)
+      #define Z4_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(Z4, Z_MIN)
+      #define Z4_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(Z4, X_MAX)
+      #define Z4_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(Z4, Y_MAX)
+      #define Z4_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(Z4, Z_MAX)
+      #define Z4_USE_ENDSTOP _ZMAX_
+    #else
+      #define _Z4_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Z4_USE_ENDSTOP _Z4_USE_ENDSTOP(Z4_E_INDEX)
+    #endif
+  #endif
 #endif
 
 #ifndef Z4_CS_PIN
@@ -1384,3 +1482,4 @@
 #endif
 
 #undef HAS_FREE_AUX2_PINS
+#undef DIAG_REMAPPED
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index ca8c3f9a99f7..acd74767a385 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1323,6 +1323,9 @@
 #if PIN_EXISTS(X_MIN)
   REPORT_NAME_DIGITAL(__LINE__, X_MIN_PIN)
 #endif
+#if PIN_EXISTS(X_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, X_DIAG_PIN)
+#endif
 #if PIN_EXISTS(X_MS1)
   REPORT_NAME_DIGITAL(__LINE__, X_MS1_PIN)
 #endif
@@ -1344,6 +1347,12 @@
 #if PIN_EXISTS(X2_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, X2_ENABLE_PIN)
 #endif
+#if PIN_EXISTS(X2_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, X2_MAX_PIN)
+#endif
+#if PIN_EXISTS(X2_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, X2_MIN_PIN)
+#endif
 #if PIN_EXISTS(X2_MS1)
   REPORT_NAME_DIGITAL(__LINE__, X2_MS1_PIN)
 #endif
@@ -1374,6 +1383,9 @@
 #if PIN_EXISTS(Y_MIN)
   REPORT_NAME_DIGITAL(__LINE__, Y_MIN_PIN)
 #endif
+#if PIN_EXISTS(Y_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Y_DIAG_PIN)
+#endif
 #if PIN_EXISTS(Y_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Y_MS1_PIN)
 #endif
@@ -1395,6 +1407,12 @@
 #if PIN_EXISTS(Y2_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, Y2_ENABLE_PIN)
 #endif
+#if PIN_EXISTS(Y2_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_MAX_PIN)
+#endif
+#if PIN_EXISTS(Y2_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_MIN_PIN)
+#endif
 #if PIN_EXISTS(Y2_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Y2_MS1_PIN)
 #endif
@@ -1425,8 +1443,8 @@
 #if PIN_EXISTS(Z_MIN)
   REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PIN)
 #endif
-#if PIN_EXISTS(Z_MIN_PROBE)
-  REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
+#if PIN_EXISTS(Z_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z_DIAG_PIN)
 #endif
 #if PIN_EXISTS(Z_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Z_MS1_PIN)
@@ -1452,6 +1470,12 @@
 #if PIN_EXISTS(Z2_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, Z2_ENABLE_PIN)
 #endif
+#if PIN_EXISTS(Z2_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MAX_PIN)
+#endif
+#if PIN_EXISTS(Z2_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MIN_PIN)
+#endif
 #if PIN_EXISTS(Z2_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
 #endif
@@ -1473,6 +1497,12 @@
 #if PIN_EXISTS(Z3_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, Z3_ENABLE_PIN)
 #endif
+#if PIN_EXISTS(Z3_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_MAX_PIN)
+#endif
+#if PIN_EXISTS(Z3_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_MIN_PIN)
+#endif
 #if PIN_EXISTS(Z3_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Z3_MS1_PIN)
 #endif
@@ -1494,6 +1524,12 @@
 #if PIN_EXISTS(Z4_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, Z4_ENABLE_PIN)
 #endif
+#if PIN_EXISTS(Z4_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_MAX_PIN)
+#endif
+#if PIN_EXISTS(Z4_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_MIN_PIN)
+#endif
 #if PIN_EXISTS(Z4_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Z4_MS1_PIN)
 #endif
@@ -1506,6 +1542,9 @@
 #if PIN_EXISTS(Z4_STEP)
   REPORT_NAME_DIGITAL(__LINE__, Z4_STEP_PIN)
 #endif
+#if PIN_EXISTS(Z_MIN_PROBE)
+  REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
+#endif
 #if PIN_EXISTS(ZRIB_V20_D6)
   REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
 #endif
@@ -1560,48 +1599,72 @@
 #if PIN_EXISTS(Z4_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, Z4_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E0_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E0_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E0_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E0_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E0_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E0_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E1_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E1_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E1_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E1_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E1_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E1_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E2_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E2_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E2_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E2_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E2_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E3_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E3_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E3_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E3_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E3_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E3_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E4_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E4_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E4_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E4_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E4_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E4_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E5_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E5_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E5_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E5_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E5_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E5_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E6_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E6_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E6_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E6_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E6_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E6_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(E7_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E7_DIAG_PIN)
+#endif
 #if PIN_EXISTS(E7_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, E7_SERIAL_TX_PIN)
 #endif

From 3c9464eea4765a8635917049e704d5d37c6721fd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 30 Jan 2020 03:21:37 -0600
Subject: [PATCH 087/565] Tweak G60/G61 slots

---
 Marlin/src/gcode/feature/pause/G60.cpp | 2 +-
 Marlin/src/gcode/feature/pause/G61.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index a0d099ad69b8..50db01d73c4d 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -45,7 +45,7 @@ void GcodeSuite::G60() {
   }
 
   stored_position[slot] = current_position;
-  SBI(saved_slots[slot >> 3], slot & 0b00000111);
+  SBI(saved_slots[slot >> 3], slot & 0x07);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
     const xyze_pos_t &pos = stored_position[slot];
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index d531c15c8004..df6345df0f64 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -48,7 +48,7 @@ void GcodeSuite::G61(void) {
   #endif
 
   // No saved position? No axes being restored?
-  if (!TEST(saved_slots[slot >> 3], slot & 0b00000111) || !parser.seen("XYZ")) return;
+  if (!TEST(saved_slots[slot >> 3], slot & 0x07) || !parser.seen("XYZ")) return;
 
   // Apply any given feedrate over 0.0
   const float fr = parser.linearval('F');

From 8d4dd88bf918db66bd611fa0977322d715baffdd Mon Sep 17 00:00:00 2001
From: felixstorm <felix.storm@gmx.de>
Date: Thu, 30 Jan 2020 19:22:42 +0100
Subject: [PATCH 088/565] Fix compile error in SdVolume on ESP32 (#16728)

---
 Marlin/src/sd/SdVolume.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/sd/SdVolume.cpp b/Marlin/src/sd/SdVolume.cpp
index c51e42108ce3..70dfa52e300c 100644
--- a/Marlin/src/sd/SdVolume.cpp
+++ b/Marlin/src/sd/SdVolume.cpp
@@ -296,7 +296,7 @@ int32_t SdVolume::freeClusterCount() {
       // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
       static millis_t nextTaskTime = 0;
       const millis_t ms = millis();
-      if (ELAPSED(ms, nextTaskTime) {
+      if (ELAPSED(ms, nextTaskTime)) {
         vTaskDelay(1);            // delay 1 tick (Minimum. Usually 10 or 1 ms depending on skdconfig.h)
         nextTaskTime = ms + 1000; // tickle the task manager again in 1 second
       }

From c45d6b2017fa45cbb0f417dc6aaf06828b2b4671 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilenko <jmz52@users.noreply.github.com>
Date: Thu, 30 Jan 2020 21:29:30 +0300
Subject: [PATCH 089/565] Simultaneous use of rotary encoder and touch buttons
 (#16729)

---
 Marlin/src/lcd/ultralcd.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 04ebd5079f6d..35366d761c01 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -777,13 +777,12 @@ void MarlinUI::update() {
     static bool wait_for_unclick; // = false
 
     #if ENABLED(TOUCH_BUTTONS)
-
       if (touch_buttons) {
         RESET_STATUS_TIMEOUT();
-        if (buttons & (EN_A | EN_B)) {                    // Menu arrows, in priority
+        if (touch_buttons & (EN_A | EN_B)) {              // Menu arrows, in priority
           if (ELAPSED(ms, next_button_update_ms)) {
             encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP) * encoderDirection;
-            if (buttons & EN_A) encoderDiff *= -1;
+            if (touch_buttons & EN_A) encoderDiff *= -1;
             #if ENABLED(AUTO_BED_LEVELING_UBL)
               if (external_control) ubl.encoder_diff = encoderDiff;
             #endif
@@ -1246,7 +1245,11 @@ void MarlinUI::update() {
             | slow_buttons
           #endif
           #if ENABLED(TOUCH_BUTTONS) && HAS_ENCODER_ACTION
-            | touch_buttons
+            | (touch_buttons
+              #if HAS_ENCODER_WHEEL
+                & (~(EN_A | EN_B))
+              #endif
+            )
           #endif
         );
 
@@ -1277,7 +1280,7 @@ void MarlinUI::update() {
 
     } // next_button_update_ms
 
-    #if HAS_ENCODER_WHEEL && DISABLED(TOUCH_BUTTONS)
+    #if HAS_ENCODER_WHEEL
       static uint8_t lastEncoderBits;
 
       #define encrot0 0

From 2822c0890a041038b9a32eeff5212cbc709a347d Mon Sep 17 00:00:00 2001
From: Robert Stein <stonecoldcrazy@stoneathome.de>
Date: Thu, 30 Jan 2020 20:17:15 +0100
Subject: [PATCH 090/565] Set up DIAG endstops for BTT SKR 1.4 / 1.4 Turbo
 (#16727)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 55 ++++++++++++++++++---
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 8e2a0cec231a..90b5edca88a0 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -37,12 +37,53 @@
 //
 #define SERVO0_PIN         P2_00
 
+//
+// TMC StallGuard DIAG pins
+//
+#define X_DIAG_PIN         P1_29   // X-STOP
+#define Y_DIAG_PIN         P1_28   // Y-STOP
+#define Z_DIAG_PIN         P1_27   // Z-STOP
+#define E0_DIAG_PIN        P1_26   // E0DET
+#define E1_DIAG_PIN        P1_25   // E1DET
+
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_29
-#define Y_STOP_PIN         P1_28
-#define Z_STOP_PIN         P1_27
+#if X_STALL_SENSITIVITY
+  #if X_HOME_DIR < 0
+    #define X_MIN_PIN      X_DIAG_PIN
+    #define X_MAX_PIN      P1_26   // E0DET
+  #else
+    #define X_MAX_PIN      X_DIAG_PIN
+    #define X_MIN_PIN      P1_26   // E0DET
+  #endif
+#else
+  #define X_STOP_PIN       P1_29   // X-STOP
+#endif
+
+#if Y_STALL_SENSITIVITY
+  #if Y_HOME_DIR < 0
+    #define Y_MIN_PIN      Y_DIAG_PIN
+    #define Y_MAX_PIN      P1_25   // E1DET
+  #else
+    #define Y_MAX_PIN      Y_DIAG_PIN
+    #define Y_MIN_PIN      P1_25   // E1DET
+  #endif
+#else
+  #define Y_STOP_PIN       P1_28   // Y-STOP
+#endif
+
+#if Z_STALL_SENSITIVITY
+  #if Z_HOME_DIR < 0
+    #define Z_MIN_PIN      Z_DIAG_PIN
+    #define Z_MAX_PIN      P1_24   // PWRDET
+  #else
+    #define Z_MAX_PIN      Z_DIAG_PIN
+    #define Z_MIN_PIN      P1_24   // PWRDET
+  #endif
+#else
+  #define Z_STOP_PIN       P1_27   // Z-STOP
+#endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -54,21 +95,21 @@
 //
 // Filament Runout Sensor
 //
-#define FIL_RUNOUT_PIN     P1_26
-#define FIL_RUNOUT2_PIN    P1_25
+#define FIL_RUNOUT_PIN     P1_26   // E0DET
+#define FIL_RUNOUT2_PIN    P1_25   // E1DET
 
 //
 // Power Supply Control
 //
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        P1_00
+  #define PS_ON_PIN        P1_00   // PWRDET
 #endif
 
 //
 // Power Loss Detection
 //
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN   P1_00
+  #define POWER_LOSS_PIN   P1_00   // PWRDET
 #endif
 
 //

From e8e25b80d1d3a78f3e5358e8992bd4a4900d6c1c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 30 Jan 2020 13:29:08 -0600
Subject: [PATCH 091/565] Extend RX/TX pins for up to 8 extruders

---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h     | 18 ++++++++++++++++++
 Marlin/src/pins/ramps/pins_RAMPS.h           | 18 ++++++++++++++++++
 Marlin/src/pins/ramps/pins_TT_OSCAR.h        |  3 +++
 Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h | 18 ++++++++++++++++++
 4 files changed, 57 insertions(+)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 2cb6fb597b54..d21c487e579b 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -363,6 +363,24 @@
   #ifndef E4_SERIAL_RX_PIN
     #define E4_SERIAL_RX_PIN -1
   #endif
+  #ifndef E5_SERIAL_TX_PIN
+    #define E5_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E5_SERIAL_RX_PIN
+    #define E5_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_TX_PIN
+    #define E6_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_RX_PIN
+    #define E6_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_TX_PIN
+    #define E7_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_RX_PIN
+    #define E7_SERIAL_RX_PIN -1
+  #endif
 #endif
 
 //////////////////////////
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index f6ccff24f67e..b7e9df475904 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -390,6 +390,24 @@
   #ifndef E4_SERIAL_RX_PIN
     #define E4_SERIAL_RX_PIN -1
   #endif
+  #ifndef E5_SERIAL_TX_PIN
+    #define E5_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E5_SERIAL_RX_PIN
+    #define E5_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_TX_PIN
+    #define E6_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_RX_PIN
+    #define E6_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_TX_PIN
+    #define E7_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_RX_PIN
+    #define E7_SERIAL_RX_PIN -1
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 1c40729a8788..145817b48496 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -147,6 +147,9 @@
   #define E3_SERIAL_RX_PIN -1
   #define E4_SERIAL_TX_PIN -1
   #define E4_SERIAL_RX_PIN -1
+  #define E5_SERIAL_RX_PIN -1
+  #define E6_SERIAL_RX_PIN -1
+  #define E7_SERIAL_RX_PIN -1
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index 8545dc488acf..d94f5e44cb3c 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -285,4 +285,22 @@
   #ifndef E4_SERIAL_RX_PIN
     #define E4_SERIAL_RX_PIN -1
   #endif
+  #ifndef E5_SERIAL_TX_PIN
+    #define E5_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E5_SERIAL_RX_PIN
+    #define E5_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_TX_PIN
+    #define E6_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_RX_PIN
+    #define E6_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_TX_PIN
+    #define E7_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_RX_PIN
+    #define E7_SERIAL_RX_PIN -1
+  #endif
 #endif

From 62f52ebb3a0ef69b166407d1f6b0e8ed9627397f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 30 Jan 2020 14:09:33 -0600
Subject: [PATCH 092/565] Fix up, improve endstop pin auto-assignment

Followup for #16723
---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 12 ++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h |  9 ++--
 Marlin/src/pins/pins.h                      | 50 +++++++++++++++------
 3 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 2b6595cd74e0..4889e4d3c3cd 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -36,11 +36,10 @@
  * Limit Switches
  */
 #if X_STALL_SENSITIVITY
+  #define X_STOP_PIN         X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN        X_DIAG_PIN
     #define X_MAX_PIN        P1_28   // X+
   #else
-    #define X_MAX_PIN        X_DIAG_PIN
     #define X_MIN_PIN        P1_28   // X+
   #endif
 #else
@@ -49,11 +48,10 @@
 #endif
 
 #if Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN         Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN        Y_DIAG_PIN
     #define Y_MAX_PIN        P1_26   // Y+
   #else
-    #define Y_MAX_PIN        Y_DIAG_PIN
     #define Y_MIN_PIN        P1_26   // Y+
   #endif
 #else
@@ -62,11 +60,10 @@
 #endif
 
 #if Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN         Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MIN_PIN        Z_DIAG_PIN
     #define Z_MAX_PIN        P1_24   // Z+
   #else
-    #define Z_MAX_PIN        Z_DIAG_PIN
     #define Z_MIN_PIN        P1_24   // Z+
   #endif
 #else
@@ -184,9 +181,6 @@
   #define E1_SERIAL_TX_PIN P1_04
   #define E1_SERIAL_RX_PIN P1_01
 
-  #define Z2_SERIAL_TX_PIN P1_04
-  #define Z2_SERIAL_RX_PIN P1_01
-
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 90b5edca88a0..d0dcd5008a90 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -50,11 +50,10 @@
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
+  #define X_STOP_PIN       X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN      X_DIAG_PIN
     #define X_MAX_PIN      P1_26   // E0DET
   #else
-    #define X_MAX_PIN      X_DIAG_PIN
     #define X_MIN_PIN      P1_26   // E0DET
   #endif
 #else
@@ -62,11 +61,10 @@
 #endif
 
 #if Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN       Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN      Y_DIAG_PIN
     #define Y_MAX_PIN      P1_25   // E1DET
   #else
-    #define Y_MAX_PIN      Y_DIAG_PIN
     #define Y_MIN_PIN      P1_25   // E1DET
   #endif
 #else
@@ -74,11 +72,10 @@
 #endif
 
 #if Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN       Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MIN_PIN      Z_DIAG_PIN
     #define Z_MAX_PIN      P1_24   // PWRDET
   #else
-    #define Z_MAX_PIN      Z_DIAG_PIN
     #define Z_MIN_PIN      P1_24   // PWRDET
   #endif
 #else
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 736dbdace0c3..4df871a50ce1 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1026,10 +1026,14 @@
 #ifdef X_STOP_PIN
   #if X_HOME_DIR < 0
     #define X_MIN_PIN X_STOP_PIN
-    #define X_MAX_PIN -1
+    #ifndef X_MAX_PIN
+      #define X_MAX_PIN -1
+    #endif
   #else
-    #define X_MIN_PIN -1
     #define X_MAX_PIN X_STOP_PIN
+    #ifndef X_MIN_PIN
+      #define X_MIN_PIN -1
+    #endif
   #endif
 #elif X_HOME_DIR < 0
   #define X_STOP_PIN X_MIN_PIN
@@ -1040,10 +1044,14 @@
 #ifdef Y_STOP_PIN
   #if Y_HOME_DIR < 0
     #define Y_MIN_PIN Y_STOP_PIN
-    #define Y_MAX_PIN -1
+    #ifndef Y_MAX_PIN
+      #define Y_MAX_PIN -1
+    #endif
   #else
-    #define Y_MIN_PIN -1
     #define Y_MAX_PIN Y_STOP_PIN
+    #ifndef Y_MIN_PIN
+      #define Y_MIN_PIN -1
+    #endif
   #endif
 #elif Y_HOME_DIR < 0
   #define Y_STOP_PIN Y_MIN_PIN
@@ -1054,10 +1062,14 @@
 #ifdef Z_STOP_PIN
   #if Z_HOME_DIR < 0
     #define Z_MIN_PIN Z_STOP_PIN
-    #define Z_MAX_PIN -1
+    #ifndef Z_MAX_PIN
+      #define Z_MAX_PIN -1
+    #endif
   #else
-    #define Z_MIN_PIN -1
     #define Z_MAX_PIN Z_STOP_PIN
+    #ifndef Z_MIN_PIN
+      #define Z_MIN_PIN -1
+    #endif
   #endif
 #elif Z_HOME_DIR < 0
   #define Z_STOP_PIN Z_MIN_PIN
@@ -1127,9 +1139,11 @@
  * overridden in Configuration.h or Configuration_adv.h.
  */
 
+#define __PEXI(p,q) PIN_EXISTS(E##p##_##q)
+#define _PEXI(p,q) __PEXI(p,q)
 #define __EPIN(p,q) E##p##_##q##_PIN
 #define _EPIN(p,q) __EPIN(p,q)
-#define DIAG_REMAPPED(P,Q) (PIN_EXISTS(Q) && (P##_DIAG_PIN == Q##_PIN))
+#define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
 
 // The X2 axis, if any, should be the next open extruder port
 #define X2_E_INDEX E_STEPPERS
@@ -1167,7 +1181,8 @@
   //
   // Auto-assign pins for stallGuard sensorless homing
   //
-  #if X2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(X2_E_INDEX, DIAG) > 0
+  #if X2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG)
+    #define X2_DIAG_PIN _EPIN(X2_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(X2, X_MIN)      // If already remapped in the pins file...
       #define X2_USE_ENDSTOP _XMIN_
     #elif DIAG_REMAPPED(X2, Y_MIN)
@@ -1184,6 +1199,7 @@
       #define _X2_USE_ENDSTOP(P) _E##P##_DIAG_
       #define X2_USE_ENDSTOP _X2_USE_ENDSTOP(X2_E_INDEX)
     #endif
+    #undef X2_DIAG_PIN
   #endif
 
   #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
@@ -1234,7 +1250,8 @@
       #define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
     #endif
   #endif
-  #if Y2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Y2_E_INDEX, DIAG) > 0
+  #if Y2_STALL_SENSITIVITY && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG)
+    #define Y2_DIAG_PIN _EPIN(Y2_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Y2, X_MIN)
       #define Y2_USE_ENDSTOP _XMIN_
     #elif DIAG_REMAPPED(Y2, Y_MIN)
@@ -1251,6 +1268,7 @@
       #define _Y2_USE_ENDSTOP(P) _E##P##_DIAG_
       #define Y2_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
     #endif
+    #undef Y2_DIAG_PIN
   #endif
   #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
 #else
@@ -1300,7 +1318,8 @@
       #define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
     #endif
   #endif
-  #if Z2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z2_E_INDEX, DIAG) > 0
+  #if Z2_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
+    #define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Z2, X_MIN)
       #define Z2_USE_ENDSTOP _XMIN_
     #elif DIAG_REMAPPED(Z2, Y_MIN)
@@ -1317,6 +1336,7 @@
       #define _Z2_USE_ENDSTOP(P) _E##P##_DIAG_
       #define Z2_USE_ENDSTOP _Z2_USE_ENDSTOP(Z2_E_INDEX)
     #endif
+    #undef Z2_DIAG_PIN
   #endif
   #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
 #else
@@ -1367,7 +1387,8 @@
       #define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
     #endif
   #endif
-  #if Z3_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z3_E_INDEX, DIAG) > 0
+  #if Z3_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
+    #define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Z3, X_MIN)
       #define Z3_USE_ENDSTOP _XMIN_
     #elif DIAG_REMAPPED(Z3, Y_MIN)
@@ -1382,8 +1403,9 @@
       #define Z3_USE_ENDSTOP _ZMAX_
     #else
       #define _Z3_USE_ENDSTOP(P) _E##P##_DIAG_
-      #define Z3_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
+      #define Z3_USE_ENDSTOP _Z3_USE_ENDSTOP(Z3_E_INDEX)
     #endif
+    #undef Z3_DIAG_PIN
   #endif
   #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
 #endif
@@ -1432,7 +1454,8 @@
       #define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
     #endif
   #endif
-  #if Z4_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z4_E_INDEX, DIAG) > 0
+  #if Z4_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
+    #define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Z4, X_MIN)
       #define Z4_USE_ENDSTOP _XMIN_
     #elif DIAG_REMAPPED(Z4, Y_MIN)
@@ -1449,6 +1472,7 @@
       #define _Z4_USE_ENDSTOP(P) _E##P##_DIAG_
       #define Z4_USE_ENDSTOP _Z4_USE_ENDSTOP(Z4_E_INDEX)
     #endif
+    #undef Z4_DIAG_PIN
   #endif
 #endif
 

From e4679c1b787887c466fa607b7408f69e420f4b90 Mon Sep 17 00:00:00 2001
From: Artur Petrzak <petrzmax@gmail.com>
Date: Fri, 31 Jan 2020 01:00:37 +0100
Subject: [PATCH 093/565] (21) PT100 for MCUs with 3.3v logic (#16731)

---
 Marlin/Configuration.h                       |  3 +-
 Marlin/src/lcd/thermistornames.h             |  4 +-
 Marlin/src/module/thermistor/thermistor_21.h | 77 ++++++++++++++++++++
 Marlin/src/module/thermistor/thermistors.h   |  6 +-
 4 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 Marlin/src/module/thermistor/thermistor_21.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7f242dce7967..550ea354676f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -379,7 +379,8 @@
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
  *    15 : 100k thermistor calibration for JGAurora A5 hotend
  *    18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
- *    20 : Pt100 with circuit in the Ultimainboard V2.x
+ *    20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
+ *    21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
  *   201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
  *    61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 17772d788045..9cfb80fba3d8 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -85,7 +85,9 @@
 #elif THERMISTOR_ID == 18
   #define THERMISTOR_NAME "ATC Semitec 204GT-2"
 #elif THERMISTOR_ID == 20
-  #define THERMISTOR_NAME "Pt100 UltiMB"
+  #define THERMISTOR_NAME "Pt100 UltiMB 5v"
+#elif THERMISTOR_ID == 21
+  #define THERMISTOR_NAME "Pt100 UltiMB 3.3v"
 #elif THERMISTOR_ID == 201
   #define THERMISTOR_NAME "Pt100 OverLord"
 #elif THERMISTOR_ID == 60
diff --git a/Marlin/src/module/thermistor/thermistor_21.h b/Marlin/src/module/thermistor/thermistor_21.h
new file mode 100644
index 000000000000..e65f90b75dca
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_21.h
@@ -0,0 +1,77 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define REVERSE_TEMP_SENSOR_RANGE
+
+#undef OV_SCALE
+#define OV_SCALE(N) (float((N) * 5) / 3.3f)
+
+// Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics"
+const short temptable_21[][2] PROGMEM = {
+  { OV(  0),    0 },
+  { OV(227),    1 },
+  { OV(236),   10 },
+  { OV(245),   20 },
+  { OV(253),   30 },
+  { OV(262),   40 },
+  { OV(270),   50 },
+  { OV(279),   60 },
+  { OV(287),   70 },
+  { OV(295),   80 },
+  { OV(304),   90 },
+  { OV(312),  100 },
+  { OV(320),  110 },
+  { OV(329),  120 },
+  { OV(337),  130 },
+  { OV(345),  140 },
+  { OV(353),  150 },
+  { OV(361),  160 },
+  { OV(369),  170 },
+  { OV(377),  180 },
+  { OV(385),  190 },
+  { OV(393),  200 },
+  { OV(401),  210 },
+  { OV(409),  220 },
+  { OV(417),  230 },
+  { OV(424),  240 },
+  { OV(432),  250 },
+  { OV(440),  260 },
+  { OV(447),  270 },
+  { OV(455),  280 },
+  { OV(463),  290 },
+  { OV(470),  300 },
+  { OV(478),  310 },
+  { OV(485),  320 },
+  { OV(493),  330 },
+  { OV(500),  340 },
+  { OV(507),  350 },
+  { OV(515),  360 },
+  { OV(522),  370 },
+  { OV(529),  380 },
+  { OV(537),  390 },
+  { OV(544),  400 },
+  { OV(614),  500 }
+};
+
+#undef OV_SCALE
+#define OV_SCALE(N) (N)
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 875f742ccb28..58e1ef115f25 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -37,7 +37,8 @@
   #error "MAX_RAW_THERMISTOR_VALUE is too large for int16_t. Reduce OVERSAMPLENR or HAL_ADC_RESOLUTION."
 #endif
 
-#define OV(N) int16_t((N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
+#define OV_SCALE(N) (N)
+#define OV(N) int16_t(OV_SCALE(N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
 
 #define ANY_THERMISTOR_IS(n) (THERMISTOR_HEATER_0 == n || THERMISTOR_HEATER_1 == n || THERMISTOR_HEATER_2 == n || THERMISTOR_HEATER_3 == n || THERMISTOR_HEATER_4 == n || THERMISTOR_HEATER_5 == n || THERMISTOR_HEATER_6 == n || THERMISTOR_HEATER_7 == n || THERMISTORBED == n || THERMISTORCHAMBER == n || THERMISTORPROBE == n)
 
@@ -105,6 +106,9 @@
 #if ANY_THERMISTOR_IS(20) // Pt100 with INA826 amp on Ultimaker v2.0 electronics
   #include "thermistor_20.h"
 #endif
+#if ANY_THERMISTOR_IS(21) // Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics"
+  #include "thermistor_21.h"
+#endif
 #if ANY_THERMISTOR_IS(51) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "EPCOS"
   #include "thermistor_51.h"
 #endif

From dabf3939209fd8ea7f6a6327d764c16743aa22aa Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 31 Jan 2020 00:06:46 +0000
Subject: [PATCH 094/565] [cron] Bump distribution date (2020-01-31)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4b933d032791..89b5d02c6352 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-30"
+  #define STRING_DISTRIBUTION_DATE "2020-01-31"
 #endif
 
 /**

From 02f61832c02dd7cb0287ed0dd498c0e003561bd4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 30 Jan 2020 23:24:34 -0600
Subject: [PATCH 095/565] Add sanity-check for new Advanced Pause option

Followup to #16372
---
 Marlin/src/inc/SanityCheck.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a91131e083f9..ea66232ff2e3 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -718,14 +718,16 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #if !HAS_RESUME_CONTINUE
     #error "ADVANCED_PAUSE_FEATURE currently requires an LCD controller or EMERGENCY_PARSER."
+  #elif DISABLED(NOZZLE_PARK_FEATURE)
+    #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE."
+  #elif !defined(FILAMENT_UNLOAD_PURGE_FEEDRATE)
+    #error "ADVANCED_PAUSE_FEATURE requires FILAMENT_UNLOAD_PURGE_FEEDRATE. Please add it to Configuration_adv.h."
   #elif ENABLED(EXTRUDER_RUNOUT_PREVENT)
     #error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE."
   #elif ENABLED(PARK_HEAD_ON_PAUSE) && NONE(SDSUPPORT, NEWPANEL, EMERGENCY_PARSER)
     #error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller."
   #elif ENABLED(HOME_BEFORE_FILAMENT_CHANGE) && DISABLED(PAUSE_PARK_NO_STEPPER_TIMEOUT)
     #error "HOME_BEFORE_FILAMENT_CHANGE requires PAUSE_PARK_NO_STEPPER_TIMEOUT."
-  #elif DISABLED(NOZZLE_PARK_FEATURE)
-    #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE."
   #elif ENABLED(PREVENT_LENGTHY_EXTRUDE) && FILAMENT_CHANGE_UNLOAD_LENGTH > EXTRUDE_MAXLENGTH
     #error "FILAMENT_CHANGE_UNLOAD_LENGTH must be less than or equal to EXTRUDE_MAXLENGTH."
   #elif ENABLED(PREVENT_LENGTHY_EXTRUDE) && FILAMENT_CHANGE_SLOW_LOAD_LENGTH > EXTRUDE_MAXLENGTH

From c4df5cf9a6c14f5527abc5ce3551b05733f326f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 31 Jan 2020 04:40:33 -0600
Subject: [PATCH 096/565] Include macros for delta ABC

---
 Marlin/src/module/delta.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index 3f61907e5171..a506eade1ae3 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -26,6 +26,7 @@
  */
 
 #include "../core/types.h"
+#include "../core/macros.h"
 
 extern float delta_height;
 extern abc_float_t delta_endstop_adj;

From 0a6ae664bd3f01eab1caacd63c3dcdc043333d92 Mon Sep 17 00:00:00 2001
From: Acenotass <44540957+Acenotass@users.noreply.github.com>
Date: Sat, 1 Feb 2020 09:43:44 +0600
Subject: [PATCH 097/565] Update Russian language (#16745)

---
 Marlin/src/lcd/language/language_ru.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index d7e4de5dd203..f86a0bcfc494 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -332,9 +332,9 @@ namespace Language_ru {
 
   PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Паркуй %s%s%s сначала");
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Отступы Z-датчика");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Смещение по X");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Смещение по Y");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Смещение по Z");
+  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Смещение X");
+  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Смещение Y");
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Смещение Z");
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Микрошаг X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Микрошаг Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Микрошаг Z");

From 300b81bfcb50e8d5b832570be65a4c3b8baa9ff2 Mon Sep 17 00:00:00 2001
From: rebel1 <453277+rebel1@users.noreply.github.com>
Date: Sat, 1 Feb 2020 04:46:02 +0100
Subject: [PATCH 098/565] Fix BTT SKR 1.4 extra endstop pins (#16738)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index d0dcd5008a90..13bd2b951f89 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -74,9 +74,9 @@
 #if Z_STALL_SENSITIVITY
   #define Z_STOP_PIN       Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_24   // PWRDET
+    #define Z_MAX_PIN      P1_00   // PWRDET
   #else
-    #define Z_MIN_PIN      P1_24   // PWRDET
+    #define Z_MIN_PIN      P1_00   // PWRDET
   #endif
 #else
   #define Z_STOP_PIN       P1_27   // Z-STOP

From 5b3d968634d817c310e751bd59e1274295459218 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Fri, 31 Jan 2020 19:51:59 -0800
Subject: [PATCH 099/565] Option for Trigorilla 1.4 with add-on endstops board
 (#16737)

---
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 987d2a07561c..f3155fdb0997 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -38,10 +38,13 @@
 #endif
 
 //
-// Limit Switches
+// Custom Limit Switches
 //
-#define X_MAX_PIN          43
-#define Y_MIN_PIN          19
+//#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
+#if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
+  #define X_MAX_PIN        43
+  #define Y_MIN_PIN        19
+#endif
 
 // Labeled pins
 #define TRIGORILLA_HEATER_BED_PIN  8

From 9a8de23858b3ec1b19542db4fd6c5e5419e6ee98 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Fri, 31 Jan 2020 21:08:37 -0800
Subject: [PATCH 100/565] Consistent M112 with Emergency Parser (#16747)

---
 Marlin/src/module/temperature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 61ed04aaea46..702f82e7708a 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1050,7 +1050,7 @@ void Temperature::manage_heater() {
   #endif
 
   #if ENABLED(EMERGENCY_PARSER)
-    if (emergency_parser.killed_by_M112) kill();
+    if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
   #endif
 
   if (!raw_temps_ready) return;

From 1af05797d7e571cf619f5672fb9b2fb9fc5442d2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 00:27:11 -0600
Subject: [PATCH 101/565] Improve mfadd helper script

- Use the original branch name if none is supplied
- Set the remote tracking to the source
- Accept User/Branch or User:Branch syntax
---
 buildroot/share/git/mfadd | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/buildroot/share/git/mfadd b/buildroot/share/git/mfadd
index 92b2e0063ec6..30be1ec0f748 100755
--- a/buildroot/share/git/mfadd
+++ b/buildroot/share/git/mfadd
@@ -1,20 +1,24 @@
 #!/usr/bin/env bash
 #
-# mfadd (user|ref) [copyname]
+# mfadd user[:branch] [copyname]
 #
 # Add a remote and fetch it. Optionally copy a branch.
 #
-# Example: mfadd myfork:patch-1 copy_of_patch-1
+# Examples:
+#  mfadd thefork
+#  mfadd thefork:patch-1
+#  mfadd thefork:patch-1 the_patch_12345
 #
 
-[[ $# > 0 && $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` (user|ref) [copyname]" 1>&2 ; exit 1; }
+[[ $# > 0 && $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` user[:branch] [copyname]" 1>&2 ; exit 1; }
 
-# If a colon is included, split the parts
-if [[ $1 =~ ":" ]]; then
-  IFS=':' read -a DATA <<< "$1"
+# If a colon or slash is included, split the parts
+if [[ $1 =~ ":" || $1 =~ "/" ]]; then
+  [[ $1 =~ ":" ]] && IFS=':' || IFS="/"
+  read -a DATA <<< "$1"
   USER=${DATA[0]}
   BRANCH=${DATA[1]}
-  NAME=$2
+  NAME=${2:-$BRANCH}
 else
   USER=$1
 fi
@@ -29,4 +33,4 @@ echo "Adding and fetching $USER..."
 git remote add "$USER" "git@github.com:$USER/$REPO.git" >/dev/null 2>&1 || echo "Remote exists."
 git fetch "$USER"
 
-[[ ! -z "$BRANCH" && ! -z "$NAME" ]] && git checkout $USER/$BRANCH -b $NAME
+[[ ! -z "$BRANCH" && ! -z "$NAME" ]] && git checkout -b "$NAME" --track "$USER/$BRANCH"

From e64b7a3ab27dd1f0dc56e227b42295e5c931df62 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 00:57:14 -0600
Subject: [PATCH 102/565] Clean up i2c encoder, sanitize serial

---
 Marlin/src/feature/I2CPositionEncoder.cpp   | 40 +++++++++++----------
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp |  4 +--
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/I2CPositionEncoder.cpp
index c3b182c72a0f..07f3aa21415d 100644
--- a/Marlin/src/feature/I2CPositionEncoder.cpp
+++ b/Marlin/src/feature/I2CPositionEncoder.cpp
@@ -162,15 +162,17 @@ void I2CPositionEncoder::update() {
       if (errIdx == 0) {
         // In order to correct for "error" but avoid correcting for noise and non-skips
         // it must be > threshold and have a difference average of < 10 and be < 2000 steps
-        if (ABS(error) > threshold * planner.settings.axis_steps_per_mm[encoderAxis] &&
-            diffSum < 10 * (I2CPE_ERR_ARRAY_SIZE - 1) && ABS(error) < 2000) { // Check for persistent error (skip)
+        if (ABS(error) > threshold * planner.settings.axis_steps_per_mm[encoderAxis]
+            && diffSum < 10 * (I2CPE_ERR_ARRAY_SIZE - 1)
+            && ABS(error) < 2000
+        ) {                              // Check for persistent error (skip)
           errPrst[errPrstIdx++] = error; // Error must persist for I2CPE_ERR_PRST_ARRAY_SIZE error cycles. This also serves to improve the average accuracy
           if (errPrstIdx >= I2CPE_ERR_PRST_ARRAY_SIZE) {
             float sumP = 0;
             LOOP_L_N(i, I2CPE_ERR_PRST_ARRAY_SIZE) sumP += errPrst[i];
             const int32_t errorP = int32_t(sumP * RECIPROCAL(I2CPE_ERR_PRST_ARRAY_SIZE));
             SERIAL_ECHO(axis_codes[encoderAxis]);
-            SERIAL_ECHOLNPAIR(" - err detected: ", errorP * planner.steps_to_mm[encoderAxis], "mm; correcting!");
+            SERIAL_ECHOLNPAIR(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
             babystep.add_steps(encoderAxis, -LROUND(errorP));
             errPrstIdx = 0;
           }
@@ -189,7 +191,8 @@ void I2CPositionEncoder::update() {
     if (ABS(error) > I2CPE_ERR_CNT_THRESH * planner.settings.axis_steps_per_mm[encoderAxis]) {
       const millis_t ms = millis();
       if (ELAPSED(ms, nextErrorCountTime)) {
-        SERIAL_ECHOLNPAIR("Large error on ", axis_codes[encoderAxis], " axis. error: ", (int)error, "; diffSum: ", diffSum);
+        SERIAL_ECHO(axis_codes[encoderAxis]);
+        SERIAL_ECHOLNPAIR(" : LARGE ERR ", int(error), "; diffSum=", diffSum);
         errorCount++;
         nextErrorCountTime = ms + I2CPE_ERR_CNT_DEBOUNCE_MS;
       }
@@ -243,17 +246,14 @@ bool I2CPositionEncoder::passes_test(const bool report) {
 }
 
 float I2CPositionEncoder::get_axis_error_mm(const bool report) {
-  float target, actual, error;
-
-  target = planner.get_axis_position_mm(encoderAxis);
-  actual = mm_from_count(position);
-  error = actual - target;
-
-  if (ABS(error) > 10000) error = 0; // ?
+  const float target = planner.get_axis_position_mm(encoderAxis),
+              actual = mm_from_count(position),
+              diff = actual - target,
+              error = ABS(diff) > 10000 ? 0 : diff; // Huge error is a bad reading
 
   if (report) {
     SERIAL_ECHO(axis_codes[encoderAxis]);
-    SERIAL_ECHOLNPAIR(" axis target: ", target, ", actual: ", actual, ", error : ",error);
+    SERIAL_ECHOLNPAIR(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
   }
 
   return error;
@@ -278,21 +278,25 @@ int32_t I2CPositionEncoder::get_axis_error_steps(const bool report) {
   //convert both 'ticks' into same units / base
   encoderCountInStepperTicksScaled = LROUND((stepperTicksPerUnit * encoderTicks) / encoderTicksPerUnit);
 
-  int32_t target = stepper.position(encoderAxis),
-          error = (encoderCountInStepperTicksScaled - target);
+  const int32_t target = stepper.position(encoderAxis);
+  int32_t error = encoderCountInStepperTicksScaled - target;
 
   //suppress discontinuities (might be caused by bad I2C readings...?)
   const bool suppressOutput = (ABS(error - errorPrev) > 100);
 
+  errorPrev = error;
+
   if (report) {
     SERIAL_ECHO(axis_codes[encoderAxis]);
-    SERIAL_ECHOLNPAIR(" axis target: ", target, ", actual: ", encoderCountInStepperTicksScaled, ", error : ", error);
-    if (suppressOutput) SERIAL_ECHOLNPGM("Discontinuity detected, suppressing error.");
+    SERIAL_ECHOLNPAIR(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
   }
 
-  errorPrev = error;
+  if (suppressOutput) {
+    if (report) SERIAL_ECHOLNPGM("!Discontinuity. Suppressing error.");
+    error = 0;
+  }
 
-  return (suppressOutput ? 0 : error);
+  return error;
 }
 
 int32_t I2CPositionEncoder::get_raw_count() {
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 203d7c715076..c8f3b45b0d95 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1629,7 +1629,7 @@
           auto debug_pt = [](PGM_P const pre, const xy_pos_t &pos, const float &zadd) {
             d_from(); serialprintPGM(pre);
             DEBUG_ECHO_F(normed(pos, zadd), 6);
-            DEBUG_ECHOLNPAIR_F("   Z error: ", zadd - get_z_correction(pos), 6);
+            DEBUG_ECHOLNPAIR_F("   Z error = ", zadd - get_z_correction(pos), 6);
           };
           debug_pt(PSTR("1st point: "), probe_pt[0], normal.z * z1);
           debug_pt(PSTR("2nd point: "), probe_pt[1], normal.z * z2);
@@ -1638,7 +1638,7 @@
           DEBUG_ECHOLNPAIR_F("0 : ", normed(safe_homing_xy, 0), 6);
           d_from(); DEBUG_ECHOPGM("safe home with Z=");
           DEBUG_ECHOLNPAIR_F("mesh value ", normed(safe_homing_xy, get_z_correction(safe_homing_xy)), 6);
-          DEBUG_ECHOPAIR("   Z error: (", Z_SAFE_HOMING_X_POINT, ",", Z_SAFE_HOMING_Y_POINT);
+          DEBUG_ECHOPAIR("   Z error = (", Z_SAFE_HOMING_X_POINT, ",", Z_SAFE_HOMING_Y_POINT);
           DEBUG_ECHOLNPAIR_F(") = ", get_z_correction(safe_homing_xy), 6);
         #endif
       } // DEBUGGING(LEVELING)

From 43d3463d5d612a300789bdc7a845eb2e8a37786d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 03:50:26 -0600
Subject: [PATCH 103/565] Misc cleanup, whitespace

---
 Marlin/src/feature/baricuda.cpp           | 2 +-
 Marlin/src/module/stepper.cpp             | 6 +++---
 Marlin/src/module/temperature.cpp         | 5 ++---
 Marlin/src/pins/sam/pins_CNCONTROLS_15D.h | 6 +++---
 Marlin/src/sd/SdVolume.cpp                | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/feature/baricuda.cpp b/Marlin/src/feature/baricuda.cpp
index 82e0a5f14f50..354e8482a562 100644
--- a/Marlin/src/feature/baricuda.cpp
+++ b/Marlin/src/feature/baricuda.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../inc/MarlinConfig.h"
+#include "../inc/MarlinConfigPre.h"
 
 #if ENABLED(BARICUDA)
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 4e46ea56cd4c..90848c99d177 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2460,10 +2460,10 @@ void Stepper::report_positions() {
 
   #define BABYSTEP_AXIS(AXIS, INVERT, DIR) {            \
       const uint8_t old_dir = _READ_DIR(AXIS);          \
-      _ENABLE_AXIS(AXIS);                                    \
-      DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);              \
+      _ENABLE_AXIS(AXIS);                               \
+      DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);          \
       _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT);   \
-      DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);              \
+      DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);         \
       _SAVE_START;                                      \
       _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
       _PULSE_WAIT;                                      \
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 702f82e7708a..d90a2123d163 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2608,9 +2608,8 @@ void Temperature::tick() {
 
       #if ENABLED(FAN_SOFT_PWM)
         #define _FAN_PWM(N) do{ \
-          uint8_t &spcf = soft_pwm_count_fan[N]; \
-          spcf = (spcf & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
-          WRITE_FAN(N, spcf > pwm_mask ? HIGH : LOW); \
+          const uint8_t spcf = (soft_pwm_count_fan[N] & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
+          WRITE_FAN(N, (spcf > pwm_mask)); \
         }while(0)
         #if HAS_FAN0
           _FAN_PWM(0);
diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
index fe9bfb9afd08..6238b8258849 100644
--- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
+++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
@@ -52,11 +52,11 @@
 // Analog Inputs
 //
 #define TEMP_0_PIN          1
-#define TEMP_1_PIN          2  
-#define TEMP_BED_PIN        4   
+#define TEMP_1_PIN          2
+#define TEMP_BED_PIN        4
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN  5   
+  #define TEMP_CHAMBER_PIN  5
 #endif
 
 //
diff --git a/Marlin/src/sd/SdVolume.cpp b/Marlin/src/sd/SdVolume.cpp
index 70dfa52e300c..1db562a80aa8 100644
--- a/Marlin/src/sd/SdVolume.cpp
+++ b/Marlin/src/sd/SdVolume.cpp
@@ -292,7 +292,7 @@ int32_t SdVolume::freeClusterCount() {
         if (cacheBuffer_.fat32[i] == 0) free++;
     }
     #ifdef ESP32
-      // Needed to reset the idle task watchdog timer on ESP32 as reading the complete FAT may easily 
+      // Needed to reset the idle task watchdog timer on ESP32 as reading the complete FAT may easily
       // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
       static millis_t nextTaskTime = 0;
       const millis_t ms = millis();

From 90b6324563b806ea7dc24ddf299f055dc4854341 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Feb 2020 04:21:36 -0600
Subject: [PATCH 104/565] Encapsulate probe as singleton class (#16751)

---
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/core/utility.cpp                   |  20 +-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |   4 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |  52 ++--
 Marlin/src/gcode/bedlevel/G42.cpp             |   6 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |   4 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  20 +-
 Marlin/src/gcode/calibrate/G28.cpp            |   4 +-
 Marlin/src/gcode/calibrate/G33.cpp            |   4 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp       |  12 +-
 Marlin/src/gcode/calibrate/G76_M871.cpp       |  16 +-
 Marlin/src/gcode/calibrate/M48.cpp            |  12 +-
 Marlin/src/gcode/config/M304.cpp              |   7 +
 Marlin/src/gcode/motion/M290.cpp              |   6 +-
 Marlin/src/gcode/probe/G30.cpp                |   8 +-
 Marlin/src/gcode/probe/G31_G32.cpp            |   4 +-
 Marlin/src/gcode/probe/M401_M402.cpp          |   6 +-
 Marlin/src/gcode/probe/M851.cpp               |   8 +-
 .../lib/dgus/DGUSDisplayDefinitionFYSETC.cpp  |   2 +-
 .../lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp |   2 +-
 .../lib/dgus/DGUSDisplayDefinitionOrigin.cpp  |   2 +-
 Marlin/src/lcd/extensible_ui/ui_api.cpp       |   6 +-
 Marlin/src/lcd/menu/menu.cpp                  |   8 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |   8 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp     |   2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |   5 +-
 Marlin/src/module/configuration_store.cpp     |  35 +--
 Marlin/src/module/delta.cpp                   |   4 +-
 Marlin/src/module/motion.cpp                  |  20 +-
 Marlin/src/module/motion.h                    |   8 +-
 Marlin/src/module/planner.cpp                 |   4 +-
 Marlin/src/module/probe.cpp                   | 105 ++++----
 Marlin/src/module/probe.h                     | 232 ++++++++++--------
 33 files changed, 338 insertions(+), 300 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 6d78190218b1..141494f20c83 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -977,7 +977,7 @@ void setup() {
   #endif
 
   #if HAS_Z_SERVO_PROBE
-    servo_probe_init();
+    probe.servo_probe_init();
   #endif
 
   #if HAS_PHOTOGRAPH
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 16d0ea17c148..14f7aa708324 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -83,42 +83,42 @@ void safe_delay(millis_t ms) {
     #if HAS_BED_PROBE
 
       #if !HAS_PROBE_XY_OFFSET
-        SERIAL_ECHOPAIR("Probe Offset X0 Y0 Z", probe_offset.z, " (");
+        SERIAL_ECHOPAIR("Probe Offset X0 Y0 Z", probe.offset.z, " (");
       #else
-        SERIAL_ECHOPAIR_P(PSTR("Probe Offset X"), probe_offset.x, SP_Y_STR, probe_offset.y, SP_Z_STR, probe_offset.z);
-        if (probe_offset.x > 0)
+        SERIAL_ECHOPAIR_P(PSTR("Probe Offset X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR, probe.offset.z);
+        if (probe.offset_xy.x > 0)
           SERIAL_ECHOPGM(" (Right");
-        else if (probe_offset.x < 0)
+        else if (probe.offset_xy.x < 0)
           SERIAL_ECHOPGM(" (Left");
-        else if (probe_offset.y != 0)
+        else if (probe.offset_xy.y != 0)
           SERIAL_ECHOPGM(" (Middle");
         else
           SERIAL_ECHOPGM(" (Aligned With");
 
-        if (probe_offset.y > 0) {
+        if (probe.offset_xy.y > 0) {
           #if IS_SCARA
             SERIAL_ECHOPGM("-Distal");
           #else
             SERIAL_ECHOPGM("-Back");
           #endif
         }
-        else if (probe_offset.y < 0) {
+        else if (probe.offset_xy.y < 0) {
           #if IS_SCARA
             SERIAL_ECHOPGM("-Proximal");
           #else
             SERIAL_ECHOPGM("-Front");
           #endif
         }
-        else if (probe_offset.x != 0)
+        else if (probe.offset_xy.x != 0)
           SERIAL_ECHOPGM("-Center");
 
         SERIAL_ECHOPGM(" & ");
 
       #endif
 
-      if (probe_offset.z < 0)
+      if (probe.offset.z < 0)
         SERIAL_ECHOPGM("Below");
-      else if (probe_offset.z > 0)
+      else if (probe.offset.z > 0)
         SERIAL_ECHOPGM("Above");
       else
         SERIAL_ECHOPGM("Same Z as");
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index adafc6a1946c..8327b468a7e3 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -173,10 +173,10 @@
       serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
     }
 
-    // Add XY probe offset from extruder because probe_at_point() subtracts them when
+    // Add XY probe offset from extruder because probe.probe_at_point() subtracts them when
     // moving to the XY position to be measured. This ensures better agreement between
     // the current Z position after G28 and the mesh values.
-    const xy_int8_t curr = closest_indexes(xy_pos_t(current_position) + probe_offset_xy);
+    const xy_int8_t curr = closest_indexes(xy_pos_t(current_position) + probe.offset_xy);
 
     if (!lcd) SERIAL_EOL();
     for (int8_t j = GRID_MAX_POINTS_Y - 1; j >= 0; j--) {
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index c8f3b45b0d95..693a4b9b2389 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -450,7 +450,7 @@
               SERIAL_ECHO(g29_pos.y);
               SERIAL_ECHOLNPGM(").\n");
             }
-            const xy_pos_t near = g29_pos + probe_offset_xy;
+            const xy_pos_t near = g29_pos + probe.offset_xy;
             probe_entire_mesh(near, parser.seen('T'), parser.seen('E'), parser.seen('U'));
 
             report_current_position();
@@ -480,8 +480,8 @@
                 #if IS_KINEMATIC
                   X_HOME_POS, Y_HOME_POS
                 #else
-                  probe_offset_xy.x > 0 ? X_BED_SIZE : 0,
-                  probe_offset_xy.y < 0 ? Y_BED_SIZE : 0
+                  probe.offset_xy.x > 0 ? X_BED_SIZE : 0,
+                  probe.offset_xy.y < 0 ? Y_BED_SIZE : 0
                 #endif
               );
             }
@@ -742,7 +742,7 @@
      * This attempts to fill in locations closest to the nozzle's start location first.
      */
     void unified_bed_leveling::probe_entire_mesh(const xy_pos_t &near, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
-      DEPLOY_PROBE(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
+      probe.deploy(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
 
       #if HAS_LCD_MENU
         ui.capture();
@@ -768,7 +768,7 @@
             ui.wait_for_release();
             ui.quick_feedback();
             ui.release();
-            STOW_PROBE(); // Release UI before stow to allow for PAUSE_BEFORE_DEPLOY_STOW
+            probe.stow(); // Release UI before stow to allow for PAUSE_BEFORE_DEPLOY_STOW
             return restore_ubl_active_state_and_leave();
           }
         #endif
@@ -778,7 +778,7 @@
           : find_closest_mesh_point_of_type(INVALID, near, true);
 
         if (best.pos.x >= 0) {    // mesh point found and is reachable by probe
-          const float measured_z = probe_at_point(
+          const float measured_z = probe.probe_at_point(
                         best.meshpos(),
                         stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level
                       );
@@ -794,20 +794,20 @@
       #if HAS_LCD_MENU
         ui.release();
       #endif
-      STOW_PROBE(); // Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
+      probe.stow(); // Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
       #if HAS_LCD_MENU
         ui.capture();
       #endif
 
       #ifdef Z_AFTER_PROBING
-        move_z_after_probing();
+        probe.move_z_after_probing();
       #endif
 
       restore_ubl_active_state_and_leave();
 
       do_blocking_move_to_xy(
-        constrain(near.x - probe_offset_xy.x, MESH_MIN_X, MESH_MAX_X),
-        constrain(near.y - probe_offset_xy.y, MESH_MIN_Y, MESH_MAX_Y)
+        constrain(near.x - probe.offset_xy.x, MESH_MIN_X, MESH_MAX_X),
+        constrain(near.y - probe.offset_xy.y, MESH_MIN_Y, MESH_MAX_Y)
       );
     }
 
@@ -907,7 +907,7 @@
       ui.return_to_status();
 
       mesh_index_pair location;
-      xy_int8_t &lpos = location.pos;
+      const xy_int8_t &lpos = location.pos;
       do {
         location = find_closest_mesh_point_of_type(INVALID, pos);
         // It doesn't matter if the probe can't reach the NAN location. This is a manual probe.
@@ -1006,7 +1006,7 @@
       #endif
 
       MeshFlags done_flags{0};
-      xy_int8_t &lpos = location.pos;
+      const xy_int8_t &lpos = location.pos;
       do {
         location = find_closest_mesh_point_of_type(SET_IN_BITMAP, pos, false, &done_flags);
 
@@ -1294,7 +1294,7 @@
     closest.distance = -99999.9f;
 
     // Get the reference position, either nozzle or probe
-    const xy_pos_t ref = probe_relative ? pos + probe_offset_xy : pos;
+    const xy_pos_t ref = probe_relative ? pos + probe.offset_xy : pos;
 
     float best_so_far = 99999.99f;
 
@@ -1393,13 +1393,13 @@
     #include "../../../libs/vector_3.h"
 
     void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
-      const float x_min = probe_min_x(), x_max = probe_max_x(),
-                  y_min = probe_min_y(), y_max = probe_max_y(),
+      const float x_min = probe.min_x(), x_max = probe.max_x(),
+                  y_min = probe.min_y(), y_max = probe.max_y(),
                   dx = (x_max - x_min) / (g29_grid_size - 1),
                   dy = (y_max - y_min) / (g29_grid_size - 1);
 
       xy_float_t points[3];
-      get_three_probe_points(points);
+      probe.get_three_points(points);
 
       float measured_z;
       bool abort_flag = false;
@@ -1417,7 +1417,7 @@
           ui.status_printf_P(0, PSTR(S_FMT " 1/3"), GET_TEXT(MSG_LCD_TILTING_MESH));
         #endif
 
-        measured_z = probe_at_point(points[0], PROBE_PT_RAISE, g29_verbose_level);
+        measured_z = probe.probe_at_point(points[0], PROBE_PT_RAISE, g29_verbose_level);
         if (isnan(measured_z))
           abort_flag = true;
         else {
@@ -1438,7 +1438,7 @@
             ui.status_printf_P(0, PSTR(S_FMT " 2/3"), GET_TEXT(MSG_LCD_TILTING_MESH));
           #endif
 
-          measured_z = probe_at_point(points[1], PROBE_PT_RAISE, g29_verbose_level);
+          measured_z = probe.probe_at_point(points[1], PROBE_PT_RAISE, g29_verbose_level);
           #ifdef VALIDATE_MESH_TILT
             z2 = measured_z;
           #endif
@@ -1460,7 +1460,7 @@
             ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH));
           #endif
 
-          measured_z = probe_at_point(points[2], PROBE_PT_STOW, g29_verbose_level);
+          measured_z = probe.probe_at_point(points[2], PROBE_PT_STOW, g29_verbose_level);
           #ifdef VALIDATE_MESH_TILT
             z3 = measured_z;
           #endif
@@ -1476,9 +1476,9 @@
           }
         }
 
-        STOW_PROBE();
+        probe.stow();
         #ifdef Z_AFTER_PROBING
-          move_z_after_probing();
+          probe.move_z_after_probing();
         #endif
 
         if (abort_flag) {
@@ -1504,7 +1504,7 @@
                 ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points);
               #endif
 
-              measured_z = probe_at_point(rpos, parser.seen('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level); // TODO: Needs error handling
+              measured_z = probe.probe_at_point(rpos, parser.seen('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level); // TODO: Needs error handling
 
               abort_flag = isnan(measured_z);
 
@@ -1523,7 +1523,7 @@
                 }
               #endif
 
-              measured_z -= get_z_correction(rpos) /* + probe_offset.z */ ;
+              measured_z -= get_z_correction(rpos) /* + probe.offset.z */ ;
 
               if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_F("   final >>>---> ", measured_z, 7);
 
@@ -1540,9 +1540,9 @@
           zig_zag ^= true;
         }
       }
-      STOW_PROBE();
+      probe.stow();
       #ifdef Z_AFTER_PROBING
-        move_z_after_probing();
+        probe.move_z_after_probing();
       #endif
 
       if (abort_flag || finish_incremental_LSF(&lsf_results)) {
@@ -1728,7 +1728,7 @@
       adjust_mesh_to_mean(g29_c_flag, g29_constant);
 
       #if HAS_BED_PROBE
-        SERIAL_ECHOLNPAIR_F("Probe Offset M851 Z", probe_offset.z, 7);
+        SERIAL_ECHOLNPAIR_F("Probe Offset M851 Z", probe.offset.z, 7);
       #endif
 
       SERIAL_ECHOLNPAIR("MESH_MIN_X  " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);
diff --git a/Marlin/src/gcode/bedlevel/G42.cpp b/Marlin/src/gcode/bedlevel/G42.cpp
index 28752cab8d5a..bd6715e29d93 100644
--- a/Marlin/src/gcode/bedlevel/G42.cpp
+++ b/Marlin/src/gcode/bedlevel/G42.cpp
@@ -27,7 +27,7 @@
 #include "../gcode.h"
 #include "../../MarlinCore.h" // for IsRunning()
 #include "../../module/motion.h"
-#include "../../module/probe.h" // for probe_offset
+#include "../../module/probe.h" // for probe.offset
 #include "../../feature/bedlevel/bedlevel.h"
 
 /**
@@ -53,8 +53,8 @@ void GcodeSuite::G42() {
 
     #if HAS_PROBE_XY_OFFSET
       if (parser.boolval('P')) {
-        if (hasI) destination.x -= probe_offset_xy.x;
-        if (hasJ) destination.y -= probe_offset_xy.y;
+        if (hasI) destination.x -= probe.offset_xy.x;
+        if (hasJ) destination.y -= probe.offset_xy.y;
       }
     #endif
 
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 9e96b456e352..70f80465e3f4 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -64,8 +64,8 @@ void GcodeSuite::M420() {
 
   #if ENABLED(MARLIN_DEV_MODE)
     if (parser.intval('S') == 2) {
-      const float x_min = probe_min_x(), x_max = probe_max_x(),
-                  y_min = probe_min_y(), y_max = probe_max_y();
+      const float x_min = probe.min_x(), x_max = probe.max_x(),
+                  y_min = probe.min_y(), y_max = probe.max_y();
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
         bilinear_start.set(x_min, y_min);
         bilinear_grid_spacing.set((x_max - x_min) / (GRID_MAX_POINTS_X - 1),
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 7cbaefbf23e9..ff0581886a70 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -269,7 +269,7 @@ G29_TYPE GcodeSuite::G29() {
     #endif
 
     vector_3 points[3];
-    get_three_probe_points(points);
+    probe.get_three_points(points);
 
   #endif // AUTO_BED_LEVELING_3POINT
 
@@ -392,8 +392,8 @@ G29_TYPE GcodeSuite::G29() {
 
       xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_SPEED));
 
-      const float x_min = probe_min_x(), x_max = probe_max_x(),
-                  y_min = probe_min_y(), y_max = probe_max_y();
+      const float x_min = probe.min_x(), x_max = probe.max_x(),
+                  y_min = probe.min_y(), y_max = probe.max_y();
 
       if (parser.seen('H')) {
         const int16_t size = (int16_t)parser.value_linear_units();
@@ -452,7 +452,7 @@ G29_TYPE GcodeSuite::G29() {
 
     #if HAS_BED_PROBE
       // Deploy the probe. Probe will raise if needed.
-      if (DEPLOY_PROBE()) {
+      if (probe.deploy()) {
         set_bed_leveling_enabled(abl_should_enable);
         G29_RETURN(false);
       }
@@ -712,7 +712,7 @@ G29_TYPE GcodeSuite::G29() {
             ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(GRID_MAX_POINTS));
           #endif
 
-          measured_z = faux ? 0.001f * random(-100, 101) : probe_at_point(probePos, raise_after, verbose_level);
+          measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(probePos, raise_after, verbose_level);
 
           if (isnan(measured_z)) {
             set_bed_leveling_enabled(abl_should_enable);
@@ -764,7 +764,7 @@ G29_TYPE GcodeSuite::G29() {
 
         // Retain the last probe position
         probePos = points[i];
-        measured_z = faux ? 0.001 * random(-100, 101) : probe_at_point(probePos, raise_after, verbose_level);
+        measured_z = faux ? 0.001 * random(-100, 101) : probe.probe_at_point(probePos, raise_after, verbose_level);
         if (isnan(measured_z)) {
           set_bed_leveling_enabled(abl_should_enable);
           break;
@@ -788,7 +788,7 @@ G29_TYPE GcodeSuite::G29() {
     #endif
 
     // Stow the probe. No raise for FIX_MOUNTED_PROBE.
-    if (STOW_PROBE()) {
+    if (probe.stow()) {
       set_bed_leveling_enabled(abl_should_enable);
       measured_z = NAN;
     }
@@ -923,8 +923,8 @@ G29_TYPE GcodeSuite::G29() {
         planner.force_unapply_leveling(converted); // use conversion machinery
 
         // Use the last measured distance to the bed, if possible
-        if ( NEAR(current_position.x, probePos.x - probe_offset_xy.x)
-          && NEAR(current_position.y, probePos.y - probe_offset_xy.y)
+        if ( NEAR(current_position.x, probePos.x - probe.offset_xy.x)
+          && NEAR(current_position.y, probePos.y - probe.offset_xy.y)
         ) {
           const float simple_z = current_position.z - measured_z;
           if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probed Z", simple_z, "  Matrix Z", converted.z, "  Discrepancy ", simple_z - converted.z);
@@ -964,7 +964,7 @@ G29_TYPE GcodeSuite::G29() {
     sync_plan_position();
 
   #if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
-    move_z_after_probing();
+    probe.move_z_after_probing();
   #endif
 
   #ifdef Z_PROBE_END_SCRIPT
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 6d87e6f9326d..0b29fbc4d6bb 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -133,7 +133,7 @@
     destination.set(safe_homing_xy, current_position.z);
 
     #if HOMING_Z_WITH_PROBE
-      destination -= probe_offset_xy;
+      destination -= probe.offset_xy;
     #endif
 
     if (position_is_reachable(destination)) {
@@ -416,7 +416,7 @@ void GcodeSuite::G28(const bool always_home_all) {
         #endif
 
         #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
-          move_z_after_probing();
+          probe.move_z_after_probing();
         #endif
 
       } // doZ
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 2ce45359d36a..bfcf9153ea1c 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -100,7 +100,7 @@ void ac_cleanup(
     do_blocking_move_to_z(delta_clip_start_height);
   #endif
   #if HAS_BED_PROBE
-    STOW_PROBE();
+    probe.stow();
   #endif
   restore_feedrate_and_scaling();
   #if HOTENDS > 1
@@ -190,7 +190,7 @@ static float std_dev_points(float z_pt[NPP + 1], const bool _0p_cal, const bool
  */
 static float calibration_probe(const xy_pos_t &xy, const bool stow) {
   #if HAS_BED_PROBE
-    return probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true);
+    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true);
   #else
     UNUSED(stow);
     return lcd_probe_pt(xy);
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 2c284de6810d..a35b3faef743 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -133,8 +133,8 @@ void GcodeSuite::G34() {
 
   do { // break out on error
 
-    #if NUM_Z_STEPPER_DRIVERS == 4
-      SERIAL_ECHOLNPGM("Quad Z Stepper Leveling not Yet Supported");
+    #if NUM_Z_STEPPER_DRIVERS >= 4
+      SERIAL_ECHOLNPGM("Alignment not supported for over 3 steppers");
       break;
     #endif
 
@@ -240,7 +240,7 @@ void GcodeSuite::G34() {
         if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
 
         // Probe a Z height for each stepper.
-        const float z_probed_height = probe_at_point(z_stepper_align_pos[iprobe], raise_after, 0, true);
+        const float z_probed_height = probe.probe_at_point(z_stepper_align_pos[iprobe], raise_after, 0, true);
         if (isnan(z_probed_height)) {
           SERIAL_ECHOLNPGM("Probing failed.");
           err_break = true;
@@ -314,7 +314,7 @@ void GcodeSuite::G34() {
 
         #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
           // Optimize one iteration's correction based on the first measurements
-          if (z_align_abs > 0.0f) amplification = iteration == 1 ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
+          if (z_align_abs) amplification = (iteration == 1) ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
         #endif
 
         // Check for less accuracy compared to last move
@@ -379,9 +379,9 @@ void GcodeSuite::G34() {
     // After this operation the z position needs correction
     set_axis_is_not_at_home(Z_AXIS);
 
-    // Stow the probe, as the last call to probe_at_point(...) left
+    // Stow the probe, as the last call to probe.probe_at_point(...) left
     // the probe deployed if it was successful.
-    STOW_PROBE();
+    probe.stow();
 
     // Home Z after the alignment procedure
     process_subcommands_now_P(PSTR("G28 Z"));
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 479f13d50c69..b94b56fd93f2 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -113,8 +113,8 @@ void GcodeSuite::G76() {
     }
     // Ensure probe position is reachable
     destination.set(
-      temp_comp.measure_point_x - probe_offset.x,
-      temp_comp.measure_point_y - probe_offset.y
+      temp_comp.measure_point_x - probe.offset_xy.x,
+      temp_comp.measure_point_y - probe.offset_xy.y
     );
     if (!position_is_reachable_by_probe(destination)) {
       SERIAL_ECHOLNPGM("!Probe position unreachable - aborting.");
@@ -209,9 +209,9 @@ void GcodeSuite::G76() {
 
       // Do a single probe
       remember_feedrate_scaling_off();
-      const float measured_z = probe_at_point(
-        destination.x + probe_offset.x,
-        destination.y + probe_offset.y,
+      const float measured_z = probe.probe_at_point(
+        destination.x + probe.offset_xy.x,
+        destination.y + probe.offset_xy.y,
         PROBE_PT_NONE
       );
       restore_feedrate_and_scaling();
@@ -318,9 +318,9 @@ void GcodeSuite::G76() {
 
       // Do a single probe
       remember_feedrate_scaling_off();
-      const float measured_z = probe_at_point(
-        destination.x + probe_offset.x,
-        destination.y + probe_offset.y,
+      const float measured_z = probe.probe_at_point(
+        destination.x + probe.offset_xy.x,
+        destination.y + probe.offset_xy.y,
         PROBE_PT_NONE
       );
       restore_feedrate_and_scaling();
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 75c5ed9a818c..707a37fc235e 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -80,8 +80,8 @@ void GcodeSuite::M48() {
   xy_float_t next_pos = current_position;
 
   const xy_pos_t probe_pos = {
-    parser.linearval('X', next_pos.x + probe_offset_xy.x),
-    parser.linearval('Y', next_pos.y + probe_offset_xy.y)
+    parser.linearval('X', next_pos.x + probe.offset_xy.x),
+    parser.linearval('Y', next_pos.y + probe.offset_xy.y)
   };
 
   if (!position_is_reachable_by_probe(probe_pos)) {
@@ -120,7 +120,7 @@ void GcodeSuite::M48() {
   float mean = 0.0, sigma = 0.0, min = 99999.9, max = -99999.9, sample_set[n_samples];
 
   // Move to the first point, deploy, and probe
-  const float t = probe_at_point(probe_pos, raise_after, verbose_level);
+  const float t = probe.probe_at_point(probe_pos, raise_after, verbose_level);
   bool probing_good = !isnan(t);
 
   if (probing_good) {
@@ -169,7 +169,7 @@ void GcodeSuite::M48() {
           while (angle < 0.0) angle += 360.0;   // outside of this range.   It looks like they behave correctly with
                                                 // numbers outside of the range, but just to be safe we clamp them.
 
-          const xy_pos_t noz_pos = probe_pos - probe_offset_xy;
+          const xy_pos_t noz_pos = probe_pos - probe.offset_xy;
           next_pos.set(noz_pos.x + cos(RADIANS(angle)) * radius,
                        noz_pos.y + sin(RADIANS(angle)) * radius);
 
@@ -194,7 +194,7 @@ void GcodeSuite::M48() {
       } // n_legs
 
       // Probe a single point
-      sample_set[n] = probe_at_point(probe_pos, raise_after, 0);
+      sample_set[n] = probe.probe_at_point(probe_pos, raise_after, 0);
 
       // Break the loop if the probe fails
       probing_good = !isnan(sample_set[n]);
@@ -238,7 +238,7 @@ void GcodeSuite::M48() {
     } // n_samples loop
   }
 
-  STOW_PROBE();
+  probe.stow();
 
   if (probing_good) {
     SERIAL_ECHOLNPGM("Finished!");
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 3048c228d5e8..6510bc03f6ec 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -27,6 +27,13 @@
 #include "../gcode.h"
 #include "../../module/temperature.h"
 
+/**
+ * M304 - Set and/or Report the current Bed PID values
+ *
+ *  P<pval> - Set the P value
+ *  I<ival> - Set the I value
+ *  D<dval> - Set the D value
+ */
 void GcodeSuite::M304() {
   if (parser.seen('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
   if (parser.seen('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index e5b5b7e76d7e..7d66ae655537 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -46,9 +46,9 @@
         && active_extruder == 0
       #endif
     ) {
-      probe_offset.z += offs;
+      probe.offset.z += offs;
       SERIAL_ECHO_START();
-      SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", probe_offset.z);
+      SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", probe.offset.z);
     }
     else {
       #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
@@ -98,7 +98,7 @@ void GcodeSuite::M290() {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-      SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET " " MSG_Z, probe_offset.z);
+      SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET " " MSG_Z, probe.offset.z);
     #endif
 
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index a236ce3edf8c..e31f1fb272bd 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -40,8 +40,8 @@
  */
 void GcodeSuite::G30() {
 
-  const xy_pos_t pos = { parser.linearval('X', current_position.x + probe_offset_xy.x),
-                         parser.linearval('Y', current_position.y + probe_offset_xy.y) };
+  const xy_pos_t pos = { parser.linearval('X', current_position.x + probe.offset_xy.x),
+                         parser.linearval('Y', current_position.y + probe.offset_xy.y) };
 
   if (!position_is_reachable_by_probe(pos)) return;
 
@@ -53,14 +53,14 @@ void GcodeSuite::G30() {
   remember_feedrate_scaling_off();
 
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
-  const float measured_z = probe_at_point(pos, raise_after, 1);
+  const float measured_z = probe.probe_at_point(pos, raise_after, 1);
   if (!isnan(measured_z))
     SERIAL_ECHOLNPAIR("Bed X: ", FIXFLOAT(pos.x), " Y: ", FIXFLOAT(pos.y), " Z: ", FIXFLOAT(measured_z));
 
   restore_feedrate_and_scaling();
 
   #ifdef Z_AFTER_PROBING
-    if (raise_after == PROBE_PT_STOW) move_z_after_probing();
+    if (raise_after == PROBE_PT_STOW) probe.move_z_after_probing();
   #endif
 
   report_current_position();
diff --git a/Marlin/src/gcode/probe/G31_G32.cpp b/Marlin/src/gcode/probe/G31_G32.cpp
index 06c3c3adf1a1..cd71f28d732a 100644
--- a/Marlin/src/gcode/probe/G31_G32.cpp
+++ b/Marlin/src/gcode/probe/G31_G32.cpp
@@ -30,11 +30,11 @@
 /**
  * G31: Deploy the Z probe
  */
-void GcodeSuite::G31() { DEPLOY_PROBE(); }
+void GcodeSuite::G31() { probe.deploy(); }
 
 /**
  * G32: Stow the Z probe
  */
-void GcodeSuite::G32() { STOW_PROBE(); }
+void GcodeSuite::G32() { probe.stow(); }
 
 #endif // Z_PROBE_SLED
diff --git a/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin/src/gcode/probe/M401_M402.cpp
index aa63a7ea7138..55851f3046bb 100644
--- a/Marlin/src/gcode/probe/M401_M402.cpp
+++ b/Marlin/src/gcode/probe/M401_M402.cpp
@@ -32,7 +32,7 @@
  * M401: Deploy and activate the Z probe
  */
 void GcodeSuite::M401() {
-  DEPLOY_PROBE();
+  probe.deploy();
   report_current_position();
 }
 
@@ -40,9 +40,9 @@ void GcodeSuite::M401() {
  * M402: Deactivate and stow the Z probe
  */
 void GcodeSuite::M402() {
-  STOW_PROBE();
+  probe.stow();
   #ifdef Z_AFTER_PROBING
-    move_z_after_probing();
+    probe.move_z_after_probing();
   #endif
   report_current_position();
 }
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index b0a63041fed1..2c26ebd2a62a 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -39,17 +39,17 @@ void GcodeSuite::M851() {
   if (!parser.seen("XYZ")) {
     SERIAL_ECHOLNPAIR_P(
       #if HAS_PROBE_XY_OFFSET
-        PSTR(MSG_PROBE_OFFSET " X"), probe_offset.x, SP_Y_STR, probe_offset.y, SP_Z_STR
+        PSTR(MSG_PROBE_OFFSET " X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR
       #else
         PSTR(MSG_PROBE_OFFSET " X0 Y0 Z")
       #endif
-      , probe_offset.z
+      , probe.offset.z
     );
     return;
   }
 
   // Start with current offsets and modify
-  xyz_pos_t offs = probe_offset;
+  xyz_pos_t offs = probe.offset;
 
   // Assume no errors
   bool ok = true;
@@ -93,7 +93,7 @@ void GcodeSuite::M851() {
   }
 
   // Save the new offsets
-  if (ok) probe_offset = offs;
+  if (ok) probe.offset = offs;
 }
 
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
index 4d953b88c894..4522617d801e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
@@ -453,7 +453,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_PrintTune, nullptr),
     #if HAS_BED_PROBE
-      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe_offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
       #if ENABLED(BABYSTEPPING)
         VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, DGUSScreenVariableHandler::HandleLiveAdjustZ, nullptr),
       #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
index 0c25f64b6a72..0a6d9933c601 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
@@ -453,7 +453,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_PrintTune, nullptr),
     #if HAS_BED_PROBE
-      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe_offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
       #if ENABLED(BABYSTEPPING)
         VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, DGUSScreenVariableHandler::HandleLiveAdjustZ, nullptr),
       #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
index ca56052829a7..4d877b6b7244 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
@@ -285,7 +285,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, DGUSScreenVariableHandler::DGUSLCD_SD_PrintTune, nullptr),
     #if HAS_BED_PROBE
-      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe_offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, DGUSScreenVariableHandler::HandleProbeOffsetZChanged, &DGUSScreenVariableHandler::DGUSLCD_SendFloatAsIntValueToDisplay<2>),
       #if ENABLED(BABYSTEPPING)
         VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, DGUSScreenVariableHandler::HandleLiveAdjustZ, nullptr),
       #endif
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 5e053b670a73..0e0a1171ab9d 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -733,7 +733,7 @@ namespace ExtUI {
           #if EXTRUDERS > 1
             && (linked_nozzles || active_extruder == 0)
           #endif
-        ) probe_offset.z += mm;
+        ) probe.offset.z += mm;
       #else
         UNUSED(mm);
       #endif
@@ -771,7 +771,7 @@ namespace ExtUI {
 
   float getZOffset_mm() {
     #if HAS_BED_PROBE
-      return probe_offset.z;
+      return probe.offset.z;
     #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
       return (planner.steps_to_mm[Z_AXIS] * babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]);
     #else
@@ -782,7 +782,7 @@ namespace ExtUI {
   void setZOffset_mm(const float value) {
     #if HAS_BED_PROBE
       if (WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX))
-        probe_offset.z = value;
+        probe.offset.z = value;
     #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
       babystep.add_mm(Z_AXIS, (value - getZOffset_mm()));
     #else
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 2bae1258e942..9c3cf057d6b3 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -406,7 +406,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
       ui.encoderPosition = 0;
 
       const float diff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
-                  new_probe_offset = probe_offset.z + diff,
+                  new_probe_offset = probe.offset.z + diff,
                   new_offs =
                     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
                       do_probe ? new_probe_offset : hotend_offset[active_extruder].z - diff
@@ -418,7 +418,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
 
         babystep.add_steps(Z_AXIS, babystep_increment);
 
-        if (do_probe) probe_offset.z = new_offs;
+        if (do_probe) probe.offset.z = new_offs;
         #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
           else hotend_offset[active_extruder].z = new_offs;
         #endif
@@ -432,10 +432,10 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
           MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), LCD_Z_OFFSET_FUNC(hotend_offset[active_extruder].z));
         else
       #endif
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), LCD_Z_OFFSET_FUNC(probe_offset.z));
+          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), LCD_Z_OFFSET_FUNC(probe.offset.z));
 
       #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
-        if (do_probe) _lcd_zoffset_overlay_gfx(probe_offset.z);
+        if (do_probe) _lcd_zoffset_overlay_gfx(probe.offset.z);
       #endif
     }
   }
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index ec03a0066cbf..471d1eeb9cef 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -497,9 +497,11 @@ void menu_cancelobject();
     void menu_probe_offsets() {
       START_MENU();
       BACK_ITEM(MSG_ADVANCED_SETTINGS);
-      EDIT_ITEM(float51sign, MSG_ZPROBE_XOFFSET, &probe_offset.x, -(X_BED_SIZE), X_BED_SIZE);
-      EDIT_ITEM(float51sign, MSG_ZPROBE_YOFFSET, &probe_offset.y, -(Y_BED_SIZE), Y_BED_SIZE);
-      EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+      #if HAS_PROBE_XY_OFFSET
+        EDIT_ITEM(float51sign, MSG_ZPROBE_XOFFSET, &probe.offset.x, -(X_BED_SIZE), X_BED_SIZE);
+        EDIT_ITEM(float51sign, MSG_ZPROBE_YOFFSET, &probe.offset.y, -(Y_BED_SIZE), Y_BED_SIZE);
+      #endif
+      EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
       END_MENU();
     }
   #endif
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 6cc40cab6ca4..d16d4670a808 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -279,7 +279,7 @@ void menu_bed_leveling() {
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
     SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
   #elif HAS_BED_PROBE
-    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
   #if ENABLED(LEVEL_BED_CORNERS)
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index c23017c3e91c..31d46816e9b9 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -317,14 +317,11 @@ void menu_configuration() {
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
     SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
   #elif HAS_BED_PROBE
-    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
   const bool busy = printer_busy();
   if (!busy) {
-    //
-    // Delta Calibration
-    //
     #if EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
       SUBMENU(MSG_DELTA_CALIBRATE, menu_delta_calibrate);
     #endif
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 85b0b850b0f2..05b67c984ca2 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -587,12 +587,12 @@ void MarlinSettings::postprocess() {
       #if HAS_FILAMENT_SENSOR
         const bool &runout_sensor_enabled = runout.enabled;
       #else
-        const bool runout_sensor_enabled = true;
+        constexpr bool runout_sensor_enabled = true;
       #endif
       #if HAS_FILAMENT_SENSOR && defined(FILAMENT_RUNOUT_DISTANCE_MM)
         const float &runout_distance_mm = runout.runout_distance();
       #else
-        const float runout_distance_mm = 0;
+        constexpr float runout_distance_mm = 0;
       #endif
       _FIELD_TEST(runout_sensor_enabled);
       EEPROM_WRITE(runout_sensor_enabled);
@@ -643,7 +643,12 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(probe_offset);
-      EEPROM_WRITE(probe_offset);
+      #if HAS_BED_PROBE
+        const xyz_pos_t &zpo = probe.offset;
+      #else
+        constexpr xyz_pos_t zpo{0};
+      #endif
+      EEPROM_WRITE(zpo);
     }
 
     //
@@ -1458,7 +1463,7 @@ void MarlinSettings::postprocess() {
       //
       {
         #if HAS_FILAMENT_SENSOR
-          bool &runout_sensor_enabled = runout.enabled;
+          const bool &runout_sensor_enabled = runout.enabled;
         #else
           bool runout_sensor_enabled;
         #endif
@@ -1515,7 +1520,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(probe_offset);
         #if HAS_BED_PROBE
-          xyz_pos_t &zpo = probe_offset;
+          const xyz_pos_t &zpo = probe.offset;
         #else
           xyz_pos_t zpo;
         #endif
@@ -1609,7 +1614,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(bltouch_last_written_mode);
         #if ENABLED(BLTOUCH)
-          bool &bltouch_last_written_mode = bltouch.last_written_mode;
+          const bool &bltouch_last_written_mode = bltouch.last_written_mode;
         #else
           bool bltouch_last_written_mode;
         #endif
@@ -2120,14 +2125,14 @@ void MarlinSettings::postprocess() {
       //
       {
         #if ENABLED(BACKLASH_GCODE)
-          xyz_float_t &backlash_distance_mm = backlash.distance_mm;
-          uint8_t &backlash_correction = backlash.correction;
+          const xyz_float_t &backlash_distance_mm = backlash.distance_mm;
+          const uint8_t &backlash_correction = backlash.correction;
         #else
           float backlash_distance_mm[XYZ];
           uint8_t backlash_correction;
         #endif
         #if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)
-          float &backlash_smoothing_mm = backlash.smoothing_mm;
+          const float &backlash_smoothing_mm = backlash.smoothing_mm;
         #else
           float backlash_smoothing_mm;
         #endif
@@ -2461,10 +2466,10 @@ void MarlinSettings::reset() {
     constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET;
     static_assert(COUNT(dpo) == 3, "NOZZLE_TO_PROBE_OFFSET must contain offsets for X, Y, and Z.");
     #if HAS_PROBE_XY_OFFSET
-      LOOP_XYZ(a) probe_offset[a] = dpo[a];
+      LOOP_XYZ(a) probe.offset[a] = dpo[a];
     #else
-      probe_offset.x = probe_offset.y = 0;
-      probe_offset.z = dpo[Z_AXIS];
+      probe.offset.x = probe.offset.y = 0;
+      probe.offset.z = dpo[Z_AXIS];
     #endif
   #endif
 
@@ -3216,13 +3221,13 @@ void MarlinSettings::reset() {
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
         #if HAS_PROBE_XY_OFFSET
-          PSTR("  M851 X"), LINEAR_UNIT(probe_offset_xy.x),
-                  SP_Y_STR, LINEAR_UNIT(probe_offset_xy.y),
+          PSTR("  M851 X"), LINEAR_UNIT(probe.offset_xy.x),
+                  SP_Y_STR, LINEAR_UNIT(probe.offset_xy.y),
                   SP_Z_STR
         #else
           PSTR("  M851 X0 Y0 Z")
         #endif
-        , LINEAR_UNIT(probe_offset.z)
+        , LINEAR_UNIT(probe.offset.z)
       );
     #endif
 
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index bed5cd24cf48..cb2d432e30b8 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -95,7 +95,7 @@ void recalc_delta_settings() {
   float delta_calibration_radius() {
     return calibration_radius_factor * (
       #if HAS_BED_PROBE
-        FLOOR((DELTA_PRINTABLE_RADIUS) - _MAX(HYPOT(probe_offset_xy.x, probe_offset_xy.y), MIN_PROBE_EDGE))
+        FLOOR((DELTA_PRINTABLE_RADIUS) - _MAX(HYPOT(probe.offset_xy.x, probe.offset_xy.y), MIN_PROBE_EDGE))
       #else
         DELTA_PRINTABLE_RADIUS
       #endif
@@ -251,7 +251,7 @@ void home_delta() {
   // Move all carriages together linearly until an endstop is hit.
   current_position.z = (delta_height + 10
     #if HAS_BED_PROBE
-      - probe_offset.z
+      - probe.offset.z
     #endif
   );
   line_to_current_position(homing_feedrate(Z_AXIS));
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 50092406c5e7..f63555d28c4f 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -280,7 +280,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
         , true
       #endif
     );
-    xyze_pos_t &cartes = pos;
+    const xyze_pos_t &cartes = pos;
   #endif
   if (axis == ALL_AXES)
     current_position = cartes;
@@ -547,7 +547,7 @@ void restore_feedrate_and_scaling() {
       soft_endstop.min[axis] = base_min_pos(axis);
       soft_endstop.max[axis] = (axis == Z_AXIS ? delta_height
       #if HAS_BED_PROBE
-        - probe_offset.z
+        - probe.offset.z
       #endif
       : base_max_pos(axis));
 
@@ -1281,7 +1281,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
   #if HOMING_Z_WITH_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
     // Wait for bed to heat back up between probing points
     if (axis == Z_AXIS && distance < 0 && thermalManager.isHeatingBed()) {
-      serialprintPGM(msg_wait_for_bed_heating);
+      serialprintPGM(probe.msg_wait_for_bed_heating);
       #if HAS_DISPLAY
         LCD_MESSAGEPGM(MSG_BED_HEATING);
       #endif
@@ -1307,7 +1307,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
   if (is_home_dir) {
 
     #if HOMING_Z_WITH_PROBE && QUIET_PROBING
-      if (axis == Z_AXIS) probing_pause(true);
+      if (axis == Z_AXIS) probe.set_probing_paused(true);
     #endif
 
     // Disable stealthChop if used. Enable diag1 pin on driver.
@@ -1347,7 +1347,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
   if (is_home_dir) {
 
     #if HOMING_Z_WITH_PROBE && QUIET_PROBING
-      if (axis == Z_AXIS) probing_pause(false);
+      if (axis == Z_AXIS) probe.set_probing_paused(false);
     #endif
 
     endstops.validate_homing_move();
@@ -1397,7 +1397,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
   #elif ENABLED(DELTA)
     current_position[axis] = (axis == Z_AXIS ? delta_height
     #if HAS_BED_PROBE
-      - probe_offset.z
+      - probe.offset.z
     #endif
     : base_home_pos(axis));
   #else
@@ -1411,9 +1411,9 @@ void set_axis_is_at_home(const AxisEnum axis) {
     if (axis == Z_AXIS) {
       #if HOMING_Z_WITH_PROBE
 
-        current_position.z -= probe_offset.z;
+        current_position.z -= probe.offset.z;
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe_offset.z = ", probe_offset.z);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe.offset.z = ", probe.offset.z);
 
       #else
 
@@ -1509,7 +1509,7 @@ void homeaxis(const AxisEnum axis) {
 
   // Homing Z towards the bed? Deploy the Z probe or endstop.
   #if HOMING_Z_WITH_PROBE
-    if (axis == Z_AXIS && DEPLOY_PROBE()) return;
+    if (axis == Z_AXIS && probe.deploy()) return;
   #endif
 
   // Set flags for X, Y, Z motor locking
@@ -1751,7 +1751,7 @@ void homeaxis(const AxisEnum axis) {
 
   // Put away the Z probe
   #if HOMING_Z_WITH_PROBE
-    if (axis == Z_AXIS && STOW_PROBE()) return;
+    if (axis == Z_AXIS && probe.stow()) return;
   #endif
 
   #if DISABLED(DELTA) && defined(HOMING_BACKOFF_MM)
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index eafa5ca8492a..a159bdd4bfa8 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -329,7 +329,7 @@ void homeaxis(const AxisEnum axis);
       // Return true if the both nozzle and the probe can reach the given point.
       // Note: This won't work on SCARA since the probe offset rotates with the arm.
       inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-        return position_is_reachable(rx - probe_offset.x, ry - probe_offset.y)
+        return position_is_reachable(rx - probe.offset_xy.x, ry - probe.offset_xy.y)
                && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));
       }
 
@@ -369,9 +369,9 @@ void homeaxis(const AxisEnum axis);
      *          nozzle must be be able to reach +10,-10.
      */
     inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-      return position_is_reachable(rx - probe_offset_xy.x, ry - probe_offset_xy.y)
-          && WITHIN(rx, probe_min_x() - slop, probe_max_x() + slop)
-          && WITHIN(ry, probe_min_y() - slop, probe_max_y() + slop);
+      return position_is_reachable(rx - probe.offset_xy.x, ry - probe.offset_xy.y)
+          && WITHIN(rx, probe.min_x() - slop, probe.max_x() + slop)
+          && WITHIN(ry, probe.min_y() - slop, probe.max_y() + slop);
     }
 
   #endif // HAS_BED_PROBE
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 351b089895e8..9f5a5c5c5e04 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2779,7 +2779,7 @@ void Planner::set_max_acceleration(const uint8_t axis, float targetValue) {
       const xyze_float_t &max_acc_edit_scaled = max_accel_edit;
     #else
       constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION;
-      const xyze_float_t max_acc_edit_scaled = max_accel_edit * 2;
+      constexpr xyze_float_t max_acc_edit_scaled = max_accel_edit * 2;
     #endif
     limit_and_warn(targetValue, axis, PSTR("Acceleration"), max_acc_edit_scaled);
   #endif
@@ -2796,7 +2796,7 @@ void Planner::set_max_feedrate(const uint8_t axis, float targetValue) {
       const xyze_float_t &max_fr_edit_scaled = max_fr_edit;
     #else
       constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE;
-      const xyze_float_t max_fr_edit_scaled = max_fr_edit * 2;
+      constexpr xyze_float_t max_fr_edit_scaled = max_fr_edit * 2;
     #endif
     limit_and_warn(targetValue, axis, PSTR("Feedrate"), max_fr_edit_scaled);
   #endif
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 5710614e007d..ef11a52122be 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * probe.cpp
+ * module/probe.cpp
  */
 
 #include "../inc/MarlinConfig.h"
@@ -84,14 +84,14 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../core/debug_out.h"
 
+Probe probe;
 
-xyz_pos_t probe_offset; // Initialized by settings.load()
+xyz_pos_t Probe::offset; // Initialized by settings.load()
 
 #if HAS_PROBE_XY_OFFSET
-  xyz_pos_t &probe_offset_xy = probe_offset;
+  const xyz_pos_t &Probe::offset_xy = probe.offset;
 #endif
 
-
 #if ENABLED(Z_PROBE_SLED)
 
   #ifndef SLED_DOCKING_OFFSET
@@ -104,7 +104,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
    * stow[in]     If false, move to MAX_X and engage the solenoid
    *              If true, move to MAX_X and release the solenoid
    */
-  static void dock_sled(bool stow) {
+  static void dock_sled(const bool stow) {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("dock_sled(", stow, ")");
 
     // Dock sled a bit closer to ensure proper capturing
@@ -118,7 +118,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
 #elif ENABLED(TOUCH_MI_PROBE)
 
   // Move to the magnet to unlock the probe
-  void run_deploy_moves_script() {
+  inline void run_deploy_moves_script() {
     #ifndef TOUCH_MI_DEPLOY_XPOS
       #define TOUCH_MI_DEPLOY_XPOS X_MIN_POS
     #elif TOUCH_MI_DEPLOY_XPOS > X_MAX_BED
@@ -153,7 +153,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
   }
 
   // Move down to the bed to stow the probe
-  void run_stow_moves_script() {
+  inline void run_stow_moves_script() {
     const xyz_pos_t oldpos = current_position;
     endstops.enable_z_probe(false);
     do_blocking_move_to_z(TOUCH_MI_RETRACT_Z, MMM_TO_MMS(HOMING_FEEDRATE_Z));
@@ -162,7 +162,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
 
 #elif ENABLED(Z_PROBE_ALLEN_KEY)
 
-  void run_deploy_moves_script() {
+  inline void run_deploy_moves_script() {
     #ifdef Z_PROBE_ALLEN_KEY_DEPLOY_1
       #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE
         #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE 0.0
@@ -200,7 +200,7 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
     #endif
   }
 
-  void run_stow_moves_script() {
+  inline void run_stow_moves_script() {
     #ifdef Z_PROBE_ALLEN_KEY_STOW_1
       #ifndef Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE
         #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE 0.0
@@ -241,7 +241,8 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
 #endif // Z_PROBE_ALLEN_KEY
 
 #if QUIET_PROBING
-  void probing_pause(const bool p) {
+
+  void Probe::set_probing_paused(const bool p) {
     #if ENABLED(PROBING_HEATERS_OFF)
       thermalManager.pause(p);
     #endif
@@ -262,16 +263,17 @@ xyz_pos_t probe_offset; // Initialized by settings.load()
       #endif
     );
   }
+
 #endif // QUIET_PROBING
 
 /**
  * Raise Z to a minimum height to make room for a probe to move
  */
-inline void do_probe_raise(const float z_raise) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("do_probe_raise(", z_raise, ")");
+void Probe::do_z_raise(const float z_raise) {
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probe::move_z(", z_raise, ")");
 
   float z_dest = z_raise;
-  if (probe_offset.z < 0) z_dest -= probe_offset.z;
+  if (offset.z < 0) z_dest -= offset.z;
 
   NOMORE(z_dest, Z_MAX_POS);
 
@@ -351,11 +353,15 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
   #endif
 }
 
-// returns false for ok and true for failure
-bool set_probe_deployed(const bool deploy) {
+/**
+ * Attempt to deploy or stow the probe
+ *
+ * Return TRUE if the probe could not be deployed/stowed
+ */
+bool Probe::set_deployed(const bool deploy) {
 
   if (DEBUGGING(LEVELING)) {
-    DEBUG_POS("set_probe_deployed", current_position);
+    DEBUG_POS("Probe::set_deployed", current_position);
     DEBUG_ECHOLNPAIR("deploy: ", deploy);
   }
 
@@ -378,7 +384,7 @@ bool set_probe_deployed(const bool deploy) {
   #endif
 
   if (deploy_stow_condition && unknown_condition)
-    do_probe_raise(_MAX(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
+    do_z_raise(_MAX(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
 
   #if EITHER(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY)
     if (axis_unhomed_error(
@@ -433,7 +439,7 @@ bool set_probe_deployed(const bool deploy) {
 
 #ifdef Z_AFTER_PROBING
   // After probing move to a preferred Z position
-  void move_z_after_probing() {
+  void Probe::move_z_after_probing() {
     if (current_position.z != Z_AFTER_PROBING) {
       do_blocking_move_to_z(Z_AFTER_PROBING);
       current_position.z = Z_AFTER_PROBING;
@@ -450,11 +456,11 @@ bool set_probe_deployed(const bool deploy) {
  */
 
 #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-  const char msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
+  PGM_P Probe::msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
 #endif
 
-static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
-  if (DEBUGGING(LEVELING)) DEBUG_POS(">>> do_probe_move", current_position);
+bool Probe::move_to_z(const float z, const feedRate_t fr_mm_s) {
+  if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::move_to_z", current_position);
 
   #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
     // Wait for bed to heat back up between probing points
@@ -482,7 +488,7 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
   #endif
 
   #if QUIET_PROBING
-    probing_pause(true);
+    set_probing_paused(true);
   #endif
 
   // Move down until the probe is triggered
@@ -504,7 +510,7 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
   ;
 
   #if QUIET_PROBING
-    probing_pause(false);
+    set_probing_paused(false);
   #endif
 
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
@@ -530,7 +536,7 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
   // Tell the planner where we actually are
   sync_plan_position();
 
-  if (DEBUGGING(LEVELING)) DEBUG_POS("<<< do_probe_move", current_position);
+  if (DEBUGGING(LEVELING)) DEBUG_POS("<<< Probe::move_to_z", current_position);
 
   return !probe_triggered;
 }
@@ -543,19 +549,19 @@ static bool do_probe_move(const float z, const feedRate_t fr_mm_s) {
  *
  * @return The Z position of the bed at the current XY or NAN on error.
  */
-static float run_z_probe() {
+float Probe::run_z_probe() {
 
-  if (DEBUGGING(LEVELING)) DEBUG_POS(">>> run_z_probe", current_position);
+  if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::run_z_probe", current_position);
 
   // Stop the probe before it goes too low to prevent damage.
   // If Z isn't known then probe to -10mm.
-  const float z_probe_low_point = TEST(axis_known_position, Z_AXIS) ? -probe_offset.z + Z_PROBE_LOW_POINT : -10.0;
+  const float z_probe_low_point = TEST(axis_known_position, Z_AXIS) ? -offset.z + Z_PROBE_LOW_POINT : -10.0;
 
   // Double-probing does a fast probe followed by a slow probe
   #if TOTAL_PROBING == 2
 
     // Do a first probe at the fast speed
-    if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
+    if (move_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOLNPGM("FAST Probe fail!");
         DEBUG_POS("<<< run_z_probe", current_position);
@@ -574,10 +580,10 @@ static float run_z_probe() {
 
     // If the nozzle is well over the travel height then
     // move down quickly before doing the slow probe
-    const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (probe_offset.z < 0 ? -probe_offset.z : 0);
+    const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (offset.z < 0 ? -offset.z : 0);
     if (current_position.z > z) {
       // Probe down fast. If the probe never triggered, raise for probe clearance
-      if (!do_probe_move(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
+      if (!move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
         do_blocking_move_to_z(current_position.z + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
     }
   #endif
@@ -587,7 +593,7 @@ static float run_z_probe() {
   #endif
 
   #if TOTAL_PROBING > 2
-    float probes_total = 0;
+    float probes_z_sum = 0;
     for (
       #if EXTRA_PROBING
         uint8_t p = 0; p < TOTAL_PROBING; p++
@@ -598,7 +604,7 @@ static float run_z_probe() {
   #endif
     {
       // Probe downward slowly to find the bed
-      if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
+      if (move_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
         if (DEBUGGING(LEVELING)) {
           DEBUG_ECHOLNPGM("SLOW Probe fail!");
           DEBUG_POS("<<< run_z_probe", current_position);
@@ -622,7 +628,7 @@ static float run_z_probe() {
           }
         }
       #elif TOTAL_PROBING > 2
-        probes_total += z;
+        probes_z_sum += z;
       #else
         UNUSED(z);
       #endif
@@ -653,11 +659,11 @@ static float run_z_probe() {
 
       // Return the average value of all remaining probes.
       for (uint8_t i = min_avg_idx; i <= max_avg_idx; i++)
-        probes_total += probes[i];
+        probes_z_sum += probes[i];
 
     #endif
 
-    const float measured_z = probes_total * RECIPROCAL(MULTIPLE_PROBING);
+    const float measured_z = probes_z_sum * RECIPROCAL(MULTIPLE_PROBING);
 
   #elif TOTAL_PROBING == 2
 
@@ -689,10 +695,10 @@ static float run_z_probe() {
  *   - Raise to the BETWEEN height
  * - Return the probed Z position
  */
-float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
+float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOLNPAIR(
-      ">>> probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
+      ">>> Probe::probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
       ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
       ", ", int(verbose_level),
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
@@ -702,9 +708,12 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
 
   // TODO: Adapt for SCARA, where the offset rotates
   xyz_pos_t npos = { rx, ry };
-  if (probe_relative) {
-    if (!position_is_reachable_by_probe(npos)) return NAN;  // The given position is in terms of the probe
-    npos -= probe_offset_xy;                                // Get the nozzle position
+  if (probe_relative) {                                     // The given position is in terms of the probe
+    if (!position_is_reachable_by_probe(npos)) {
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
+      return NAN;
+    }
+    npos -= offset_xy;                                      // Get the nozzle position
   }
   else if (!position_is_reachable(npos)) return NAN;        // The given position is in terms of the nozzle
 
@@ -724,38 +733,38 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
   do_blocking_move_to(npos);
 
   float measured_z = NAN;
-  if (!DEPLOY_PROBE()) {
-    measured_z = run_z_probe() + probe_offset.z;
+  if (!deploy()) {
+    measured_z = run_z_probe() + offset.z;
 
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
     if (big_raise || raise_after == PROBE_PT_RAISE)
       do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
     else if (raise_after == PROBE_PT_STOW)
-      if (STOW_PROBE()) measured_z = NAN;
+      if (stow()) measured_z = NAN;
   }
 
   if (verbose_level > 2) {
     SERIAL_ECHOPAIR_F("Bed X: ", LOGICAL_X_POSITION(rx), 3);
-    SERIAL_ECHOPAIR_F(" Y: ", LOGICAL_Y_POSITION(ry), 3);
-    SERIAL_ECHOLNPAIR_F(" Z: ", measured_z, 3);
+    SERIAL_ECHOPAIR_F(   " Y: ", LOGICAL_Y_POSITION(ry), 3);
+    SERIAL_ECHOLNPAIR_F( " Z: ", measured_z, 3);
   }
 
   feedrate_mm_s = old_feedrate_mm_s;
 
   if (isnan(measured_z)) {
-    STOW_PROBE();
+    stow();
     LCD_MESSAGEPGM(MSG_LCD_PROBING_FAILED);
     SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
   }
 
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< probe_at_point");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< Probe::probe_at_point");
 
   return measured_z;
 }
 
 #if HAS_Z_SERVO_PROBE
 
-  void servo_probe_init() {
+  void Probe::servo_probe_init() {
     /**
      * Set position of Z Servo Endstop
      *
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index a6e8bf4eab22..5cf0ecc2546c 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -22,132 +22,150 @@
 #pragma once
 
 /**
- * probe.h - Move, deploy, enable, etc.
+ * module/probe.h - Move, deploy, enable, etc.
  */
 
 #include "../inc/MarlinConfig.h"
 
 #if HAS_BED_PROBE
-
-  extern xyz_pos_t probe_offset;
-
-  #if HAS_PROBE_XY_OFFSET
-    extern xyz_pos_t &probe_offset_xy;
-  #else
-    constexpr xy_pos_t probe_offset_xy{0};
-  #endif
-
-  bool set_probe_deployed(const bool deploy);
-  #ifdef Z_AFTER_PROBING
-    void move_z_after_probing();
-  #endif
-  enum ProbePtRaise : unsigned char {
-    PROBE_PT_NONE,  // No raise or stow after run_z_probe
-    PROBE_PT_STOW,  // Do a complete stow after run_z_probe
-    PROBE_PT_RAISE, // Raise to "between" clearance after run_z_probe
+  enum ProbePtRaise : uint8_t {
+    PROBE_PT_NONE,      // No raise or stow after run_z_probe
+    PROBE_PT_STOW,      // Do a complete stow after run_z_probe
+    PROBE_PT_RAISE,     // Raise to "between" clearance after run_z_probe
     PROBE_PT_BIG_RAISE  // Raise to big clearance after run_z_probe
   };
-  float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true);
-  inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true) {
-    return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
-  }
-  #define DEPLOY_PROBE() set_probe_deployed(true)
-  #define STOW_PROBE() set_probe_deployed(false)
-  #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-    extern const char msg_wait_for_bed_heating[25];
-  #endif
+#endif
 
-#else
+class Probe {
+public:
 
-  constexpr xyz_pos_t probe_offset{0};
-  constexpr xy_pos_t probe_offset_xy{0};
+  #if HAS_BED_PROBE
 
-  #define DEPLOY_PROBE()
-  #define STOW_PROBE()
+    static xyz_pos_t offset;
 
-#endif
+    // Use offset_xy for read only access
+    // More optimal the XY offset is known to always be zero.
+    #if HAS_PROBE_XY_OFFSET
+      static const xyz_pos_t &offset_xy;
+    #else
+      static constexpr xy_pos_t offset_xy{0};
+    #endif
 
-#if HAS_BED_PROBE || HAS_LEVELING
-  #if IS_KINEMATIC
-    constexpr float printable_radius = (
-      #if ENABLED(DELTA)
-        DELTA_PRINTABLE_RADIUS
-      #elif IS_SCARA
-        SCARA_PRINTABLE_RADIUS
-      #endif
-    );
-
-    inline float probe_radius() {
-      return printable_radius - _MAX(MIN_PROBE_EDGE, HYPOT(probe_offset_xy.x, probe_offset_xy.y));
+    static bool set_deployed(const bool deploy);
+
+    #ifdef Z_AFTER_PROBING
+      static void move_z_after_probing();
+    #endif
+    static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true);
+    static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true) {
+      return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
     }
+    #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
+      static PGM_P msg_wait_for_bed_heating[25];
+    #endif
+
+  #else
+
+    static constexpr xyz_pos_t offset{0};
+    static constexpr xy_pos_t offset_xy{0};
+
+    static bool set_deployed(const bool) { return false; }
+
   #endif
 
-  inline float probe_min_x() {
-    return (
-      #if IS_KINEMATIC
-        (X_CENTER) - probe_radius()
-      #else
-        _MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + probe_offset_xy.x)
-      #endif
-    );
-  }
-  inline float probe_max_x() {
-    return (
-      #if IS_KINEMATIC
-        (X_CENTER) + probe_radius()
-      #else
-        _MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + probe_offset_xy.x)
-      #endif
-    );
-  }
-  inline float probe_min_y() {
-    return (
-      #if IS_KINEMATIC
-        (Y_CENTER) - probe_radius()
-      #else
-        _MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + probe_offset_xy.y)
-      #endif
-    );
-  }
-  inline float probe_max_y() {
-    return (
-      #if IS_KINEMATIC
-        (Y_CENTER) + probe_radius()
-      #else
-        _MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + probe_offset_xy.y)
-      #endif
-    );
-  }
-
-  #if NEEDS_THREE_PROBE_POINTS
-    // Retrieve three points to probe the bed. Any type exposing set(X,Y) may be used.
-    template <typename T>
-    inline void get_three_probe_points(T points[3]) {
-      #if ENABLED(HAS_FIXED_3POINT)
-        points[0].set(PROBE_PT_1_X, PROBE_PT_1_Y);
-        points[1].set(PROBE_PT_2_X, PROBE_PT_2_Y);
-        points[2].set(PROBE_PT_3_X, PROBE_PT_3_Y);
-      #else
+  static inline bool deploy() { return set_deployed(true); }
+  static inline bool stow() { return set_deployed(false); }
+
+  #if HAS_BED_PROBE || HAS_LEVELING
+    #if IS_KINEMATIC
+      static constexpr float printable_radius = (
+        #if ENABLED(DELTA)
+          DELTA_PRINTABLE_RADIUS
+        #elif IS_SCARA
+          SCARA_PRINTABLE_RADIUS
+        #endif
+      );
+
+      static inline float probe_radius() {
+        return printable_radius - _MAX(MIN_PROBE_EDGE, HYPOT(offset_xy.x, offset_xy.y));
+      }
+    #endif
+
+    static inline float min_x() {
+      return (
         #if IS_KINEMATIC
-          constexpr float SIN0 = 0.0, SIN120 = 0.866025, SIN240 = -0.866025,
-                          COS0 = 1.0, COS120 = -0.5    , COS240 = -0.5;
-          points[0].set((X_CENTER) + probe_radius() * COS0,   (Y_CENTER) + probe_radius() * SIN0);
-          points[1].set((X_CENTER) + probe_radius() * COS120, (Y_CENTER) + probe_radius() * SIN120);
-          points[2].set((X_CENTER) + probe_radius() * COS240, (Y_CENTER) + probe_radius() * SIN240);
+          (X_CENTER) - probe_radius()
         #else
-          points[0].set(probe_min_x(), probe_min_y());
-          points[1].set(probe_max_x(), probe_min_y());
-          points[2].set((probe_max_x() - probe_min_x()) / 2, probe_max_y());
+          _MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + offset_xy.x)
         #endif
-      #endif
+      );
     }
+    static inline float max_x() {
+      return (
+        #if IS_KINEMATIC
+          (X_CENTER) + probe_radius()
+        #else
+          _MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + offset_xy.x)
+        #endif
+      );
+    }
+    static inline float min_y() {
+      return (
+        #if IS_KINEMATIC
+          (Y_CENTER) - probe_radius()
+        #else
+          _MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + offset_xy.y)
+        #endif
+      );
+    }
+    static inline float max_y() {
+      return (
+        #if IS_KINEMATIC
+          (Y_CENTER) + probe_radius()
+        #else
+          _MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + offset_xy.y)
+        #endif
+      );
+    }
+
+    #if NEEDS_THREE_PROBE_POINTS
+      // Retrieve three points to probe the bed. Any type exposing set(X,Y) may be used.
+      template <typename T>
+      static inline void get_three_points(T points[3]) {
+        #if ENABLED(HAS_FIXED_3POINT)
+          points[0].set(PROBE_PT_1_X, PROBE_PT_1_Y);
+          points[1].set(PROBE_PT_2_X, PROBE_PT_2_Y);
+          points[2].set(PROBE_PT_3_X, PROBE_PT_3_Y);
+        #else
+          #if IS_KINEMATIC
+            constexpr float SIN0 = 0.0, SIN120 = 0.866025, SIN240 = -0.866025,
+                            COS0 = 1.0, COS120 = -0.5    , COS240 = -0.5;
+            points[0].set((X_CENTER) + probe_radius() * COS0,   (Y_CENTER) + probe_radius() * SIN0);
+            points[1].set((X_CENTER) + probe_radius() * COS120, (Y_CENTER) + probe_radius() * SIN120);
+            points[2].set((X_CENTER) + probe_radius() * COS240, (Y_CENTER) + probe_radius() * SIN240);
+          #else
+            points[0].set(min_x(), min_y());
+            points[1].set(max_x(), min_y());
+            points[2].set((max_x() - min_x()) / 2, max_y());
+          #endif
+        #endif
+      }
+    #endif
+
+  #endif // HAS_BED_PROBE
+
+  #if HAS_Z_SERVO_PROBE
+    static void servo_probe_init();
   #endif
-#endif
 
-#if HAS_Z_SERVO_PROBE
-  void servo_probe_init();
-#endif
+  #if QUIET_PROBING
+    static void set_probing_paused(const bool p);
+  #endif
 
-#if QUIET_PROBING
-  void probing_pause(const bool p);
-#endif
+private:
+  static bool move_to_z(const float z, const feedRate_t fr_mm_s);
+  static void do_z_raise(const float z_raise);
+  static float run_z_probe();
+};
+
+extern Probe probe;

From e58d1bf97405f89d0a720c90a63ad677ca0624b5 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 1 Feb 2020 05:50:44 -0500
Subject: [PATCH 105/565] G34 automatic point assignment (#16473)

---
 Marlin/Configuration_adv.h                |  53 ++++++---
 Marlin/src/feature/z_stepper_align.cpp    | 137 ++++++++++++++++++++++
 Marlin/src/feature/z_stepper_align.h      |  41 +++++++
 Marlin/src/gcode/bedlevel/G26.cpp         |   2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp   | 132 ++++++++-------------
 Marlin/src/module/configuration_store.cpp |  38 +++++-
 6 files changed, 298 insertions(+), 105 deletions(-)
 create mode 100644 Marlin/src/feature/z_stepper_align.cpp
 create mode 100644 Marlin/src/feature/z_stepper_align.h

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e2bda3f8055d..9a979f2528f7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -668,11 +668,37 @@
  */
 //#define Z_STEPPER_AUTO_ALIGN
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
-  // Define probe X and Y positions for Z1, Z2 [, Z3]
-  #define Z_STEPPER_ALIGN_XY { {  10, 190 }, { 100,  10 }, { 190, 190 } }
+  // Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
+  // If not defined, probe limits will be used.
+  // Override with 'M422 S<index> X<pos> Y<pos>'
+  //#define Z_STEPPER_ALIGN_XY { {  10, 190 }, { 100,  10 }, { 190, 190 } }
+
+  /**
+   * Orientation for the automatically-calculated probe positions.
+   * Override Z stepper align points with 'M422 S<index> X<pos> Y<pos>'
+   *
+   * 2 Steppers:  (0)     (1)
+   *               |       |   2   |
+   *               | 1   2 |       |
+   *               |       |   1   |
+   *
+   * 3 Steppers:  (0)     (1)     (2)     (3)
+   *               |   3   | 1     | 2   1 |     2 |
+   *               |       |     3 |       | 3     |
+   *               | 1   2 | 2     |   3   |     1 |
+   *
+   * 4 Steppers:  (0)     (1)     (2)     (3)
+   *               | 4   3 | 1   4 | 2   1 | 3   2 |
+   *               |       |       |       |       |
+   *               | 1   2 | 2   3 | 3   4 | 4   1 |
+   *
+   */
+  #ifndef Z_STEPPER_ALIGN_XY
+    //#define Z_STEPPERS_ORIENTATION 0
+  #endif
 
   // Provide Z stepper positions for more rapid convergence in bed alignment.
-  // Currently requires triple stepper drivers.
+  // Requires triple stepper drivers (i.e., set NUM_Z_STEPPER_DRIVERS to 3)
   //#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
   #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
     // Define Stepper XY positions for Z1, Z2, Z3 corresponding to
@@ -680,23 +706,16 @@
     // Define one position per Z stepper in stepper driver order.
     #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
   #else
-    // Amplification factor. Used to scale the correction step up or down.
-    // In case the stepper (spindle) position is further out than the test point.
-    // Use a value > 1. NOTE: This may cause instability
-    #define Z_STEPPER_ALIGN_AMP 1.0
+    // Amplification factor. Used to scale the correction step up or down in case
+    // the stepper (spindle) position is farther out than the test point.
+    #define Z_STEPPER_ALIGN_AMP 1.0       // Use a value > 1.0 NOTE: This may cause instability!
   #endif
 
-  // Set number of iterations to align
-  #define Z_STEPPER_ALIGN_ITERATIONS 3
-
-  // Enable to restore leveling setup after operation
-  #define RESTORE_LEVELING_AFTER_G34
-
   // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
-  #define G34_MAX_GRADE  5  // (%) Maximum incline G34 will handle
-
-  // Stop criterion. If the accuracy is better than this stop iterating early
-  #define Z_STEPPER_ALIGN_ACC 0.02
+  #define G34_MAX_GRADE              5    // (%) Maximum incline that G34 will handle
+  #define Z_STEPPER_ALIGN_ITERATIONS 5    // Number of iterations to apply during alignment
+  #define Z_STEPPER_ALIGN_ACC        0.02 // Stop iterating early if the accuracy is better than this
+  #define RESTORE_LEVELING_AFTER_G34      // Restore leveling after G34 is done?
 #endif
 
 // @section motion
diff --git a/Marlin/src/feature/z_stepper_align.cpp b/Marlin/src/feature/z_stepper_align.cpp
new file mode 100644
index 000000000000..0e2b7cef2ada
--- /dev/null
+++ b/Marlin/src/feature/z_stepper_align.cpp
@@ -0,0 +1,137 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * feature/z_stepper_align.cpp
+ */
+
+#include "../inc/MarlinConfigPre.h"
+
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
+
+#include "z_stepper_align.h"
+#include "../module/probe.h"
+
+ZStepperAlign z_stepper_align;
+
+xy_pos_t ZStepperAlign::xy[NUM_Z_STEPPER_DRIVERS];
+
+#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  xy_pos_t ZStepperAlign::stepper_xy[NUM_Z_STEPPER_DRIVERS];
+#endif
+
+void ZStepperAlign::reset_to_default() {
+  #ifdef Z_STEPPER_ALIGN_XY
+
+    constexpr xy_pos_t xy_init[] = Z_STEPPER_ALIGN_XY;
+    static_assert(COUNT(xy_init) == NUM_Z_STEPPER_DRIVERS,
+      "Z_STEPPER_ALIGN_XY requires "
+      #if NUM_Z_STEPPER_DRIVERS == 4
+        "four {X,Y} entries (Z, Z2, Z3, and Z4)."
+      #elif NUM_Z_STEPPER_DRIVERS == 3
+        "three {X,Y} entries (Z, Z2, and Z3)."
+      #else
+        "two {X,Y} entries (Z and Z2)."
+      #endif
+    );
+
+    constexpr xyz_pos_t dpo = NOZZLE_TO_PROBE_OFFSET;
+
+    #define LTEST(N) (xy_init[N].x >= _MAX(X_MIN_BED + MIN_PROBE_EDGE_LEFT,  X_MIN_POS + dpo.x) - 0.00001f)
+    #define RTEST(N) (xy_init[N].x <= _MIN(X_MAX_BED - MIN_PROBE_EDGE_RIGHT, X_MAX_POS + dpo.x) + 0.00001f)
+    #define FTEST(N) (xy_init[N].y >= _MAX(Y_MIN_BED + MIN_PROBE_EDGE_FRONT, Y_MIN_POS + dpo.y) - 0.00001f)
+    #define BTEST(N) (xy_init[N].y <= _MIN(Y_MAX_BED - MIN_PROBE_EDGE_BACK,  Y_MAX_POS + dpo.y) + 0.00001f)
+
+    static_assert(LTEST(0) && RTEST(0), "The 1st Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+    static_assert(FTEST(0) && BTEST(0), "The 1st Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+    static_assert(LTEST(1) && RTEST(1), "The 2nd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+    static_assert(FTEST(1) && BTEST(1), "The 2nd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+    #if NUM_Z_STEPPER_DRIVERS >= 3
+      static_assert(LTEST(2) && RTEST(2), "The 3rd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+      static_assert(FTEST(2) && BTEST(2), "The 3rd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+      #if NUM_Z_STEPPER_DRIVERS >= 4
+        static_assert(LTEST(3) && RTEST(3), "The 4th Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
+        static_assert(FTEST(3) && BTEST(3), "The 4th Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
+      #endif
+    #endif
+
+  #else // !defined(Z_STEPPER_ALIGN_XY)
+
+    const xy_pos_t xy_init[] = {
+      #if NUM_Z_STEPPER_DRIVERS >= 3  // First probe point...
+        #if !Z_STEPPERS_ORIENTATION
+          { probe.min_x(), probe.min_y() }, // SW
+        #elif Z_STEPPERS_ORIENTATION == 1
+          { probe.min_x(), probe.max_y() }, // NW
+        #elif Z_STEPPERS_ORIENTATION == 2
+          { probe.max_x(), probe.max_y() }, // NE
+        #elif Z_STEPPERS_ORIENTATION == 3
+          { probe.max_x(), probe.min_y() }, // SE
+        #else
+          #error "Z_STEPPERS_ORIENTATION must be from 0 to 3 (first point SW, NW, NE, SE)."
+        #endif
+        #if NUM_Z_STEPPER_DRIVERS == 4    // 3 more points...
+          #if !Z_STEPPERS_ORIENTATION
+            { probe.min_x(), probe.max_y() }, { probe.max_x(), probe.max_y() }, { probe.max_x(), probe.min_y() }  // SW
+          #elif Z_STEPPERS_ORIENTATION == 1
+            { probe.max_x(), probe.max_y() }, { probe.max_x(), probe.min_y() }, { probe.min_x(), probe.min_y() }  // NW
+          #elif Z_STEPPERS_ORIENTATION == 2
+            { probe.max_x(), probe.min_y() }, { probe.min_x(), probe.min_y() }, { probe.min_x(), probe.max_y() }  // NE
+          #elif Z_STEPPERS_ORIENTATION == 3
+            { probe.min_x(), probe.min_y() }, { probe.min_x(), probe.max_y() }, { probe.max_x(), probe.max_y() }  // SE
+          #endif
+        #elif !Z_STEPPERS_ORIENTATION     // or 2 more points...
+          { probe.max_x(), probe.min_y() }, { X_CENTER, probe.max_y() } // SW
+        #elif Z_STEPPERS_ORIENTATION == 1
+          { probe.min_x(), probe.min_y() }, { probe.max_x(), Y_CENTER } // NW
+        #elif Z_STEPPERS_ORIENTATION == 2
+          { probe.min_x(), probe.max_y() }, { X_CENTER, probe.min_y() } // NE
+        #elif Z_STEPPERS_ORIENTATION == 3
+          { probe.max_x(), probe.max_y() }, { probe.min_x(), Y_CENTER } // SE
+        #endif
+      #elif Z_STEPPERS_ORIENTATION
+        { X_CENTER, probe.min_y() }, { X_CENTER, probe.max_y() }
+      #else
+        { probe.min_x(), Y_CENTER }, { probe.max_x(), Y_CENTER }
+      #endif
+    };
+
+  #endif // !defined(Z_STEPPER_ALIGN_XY)
+
+  COPY(xy, xy_init);
+
+  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+    constexpr xy_pos_t stepper_xy_init[] = Z_STEPPER_ALIGN_STEPPER_XY;
+    static_assert(
+      COUNT(stepper_xy_init) == NUM_Z_STEPPER_DRIVERS,
+      "Z_STEPPER_ALIGN_STEPPER_XY requires "
+      #if NUM_Z_STEPPER_DRIVERS == 4
+        "four {X,Y} entries (Z, Z2, Z3, and Z4)."
+      #elif NUM_Z_STEPPER_DRIVERS == 3
+        "three {X,Y} entries (Z, Z2, and Z3)."
+      #endif
+    );
+    COPY(stepper_xy, stepper_xy_init);
+  #endif
+}
+
+#endif // Z_STEPPER_AUTO_ALIGN
diff --git a/Marlin/src/feature/z_stepper_align.h b/Marlin/src/feature/z_stepper_align.h
new file mode 100644
index 000000000000..8b31ac4bded9
--- /dev/null
+++ b/Marlin/src/feature/z_stepper_align.h
@@ -0,0 +1,41 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * feature/z_stepper_align.h
+ */
+
+#include "../inc/MarlinConfig.h"
+
+class ZStepperAlign {
+  public:
+    static xy_pos_t xy[NUM_Z_STEPPER_DRIVERS];
+
+    #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      static xy_pos_t stepper_xy[NUM_Z_STEPPER_DRIVERS];
+    #endif
+
+  static void reset_to_default();
+};
+
+extern ZStepperAlign z_stepper_align;
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 611538a909f3..7b580b666f1a 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -707,7 +707,7 @@ void GcodeSuite::G26() {
     if (location.valid()) {
       const xy_pos_t circle = _GET_MESH_POS(location.pos);
 
-      // If this mesh location is outside the printable_radius, skip it.
+      // If this mesh location is outside the printable radius, skip it.
       if (!position_is_reachable(circle)) continue;
 
       // Determine where to start and end the circle,
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index a35b3faef743..4532da8f8ca6 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -24,6 +24,8 @@
 
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
 
+#include "../../feature/z_stepper_align.h"
+
 #include "../gcode.h"
 #include "../../module/planner.h"
 #include "../../module/stepper.h"
@@ -45,68 +47,6 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
-//
-// Sanity check G34 / M422 settings
-//
-constexpr xy_pos_t test_z_stepper_align_xy[] = Z_STEPPER_ALIGN_XY;
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-
-  static_assert(COUNT(test_z_stepper_align_xy) >= NUM_Z_STEPPER_DRIVERS,
-    "Z_STEPPER_ALIGN_XY requires at least three {X,Y} entries (Z, Z2, Z3, ...)."
-  );
-
-  constexpr float test_z_stepper_align_stepper_xy[][XY] = Z_STEPPER_ALIGN_STEPPER_XY;
-  static_assert(
-    COUNT(test_z_stepper_align_stepper_xy) == NUM_Z_STEPPER_DRIVERS,
-    "Z_STEPPER_ALIGN_STEPPER_XY requires three {X,Y} entries (one per Z stepper)."
-  );
-
-#else
-
-  static_assert(COUNT(test_z_stepper_align_xy) == NUM_Z_STEPPER_DRIVERS,
-    #if NUM_Z_STEPPER_DRIVERS == 4
-      "Z_STEPPER_ALIGN_XY requires four {X,Y} entries (Z, Z2, Z3, and Z4)."
-    #elif NUM_Z_STEPPER_DRIVERS == 3
-      "Z_STEPPER_ALIGN_XY requires three {X,Y} entries (Z, Z2, and Z3)."
-    #else
-      "Z_STEPPER_ALIGN_XY requires two {X,Y} entries (Z and Z2)."
-    #endif
-  );
-
-#endif
-
-constexpr xyz_pos_t dpo = NOZZLE_TO_PROBE_OFFSET;
-
-#define LTEST(N) (test_z_stepper_align_xy[N].x >= _MAX(X_MIN_BED + MIN_PROBE_EDGE_LEFT,  X_MIN_POS + dpo.x) - 0.00001f)
-#define RTEST(N) (test_z_stepper_align_xy[N].x <= _MIN(X_MAX_BED - MIN_PROBE_EDGE_RIGHT, X_MAX_POS + dpo.x) + 0.00001f)
-#define FTEST(N) (test_z_stepper_align_xy[N].y >= _MAX(Y_MIN_BED + MIN_PROBE_EDGE_FRONT, Y_MIN_POS + dpo.y) - 0.00001f)
-#define BTEST(N) (test_z_stepper_align_xy[N].y <= _MIN(Y_MAX_BED - MIN_PROBE_EDGE_BACK,  Y_MAX_POS + dpo.y) + 0.00001f)
-
-static_assert(LTEST(0) && RTEST(0), "The 1st Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
-static_assert(FTEST(0) && BTEST(0), "The 1st Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
-static_assert(LTEST(1) && RTEST(1), "The 2nd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
-static_assert(FTEST(1) && BTEST(1), "The 2nd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
-#if NUM_Z_STEPPER_DRIVERS >= 3
-  static_assert(LTEST(2) && RTEST(2), "The 3rd Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
-  static_assert(FTEST(2) && BTEST(2), "The 3rd Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
-  #if NUM_Z_STEPPER_DRIVERS >= 4
-    static_assert(LTEST(3) && RTEST(3), "The 4th Z_STEPPER_ALIGN_XY X is unreachable with the default probe X offset.");
-    static_assert(FTEST(3) && BTEST(3), "The 4th Z_STEPPER_ALIGN_XY Y is unreachable with the default probe Y offset.");
-  #endif
-#endif
-
-//
-// G34 / M422 shared data
-//
-static xy_pos_t z_stepper_align_pos[] = Z_STEPPER_ALIGN_XY;
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-  static xy_pos_t z_stepper_align_stepper_pos[] = Z_STEPPER_ALIGN_STEPPER_XY;
-#endif
-
-#define G34_PROBE_COUNT COUNT(z_stepper_align_pos)
-
 inline void set_all_z_lock(const bool lock) {
   stepper.set_z_lock(lock);
   stepper.set_z2_lock(lock);
@@ -201,11 +141,11 @@ void GcodeSuite::G34() {
     // iteration this will be re-calculated based on the actual bed position
     float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * (
       #if NUM_Z_STEPPER_DRIVERS == 3
-         SQRT(_MAX(HYPOT2(z_stepper_align_pos[0].x - z_stepper_align_pos[0].y, z_stepper_align_pos[1].x - z_stepper_align_pos[1].y),
-                   HYPOT2(z_stepper_align_pos[1].x - z_stepper_align_pos[1].y, z_stepper_align_pos[2].x - z_stepper_align_pos[2].y),
-                   HYPOT2(z_stepper_align_pos[2].x - z_stepper_align_pos[2].y, z_stepper_align_pos[0].x - z_stepper_align_pos[0].y)))
+         SQRT(_MAX(HYPOT2(z_stepper_align.xy[0].x - z_stepper_align.xy[0].y, z_stepper_align.xy[1].x - z_stepper_align.xy[1].y),
+                   HYPOT2(z_stepper_align.xy[1].x - z_stepper_align.xy[1].y, z_stepper_align.xy[2].x - z_stepper_align.xy[2].y),
+                   HYPOT2(z_stepper_align.xy[2].x - z_stepper_align.xy[2].y, z_stepper_align.xy[0].x - z_stepper_align.xy[0].y)))
       #else
-         HYPOT(z_stepper_align_pos[0].x - z_stepper_align_pos[0].y, z_stepper_align_pos[1].x - z_stepper_align_pos[1].y)
+         HYPOT(z_stepper_align.xy[0].x - z_stepper_align.xy[0].y, z_stepper_align.xy[1].x - z_stepper_align.xy[1].y)
       #endif
     );
 
@@ -216,31 +156,39 @@ void GcodeSuite::G34() {
     current_position.z -= z_probe * 0.5f;
 
     float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f),
-          z_measured[G34_PROBE_COUNT] = { 0 },
+          z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
           z_maxdiff = 0.0f,
           amplification = z_auto_align_amplification;
 
     uint8_t iteration;
     bool err_break = false;
+
+    #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      bool adjustment_reverse = false;
+    #endif
+
     for (iteration = 0; iteration < z_auto_align_iterations; ++iteration) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
 
       SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
 
       // Initialize minimum value
-      float z_measured_min = 100000.0f,
+      float z_measured_min =  100000.0f,
             z_measured_max = -100000.0f;
 
       // Probe all positions (one per Z-Stepper)
-      for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i) {
+      for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
         // iteration odd/even --> downward / upward stepper sequence
-        const uint8_t iprobe = (iteration & 1) ? G34_PROBE_COUNT - 1 - i : i;
+        const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
 
         // Safe clearance even on an incline
         if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
 
+        if (DEBUGGING(LEVELING))
+          DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
+
         // Probe a Z height for each stepper.
-        const float z_probed_height = probe.probe_at_point(z_stepper_align_pos[iprobe], raise_after, 0, true);
+        const float z_probed_height = probe.probe_at_point(z_stepper_align.xy[iprobe], raise_after, 0, true);
         if (isnan(z_probed_height)) {
           SERIAL_ECHOLNPGM("Probing failed.");
           err_break = true;
@@ -279,15 +227,15 @@ void GcodeSuite::G34() {
         // This allows the actual adjustment logic to be shared by both algorithms.
         linear_fit_data lfd;
         incremental_LSF_reset(&lfd);
-        for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i) {
-          SERIAL_ECHOLNPAIR("PROBEPT_", int(i + 1), ": ", z_measured[i]);
-          incremental_LSF(&lfd, z_stepper_align_pos[i], z_measured[i]);
+        for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
+          SERIAL_ECHOLNPAIR("PROBEPT_", i + '1', ": ", z_measured[i]);
+          incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
         }
         finish_incremental_LSF(&lfd);
 
         z_measured_min = 100000.0f;
         for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
-          z_measured[i] = -(lfd.A * z_stepper_align_stepper_pos[i].x + lfd.B * z_stepper_align_stepper_pos[i].y);
+          z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y);
           z_measured_min = _MIN(z_measured_min, z_measured[i]);
         }
 
@@ -309,8 +257,8 @@ void GcodeSuite::G34() {
       // Correct the individual stepper offsets
       for (uint8_t zstepper = 0; zstepper < NUM_Z_STEPPER_DRIVERS; ++zstepper) {
         // Calculate current stepper move
-        const float z_align_move = z_measured[zstepper] - z_measured_min,
-                    z_align_abs = ABS(z_align_move);
+        float z_align_move = z_measured[zstepper] - z_measured_min;
+        const float z_align_abs = ABS(z_align_move);
 
         #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
           // Optimize one iteration's correction based on the first measurements
@@ -318,10 +266,14 @@ void GcodeSuite::G34() {
         #endif
 
         // Check for less accuracy compared to last move
-        if (last_z_align_move[zstepper] < z_align_abs - 1.0) {
+        if (last_z_align_move[zstepper] < z_align_abs * 0.7f) {
           SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
-          err_break = true;
-          break;
+          #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+            adjustment_reverse = !adjustment_reverse;
+          #else
+            err_break = true;
+            break;
+          #endif
         }
 
         // Remember the alignment for the next iteration
@@ -342,6 +294,13 @@ void GcodeSuite::G34() {
           #endif
         }
 
+        #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+          // Decreasing accuracy was detected so move was inverted.
+          // Will match reversed Z steppers on dual steppers. Triple will need more work to map.
+          if (adjustment_reverse)
+            z_align_move = -z_align_move;
+        #endif
+
         // Do a move to correct part of the misalignment for the current stepper
         do_blocking_move_to_z(amplification * z_align_move + current_position.z);
       } // for (zstepper)
@@ -406,12 +365,13 @@ void GcodeSuite::G34() {
  *   Y<pos>   : Y position to set (Unchanged if omitted)
  */
 void GcodeSuite::M422() {
+
   if (!parser.seen_any()) {
-    for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i)
-      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + 1, SP_X_STR, z_stepper_align_pos[i].x, SP_Y_STR, z_stepper_align_pos[i].y);
+    for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
+      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + '1', SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
     #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
       for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
-        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + 1, SP_X_STR, z_stepper_align_stepper_pos[i].x, SP_Y_STR, z_stepper_align_stepper_pos[i].y);
+        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + '1', SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
     #endif
     return;
   }
@@ -427,9 +387,9 @@ void GcodeSuite::M422() {
 
   xy_pos_t *pos_dest = (
     #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-      !is_probe_point ? z_stepper_align_stepper_pos :
+      !is_probe_point ? z_stepper_align.stepper_xy :
     #endif
-    z_stepper_align_pos
+    z_stepper_align.xy
   );
 
   if (!is_probe_point
@@ -451,7 +411,7 @@ void GcodeSuite::M422() {
   int8_t position_index;
   if (is_probe_point) {
     position_index = parser.intval('S') - 1;
-    if (!WITHIN(position_index, 0, int8_t(G34_PROBE_COUNT) - 1)) {
+    if (!WITHIN(position_index, 0, int8_t(NUM_Z_STEPPER_DRIVERS) - 1)) {
       SERIAL_ECHOLNPGM("?(S) Z-ProbePosition index invalid.");
       return;
     }
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 05b67c984ca2..0e4e6cef305a 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -37,7 +37,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V75"
+#define EEPROM_VERSION "V76"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -66,6 +66,10 @@
   #include "../feature/bedlevel/bedlevel.h"
 #endif
 
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
+  #include "../feature/z_stepper_align.h"
+#endif
+
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extensible_ui/ui_api.h"
 #endif
@@ -251,6 +255,16 @@ typedef struct SettingsDataStruct {
           z4_endstop_adj;                               // M666 (S4) Z
   #endif
 
+  //
+  // Z_STEPPER_AUTO_ALIGN, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
+  //
+  #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+    xy_pos_t z_stepper_align_xy[NUM_Z_STEPPER_DRIVERS];             // M422 S X Y
+    #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      xy_pos_t z_stepper_align_stepper_xy[NUM_Z_STEPPER_DRIVERS];   // M422 W X Y
+    #endif
+  #endif
+
   //
   // ULTIPANEL
   //
@@ -801,6 +815,13 @@ void MarlinSettings::postprocess() {
       #endif
     }
 
+    #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+      EEPROM_WRITE(z_stepper_align.xy);
+      #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+        EEPROM_WRITE(z_stepper_align.stepper_xy);
+      #endif
+    #endif
+
     //
     // LCD Preheat settings
     //
@@ -1669,6 +1690,13 @@ void MarlinSettings::postprocess() {
         #endif
       }
 
+      #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+        EEPROM_READ(z_stepper_align.xy);
+        #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+          EEPROM_READ(z_stepper_align.stepper_xy);
+        #endif
+      #endif
+
       //
       // LCD Preheat settings
       //
@@ -2473,6 +2501,14 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
+  //
+  // Z Stepper Auto-alignment points
+  //
+
+  #if ENABLED(Z_STEPPER_AUTO_ALIGN)
+    z_stepper_align.reset_to_default();
+  #endif
+
   //
   // Servo Angles
   //

From c3cab37d7eec97f871ad73d07a3abfa616bbd35c Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sat, 1 Feb 2020 02:51:57 -0800
Subject: [PATCH 106/565] Fix Temperature::over_autostart_threshold (#16749)

---
 Marlin/src/module/temperature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index d90a2123d163..24cd138c5d69 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2143,7 +2143,7 @@ void Temperature::disable_all_heaters() {
 
   bool Temperature::over_autostart_threshold() {
     #if HOTENDS
-      HOTEND_LOOP() if (degTargetHotend(e) < (EXTRUDE_MINTEMP) / 2) return true;
+      HOTEND_LOOP() if (degTargetHotend(e) > (EXTRUDE_MINTEMP) / 2) return true;
     #endif
     #if HAS_HEATED_BED
       if (degTargetBed() > BED_MINTEMP) return true;

From 832d33ce9df787a41d772b432118d31a92105512 Mon Sep 17 00:00:00 2001
From: Acenotass <44540957+Acenotass@users.noreply.github.com>
Date: Sat, 1 Feb 2020 16:53:18 +0600
Subject: [PATCH 107/565] Update Russian language (#16750)

---
 Marlin/src/lcd/language/language_ru.h | 53 ++++++++++++++++-----------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index f86a0bcfc494..51875761bd76 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -50,7 +50,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Выключить двигатели");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Меню отладки");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Тест индикатора");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Автопарковка");
+  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Парковка XYZ");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Парковка X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Парковка Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Парковка Z");
@@ -63,20 +63,29 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Коррекции применены");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Запомнить ноль");
   PROGMEM Language_Str MSG_PREHEAT_1                       = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
-  PROGMEM Language_Str MSG_PREHEAT_1_H                     = _UxGT("Преднагрев ") PREHEAT_1_LABEL " ~";
-  PROGMEM Language_Str MSG_PREHEAT_1_END                   = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" сопло");
-  PROGMEM Language_Str MSG_PREHEAT_1_END_E                 = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~");
-  PROGMEM Language_Str MSG_PREHEAT_1_ALL                   = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" всё");
-  PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY               = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" стол");
-  PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS              = _UxGT("Преднагрев ") PREHEAT_1_LABEL _UxGT(" настр.");
+  PROGMEM Language_Str MSG_PREHEAT_1_H                     = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~";
+  PROGMEM Language_Str MSG_PREHEAT_1_END                   = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло");
+  PROGMEM Language_Str MSG_PREHEAT_1_END_E                 = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~");
+  PROGMEM Language_Str MSG_PREHEAT_1_ALL                   = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё");
+  PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY               = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол");
+  PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS              = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка");
   PROGMEM Language_Str MSG_PREHEAT_2                       = _UxGT("Преднагрев ") PREHEAT_2_LABEL;
-  PROGMEM Language_Str MSG_PREHEAT_2_H                     = _UxGT("Преднагрев ") PREHEAT_2_LABEL " ~";
-  PROGMEM Language_Str MSG_PREHEAT_2_END                   = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" сопло");
-  PROGMEM Language_Str MSG_PREHEAT_2_END_E                 = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~");
-  PROGMEM Language_Str MSG_PREHEAT_2_ALL                   = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" всё");
-  PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY               = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" стол");
-  PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS              = _UxGT("Преднагрев ") PREHEAT_2_LABEL _UxGT(" настр.");
+  PROGMEM Language_Str MSG_PREHEAT_2_H                     = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~";
+  PROGMEM Language_Str MSG_PREHEAT_2_END                   = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло");
+  PROGMEM Language_Str MSG_PREHEAT_2_END_E                 = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~");
+  PROGMEM Language_Str MSG_PREHEAT_2_ALL                   = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё");
+  PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY               = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол");
+  PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS              = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка");
   PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Охлаждение");
+  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Управление лазером");
+  PROGMEM Language_Str MSG_LASER_OFF                       = _UxGT("Выключить лазер");
+  PROGMEM Language_Str MSG_LASER_ON                        = _UxGT("Включить лазер");
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Мощность лазера");
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Шпиндель управление");
+  PROGMEM Language_Str MSG_SPINDLE_OFF                     = _UxGT("Выключить шпиндель");
+  PROGMEM Language_Str MSG_SPINDLE_ON                      = _UxGT("Включить шпиндель");
+  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Мощность шпинделя");
+  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Инверсия шпинделя");
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Включить питание");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Выключить питание");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Экструзия");
@@ -87,7 +96,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Выровнять углы");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Следующий угол");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редактировать сетку");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ред. сетки завершено");
+  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Правка сетки окончена");
   PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Точка сетки:");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Индекс X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Индекс Y");
@@ -108,10 +117,10 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Выполняем G29");
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Утилиты UBL");
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Калибровка UBL");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Постр. сетку от руки");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Пост. шимм и измер.");
+  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Правка сетки вручную");
+  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Z-пробник и замеры");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Измерение");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Удал. и измер. стол");
+  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Убрать и замер стола");
   PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Двигаемся дальше");
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Активировать UBL");
   PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Деактивировать UBL");
@@ -128,7 +137,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1               = _UxGT("Построить сетку ") PREHEAT_1_LABEL;
   PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2               = _UxGT("Построить сетку ") PREHEAT_2_LABEL;
   PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Построить хол. сетку");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Устан. высоту сетки");
+  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Правка высоты сетки");
   PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Высота");
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Проверить сетку");
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1            = _UxGT("Проверить сетку ") PREHEAT_1_LABEL;
@@ -220,8 +229,10 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Макс");
   PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Фактор");
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Автотемпература");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Вкл.");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Выкл.");
+  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Вкл");
+  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Выкл");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Автонастройка");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Автонастройка *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Выбор");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Выбор *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Ускорение");
@@ -266,7 +277,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Сохранить настройки");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Загрузить настройки");
   PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Вернуть настройки");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Инициализация EEPROM");
+  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Изначальный EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Обновление прошивки");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Сброс принтера");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Обновить");

From 0d342bac51a5f32d143f0dba9c65af820dfab621 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 06:27:17 -0600
Subject: [PATCH 108/565] Fix CURRENT_STEP_DOWN compile error

---
 Marlin/src/feature/tmc_util.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 340855a6dada..84b5c2db7b79 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -281,6 +281,10 @@
       }
     }
 
+  #else
+
+    #define step_current_down(...)
+
   #endif
 
   template<typename TMC>
@@ -288,7 +292,7 @@
     TMC_driver_data data = get_driver_data(st);
     if (data.drv_status == 0xFFFFFFFF || data.drv_status == 0x0) return false;
 
-    bool did_step_down = false;
+    bool should_step_down = false;
 
     if (need_update_error_counters) {
       if (data.is_ot /* | data.s2ga | data.s2gb*/) st.error_count++;
@@ -308,10 +312,8 @@
 
       #if CURRENT_STEP_DOWN > 0
         // Decrease current if is_otpw is true and driver is enabled and there's been more than 4 warnings
-        if (data.is_otpw && st.otpw_count > 4 && st.isEnabled()) {
-          step_current_down(st);
-          did_step_down = true;
-        }
+        if (data.is_otpw && st.otpw_count > 4 && st.isEnabled())
+          should_step_down = true;
       #endif
 
       if (data.is_otpw) {
@@ -325,7 +327,7 @@
       if (need_debug_reporting) report_polled_driver_data(st, data);
     #endif
 
-    return did_step_down;
+    return should_step_down;
   }
 
   void monitor_tmc_drivers() {

From 5296af94d22074112ed1a7ca4a7af720cc1ebe94 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 06:49:56 -0600
Subject: [PATCH 109/565] Drop obsolete SD special char handling

See #14035
---
 Marlin/src/gcode/queue.cpp | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index b1673f57f3a9..b9b4d1bd9648 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -491,8 +491,7 @@ void GCodeQueue::get_serial_commands() {
    * can also interrupt buffering.
    */
   inline void GCodeQueue::get_sdcard_commands() {
-    static bool stop_buffering = false,
-                sd_comment_mode = false
+    static bool sd_comment_mode = false
                 #if ENABLED(PAREN_COMMENTS)
                   , sd_comment_paren_mode = false
                 #endif
@@ -500,29 +499,13 @@ void GCodeQueue::get_serial_commands() {
 
     if (!IS_SD_PRINTING()) return;
 
-    /**
-     * '#' stops reading from SD to the buffer prematurely, so procedural
-     * macro calls are possible. If it occurs, stop_buffering is triggered
-     * and the buffer is run dry; this character _can_ occur in serial com
-     * due to checksums, however, no checksums are used in SD printing.
-     */
-
-    if (length == 0) stop_buffering = false;
-
     uint16_t sd_count = 0;
     bool card_eof = card.eof();
-    while (length < BUFSIZE && !card_eof && !stop_buffering) {
+    while (length < BUFSIZE && !card_eof) {
       const int16_t n = card.get();
       char sd_char = (char)n;
       card_eof = card.eof();
-      if (card_eof || n == -1
-          || sd_char == '\n' || sd_char == '\r'
-          || ((sd_char == '#' || sd_char == ':') && !sd_comment_mode
-            #if ENABLED(PAREN_COMMENTS)
-              && !sd_comment_paren_mode
-            #endif
-          )
-      ) {
+      if (card_eof || n == -1 || sd_char == '\n' || sd_char == '\r') {
         if (card_eof) {
 
           card.printingHasFinished();
@@ -548,8 +531,6 @@ void GCodeQueue::get_serial_commands() {
         else if (n == -1)
           SERIAL_ERROR_MSG(MSG_SD_ERR_READ);
 
-        if (sd_char == '#') stop_buffering = true;
-
         sd_comment_mode = false; // for new command
         #if ENABLED(PAREN_COMMENTS)
           sd_comment_paren_mode = false;

From 995a9238b37931ea41698abc90388bbb74c0ae5f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 07:51:50 -0600
Subject: [PATCH 110/565] Probe singleton patch

Followup to #16751
---
 Marlin/src/module/probe.cpp | 4 ++--
 Marlin/src/module/probe.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index ef11a52122be..35aaf93f09bb 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -455,8 +455,8 @@ bool Probe::set_deployed(const bool deploy) {
  * @return true to indicate an error
  */
 
-#if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-  PGM_P Probe::msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
+#if HAS_BED_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
+  const char Probe::msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
 #endif
 
 bool Probe::move_to_z(const float z, const feedRate_t fr_mm_s) {
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 5cf0ecc2546c..af01e208cda2 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -61,7 +61,7 @@ class Probe {
       return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
     }
     #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-      static PGM_P msg_wait_for_bed_heating[25];
+      static const char msg_wait_for_bed_heating[25];
     #endif
 
   #else

From 7a4758a6a29eb56c3e56c0eaed7809022459c6ae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 07:55:53 -0600
Subject: [PATCH 111/565] Fix RGB / Neopixel white color bug

See #16752
---
 Marlin/src/feature/caselight.cpp             | 2 +-
 Marlin/src/feature/leds/leds.h               | 3 ++-
 Marlin/src/feature/leds/printer_event_leds.h | 2 +-
 buildroot/share/tests/megaatmega2560-tests   | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index bdc2898baf1a..740dd7183a88 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -58,7 +58,7 @@ void update_case_light() {
   if (case_light_arg_flag && case_light_on)
     case_light_brightness = case_light_brightness_sav;  // restore last brightens if this is an S1 argument
 
-  #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) || NONE(CASE_LIGHT_USE_NEOPIXEL, CASE_LIGHT_NO_BRIGHTNESS)
+  #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) || DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
     const uint8_t i = case_light_on ? case_light_brightness : 0, n10ct = INVERT_CASE_LIGHT ? 255 - i : i;
   #endif
 
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 14a50cb06f26..443ecdcbca5c 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -33,6 +33,7 @@
   #include "neopixel.h"
 #endif
 
+// A white component can be passed
 #define HAS_WHITE_LED EITHER(RGBW_LED, NEOPIXEL_LED)
 
 /**
@@ -137,7 +138,7 @@ typedef struct LEDColor {
 #define LEDColorBlue()            LEDColor(  0,   0, 255)
 #define LEDColorIndigo()          LEDColor(  0, 255, 255)
 #define LEDColorViolet()          LEDColor(255,   0, 255)
-#if HAS_WHITE_LED
+#if HAS_WHITE_LED && DISABLED(RGB_LED)
   #define LEDColorWhite()         LEDColor(  0,   0,   0, 255)
 #else
   #define LEDColorWhite()         LEDColor(255, 255, 255)
diff --git a/Marlin/src/feature/leds/printer_event_leds.h b/Marlin/src/feature/leds/printer_event_leds.h
index f59d6c699c19..07ad653fd0f3 100644
--- a/Marlin/src/feature/leds/printer_event_leds.h
+++ b/Marlin/src/feature/leds/printer_event_leds.h
@@ -56,7 +56,7 @@ class PrinterEventLEDs {
   #endif
 
   #if HAS_TEMP_HOTEND || HAS_HEATED_BED
-    static inline void onHeatingDone() { leds.set_color(LEDColorWhite()); }
+    static inline void onHeatingDone() { leds.set_white(); }
     static inline void onPidTuningDone(LEDColor c) { leds.set_color(c); }
   #endif
 
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests
index b34da5752df3..039e023e314b 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/megaatmega2560-tests
@@ -31,7 +31,8 @@ opt_set GRID_MAX_POINTS_X 16
 opt_set FANMUX0_PIN 53
 opt_disable USE_WATCHDOG
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
-           PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
+           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
+           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
            EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
            BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
            NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
@@ -44,7 +45,7 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TE
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
-           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
+          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
 

From c4cbc54484b5b4afc6d8686e42d2280c07a40bb8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 10:37:50 -0600
Subject: [PATCH 112/565] Suppress a compile warning

---
 Marlin/src/lcd/menu/menu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 5c7fc773062d..3e3dcdc12335 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -324,7 +324,7 @@ class MenuItem_bool : public MenuEditItemBase {
 #define SCREEN_OR_MENU_LOOP(IS_MENU)                \
   scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU); \
   int8_t _menuLineNr = encoderTopLine, _thisItemNr; \
-  bool _skipStatic = IS_MENU;                       \
+  bool _skipStatic = IS_MENU; UNUSED(_thisItemNr);  \
   for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
     _thisItemNr = 0
 

From 22556a7bbf8cad71fe2d4afaa9cd0ca14eaf6952 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 15:18:01 -0600
Subject: [PATCH 113/565] More 8-extruder fixups

---
 Marlin/src/HAL/HAL_ESP32/HAL.cpp              |  6 +++
 Marlin/src/MarlinCore.cpp                     |  3 ++
 Marlin/src/gcode/config/M200-M205.cpp         |  5 ++-
 .../screens/temperature_screen.cpp            | 20 +++++-----
 Marlin/src/module/temperature.cpp             | 39 ++++++++++---------
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
index 7bc007f3c4c1..3a011e00e1c2 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
@@ -172,6 +172,12 @@ void HAL_adc_init() {
   #if HAS_TEMP_ADC_5
     adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db);
   #endif
+  #if HAS_TEMP_ADC_6
+    adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db);
+  #endif
+  #if HAS_TEMP_ADC_7
+    adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db);
+  #endif
   #if HAS_HEATED_BED
     adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db);
   #endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 141494f20c83..f571480ff699 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -547,6 +547,9 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
             case 2: case 3: oldstatus = E1_ENABLE_READ(); ENABLE_AXIS_E1(); break;
             #if E_STEPPERS > 2
               case 4: case 5: oldstatus = E2_ENABLE_READ(); ENABLE_AXIS_E2(); break;
+              #if E_STEPPERS > 3
+                case 6: case 7: oldstatus = E3_ENABLE_READ(); ENABLE_AXIS_E3(); break;
+              #endif // E_STEPPERS > 3
             #endif // E_STEPPERS > 2
           #endif // E_STEPPERS > 1
         }
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 594813e038ac..14ddb1efc257 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -41,8 +41,9 @@
       // setting any extruder filament size disables volumetric on the assumption that
       // slicers either generate in extruder values as cubic mm or as as filament feeds
       // for all extruders
-      if ( (parser.volumetric_enabled = (parser.value_linear_units() != 0)) )
-        planner.set_filament_size(target_extruder, parser.value_linear_units());
+      const float dval = parser.value_linear_units();
+      if ( (parser.volumetric_enabled = (dval != 0)) )
+        planner.set_filament_size(target_extruder, dval);
     }
     planner.calculate_volumetric_multipliers();
   }
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
index f969f4797959..81cde5a34120 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
@@ -75,24 +75,24 @@ bool TemperatureScreen::onTouchHeld(uint8_t tag) {
     case 22: UI_DECREMENT(TargetTemp_celsius, CHAMBER); break;
     case 23: UI_INCREMENT(TargetTemp_celsius, CHAMBER); break;
     #ifndef NO_TOOLHEAD_HEATER_GCODE
-    case  2: UI_DECREMENT(TargetTemp_celsius, E0); break;
-    case  3: UI_INCREMENT(TargetTemp_celsius, E0); break;
+      case  2: UI_DECREMENT(TargetTemp_celsius, E0); break;
+      case  3: UI_INCREMENT(TargetTemp_celsius, E0); break;
     #endif
     #if HOTENDS > 1
-    case  4: UI_DECREMENT(TargetTemp_celsius, E1); break;
-    case  5: UI_INCREMENT(TargetTemp_celsius, E1); break;
+      case  4: UI_DECREMENT(TargetTemp_celsius, E1); break;
+      case  5: UI_INCREMENT(TargetTemp_celsius, E1); break;
     #endif
     #if HOTENDS > 2
-    case  6: UI_DECREMENT(TargetTemp_celsius, E2); break;
-    case  7: UI_INCREMENT(TargetTemp_celsius, E2); break;
+      case  6: UI_DECREMENT(TargetTemp_celsius, E2); break;
+      case  7: UI_INCREMENT(TargetTemp_celsius, E2); break;
     #endif
     #if HOTENDS > 3
-    case  8: UI_DECREMENT(TargetTemp_celsius, E3); break;
-    case  9: UI_INCREMENT(TargetTemp_celsius, E3); break;
+      case  8: UI_DECREMENT(TargetTemp_celsius, E3); break;
+      case  9: UI_INCREMENT(TargetTemp_celsius, E3); break;
     #endif
     #if FAN_COUNT > 0
-    case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
-    case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
+      case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
+      case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
     #endif
     case 30:
       #define _HOTEND_OFF(N) setTargetTemp_celsius(0,E##N);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 24cd138c5d69..4b00b095c204 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2331,25 +2331,26 @@ void Temperature::update_raw_temperatures() {
     #elif DISABLED(HEATER_1_USES_MAX6675)
       temp_hotend[1].update();
     #endif
-    #if HAS_TEMP_ADC_2
-      temp_hotend[2].update();
-      #if HAS_TEMP_ADC_3
-        temp_hotend[3].update();
-        #if HAS_TEMP_ADC_4
-          temp_hotend[4].update();
-          #if HAS_TEMP_ADC_5
-            temp_hotend[5].update();
-            #if HAS_TEMP_ADC_6
-              temp_hotend[6].update();
-              #if HAS_TEMP_ADC_7
-                temp_hotend[7].update();
-              #endif // HAS_TEMP_ADC_7
-            #endif // HAS_TEMP_ADC_6
-          #endif // HAS_TEMP_ADC_5
-        #endif // HAS_TEMP_ADC_4
-      #endif // HAS_TEMP_ADC_3
-    #endif // HAS_TEMP_ADC_2
-  #endif // HAS_TEMP_ADC_1
+  #endif
+
+  #if HAS_TEMP_ADC_2
+    temp_hotend[2].update();
+  #endif
+  #if HAS_TEMP_ADC_3
+    temp_hotend[3].update();
+  #endif
+  #if HAS_TEMP_ADC_4
+    temp_hotend[4].update();
+  #endif
+  #if HAS_TEMP_ADC_5
+    temp_hotend[5].update();
+  #endif
+  #if HAS_TEMP_ADC_6
+    temp_hotend[6].update();
+  #endif
+  #if HAS_TEMP_ADC_7
+    temp_hotend[7].update();
+  #endif
 
   #if HAS_HEATED_BED
     temp_bed.update();

From 63469ed8f75da3c3ca703d8b45c2b0d323f26a1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 18:31:00 -0600
Subject: [PATCH 114/565] Add EXP labels to SKR pins

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h  | 109 +++++++++++--------
 Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h  |  58 +++++-----
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h |  53 +++++----
 3 files changed, 127 insertions(+), 93 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 4889e4d3c3cd..6b439cfa26eb 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -195,6 +195,25 @@
  *               -----                                              -----
  *               EXP2                                               EXP1
  */
+
+#define EXP1_1_PIN          P1_30
+#define EXP1_2_PIN          P1_18
+#define EXP1_3_PIN          P1_20
+#define EXP1_4_PIN          P1_22
+#define EXP1_6_PIN          P0_28
+#define EXP1_7_PIN          P1_19
+#define EXP1_8_PIN          P1_21
+#define EXP1_9_PIN          P1_23
+
+#define EXP2_1_PIN          P0_17
+#define EXP2_2_PIN          P3_26
+#define EXP2_3_PIN          P3_25
+#define EXP2_4_PIN          P1_31
+#define EXP2_6_PIN          P0_15
+#define EXP2_7_PIN          P0_16
+#define EXP2_8_PIN          P0_18
+#define EXP2_9_PIN          -1
+
 #if HAS_SPI_LCD
 
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
@@ -222,75 +241,75 @@
     *                   LCD                             LCD
     */
 
-    #define LCD_PINS_RS    P1_23
+    #define LCD_PINS_RS    EXP1_9_PIN
 
-    #define BTN_EN1        P1_20
-    #define BTN_EN2        P1_22
-    #define BTN_ENC        P1_18
+    #define BTN_EN1        EXP1_3_PIN
+    #define BTN_EN2        EXP1_4_PIN
+    #define BTN_ENC        EXP1_2_PIN
 
-    #define LCD_PINS_ENABLE P1_21
-    #define LCD_PINS_D4    P1_19
+    #define LCD_PINS_ENABLE EXP1_8_PIN
+    #define LCD_PINS_D4    EXP1_7_PIN
 
   #elif ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    P1_22
+    #define LCD_PINS_RS    EXP1_4_PIN
 
-    #define BTN_EN1        P1_18
-    #define BTN_EN2        P1_20
-    #define BTN_ENC        P0_28   // (58) open-drain
+    #define BTN_EN1        EXP1_2_PIN
+    #define BTN_EN2        EXP1_3_PIN
+    #define BTN_ENC        EXP1_6_PIN   // (58) open-drain
 
-    #define LCD_PINS_ENABLE P1_23
-    #define LCD_PINS_D4    P1_21
+    #define LCD_PINS_ENABLE EXP1_9_PIN
+    #define LCD_PINS_D4    EXP1_8_PIN
 
   #else // !CR10_STOCKDISPLAY
 
-    #define LCD_PINS_RS    P1_19
+    #define LCD_PINS_RS    EXP1_7_PIN
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
-    #define BTN_ENC        P0_28   // (58) open-drain
+    #define BTN_EN1        EXP2_2_PIN   // (31) J3-2 & AUX-4
+    #define BTN_EN2        EXP2_3_PIN   // (33) J3-4 & AUX-4
+    #define BTN_ENC        EXP1_6_PIN   // (58) open-drain
 
-    #define LCD_PINS_ENABLE P1_18
-    #define LCD_PINS_D4    P1_20
+    #define LCD_PINS_ENABLE EXP1_2_PIN
+    #define LCD_PINS_D4    EXP1_3_PIN
 
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN  P1_31   // (49) (NOT 5V tolerant)
+    #define LCD_SDSS       EXP2_7_PIN   // (16) J3-7 & AUX-4
+    #define SD_DETECT_PIN  EXP2_4_PIN   // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    P1_18
-      #define DOGLCD_A0    P1_19
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_CS    EXP1_2_PIN
+      #define DOGLCD_A0    EXP1_7_PIN
+      #define DOGLCD_SCK   EXP2_6_PIN
+      #define DOGLCD_MOSI  EXP2_8_PIN
 
       #define LCD_BACKLIGHT_PIN -1
 
       #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN EXP1_3_PIN   // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_21
+          #define RGB_LED_R_PIN EXP1_8_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_22
+          #define RGB_LED_G_PIN EXP1_4_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_23
+          #define RGB_LED_B_PIN EXP1_9_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    P1_21
+        #define NEOPIXEL_PIN    EXP1_8_PIN
       #endif
 
     #else // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_CS    P1_21
-        #define DOGLCD_A0    P1_22
-        #define DOGLCD_SCK   P0_15
-        #define DOGLCD_MOSI  P0_18
+        #define DOGLCD_CS    EXP1_8_PIN
+        #define DOGLCD_A0    EXP1_4_PIN
+        #define DOGLCD_SCK   EXP2_6_PIN
+        #define DOGLCD_MOSI  EXP2_8_PIN
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 
@@ -300,27 +319,27 @@
          *               5V | · · | GND
          *     (MOSI) P1_23 | · · | P1_22 (LCD_CS)
          *   (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
-         *      RESET P1.19 | · · | P1_18 (BTN_EN1)
+         *      RESET P1_19 | · · | P1_18 (BTN_EN1)
          *  (BTN_ENC) P0_28 | · · | P1_30 (SCK)
          *                   -----
          *                    EXP1
          */
 
-        #define BTN_EN1      P1_18
-        #define BTN_EN2      P1_20
-        #define BTN_ENC      P0_28
-        #define DOGLCD_CS    P1_22
-        #define DOGLCD_A0    P1_21
-        #define DOGLCD_SCK   P1_30
-        #define DOGLCD_MOSI  P1_23
+        #define BTN_EN1      EXP1_2_PIN
+        #define BTN_EN2      EXP1_3_PIN
+        #define BTN_ENC      EXP1_6_PIN
+        #define DOGLCD_CS    EXP1_4_PIN
+        #define DOGLCD_A0    EXP1_8_PIN
+        #define DOGLCD_SCK   EXP1_1_PIN
+        #define DOGLCD_MOSI  EXP1_9_PIN
         #define FORCE_SOFT_SPI
         #define LCD_BACKLIGHT_PIN -1
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_21
-        #define LCD_PINS_D6 P1_22
-        #define LCD_PINS_D7 P1_23
+        #define LCD_PINS_D5 EXP1_8_PIN
+        #define LCD_PINS_D6 EXP1_4_PIN
+        #define LCD_PINS_D7 EXP1_9_PIN
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -338,7 +357,7 @@
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P0_16
+  #define SS_PIN           EXP2_7_PIN
 #endif
 
 /**
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
index b23ab1c2db72..74f6df9da945 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
@@ -42,25 +42,25 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA1
+#define SERVO0_PIN         PA1    // SERVOS
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC1
-#define Y_STOP_PIN         PC0
-#define Z_STOP_PIN         PC15
+#define X_STOP_PIN         PC1    // X-STOP
+#define Y_STOP_PIN         PC0    // Y-STOP
+#define Z_STOP_PIN         PC15   // Z-STOP
 
 //
 // Z Probe must be this pin
 //
-#define Z_MIN_PROBE_PIN    PC14
+#define Z_MIN_PROBE_PIN    PC14   // PROBE
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC2
+  #define FIL_RUNOUT_PIN   PC2    // E0-STOP
 #endif
 
 //
@@ -143,15 +143,15 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input
-#define TEMP_BED_PIN       PC3   // Analog Input
+#define TEMP_0_PIN         PA0   // Analog Input "TH0"
+#define TEMP_BED_PIN       PC3   // Analog Input "TB0"
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC8   // EXTRUDER
-#define HEATER_BED_PIN     PC9   // BED
-#define FAN_PIN            PA8
+#define HEATER_0_PIN       PC8   // HE
+#define HEATER_BED_PIN     PC9   // HB
+#define FAN_PIN            PA8   // FAN0
 
 //
 // USB connect control
@@ -171,19 +171,27 @@
  *                 -----
  *                 EXP1
  */
+#define EXP1_1_PIN         PA15
+#define EXP1_2_PIN         PA9
+#define EXP1_3_PIN         PA10
+#define EXP1_4_PIN         PB8
+#define EXP1_6_PIN         PB6
+#define EXP1_7_PIN         -1
+#define EXP1_8_PIN         PB9
+#define EXP1_9_PIN         PB7
+
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PA15
-  #define BTN_ENC          PB6
+  #define BTN_ENC          EXP1_6_PIN
+  #define BTN_EN1          EXP1_2_PIN
+  #define BTN_EN2          EXP1_3_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    PB8
-
-    #define BTN_EN1        PA9
-    #define BTN_EN2        PA10
+    #define BEEPER_PIN     EXP1_1_PIN
 
-    #define LCD_PINS_ENABLE PB7
-    #define LCD_PINS_D4    PB9
+    #define LCD_PINS_RS    EXP1_4_PIN
+    #define LCD_PINS_ENABLE EXP1_9_PIN
+    #define LCD_PINS_D4    EXP1_8_PIN
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -198,17 +206,15 @@
      *                    EXP1
      */
 
-    #define BTN_EN1      PA9
-    #define BTN_EN2      PA10
-    #define DOGLCD_CS    PB8
-    #define DOGLCD_A0    PB9
-    #define DOGLCD_SCK   PA15
-    #define DOGLCD_MOSI  PB7
+    #define DOGLCD_CS    EXP1_4_PIN
+    #define DOGLCD_A0    EXP1_8_PIN
+    #define DOGLCD_SCK   EXP1_1_PIN
+    #define DOGLCD_MOSI  EXP1_9_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN -1
 
   #else
-    #error "Only CR10_STOCKDISPLAY and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
+    #error "Only CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
index 82a1f62009ec..936c1992449c 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
@@ -111,31 +111,40 @@
  *                 -----
  *                 EXP1
  */
+
+#define EXP1_1_PIN         PB5
+#define EXP1_2_PIN         PA9
+#define EXP1_3_PIN         PA10
+#define EXP1_4_PIN         PB8
+#define EXP1_6_PIN         PB6
+#define EXP1_7_PIN         -1
+#define EXP1_8_PIN         PB9
+#define EXP1_9_PIN         PB7
+
 #if HAS_SPI_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN     PB5
-    #define BTN_ENC        PB6
-
-    #define LCD_PINS_RS    PB8
+    #define BEEPER_PIN     EXP1_1_PIN
 
-    #define BTN_EN1        PA9
-    #define BTN_EN2        PA10
+    #define BTN_EN1        EXP1_2_PIN
+    #define BTN_EN2        EXP1_3_PIN
+    #define BTN_ENC        EXP1_6_PIN
 
-    #define LCD_PINS_ENABLE PB7
-    #define LCD_PINS_D4    PB9
+    #define LCD_PINS_RS    EXP1_4_PIN
+    #define LCD_PINS_ENABLE EXP1_9_PIN
+    #define LCD_PINS_D4    EXP1_8_PIN
 
   #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
 
-    #define LCD_PINS_RS    PB9
-    #define LCD_PINS_ENABLE PB6
-    #define LCD_PINS_D4    PB8
-    #define LCD_PINS_D5    PA10
-    #define LCD_PINS_D6    PA9
-    #define LCD_PINS_D7    PB5
+    #define LCD_PINS_RS    EXP1_8_PIN
+    #define LCD_PINS_ENABLE EXP1_6_PIN
+    #define LCD_PINS_D4    EXP1_4_PIN
+    #define LCD_PINS_D5    EXP1_3_PIN
+    #define LCD_PINS_D6    EXP1_2_PIN
+    #define LCD_PINS_D7    EXP1_1_PIN
     #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
@@ -150,14 +159,14 @@
      *                   -----
      *                    EXP1
      */
-    #define BTN_EN1        PA9
-    #define BTN_EN2        PA10
-    #define BTN_ENC        PB6
-
-    #define DOGLCD_CS      PB8
-    #define DOGLCD_A0      PB9
-    #define DOGLCD_SCK     PB5
-    #define DOGLCD_MOSI    PB7
+    #define BTN_EN1        EXP1_2_PIN
+    #define BTN_EN2        EXP1_3_PIN
+    #define BTN_ENC        EXP1_6_PIN
+
+    #define DOGLCD_CS      EXP1_4_PIN
+    #define DOGLCD_A0      EXP1_8_PIN
+    #define DOGLCD_SCK     EXP1_1_PIN
+    #define DOGLCD_MOSI    EXP1_9_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN -1
 

From 4937519d51047f95032d9f8149432c45fc95c48f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 17:04:29 -0600
Subject: [PATCH 115/565] Fix LPC build with USE_WATCHDOG off

---
 Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp b/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
index fefee386e590..bd6c59bcb726 100644
--- a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
@@ -199,14 +199,23 @@ void HardFault_HandlerC(unsigned long *sp, unsigned long lr, unsigned long cause
 
   // Clear cause of reset to prevent entering smoothie bootstrap
   HAL_clear_reset_source();
+
   // Restart watchdog
-  //WDT_Restart(WDT);
-  watchdog_init();
+  #if ENABLED(USE_WATCHDOG)
+    //WDT_Restart(WDT);
+    watchdog_init();
+  #endif
 
   // Reset controller
   NVIC_SystemReset();
 
-  for (;;) watchdog_init();
+  // Nothing below here is compiled because NVIC_SystemReset loops forever
+
+  for (;;) {
+    #if ENABLED(USE_WATCHDOG)
+      watchdog_init();
+    #endif
+  }
 }
 
 extern "C" {

From 0e72c315a0be49e98758d9744ac0117b0904b7e1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 17:05:42 -0600
Subject: [PATCH 116/565] Minor string storage optimization

---
 Marlin/src/MarlinCore.cpp                 |  2 ++
 Marlin/src/MarlinCore.h                   |  2 +-
 Marlin/src/gcode/config/M200-M205.cpp     |  2 +-
 Marlin/src/gcode/config/M217.cpp          |  2 +-
 Marlin/src/gcode/control/M605.cpp         |  2 +-
 Marlin/src/gcode/feature/mixing/M166.cpp  |  2 +-
 Marlin/src/gcode/queue.cpp                |  4 ++--
 Marlin/src/module/configuration_store.cpp | 16 ++++++++--------
 Marlin/src/module/temperature.cpp         |  2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index f571480ff699..a1154231c2f6 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -187,6 +187,8 @@ const char NUL_STR[] PROGMEM = "",
            M21_STR[] PROGMEM = "M21",
            M23_STR[] PROGMEM = "M23 %s",
            M24_STR[] PROGMEM = "M24",
+           SP_P_STR[] PROGMEM = " P",
+           SP_T_STR[] PROGMEM = " T",
            SP_X_STR[] PROGMEM = " X",
            SP_Y_STR[] PROGMEM = " Y",
            SP_Z_STR[] PROGMEM = " Z",
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index b7f1460ff880..85138268bf12 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -121,4 +121,4 @@ void protected_pin_err();
 #endif
 
 extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
-                  SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];
+                  SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 14ddb1efc257..46a4e6c6c0cf 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -96,7 +96,7 @@ void GcodeSuite::M204() {
   if (!parser.seen("PRST")) {
     SERIAL_ECHOPAIR("Acceleration: P", planner.settings.acceleration);
     SERIAL_ECHOPAIR(" R", planner.settings.retract_acceleration);
-    SERIAL_ECHOLNPAIR(" T", planner.settings.travel_acceleration);
+    SERIAL_ECHOLNPAIR_P(SP_T_STR, planner.settings.travel_acceleration);
   }
   else {
     //planner.synchronize();
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 57178950cb40..d14ceaa0e5d6 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -37,7 +37,7 @@ void M217_report(const bool eeprom=false) {
     serialprintPGM(eeprom ? PSTR("  M217") : PSTR("Toolchange:"));
     SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
     SERIAL_ECHOPAIR_P(SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime));
-    SERIAL_ECHOPAIR(" P", LINEAR_UNIT(toolchange_settings.prime_speed));
+    SERIAL_ECHOPAIR_P(SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
     SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed));
 
     #if ENABLED(TOOLCHANGE_PARK)
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 007c6fc6b826..95d72b65d78f 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -137,7 +137,7 @@
         DEBUG_EOL();
 
         HOTEND_LOOP() {
-          DEBUG_ECHOPAIR(" T", int(e));
+          DEBUG_ECHOPAIR_P(SP_T_STR, int(e));
           LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", int(e), "].", axis_codes[a] | 0x20, "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
diff --git a/Marlin/src/gcode/feature/mixing/M166.cpp b/Marlin/src/gcode/feature/mixing/M166.cpp
index cb3541eb8fd0..c1c29a4457df 100644
--- a/Marlin/src/gcode/feature/mixing/M166.cpp
+++ b/Marlin/src/gcode/feature/mixing/M166.cpp
@@ -35,7 +35,7 @@ inline void echo_mix() {
 
 inline void echo_zt(const int t, const float &z) {
   mixer.update_mix_from_vtool(t);
-  SERIAL_ECHOPAIR_P(SP_Z_STR, z, PSTR(" T"), t);
+  SERIAL_ECHOPAIR_P(SP_Z_STR, z, SP_T_STR, t);
   echo_mix();
 }
 
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index b9b4d1bd9648..d5815099630f 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -254,8 +254,8 @@ void GCodeQueue::ok_to_send() {
       while (NUMERIC_SIGNED(*p))
         SERIAL_ECHO(*p++);
     }
-    SERIAL_ECHOPGM(" P"); SERIAL_ECHO(int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
-    SERIAL_ECHOPGM(" B"); SERIAL_ECHO(BUFSIZE - length);
+    SERIAL_ECHOPAIR_P(SP_P_STR, int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
+    SERIAL_ECHOPAIR(" B", BUFSIZE - length);
   #endif
   SERIAL_EOL();
 }
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 0e4e6cef305a..f1c7698a48e7 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2922,10 +2922,10 @@ void MarlinSettings::reset() {
 
     CONFIG_ECHO_HEADING("Acceleration (units/s2): P<print_accel> R<retract_accel> T<travel_accel>");
     CONFIG_ECHO_START();
-    SERIAL_ECHOLNPAIR(
-        "  M204 P", LINEAR_UNIT(planner.settings.acceleration)
-      , " R", LINEAR_UNIT(planner.settings.retract_acceleration)
-      , " T", LINEAR_UNIT(planner.settings.travel_acceleration)
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M204 P"), LINEAR_UNIT(planner.settings.acceleration)
+      , PSTR(" R"), LINEAR_UNIT(planner.settings.retract_acceleration)
+      , SP_T_STR, LINEAR_UNIT(planner.settings.travel_acceleration)
     );
 
     if (!forReplay) {
@@ -2946,7 +2946,7 @@ void MarlinSettings::reset() {
     SERIAL_ECHOLNPAIR_P(
         PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
       , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
-      , PSTR(" T"), LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
+      , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
       #if DISABLED(CLASSIC_JERK)
         , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
       #endif
@@ -3089,8 +3089,8 @@ void MarlinSettings::reset() {
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
           PSTR("  M665 S"), delta_segments_per_second
-        , PSTR(" P"), scara_home_offset.a
-        , PSTR(" T"), scara_home_offset.b
+        , SP_P_STR, scara_home_offset.a
+        , SP_T_STR, scara_home_offset.b
         , SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
       );
 
@@ -3168,7 +3168,7 @@ void MarlinSettings::reset() {
           SERIAL_ECHOPAIR_P(
             #if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
               PSTR("  M301 E"), e,
-              PSTR(" P")
+              SP_P_STR
             #else
               PSTR("  M301 P")
             #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4b00b095c204..6dc831f715b1 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1326,7 +1326,7 @@ void Temperature::manage_heater() {
     const user_thermistor_t &t = user_thermistor[t_index];
 
     SERIAL_ECHOPAIR_F(" R", t.series_res, 1);
-    SERIAL_ECHOPAIR_F(" T", t.res_25, 1);
+    SERIAL_ECHOPAIR_F_P(SP_T_STR, t.res_25, 1);
     SERIAL_ECHOPAIR_F(" B", t.beta, 1);
     SERIAL_ECHOPAIR_F(" C", t.sh_c_coeff, 9);
     SERIAL_ECHOPGM(" ; ");

From 4716dac8742e536dde12773b579407fb1ae1cb66 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Feb 2020 21:00:53 -0600
Subject: [PATCH 117/565] Apply REPEAT, RREPEAT, and loop macros (#16757)

---
 Marlin/src/core/macros.h                  | 18 +++++
 Marlin/src/feature/runout.h               | 48 +++----------
 Marlin/src/gcode/calibrate/M666.cpp       |  9 +--
 Marlin/src/gcode/config/M301.cpp          |  2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp     | 54 +++-----------
 Marlin/src/module/configuration_store.cpp | 86 +++++++----------------
 Marlin/src/module/endstops.cpp            | 23 +-----
 Marlin/src/module/stepper/indirection.h   | 30 ++------
 Marlin/src/module/temperature.cpp         | 29 ++------
 Marlin/src/pins/pins.h                    |  4 ++
 10 files changed, 82 insertions(+), 221 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index e83aa409b96a..2885150d1ca6 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -457,3 +457,21 @@
 // Repeat a macro passing 0...N-1 plus additional arguments.
 #define REPEAT2_S(S,N,OP,V...)  EVAL(_REPEAT2(S,SUB##S(N),OP,V))
 #define REPEAT2(N,OP,V...)      REPEAT2_S(0,N,OP,V)
+
+// Use RREPEAT macros with REPEAT macros for nesting
+#define _RREPEAT(_RPT_I,_RPT_N,_RPT_OP)                           \
+  _RPT_OP(_RPT_I)                                                 \
+  IF_ELSE(SUB1(_RPT_N))                                           \
+    ( DEFER2(__RREPEAT)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP) )    \
+    ( /* Do nothing */ )
+#define __RREPEAT() _RREPEAT
+#define _RREPEAT2(_RPT_I,_RPT_N,_RPT_OP,V...)                     \
+  _RPT_OP(_RPT_I,V)                                               \
+  IF_ELSE(SUB1(_RPT_N))                                           \
+    ( DEFER2(__RREPEAT2)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP,V) ) \
+    ( /* Do nothing */ )
+#define __RREPEAT2() _RREPEAT2
+#define RREPEAT_S(S,N,OP)        EVAL(_RREPEAT(S,SUB##S(N),OP))
+#define RREPEAT(N,OP)            RREPEAT_S(0,N,OP)
+#define RREPEAT2_S(S,N,OP,V...)  EVAL(_RREPEAT2(S,SUB##S(N),OP,V))
+#define RREPEAT2(N,OP,V...)      RREPEAT2_S(0,N,OP,V)
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index d49fb77fe308..8f43ea39e1e5 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -139,56 +139,28 @@ class FilamentSensorBase {
         #define INIT_RUNOUT_PIN(P) SET_INPUT(P)
       #endif
 
-      INIT_RUNOUT_PIN(FIL_RUNOUT_PIN);
-      #if NUM_RUNOUT_SENSORS > 1
-        INIT_RUNOUT_PIN(FIL_RUNOUT2_PIN);
-        #if NUM_RUNOUT_SENSORS > 2
-          INIT_RUNOUT_PIN(FIL_RUNOUT3_PIN);
-          #if NUM_RUNOUT_SENSORS > 3
-            INIT_RUNOUT_PIN(FIL_RUNOUT4_PIN);
-            #if NUM_RUNOUT_SENSORS > 4
-              INIT_RUNOUT_PIN(FIL_RUNOUT5_PIN);
-              #if NUM_RUNOUT_SENSORS > 5
-                INIT_RUNOUT_PIN(FIL_RUNOUT6_PIN);
-              #endif
-            #endif
-          #endif
-        #endif
-      #endif
+      #define _INIT_RUNOUT(N) INIT_RUNOUT_PIN(FIL_RUNOUT##N##_PIN);
+      REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _INIT_RUNOUT)
+      #undef _INIT_RUNOUT
     }
 
     // Return a bitmask of runout pin states
     static inline uint8_t poll_runout_pins() {
-      return (
-        (READ(FIL_RUNOUT_PIN ) ? _BV(0) : 0)
-        #if NUM_RUNOUT_SENSORS > 1
-          | (READ(FIL_RUNOUT2_PIN) ? _BV(1) : 0)
-          #if NUM_RUNOUT_SENSORS > 2
-            | (READ(FIL_RUNOUT3_PIN) ? _BV(2) : 0)
-            #if NUM_RUNOUT_SENSORS > 3
-              | (READ(FIL_RUNOUT4_PIN) ? _BV(3) : 0)
-              #if NUM_RUNOUT_SENSORS > 4
-                | (READ(FIL_RUNOUT5_PIN) ? _BV(4) : 0)
-                #if NUM_RUNOUT_SENSORS > 5
-                  | (READ(FIL_RUNOUT6_PIN) ? _BV(5) : 0)
-                #endif
-              #endif
-            #endif
-          #endif
-        #endif
-      );
+      #define _OR_RUNOUT(N) | (READ(FIL_RUNOUT##N##_PIN) ? _BV((N) - 1) : 0)
+      return (0 REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _OR_RUNOUT));
+      #undef _OR_RUNOUT
     }
 
     // Return a bitmask of runout flag states (1 bits always indicates runout)
     static inline uint8_t poll_runout_states() {
-      return poll_runout_pins() ^ uint8_t(
+      return (poll_runout_pins()
         #if DISABLED(FIL_RUNOUT_INVERTING)
-          _BV(NUM_RUNOUT_SENSORS) - 1
-        #else
-          0
+          ^ uint8_t(_BV(NUM_RUNOUT_SENSORS) - 1)
         #endif
       );
     }
+
+  #undef INIT_RUNOUT_PIN
 };
 
 #if ENABLED(FILAMENT_MOTION_SENSOR)
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index ea429875c580..c2c13a774af1 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -94,13 +94,8 @@
         SERIAL_ECHOPAIR(" Y2:", endstops.y2_endstop_adj);
       #endif
       #if ENABLED(Z_MULTI_ENDSTOPS)
-        SERIAL_ECHOPAIR(" Z2:", endstops.z2_endstop_adj);
-        #if NUM_Z_STEPPER_DRIVERS >= 3
-          SERIAL_ECHOPAIR(" Z3:", endstops.z3_endstop_adj);
-          #if NUM_Z_STEPPER_DRIVERS >= 4
-            SERIAL_ECHOPAIR(" Z4:", endstops.z4_endstop_adj);
-          #endif
-        #endif
+        #define _ECHO_ZADJ(N) SERIAL_ECHOPAIR(" Z" STRINGIFY(N) ":", endstops.z##N##_endstop_adj);
+        REPEAT_S(2, INCREMENT(NUM_Z_STEPPER_DRIVERS), _ECHO_ZADJ)
       #endif
       SERIAL_EOL();
     }
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 0449293bf537..c0b48d0dab44 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -68,7 +68,7 @@ void GcodeSuite::M301() {
     SERIAL_ECHO_START();
     #if ENABLED(PID_PARAMS_PER_HOTEND)
       SERIAL_ECHOPAIR(" e:", e); // specify extruder in serial output
-    #endif // PID_PARAMS_PER_HOTEND
+    #endif
     SERIAL_ECHOPAIR(" p:", PID_PARAM(Kp, e),
                     " i:", unscalePID_i(PID_PARAM(Ki, e)),
                     " d:", unscalePID_d(PID_PARAM(Kd, e)));
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 471d1eeb9cef..454a56a9a051 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -228,35 +228,17 @@ void menu_cancelobject();
 #if ENABLED(PID_AUTOTUNE_MENU)
   #define DEFINE_PIDTEMP_FUNCS(N) \
     _DEFINE_PIDTEMP_BASE_FUNCS(N); \
-    void lcd_autotune_callback_E##N() { _lcd_autotune(N); } //
+    void lcd_autotune_callback_E##N() { _lcd_autotune(N); }
 #else
-  #define DEFINE_PIDTEMP_FUNCS(N) _DEFINE_PIDTEMP_BASE_FUNCS(N); //
+  #define DEFINE_PIDTEMP_FUNCS(N) _DEFINE_PIDTEMP_BASE_FUNCS(N);
 #endif
 
 #if HOTENDS
   DEFINE_PIDTEMP_FUNCS(0);
   #if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
-    DEFINE_PIDTEMP_FUNCS(1);
-    #if HOTENDS > 2
-      DEFINE_PIDTEMP_FUNCS(2);
-      #if HOTENDS > 3
-        DEFINE_PIDTEMP_FUNCS(3);
-        #if HOTENDS > 4
-          DEFINE_PIDTEMP_FUNCS(4);
-          #if HOTENDS > 5
-            DEFINE_PIDTEMP_FUNCS(5);
-            #if HOTENDS > 6
-              DEFINE_PIDTEMP_FUNCS(6);
-              #if HOTENDS > 7
-                DEFINE_PIDTEMP_FUNCS(7);
-              #endif // HOTENDS > 7
-            #endif // HOTENDS > 6
-          #endif // HOTENDS > 5
-        #endif // HOTENDS > 4
-      #endif // HOTENDS > 3
-    #endif // HOTENDS > 2
-  #endif // HOTENDS > 1 && PID_PARAMS_PER_HOTEND
-#endif // HOTENDS
+    REPEAT_S(1, HOTENDS, DEFINE_PIDTEMP_FUNCS)
+  #endif
+#endif
 
 #define SHOW_MENU_ADVANCED_TEMPERATURE ((ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU))
 
@@ -320,33 +302,15 @@ void menu_cancelobject();
     #if ENABLED(PID_AUTOTUNE_MENU)
       #define PID_EDIT_MENU_ITEMS(N) \
         _PID_EDIT_MENU_ITEMS(N); \
-        EDIT_ITEM_FAST_N(int3, N, MSG_PID_AUTOTUNE_E, &autotune_temp[N], 150, heater_maxtemp[N] - 15, []{ _lcd_autotune(MenuItemBase::itemIndex); })
+        EDIT_ITEM_FAST_N(int3, N, MSG_PID_AUTOTUNE_E, &autotune_temp[N], 150, heater_maxtemp[N] - 15, []{ _lcd_autotune(MenuItemBase::itemIndex); });
     #else
-      #define PID_EDIT_MENU_ITEMS(N) _PID_EDIT_MENU_ITEMS(N)
+      #define PID_EDIT_MENU_ITEMS(N) _PID_EDIT_MENU_ITEMS(N);
     #endif
 
     PID_EDIT_MENU_ITEMS(0);
     #if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
-      PID_EDIT_MENU_ITEMS(1);
-      #if HOTENDS > 2
-        PID_EDIT_MENU_ITEMS(2);
-        #if HOTENDS > 3
-          PID_EDIT_MENU_ITEMS(3);
-          #if HOTENDS > 4
-            PID_EDIT_MENU_ITEMS(4);
-            #if HOTENDS > 5
-              PID_EDIT_MENU_ITEMS(5);
-              #if HOTENDS > 6
-                PID_EDIT_MENU_ITEMS(6);
-                #if HOTENDS > 7
-                  PID_EDIT_MENU_ITEMS(7);
-                #endif // HOTENDS > 7
-              #endif // HOTENDS > 6
-            #endif // HOTENDS > 5
-          #endif // HOTENDS > 4
-        #endif // HOTENDS > 3
-      #endif // HOTENDS > 2
-    #endif // HOTENDS > 1 && PID_PARAMS_PER_HOTEND
+      REPEAT_S(1, HOTENDS, PID_EDIT_MENU_ITEMS)
+    #endif
 
     END_MENU();
   }
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index f1c7698a48e7..3cca051cd898 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2667,7 +2667,7 @@ void MarlinSettings::reset() {
         false
       #endif
     ;
-    for (uint8_t q = 0; q < COUNT(planner.filament_size); q++)
+    LOOP_L_N(q, COUNT(planner.filament_size))
       planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
 
   #endif
@@ -2730,7 +2730,7 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    for (uint8_t e = 0; e < EXTRUDERS; e++) {
+    LOOP_L_N(e, EXTRUDERS) {
       fc_settings[e].unload_length = FILAMENT_CHANGE_UNLOAD_LENGTH;
       fc_settings[e].load_length = FILAMENT_CHANGE_FAST_LOAD_LENGTH;
     }
@@ -2842,36 +2842,17 @@ void MarlinSettings::reset() {
           SERIAL_ECHOLNPGM(" Disabled");
       }
 
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR("  M200 D", LINEAR_UNIT(planner.filament_size[0]));
-      #if EXTRUDERS > 1
+      #if EXTRUDERS == 1
         CONFIG_ECHO_START();
-        SERIAL_ECHOLNPAIR("  M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
-        #if EXTRUDERS > 2
+        SERIAL_ECHOLNPAIR("  M200 D", LINEAR_UNIT(planner.filament_size[0]));
+      #elif EXTRUDERS
+        LOOP_L_N(i, EXTRUDERS) {
           CONFIG_ECHO_START();
-          SERIAL_ECHOLNPAIR("  M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
-          #if EXTRUDERS > 3
-            CONFIG_ECHO_START();
-            SERIAL_ECHOLNPAIR("  M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
-            #if EXTRUDERS > 4
-              CONFIG_ECHO_START();
-              SERIAL_ECHOLNPAIR("  M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
-              #if EXTRUDERS > 5
-                CONFIG_ECHO_START();
-                SERIAL_ECHOLNPAIR("  M200 T5 D", LINEAR_UNIT(planner.filament_size[5]));
-                #if EXTRUDERS > 6
-                  CONFIG_ECHO_START();
-                  SERIAL_ECHOLNPAIR("  M200 T6 D", LINEAR_UNIT(planner.filament_size[6]));
-                  #if EXTRUDERS > 7
-                    CONFIG_ECHO_START();
-                    SERIAL_ECHOLNPAIR("  M200 T7 D", LINEAR_UNIT(planner.filament_size[7]));
-                  #endif // EXTRUDERS > 7
-                #endif // EXTRUDERS > 6
-              #endif // EXTRUDERS > 5
-            #endif // EXTRUDERS > 4
-          #endif // EXTRUDERS > 3
-        #endif // EXTRUDERS > 2
-      #endif // EXTRUDERS > 1
+          SERIAL_ECHOPGM("  M200");
+          if (i) SERIAL_ECHOPAIR_P(SP_T_STR, int(i));
+          SERIAL_ECHOLNPAIR(" D", LINEAR_UNIT(planner.filament_size[i]));
+        }
+      #endif
 
       if (!parser.volumetric_enabled)
         CONFIG_ECHO_MSG("  M200 D0");
@@ -2893,7 +2874,7 @@ void MarlinSettings::reset() {
     );
     #if ENABLED(DISTINCT_E_FACTORS)
       CONFIG_ECHO_START();
-      for (uint8_t i = 0; i < E_STEPPERS; i++) {
+      LOOP_L_N(i, E_STEPPERS) {
         SERIAL_ECHOLNPAIR_P(
             PSTR("  M203 T"), (int)i
           , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
@@ -2913,7 +2894,7 @@ void MarlinSettings::reset() {
     );
     #if ENABLED(DISTINCT_E_FACTORS)
       CONFIG_ECHO_START();
-      for (uint8_t i = 0; i < E_STEPPERS; i++)
+      LOOP_L_N(i, E_STEPPERS)
         SERIAL_ECHOLNPAIR_P(
             PSTR("  M201 T"), (int)i
           , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
@@ -3022,8 +3003,8 @@ void MarlinSettings::reset() {
       #if ENABLED(MESH_BED_LEVELING)
 
         if (leveling_is_valid()) {
-          for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
-            for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
+          LOOP_L_N(py, GRID_MAX_POINTS_Y) {
+            LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
               SERIAL_ECHOPAIR_P(PSTR("  G29 S3 I"), (int)px, PSTR(" J"), (int)py);
               SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
@@ -3047,8 +3028,8 @@ void MarlinSettings::reset() {
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
         if (leveling_is_valid()) {
-          for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
-            for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
+          LOOP_L_N(py, GRID_MAX_POINTS_Y) {
+            LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
               SERIAL_ECHOPAIR("  G29 W I", (int)px, " J", (int)py);
               SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
@@ -3063,7 +3044,7 @@ void MarlinSettings::reset() {
     #if ENABLED(EDITABLE_SERVO_ANGLES)
 
       CONFIG_ECHO_HEADING("Servo Angles:");
-      for (uint8_t i = 0; i < NUM_SERVOS; i++) {
+      LOOP_L_N(i, NUM_SERVOS) {
         switch (i) {
           #if ENABLED(SWITCHING_EXTRUDER)
             case SWITCHING_EXTRUDER_SERVO_NR:
@@ -3146,7 +3127,7 @@ void MarlinSettings::reset() {
     #if HOTENDS && HAS_LCD_MENU
 
       CONFIG_ECHO_HEADING("Material heatup parameters:");
-      for (uint8_t i = 0; i < COUNT(ui.preheat_hotend_temp); i++) {
+      LOOP_L_N(i, COUNT(ui.preheat_hotend_temp)) {
         CONFIG_ECHO_START();
         SERIAL_ECHOLNPAIR(
             "  M145 S", (int)i
@@ -3200,7 +3181,7 @@ void MarlinSettings::reset() {
 
     #if HAS_USER_THERMISTORS
       CONFIG_ECHO_HEADING("User thermistors:");
-      for (uint8_t i = 0; i < USER_THERMISTORS; i++)
+      LOOP_L_N(i, USER_THERMISTORS)
         thermalManager.log_user_thermistor(i, true);
     #endif
 
@@ -3596,29 +3577,10 @@ void MarlinSettings::reset() {
         say_M603(forReplay);
         SERIAL_ECHOLNPAIR("L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length));
       #else
-        #define _ECHO_603(N) do{ say_M603(forReplay); SERIAL_ECHOLNPAIR("T" STRINGIFY(N) " L", LINEAR_UNIT(fc_settings[N].load_length), " U", LINEAR_UNIT(fc_settings[N].unload_length)); }while(0)
-        _ECHO_603(0);
-        _ECHO_603(1);
-        #if EXTRUDERS > 2
-          _ECHO_603(2);
-          #if EXTRUDERS > 3
-            _ECHO_603(3);
-            #if EXTRUDERS > 4
-              _ECHO_603(4);
-              #if EXTRUDERS > 5
-                _ECHO_603(5);
-                #if EXTRUDERS > 6
-                  _ECHO_603(6);
-                  #if EXTRUDERS > 7
-                    _ECHO_603(7);
-                  #endif // EXTRUDERS > 7
-                #endif // EXTRUDERS > 6
-              #endif // EXTRUDERS > 5
-            #endif // EXTRUDERS > 4
-          #endif // EXTRUDERS > 3
-        #endif // EXTRUDERS > 2
-      #endif // EXTRUDERS == 1
-    #endif // ADVANCED_PAUSE_FEATURE
+        #define _ECHO_603(N) do{ say_M603(forReplay); SERIAL_ECHOLNPAIR("T" STRINGIFY(N) " L", LINEAR_UNIT(fc_settings[N].load_length), " U", LINEAR_UNIT(fc_settings[N].unload_length)); }while(0);
+        REPEAT(EXTRUDERS, _ECHO_603)
+      #endif
+    #endif
 
     #if EXTRUDERS > 1
       CONFIG_ECHO_HEADING("Tool-changing:");
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7d8e270fed0b..8eaab9bd55c7 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -480,35 +480,18 @@ void _O2 Endstops::report_states() {
     #if NUM_RUNOUT_SENSORS == 1
       print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
     #else
+      #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
       for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
         pin_t pin;
         switch (i) {
           default: continue;
-          case 1: pin = FIL_RUNOUT_PIN; break;
-          case 2: pin = FIL_RUNOUT2_PIN; break;
-          #if NUM_RUNOUT_SENSORS >= 3
-            case 3: pin = FIL_RUNOUT3_PIN; break;
-            #if NUM_RUNOUT_SENSORS >= 4
-              case 4: pin = FIL_RUNOUT4_PIN; break;
-              #if NUM_RUNOUT_SENSORS >= 5
-                case 5: pin = FIL_RUNOUT5_PIN; break;
-                #if NUM_RUNOUT_SENSORS >= 6
-                  case 6: pin = FIL_RUNOUT6_PIN; break;
-                  #if NUM_RUNOUT_SENSORS >= 7
-                    case 7: pin = FIL_RUNOUT7_PIN; break;
-                    #if NUM_RUNOUT_SENSORS >= 8
-                      case 8: pin = FIL_RUNOUT8_PIN; break;
-                    #endif
-                  #endif
-                #endif
-              #endif
-            #endif
-          #endif
+          REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
         }
         SERIAL_ECHOPGM(MSG_FILAMENT_RUNOUT_SENSOR);
         if (i > 1) SERIAL_CHAR(' ', '0' + i);
         print_es_state(extDigitalRead(pin) != FIL_RUNOUT_INVERTING);
       }
+      #undef _CASE_RUNOUT
     #endif
   #endif
   #if ENABLED(BLTOUCH)
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 55e44fbe046f..eef232321662 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -855,34 +855,14 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 //
 
 #if ENABLED(MIXING_EXTRUDER)
-
   /**
    * Mixing steppers keep all their enable (and direction) states synchronized
    */
-  #if MIXING_STEPPERS > 7
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4();  ENABLE_STEPPER_E5();  ENABLE_STEPPER_E6();  ENABLE_STEPPER_E7(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); DISABLE_STEPPER_E6(); DISABLE_STEPPER_E7(); }
-  #elif MIXING_STEPPERS > 6
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4();  ENABLE_STEPPER_E5();  ENABLE_STEPPER_E6(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); DISABLE_STEPPER_E6(); }
-  #elif MIXING_STEPPERS > 5
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4();  ENABLE_STEPPER_E5(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); DISABLE_STEPPER_E5(); }
-  #elif MIXING_STEPPERS > 4
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3();  ENABLE_STEPPER_E4(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); DISABLE_STEPPER_E4(); }
-  #elif MIXING_STEPPERS > 3
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2();  ENABLE_STEPPER_E3(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); DISABLE_STEPPER_E3(); }
-  #elif MIXING_STEPPERS > 2
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1();  ENABLE_STEPPER_E2(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); DISABLE_STEPPER_E2(); }
-  #else
-    #define  ENABLE_AXIS_E0() { ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1(); }
-    #define DISABLE_AXIS_E0() { DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); }
-  #endif
-
-#endif // !MIXING_EXTRUDER
+  #define _CALL_ENA_E(N)  ENABLE_STEPPER_E##N () ;
+  #define _CALL_DIS_E(N) DISABLE_STEPPER_E##N () ;
+  #define  ENABLE_AXIS_E0() { RREPEAT(MIXING_STEPPERS, _CALL_ENA_E) }
+  #define DISABLE_AXIS_E0() { RREPEAT(MIXING_STEPPERS, _CALL_DIS_E) }
+#endif
 
 #ifndef ENABLE_AXIS_E0
   #if E_STEPPERS > 0 && HAS_E0_ENABLE
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 6dc831f715b1..9919c4e35c2b 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -679,25 +679,8 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
     static const uint8_t fanBit[] PROGMEM = {
       0
       #if HOTENDS > 1
-        , REPEAT2(1,_EFAN,1) 1
-        #if HOTENDS > 2
-          , REPEAT2(2,_EFAN,2) 2
-          #if HOTENDS > 3
-            , REPEAT2(3,_EFAN,3) 3
-            #if HOTENDS > 4
-              , REPEAT2(4,_EFAN,4) 4
-              #if HOTENDS > 5
-                , REPEAT2(5,_EFAN,5) 5
-                #if HOTENDS > 6
-                  , REPEAT2(6,_EFAN,6) 6
-                  #if HOTENDS > 7
-                    , REPEAT2(7,_EFAN,7) 7
-                  #endif
-                #endif
-              #endif
-            #endif
-          #endif
-        #endif
+        #define _NEXT_FAN(N) , REPEAT2(N,_EFAN,N) N
+        RREPEAT_S(1, HOTENDS, _NEXT_FAN)
       #endif
       #if HAS_AUTO_CHAMBER_FAN
         #define _CFAN(B) _FANOVERLAP(CHAMBER,B) ? B :
@@ -2116,10 +2099,10 @@ void Temperature::disable_all_heaters() {
     pause(false);
   #endif
 
-  #define DISABLE_HEATER(NR) { \
-    setTargetHotend(0, NR); \
-    temp_hotend[NR].soft_pwm_amount = 0; \
-    WRITE_HEATER_ ##NR (LOW); \
+  #define DISABLE_HEATER(N) {           \
+    setTargetHotend(0, N);              \
+    temp_hotend[N].soft_pwm_amount = 0; \
+    WRITE_HEATER_##N(LOW);              \
   }
 
   #if HAS_TEMP_HOTEND
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4df871a50ce1..691f6ab4b836 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1115,6 +1115,10 @@
   #define Z_MIN_PIN          -1
 #endif
 
+#if HAS_FILAMENT_SENSOR
+  #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
+#endif
+
 #ifndef LCD_PINS_D4
   #define LCD_PINS_D4 -1
 #endif

From ee6003be8705da8a096780f433199299898af6bc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Feb 2020 23:07:12 -0600
Subject: [PATCH 118/565] Revert breaking change to _FAN_PWM macro

---
 Marlin/src/module/temperature.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9919c4e35c2b..81068c7f7b1d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2591,9 +2591,10 @@ void Temperature::tick() {
       #endif
 
       #if ENABLED(FAN_SOFT_PWM)
-        #define _FAN_PWM(N) do{ \
-          const uint8_t spcf = (soft_pwm_count_fan[N] & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
-          WRITE_FAN(N, (spcf > pwm_mask)); \
+        #define _FAN_PWM(N) do{                                     \
+          uint8_t &spcf = soft_pwm_count_fan[N];                    \
+          spcf = (spcf & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
+          WRITE_FAN(N, spcf > pwm_mask ? HIGH : LOW);               \
         }while(0)
         #if HAS_FAN0
           _FAN_PWM(0);

From 72b4d91d2e4d645c7b77eb7eb2aec2f5461f9728 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 2 Feb 2020 00:02:30 -0600
Subject: [PATCH 119/565] Add Z_AFTER_HOMING to raise Z more in G28 (#16755)

---
 Marlin/Configuration.h             | 10 ++++++----
 Marlin/src/gcode/calibrate/G28.cpp | 10 +++++++++-
 Marlin/src/module/motion.cpp       |  7 +++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 550ea354676f..998055b7254e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1065,12 +1065,14 @@
 
 // @section homing
 
-//#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
+//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
 
-//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
+//#define UNKNOWN_Z_NO_RAISE      // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
 
-//#define Z_HOMING_HEIGHT 4  // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
-                             // Be sure you have this distance over your Z_MAX_POS in case.
+//#define Z_HOMING_HEIGHT  4      // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
+                                  // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
+
+//#define Z_AFTER_HOMING  10      // (mm) Height to move to after homing Z
 
 // Direction of endstops when homing; 1=MAX, -1=MIN
 // :[-1,1]
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 0b29fbc4d6bb..2b8c15014047 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -405,6 +405,7 @@ void GcodeSuite::G28(const bool always_home_all) {
 
     // Home Z last if homing towards the bed
     #if Z_HOME_DIR < 0
+
       if (doZ) {
         #if ENABLED(BLTOUCH)
           bltouch.init();
@@ -416,10 +417,17 @@ void GcodeSuite::G28(const bool always_home_all) {
         #endif
 
         #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
-          probe.move_z_after_probing();
+          #if Z_AFTER_HOMING > Z_AFTER_PROBING
+            do_blocking_move_to_z(Z_AFTER_HOMING);
+          #else
+            probe.move_z_after_probing();
+          #endif
+        #elif defined(Z_AFTER_HOMING)
+          do_blocking_move_to_z(Z_AFTER_HOMING);
         #endif
 
       } // doZ
+
     #endif // Z_HOME_DIR < 0
 
     sync_plan_position();
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index f63555d28c4f..4cb4d0a95869 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1755,10 +1755,9 @@ void homeaxis(const AxisEnum axis) {
   #endif
 
   #if DISABLED(DELTA) && defined(HOMING_BACKOFF_MM)
-    constexpr xyz_float_t endstop_backoff = HOMING_BACKOFF_MM;
-    const float backoff_mm = endstop_backoff[axis];
-    if (backoff_mm) {
-      current_position[axis] -= ABS(backoff_mm) * axis_home_dir;
+    const xyz_float_t endstop_backoff = HOMING_BACKOFF_MM;
+    if (endstop_backoff[axis]) {
+      current_position[axis] -= ABS(endstop_backoff[axis]) * axis_home_dir;
       line_to_current_position(
         #if HOMING_Z_WITH_PROBE
           (axis == Z_AXIS) ? MMM_TO_MMS(Z_PROBE_SPEED_FAST) :

From 7f9c62437e5c72947acc3310d94829f132697c81 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 3 Feb 2020 00:00:35 -0600
Subject: [PATCH 120/565] Corner Leveling: Add inset for each side (#16759)

---
 Marlin/Configuration.h                   |  8 +++----
 Marlin/src/feature/joystick.cpp          |  2 +-
 Marlin/src/inc/SanityCheck.h             |  6 +++--
 Marlin/src/lcd/extensible_ui/ui_api.cpp  |  4 ++--
 Marlin/src/lcd/menu/menu.cpp             |  2 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp | 29 +++++++++---------------
 Marlin/src/lcd/ultralcd.cpp              |  2 +-
 Marlin/src/module/planner.h              |  3 ++-
 8 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 998055b7254e..ba07d3f0881f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1313,10 +1313,10 @@
 //#define LEVEL_BED_CORNERS
 
 #if ENABLED(LEVEL_BED_CORNERS)
-  #define LEVEL_CORNERS_INSET 30    // (mm) An inset for corner leveling
-  #define LEVEL_CORNERS_Z_HOP  4.0  // (mm) Move nozzle up before moving between corners
-  #define LEVEL_CORNERS_HEIGHT 0.0  // (mm) Z height of nozzle at leveling points
-  //#define LEVEL_CENTER_TOO        // Move to the center after the last corner
+  #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
+  #define LEVEL_CORNERS_HEIGHT      0.0   // (mm) Z height of nozzle at leveling points
+  #define LEVEL_CORNERS_Z_HOP       4.0   // (mm) Z height of nozzle between leveling points
+  //#define LEVEL_CENTER_TOO              // Move to the center after the last corner
 #endif
 
 /**
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index acf6c13a10af..7a8e40f503e2 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -164,7 +164,7 @@ Joystick joystick;
     LOOP_XYZ(i) if (norm_jog[i]) {
       move_dist[i] = seg_time * norm_jog[i] *
         #if ENABLED(EXTENSIBLE_UI)
-          MMM_TO_MMS(manual_feedrate_mm_m[i]);
+          manual_feedrate_mm_s[i];
         #else
           planner.settings.max_feedrate_mm_s[i];
         #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ea66232ff2e3..210c6c897ac2 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -312,8 +312,10 @@
   #error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration."
 #elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
   #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration."
-#elif ENABLED(LEVEL_BED_CORNERS) && !defined(LEVEL_CORNERS_INSET)
-  #error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
+#elif defined(LEVEL_CORNERS_INSET)
+  #error "LEVEL_CORNERS_INSET is now LEVEL_CORNERS_INSET_LFRB . Please update your Configuration.h."
+#elif ENABLED(LEVEL_BED_CORNERS) && !defined(LEVEL_CORNERS_INSET_LFRB)
+  #error "LEVEL_BED_CORNERS requires LEVEL_CORNERS_INSET_LFRB values. Please update your Configuration.h."
 #elif defined(BEZIER_JERK_CONTROL)
   #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration."
 #elif DISABLED(CLASSIC_JERK) && defined(JUNCTION_DEVIATION_FACTOR)
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 0e0a1171ab9d..f8db5c82098f 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -389,14 +389,14 @@ namespace ExtUI {
     #endif
 
     current_position[axis] = constrain(position, min, max);
-    line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m[axis]));
+    line_to_current_position(manual_feedrate_mm_s[axis]);
   }
 
   void setAxisPosition_mm(const float position, const extruder_t extruder) {
     setActiveTool(extruder, true);
 
     current_position.e = position;
-    line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m.e));
+    line_to_current_position(manual_feedrate_mm_s.e);
   }
 
   void setActiveTool(const extruder_t extruder, bool no_move) {
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 9c3cf057d6b3..269709bf244c 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -384,7 +384,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
 
   void line_to_z(const float &z) {
     current_position.z = z;
-    line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m.z));
+    line_to_current_position(manual_feedrate_mm_s.z);
   }
 
 #endif
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index a7fffb1e02ed..f09ac1551601 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -55,33 +55,26 @@ static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Pleas
  */
 static int8_t bed_corner;
 static inline void _lcd_goto_next_corner() {
+  constexpr float lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
+  constexpr xy_pos_t lf { (X_MIN_BED) + lfrb[0], (Y_MIN_BED) + lfrb[1] },
+                     rb { (X_MAX_BED) - lfrb[2], (Y_MAX_BED) - lfrb[3] };
   line_to_z(LEVEL_CORNERS_Z_HOP);
   switch (bed_corner) {
-    case 0:
-      current_position.set(X_MIN_BED + LEVEL_CORNERS_INSET, Y_MIN_BED + LEVEL_CORNERS_INSET);
-      break;
-    case 1:
-      current_position.x = X_MAX_BED - (LEVEL_CORNERS_INSET);
-      break;
-    case 2:
-      current_position.y = Y_MAX_BED - (LEVEL_CORNERS_INSET);
-      break;
-    case 3:
-      current_position.x = X_MIN_BED + LEVEL_CORNERS_INSET;
-      break;
+    case 0: current_position   = lf;   break; // copy xy
+    case 1: current_position.x = rb.x; break;
+    case 2: current_position.y = rb.y; break;
+    case 3: current_position.x = lf.x; break;
     #if ENABLED(LEVEL_CENTER_TOO)
-      case 4:
-        current_position.set(X_CENTER, Y_CENTER);
-        break;
+      case 4: current_position.set(X_CENTER, Y_CENTER); break;
     #endif
   }
-  line_to_current_position(MMM_TO_MMS(manual_feedrate_mm_m.x));
+  line_to_current_position(manual_feedrate_mm_s.x);
   line_to_z(LEVEL_CORNERS_HEIGHT);
-  if (++bed_corner > 3
+  if (++bed_corner > (3
     #if ENABLED(LEVEL_CENTER_TOO)
       + 1
     #endif
-  ) bed_corner = 0;
+  )) bed_corner = 0;
 }
 
 static inline void _lcd_level_bed_corners_homing() {
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 35366d761c01..eaeddcd106b0 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -673,7 +673,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
 
     if (manual_move_axis != (int8_t)NO_AXIS && ELAPSED(millis(), manual_move_start_time) && !planner.is_full()) {
 
-      const feedRate_t fr_mm_s = MMM_TO_MMS(manual_feedrate_mm_m[manual_move_axis]);
+      const feedRate_t fr_mm_s = manual_feedrate_mm_s[manual_move_axis];
       #if IS_KINEMATIC
 
         #if EXTRUDERS > 1
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 52b6bc1ea43b..5f70c06cc525 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -57,7 +57,8 @@
 
 // Feedrate for manual moves
 #ifdef MANUAL_FEEDRATE
-  constexpr xyze_feedrate_t manual_feedrate_mm_m = MANUAL_FEEDRATE;
+  constexpr xyze_feedrate_t _mf = MANUAL_FEEDRATE,
+                            manual_feedrate_mm_s { _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f, _mf.e / 60.0f };
 #endif
 
 enum BlockFlagBit : char {

From bfad23d3e2e590b257ebe4317d7b14cc2dd3435c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 3 Feb 2020 08:00:57 -0600
Subject: [PATCH 121/565] (c) 2020

---
 .gitignore                                                      | 2 +-
 Marlin/Configuration.h                                          | 2 +-
 Marlin/Configuration_adv.h                                      | 2 +-
 Marlin/Version.h                                                | 2 +-
 Marlin/src/HAL/HAL.h                                            | 2 +-
 Marlin/src/HAL/HAL_AVR/HAL.cpp                                  | 2 +-
 Marlin/src/HAL/HAL_AVR/HAL.h                                    | 2 +-
 Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp                              | 2 +-
 Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp                         | 2 +-
 Marlin/src/HAL/HAL_AVR/MarlinSerial.h                           | 2 +-
 Marlin/src/HAL/HAL_AVR/Servo.cpp                                | 2 +-
 Marlin/src/HAL/HAL_AVR/ServoTimers.h                            | 2 +-
 Marlin/src/HAL/HAL_AVR/endstop_interrupts.h                     | 2 +-
 Marlin/src/HAL/HAL_AVR/fast_pwm.cpp                             | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio.cpp                               | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio.h                                 | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h                     | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h                     | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h                      | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h                      | 2 +-
 Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h                  | 2 +-
 Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h                   | 2 +-
 Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h                   | 2 +-
 Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h                  | 2 +-
 Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h                        | 2 +-
 Marlin/src/HAL/HAL_AVR/math.h                                   | 2 +-
 Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp              | 2 +-
 Marlin/src/HAL/HAL_AVR/pinsDebug.h                              | 2 +-
 Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h                  | 2 +-
 Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h                      | 2 +-
 Marlin/src/HAL/HAL_AVR/spi_pins.h                               | 2 +-
 Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp               | 2 +-
 Marlin/src/HAL/HAL_AVR/watchdog.cpp                             | 2 +-
 Marlin/src/HAL/HAL_AVR/watchdog.h                               | 2 +-
 Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp                         | 2 +-
 Marlin/src/HAL/HAL_DUE/HAL.cpp                                  | 2 +-
 Marlin/src/HAL/HAL_DUE/HAL.h                                    | 2 +-
 Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp                              | 2 +-
 Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp                     | 2 +-
 Marlin/src/HAL/HAL_DUE/InterruptVectors.h                       | 2 +-
 Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp                         | 2 +-
 Marlin/src/HAL/HAL_DUE/MarlinSerial.h                           | 2 +-
 Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp                      | 2 +-
 Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h                        | 2 +-
 Marlin/src/HAL/HAL_DUE/Servo.cpp                                | 2 +-
 Marlin/src/HAL/HAL_DUE/Tone.cpp                                 | 2 +-
 Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp   | 2 +-
 Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp   | 2 +-
 Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp          | 2 +-
 Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp   | 2 +-
 Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h     | 2 +-
 Marlin/src/HAL/HAL_DUE/endstop_interrupts.h                     | 2 +-
 Marlin/src/HAL/HAL_DUE/fastio.h                                 | 2 +-
 Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp                        | 2 +-
 Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h                          | 2 +-
 Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h                         | 2 +-
 Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h                   | 2 +-
 Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h                   | 2 +-
 Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h                  | 2 +-
 Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h                        | 2 +-
 Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp              | 2 +-
 Marlin/src/HAL/HAL_DUE/pinsDebug.h                              | 2 +-
 Marlin/src/HAL/HAL_DUE/spi_pins.h                               | 2 +-
 Marlin/src/HAL/HAL_DUE/timers.cpp                               | 2 +-
 Marlin/src/HAL/HAL_DUE/timers.h                                 | 2 +-
 Marlin/src/HAL/HAL_DUE/watchdog.cpp                             | 2 +-
 Marlin/src/HAL/HAL_DUE/watchdog.h                               | 2 +-
 Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp            | 2 +-
 Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h              | 2 +-
 Marlin/src/HAL/HAL_ESP32/HAL.cpp                                | 2 +-
 Marlin/src/HAL/HAL_ESP32/HAL.h                                  | 2 +-
 Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp                            | 2 +-
 Marlin/src/HAL/HAL_ESP32/Servo.cpp                              | 2 +-
 Marlin/src/HAL/HAL_ESP32/Servo.h                                | 2 +-
 Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp                    | 2 +-
 Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h                      | 2 +-
 Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h                   | 2 +-
 Marlin/src/HAL/HAL_ESP32/fastio.h                               | 2 +-
 Marlin/src/HAL/HAL_ESP32/i2s.cpp                                | 2 +-
 Marlin/src/HAL/HAL_ESP32/i2s.h                                  | 2 +-
 Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h                 | 2 +-
 Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h                 | 2 +-
 Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h                | 2 +-
 Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h                      | 2 +-
 Marlin/src/HAL/HAL_ESP32/ota.cpp                                | 2 +-
 Marlin/src/HAL/HAL_ESP32/ota.h                                  | 2 +-
 Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp              | 2 +-
 Marlin/src/HAL/HAL_ESP32/servotimers.h                          | 2 +-
 Marlin/src/HAL/HAL_ESP32/spi_pins.h                             | 2 +-
 Marlin/src/HAL/HAL_ESP32/spiffs.cpp                             | 2 +-
 Marlin/src/HAL/HAL_ESP32/spiffs.h                               | 2 +-
 Marlin/src/HAL/HAL_ESP32/timers.cpp                             | 2 +-
 Marlin/src/HAL/HAL_ESP32/timers.h                               | 2 +-
 Marlin/src/HAL/HAL_ESP32/watchdog.cpp                           | 2 +-
 Marlin/src/HAL/HAL_ESP32/watchdog.h                             | 2 +-
 Marlin/src/HAL/HAL_ESP32/web.cpp                                | 2 +-
 Marlin/src/HAL/HAL_ESP32/web.h                                  | 2 +-
 Marlin/src/HAL/HAL_ESP32/wifi.cpp                               | 2 +-
 Marlin/src/HAL/HAL_ESP32/wifi.h                                 | 2 +-
 Marlin/src/HAL/HAL_LINUX/HAL.cpp                                | 2 +-
 Marlin/src/HAL/HAL_LINUX/HAL.h                                  | 2 +-
 Marlin/src/HAL/HAL_LINUX/arduino.cpp                            | 2 +-
 Marlin/src/HAL/HAL_LINUX/fastio.h                               | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp                     | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Clock.h                       | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp                      | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h                        | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp                    | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Heater.h                      | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp               | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h                 | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp                | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h                  | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp                     | 2 +-
 Marlin/src/HAL/HAL_LINUX/hardware/Timer.h                       | 2 +-
 Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h                 | 2 +-
 Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h                 | 2 +-
 Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h                | 2 +-
 Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h                      | 2 +-
 Marlin/src/HAL/HAL_LINUX/include/Arduino.h                      | 2 +-
 Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp                 | 2 +-
 Marlin/src/HAL/HAL_LINUX/include/pinmapping.h                   | 2 +-
 Marlin/src/HAL/HAL_LINUX/include/serial.h                       | 2 +-
 Marlin/src/HAL/HAL_LINUX/main.cpp                               | 2 +-
 Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp              | 2 +-
 Marlin/src/HAL/HAL_LINUX/pinsDebug.h                            | 2 +-
 Marlin/src/HAL/HAL_LINUX/servo_private.h                        | 2 +-
 Marlin/src/HAL/HAL_LINUX/spi_pins.h                             | 2 +-
 Marlin/src/HAL/HAL_LINUX/timers.cpp                             | 2 +-
 Marlin/src/HAL/HAL_LINUX/timers.h                               | 2 +-
 Marlin/src/HAL/HAL_LINUX/watchdog.cpp                           | 2 +-
 Marlin/src/HAL/HAL_LINUX/watchdog.h                             | 2 +-
 Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp                     | 2 +-
 Marlin/src/HAL/HAL_LPC1768/HAL.cpp                              | 2 +-
 Marlin/src/HAL/HAL_LPC1768/HAL.h                                | 2 +-
 Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp                          | 2 +-
 Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp                     | 2 +-
 Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h                       | 2 +-
 Marlin/src/HAL/HAL_LPC1768/Servo.h                              | 2 +-
 Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h                 | 2 +-
 Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp                         | 2 +-
 Marlin/src/HAL/HAL_LPC1768/fastio.h                             | 2 +-
 Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h               | 2 +-
 Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h               | 2 +-
 Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h              | 2 +-
 Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h                    | 2 +-
 Marlin/src/HAL/HAL_LPC1768/include/SPI.h                        | 2 +-
 .../src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c  | 2 +-
 .../src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h  | 2 +-
 Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c                   | 2 +-
 Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h                   | 2 +-
 Marlin/src/HAL/HAL_LPC1768/main.cpp                             | 2 +-
 Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h               | 2 +-
 Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp           | 2 +-
 Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp          | 2 +-
 Marlin/src/HAL/HAL_LPC1768/pinsDebug.h                          | 2 +-
 Marlin/src/HAL/HAL_LPC1768/spi_pins.h                           | 2 +-
 Marlin/src/HAL/HAL_LPC1768/timers.cpp                           | 2 +-
 Marlin/src/HAL/HAL_LPC1768/timers.h                             | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp             | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h               | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h                    | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h                      | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c               | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h               | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp   | 2 +-
 .../src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp  | 2 +-
 .../HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp   | 2 +-
 .../HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp   | 2 +-
 Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp   | 2 +-
 Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp                       | 2 +-
 Marlin/src/HAL/HAL_LPC1768/watchdog.cpp                         | 2 +-
 Marlin/src/HAL/HAL_LPC1768/watchdog.h                           | 2 +-
 Marlin/src/HAL/HAL_SAMD51/HAL.cpp                               | 2 +-
 Marlin/src/HAL/HAL_SAMD51/HAL.h                                 | 2 +-
 Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp                           | 2 +-
 Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp                | 2 +-
 Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h                  | 2 +-
 Marlin/src/HAL/HAL_SAMD51/SAMD51.h                              | 2 +-
 Marlin/src/HAL/HAL_SAMD51/Servo.cpp                             | 2 +-
 Marlin/src/HAL/HAL_SAMD51/ServoTimers.h                         | 2 +-
 Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h                  | 2 +-
 Marlin/src/HAL/HAL_SAMD51/fastio.h                              | 2 +-
 Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h                | 2 +-
 Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h                | 2 +-
 Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h               | 2 +-
 Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h                     | 2 +-
 Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp           | 2 +-
 Marlin/src/HAL/HAL_SAMD51/pinsDebug.h                           | 2 +-
 Marlin/src/HAL/HAL_SAMD51/spi_pins.h                            | 2 +-
 Marlin/src/HAL/HAL_SAMD51/timers.cpp                            | 2 +-
 Marlin/src/HAL/HAL_SAMD51/timers.h                              | 2 +-
 Marlin/src/HAL/HAL_SAMD51/watchdog.cpp                          | 2 +-
 Marlin/src/HAL/HAL_SAMD51/watchdog.h                            | 2 +-
 Marlin/src/HAL/HAL_STM32/HAL.cpp                                | 2 +-
 Marlin/src/HAL/HAL_STM32/HAL.h                                  | 2 +-
 Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp                            | 2 +-
 Marlin/src/HAL/HAL_STM32/Servo.cpp                              | 2 +-
 Marlin/src/HAL/HAL_STM32/Servo.h                                | 2 +-
 Marlin/src/HAL/HAL_STM32/endstop_interrupts.h                   | 2 +-
 Marlin/src/HAL/HAL_STM32/fastio.cpp                             | 2 +-
 Marlin/src/HAL/HAL_STM32/fastio.h                               | 2 +-
 Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h                 | 2 +-
 Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h                 | 2 +-
 Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h                | 2 +-
 Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h                      | 2 +-
 Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp             | 2 +-
 Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp              | 2 +-
 Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp            | 2 +-
 Marlin/src/HAL/HAL_STM32/pinsDebug.h                            | 2 +-
 Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h               | 2 +-
 Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h                 | 2 +-
 Marlin/src/HAL/HAL_STM32/pins_Xref.h                            | 2 +-
 Marlin/src/HAL/HAL_STM32/spi_pins.h                             | 2 +-
 Marlin/src/HAL/HAL_STM32/timers.cpp                             | 2 +-
 Marlin/src/HAL/HAL_STM32/timers.h                               | 2 +-
 Marlin/src/HAL/HAL_STM32/watchdog.cpp                           | 2 +-
 Marlin/src/HAL/HAL_STM32/watchdog.h                             | 2 +-
 Marlin/src/HAL/HAL_STM32F1/HAL.cpp                              | 2 +-
 Marlin/src/HAL/HAL_STM32F1/HAL.h                                | 2 +-
 Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp                          | 2 +-
 Marlin/src/HAL/HAL_STM32F1/Servo.cpp                            | 2 +-
 Marlin/src/HAL/HAL_STM32F1/Servo.h                              | 2 +-
 Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp                   | 2 +-
 Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h                     | 2 +-
 Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp     | 2 +-
 Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp    | 2 +-
 Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h                 | 2 +-
 Marlin/src/HAL/HAL_STM32F1/fastio.h                             | 2 +-
 Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h               | 2 +-
 Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h               | 2 +-
 Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h              | 2 +-
 Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h                    | 2 +-
 Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp                           | 2 +-
 Marlin/src/HAL/HAL_STM32F1/msc_sd.h                             | 2 +-
 Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp                       | 2 +-
 Marlin/src/HAL/HAL_STM32F1/onboard_sd.h                         | 2 +-
 Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp          | 2 +-
 Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp           | 2 +-
 Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp          | 2 +-
 Marlin/src/HAL/HAL_STM32F1/pinsDebug.h                          | 2 +-
 Marlin/src/HAL/HAL_STM32F1/sdio.cpp                             | 2 +-
 Marlin/src/HAL/HAL_STM32F1/sdio.h                               | 2 +-
 Marlin/src/HAL/HAL_STM32F1/spi_pins.h                           | 2 +-
 Marlin/src/HAL/HAL_STM32F1/timers.cpp                           | 2 +-
 Marlin/src/HAL/HAL_STM32F1/timers.h                             | 2 +-
 Marlin/src/HAL/HAL_STM32F1/watchdog.cpp                         | 2 +-
 Marlin/src/HAL/HAL_STM32F1/watchdog.h                           | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp               | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp                          | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h                            | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp                      | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp               | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h                 | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp               | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h                 | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp                        | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h                          | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h             | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h                         | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h           | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h           | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h          | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h                | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp      | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h                      | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h                       | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/timers.h                         | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp                     | 2 +-
 Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h                       | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp                          | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/HAL.h                            | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp                      | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp                        | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/Servo.h                          | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h             | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/fastio.h                         | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h           | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h           | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h          | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h                | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp        | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h                       | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp                       | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/timers.h                         | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp                     | 2 +-
 Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h                       | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp                          | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/HAL.h                            | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp                      | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp                        | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/Servo.h                          | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h             | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/fastio.h                         | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h           | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h           | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h          | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h                | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp      | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h                      | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h                       | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp                       | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/timers.h                         | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp                     | 2 +-
 Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h                       | 2 +-
 Marlin/src/HAL/platforms.h                                      | 2 +-
 Marlin/src/HAL/shared/Delay.h                                   | 2 +-
 Marlin/src/HAL/shared/HAL_SPI.h                                 | 2 +-
 Marlin/src/HAL/shared/HAL_ST7920.h                              | 2 +-
 Marlin/src/HAL/shared/HAL_spi_L6470.cpp                         | 2 +-
 Marlin/src/HAL/shared/Marduino.h                                | 2 +-
 Marlin/src/HAL/shared/MarlinSerial.h                            | 2 +-
 Marlin/src/HAL/shared/backtrace/backtrace.cpp                   | 2 +-
 Marlin/src/HAL/shared/backtrace/backtrace.h                     | 2 +-
 Marlin/src/HAL/shared/eeprom_i2c.cpp                            | 2 +-
 Marlin/src/HAL/shared/eeprom_spi.cpp                            | 2 +-
 Marlin/src/HAL/shared/math_32bit.h                              | 2 +-
 Marlin/src/HAL/shared/persistent_store_api.cpp                  | 2 +-
 Marlin/src/HAL/shared/persistent_store_api.h                    | 2 +-
 Marlin/src/HAL/shared/servo.cpp                                 | 2 +-
 Marlin/src/HAL/shared/servo.h                                   | 2 +-
 Marlin/src/HAL/shared/servo_private.h                           | 2 +-
 Marlin/src/MarlinCore.cpp                                       | 2 +-
 Marlin/src/MarlinCore.h                                         | 2 +-
 Marlin/src/core/boards.h                                        | 2 +-
 Marlin/src/core/debug_out.h                                     | 2 +-
 Marlin/src/core/drivers.h                                       | 2 +-
 Marlin/src/core/language.h                                      | 2 +-
 Marlin/src/core/macros.h                                        | 2 +-
 Marlin/src/core/millis_t.h                                      | 2 +-
 Marlin/src/core/serial.cpp                                      | 2 +-
 Marlin/src/core/serial.h                                        | 2 +-
 Marlin/src/core/types.h                                         | 2 +-
 Marlin/src/core/utility.cpp                                     | 2 +-
 Marlin/src/core/utility.h                                       | 2 +-
 Marlin/src/feature/I2CPositionEncoder.cpp                       | 2 +-
 Marlin/src/feature/I2CPositionEncoder.h                         | 2 +-
 Marlin/src/feature/Max7219_Debug_LEDs.cpp                       | 2 +-
 Marlin/src/feature/Max7219_Debug_LEDs.h                         | 2 +-
 Marlin/src/feature/babystep.cpp                                 | 2 +-
 Marlin/src/feature/babystep.h                                   | 2 +-
 Marlin/src/feature/backlash.cpp                                 | 2 +-
 Marlin/src/feature/backlash.h                                   | 2 +-
 Marlin/src/feature/baricuda.cpp                                 | 2 +-
 Marlin/src/feature/baricuda.h                                   | 2 +-
 Marlin/src/feature/bedlevel/abl/abl.cpp                         | 2 +-
 Marlin/src/feature/bedlevel/abl/abl.h                           | 2 +-
 Marlin/src/feature/bedlevel/bedlevel.cpp                        | 2 +-
 Marlin/src/feature/bedlevel/bedlevel.h                          | 2 +-
 Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp           | 2 +-
 Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h             | 2 +-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp                         | 2 +-
 Marlin/src/feature/bedlevel/ubl/ubl.h                           | 2 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp                     | 2 +-
 Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp                  | 2 +-
 Marlin/src/feature/binary_protocol.cpp                          | 2 +-
 Marlin/src/feature/binary_protocol.h                            | 2 +-
 Marlin/src/feature/bltouch.cpp                                  | 2 +-
 Marlin/src/feature/bltouch.h                                    | 2 +-
 Marlin/src/feature/cancel_object.cpp                            | 2 +-
 Marlin/src/feature/cancel_object.h                              | 2 +-
 Marlin/src/feature/caselight.cpp                                | 2 +-
 Marlin/src/feature/caselight.h                                  | 2 +-
 Marlin/src/feature/closedloop.cpp                               | 2 +-
 Marlin/src/feature/closedloop.h                                 | 2 +-
 Marlin/src/feature/controllerfan.cpp                            | 2 +-
 Marlin/src/feature/controllerfan.h                              | 2 +-
 Marlin/src/feature/dac/dac_dac084s085.h                         | 2 +-
 Marlin/src/feature/dac/dac_mcp4728.cpp                          | 2 +-
 Marlin/src/feature/dac/dac_mcp4728.h                            | 2 +-
 Marlin/src/feature/dac/stepper_dac.cpp                          | 2 +-
 Marlin/src/feature/dac/stepper_dac.h                            | 2 +-
 Marlin/src/feature/digipot/digipot.h                            | 2 +-
 Marlin/src/feature/digipot/digipot_mcp4018.cpp                  | 2 +-
 Marlin/src/feature/digipot/digipot_mcp4451.cpp                  | 2 +-
 Marlin/src/feature/emergency_parser.cpp                         | 2 +-
 Marlin/src/feature/emergency_parser.h                           | 2 +-
 Marlin/src/feature/fanmux.cpp                                   | 2 +-
 Marlin/src/feature/fanmux.h                                     | 2 +-
 Marlin/src/feature/filwidth.cpp                                 | 2 +-
 Marlin/src/feature/filwidth.h                                   | 2 +-
 Marlin/src/feature/fwretract.cpp                                | 2 +-
 Marlin/src/feature/fwretract.h                                  | 2 +-
 Marlin/src/feature/host_actions.cpp                             | 2 +-
 Marlin/src/feature/host_actions.h                               | 2 +-
 Marlin/src/feature/joystick.cpp                                 | 2 +-
 Marlin/src/feature/joystick.h                                   | 2 +-
 Marlin/src/feature/leds/blinkm.cpp                              | 2 +-
 Marlin/src/feature/leds/blinkm.h                                | 2 +-
 Marlin/src/feature/leds/leds.cpp                                | 2 +-
 Marlin/src/feature/leds/leds.h                                  | 2 +-
 Marlin/src/feature/leds/neopixel.cpp                            | 2 +-
 Marlin/src/feature/leds/neopixel.h                              | 2 +-
 Marlin/src/feature/leds/pca9632.cpp                             | 2 +-
 Marlin/src/feature/leds/pca9632.h                               | 2 +-
 Marlin/src/feature/leds/printer_event_leds.cpp                  | 2 +-
 Marlin/src/feature/leds/printer_event_leds.h                    | 2 +-
 Marlin/src/feature/leds/tempstat.cpp                            | 2 +-
 Marlin/src/feature/leds/tempstat.h                              | 2 +-
 Marlin/src/feature/mixing.cpp                                   | 2 +-
 Marlin/src/feature/mixing.h                                     | 2 +-
 Marlin/src/feature/pause.cpp                                    | 2 +-
 Marlin/src/feature/pause.h                                      | 2 +-
 Marlin/src/feature/power.cpp                                    | 2 +-
 Marlin/src/feature/power.h                                      | 2 +-
 Marlin/src/feature/power_loss_recovery.cpp                      | 2 +-
 Marlin/src/feature/power_loss_recovery.h                        | 2 +-
 Marlin/src/feature/probe_temp_compensation.cpp                  | 2 +-
 Marlin/src/feature/probe_temp_compensation.h                    | 2 +-
 Marlin/src/feature/prusa_MMU2/mmu2.cpp                          | 2 +-
 Marlin/src/feature/prusa_MMU2/mmu2.h                            | 2 +-
 Marlin/src/feature/runout.cpp                                   | 2 +-
 Marlin/src/feature/runout.h                                     | 2 +-
 Marlin/src/feature/snmm.cpp                                     | 2 +-
 Marlin/src/feature/snmm.h                                       | 2 +-
 Marlin/src/feature/solenoid.cpp                                 | 2 +-
 Marlin/src/feature/solenoid.h                                   | 2 +-
 Marlin/src/feature/spindle_laser.cpp                            | 2 +-
 Marlin/src/feature/spindle_laser.h                              | 2 +-
 Marlin/src/feature/tmc_util.cpp                                 | 2 +-
 Marlin/src/feature/tmc_util.h                                   | 2 +-
 Marlin/src/feature/touch/xpt2046.cpp                            | 2 +-
 Marlin/src/feature/touch/xpt2046.h                              | 2 +-
 Marlin/src/feature/twibus.cpp                                   | 2 +-
 Marlin/src/feature/twibus.h                                     | 2 +-
 Marlin/src/feature/z_stepper_align.cpp                          | 2 +-
 Marlin/src/feature/z_stepper_align.h                            | 2 +-
 Marlin/src/gcode/bedlevel/G26.cpp                               | 2 +-
 Marlin/src/gcode/bedlevel/G42.cpp                               | 2 +-
 Marlin/src/gcode/bedlevel/M420.cpp                              | 2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp                           | 2 +-
 Marlin/src/gcode/bedlevel/abl/M421.cpp                          | 2 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp                           | 2 +-
 Marlin/src/gcode/bedlevel/mbl/M421.cpp                          | 2 +-
 Marlin/src/gcode/bedlevel/ubl/G29.cpp                           | 2 +-
 Marlin/src/gcode/bedlevel/ubl/M421.cpp                          | 2 +-
 Marlin/src/gcode/calibrate/G28.cpp                              | 2 +-
 Marlin/src/gcode/calibrate/G33.cpp                              | 2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp                         | 2 +-
 Marlin/src/gcode/calibrate/G425.cpp                             | 2 +-
 Marlin/src/gcode/calibrate/G76_M871.cpp                         | 2 +-
 Marlin/src/gcode/calibrate/M100.cpp                             | 2 +-
 Marlin/src/gcode/calibrate/M12.cpp                              | 2 +-
 Marlin/src/gcode/calibrate/M425.cpp                             | 2 +-
 Marlin/src/gcode/calibrate/M48.cpp                              | 2 +-
 Marlin/src/gcode/calibrate/M665.cpp                             | 2 +-
 Marlin/src/gcode/calibrate/M666.cpp                             | 2 +-
 Marlin/src/gcode/calibrate/M852.cpp                             | 2 +-
 Marlin/src/gcode/config/M200-M205.cpp                           | 2 +-
 Marlin/src/gcode/config/M217.cpp                                | 2 +-
 Marlin/src/gcode/config/M218.cpp                                | 2 +-
 Marlin/src/gcode/config/M220.cpp                                | 2 +-
 Marlin/src/gcode/config/M221.cpp                                | 2 +-
 Marlin/src/gcode/config/M281.cpp                                | 2 +-
 Marlin/src/gcode/config/M301.cpp                                | 2 +-
 Marlin/src/gcode/config/M302.cpp                                | 2 +-
 Marlin/src/gcode/config/M304.cpp                                | 2 +-
 Marlin/src/gcode/config/M305.cpp                                | 2 +-
 Marlin/src/gcode/config/M43.cpp                                 | 2 +-
 Marlin/src/gcode/config/M540.cpp                                | 2 +-
 Marlin/src/gcode/config/M575.cpp                                | 2 +-
 Marlin/src/gcode/config/M92.cpp                                 | 2 +-
 Marlin/src/gcode/control/M108_M112_M410.cpp                     | 2 +-
 Marlin/src/gcode/control/M111.cpp                               | 2 +-
 Marlin/src/gcode/control/M120_M121.cpp                          | 2 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp                        | 2 +-
 Marlin/src/gcode/control/M211.cpp                               | 2 +-
 Marlin/src/gcode/control/M226.cpp                               | 2 +-
 Marlin/src/gcode/control/M280.cpp                               | 2 +-
 Marlin/src/gcode/control/M3-M5.cpp                              | 2 +-
 Marlin/src/gcode/control/M350_M351.cpp                          | 2 +-
 Marlin/src/gcode/control/M380_M381.cpp                          | 2 +-
 Marlin/src/gcode/control/M400.cpp                               | 2 +-
 Marlin/src/gcode/control/M42.cpp                                | 2 +-
 Marlin/src/gcode/control/M605.cpp                               | 2 +-
 Marlin/src/gcode/control/M7-M9.cpp                              | 2 +-
 Marlin/src/gcode/control/M80_M81.cpp                            | 2 +-
 Marlin/src/gcode/control/M85.cpp                                | 2 +-
 Marlin/src/gcode/control/M997.cpp                               | 2 +-
 Marlin/src/gcode/control/M999.cpp                               | 2 +-
 Marlin/src/gcode/control/T.cpp                                  | 2 +-
 Marlin/src/gcode/eeprom/M500-M504.cpp                           | 2 +-
 Marlin/src/gcode/feature/L6470/M122.cpp                         | 2 +-
 Marlin/src/gcode/feature/L6470/M906.cpp                         | 2 +-
 Marlin/src/gcode/feature/L6470/M916-918.cpp                     | 2 +-
 Marlin/src/gcode/feature/advance/M900.cpp                       | 2 +-
 Marlin/src/gcode/feature/baricuda/M126-M129.cpp                 | 2 +-
 Marlin/src/gcode/feature/camera/M240.cpp                        | 2 +-
 Marlin/src/gcode/feature/cancel/M486.cpp                        | 2 +-
 Marlin/src/gcode/feature/caselight/M355.cpp                     | 2 +-
 Marlin/src/gcode/feature/clean/G12.cpp                          | 2 +-
 Marlin/src/gcode/feature/digipot/M907-M910.cpp                  | 2 +-
 Marlin/src/gcode/feature/filwidth/M404-M407.cpp                 | 2 +-
 Marlin/src/gcode/feature/fwretract/G10_G11.cpp                  | 2 +-
 Marlin/src/gcode/feature/fwretract/M207-M209.cpp                | 2 +-
 Marlin/src/gcode/feature/i2c/M260_M261.cpp                      | 2 +-
 Marlin/src/gcode/feature/leds/M150.cpp                          | 2 +-
 Marlin/src/gcode/feature/leds/M7219.cpp                         | 2 +-
 Marlin/src/gcode/feature/macro/M810-M819.cpp                    | 2 +-
 Marlin/src/gcode/feature/mixing/M163-M165.cpp                   | 2 +-
 Marlin/src/gcode/feature/mixing/M166.cpp                        | 2 +-
 Marlin/src/gcode/feature/pause/G27.cpp                          | 2 +-
 Marlin/src/gcode/feature/pause/G60.cpp                          | 2 +-
 Marlin/src/gcode/feature/pause/G61.cpp                          | 2 +-
 Marlin/src/gcode/feature/pause/M125.cpp                         | 2 +-
 Marlin/src/gcode/feature/pause/M600.cpp                         | 2 +-
 Marlin/src/gcode/feature/pause/M603.cpp                         | 2 +-
 Marlin/src/gcode/feature/pause/M701_M702.cpp                    | 2 +-
 Marlin/src/gcode/feature/powerloss/M1000.cpp                    | 2 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp                     | 2 +-
 Marlin/src/gcode/feature/prusa_MMU2/M403.cpp                    | 2 +-
 Marlin/src/gcode/feature/runout/M412.cpp                        | 2 +-
 Marlin/src/gcode/feature/trinamic/M122.cpp                      | 2 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp                      | 2 +-
 Marlin/src/gcode/feature/trinamic/M906.cpp                      | 2 +-
 Marlin/src/gcode/feature/trinamic/M911-M914.cpp                 | 2 +-
 Marlin/src/gcode/gcode.cpp                                      | 2 +-
 Marlin/src/gcode/gcode.h                                        | 2 +-
 Marlin/src/gcode/geometry/G17-G19.cpp                           | 2 +-
 Marlin/src/gcode/geometry/G53-G59.cpp                           | 2 +-
 Marlin/src/gcode/geometry/G92.cpp                               | 2 +-
 Marlin/src/gcode/geometry/M206_M428.cpp                         | 2 +-
 Marlin/src/gcode/host/M110.cpp                                  | 2 +-
 Marlin/src/gcode/host/M113.cpp                                  | 2 +-
 Marlin/src/gcode/host/M114.cpp                                  | 2 +-
 Marlin/src/gcode/host/M115.cpp                                  | 2 +-
 Marlin/src/gcode/host/M118.cpp                                  | 2 +-
 Marlin/src/gcode/host/M119.cpp                                  | 2 +-
 Marlin/src/gcode/host/M16.cpp                                   | 2 +-
 Marlin/src/gcode/host/M876.cpp                                  | 2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                                  | 2 +-
 Marlin/src/gcode/lcd/M117.cpp                                   | 2 +-
 Marlin/src/gcode/lcd/M145.cpp                                   | 2 +-
 Marlin/src/gcode/lcd/M250.cpp                                   | 2 +-
 Marlin/src/gcode/lcd/M300.cpp                                   | 2 +-
 Marlin/src/gcode/lcd/M73.cpp                                    | 2 +-
 Marlin/src/gcode/motion/G0_G1.cpp                               | 2 +-
 Marlin/src/gcode/motion/G2_G3.cpp                               | 2 +-
 Marlin/src/gcode/motion/G4.cpp                                  | 2 +-
 Marlin/src/gcode/motion/G5.cpp                                  | 2 +-
 Marlin/src/gcode/motion/G80.cpp                                 | 2 +-
 Marlin/src/gcode/motion/M290.cpp                                | 2 +-
 Marlin/src/gcode/parser.cpp                                     | 2 +-
 Marlin/src/gcode/parser.h                                       | 2 +-
 Marlin/src/gcode/probe/G30.cpp                                  | 2 +-
 Marlin/src/gcode/probe/G31_G32.cpp                              | 2 +-
 Marlin/src/gcode/probe/G38.cpp                                  | 2 +-
 Marlin/src/gcode/probe/M401_M402.cpp                            | 2 +-
 Marlin/src/gcode/probe/M851.cpp                                 | 2 +-
 Marlin/src/gcode/probe/M951.cpp                                 | 2 +-
 Marlin/src/gcode/queue.cpp                                      | 2 +-
 Marlin/src/gcode/queue.h                                        | 2 +-
 Marlin/src/gcode/scara/M360-M364.cpp                            | 2 +-
 Marlin/src/gcode/sdcard/M20.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M21_M22.cpp                             | 2 +-
 Marlin/src/gcode/sdcard/M23.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M24_M25.cpp                             | 2 +-
 Marlin/src/gcode/sdcard/M26.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M27.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M28_M29.cpp                             | 2 +-
 Marlin/src/gcode/sdcard/M30.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M32.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M33.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M34.cpp                                 | 2 +-
 Marlin/src/gcode/sdcard/M524.cpp                                | 2 +-
 Marlin/src/gcode/sdcard/M928.cpp                                | 2 +-
 Marlin/src/gcode/stats/M31.cpp                                  | 2 +-
 Marlin/src/gcode/stats/M75-M78.cpp                              | 2 +-
 Marlin/src/gcode/temperature/M104_M109.cpp                      | 2 +-
 Marlin/src/gcode/temperature/M105.cpp                           | 2 +-
 Marlin/src/gcode/temperature/M106_M107.cpp                      | 2 +-
 Marlin/src/gcode/temperature/M140_M190.cpp                      | 2 +-
 Marlin/src/gcode/temperature/M141_M191.cpp                      | 2 +-
 Marlin/src/gcode/temperature/M155.cpp                           | 2 +-
 Marlin/src/gcode/temperature/M303.cpp                           | 2 +-
 Marlin/src/gcode/units/G20_G21.cpp                              | 2 +-
 Marlin/src/gcode/units/M149.cpp                                 | 2 +-
 Marlin/src/gcode/units/M82_M83.cpp                              | 2 +-
 Marlin/src/inc/Conditionals_LCD.h                               | 2 +-
 Marlin/src/inc/Conditionals_adv.h                               | 2 +-
 Marlin/src/inc/Conditionals_post.h                              | 2 +-
 Marlin/src/inc/MarlinConfig.h                                   | 2 +-
 Marlin/src/inc/MarlinConfigPre.h                                | 2 +-
 Marlin/src/inc/SanityCheck.h                                    | 2 +-
 Marlin/src/inc/Version.h                                        | 2 +-
 Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp                     | 2 +-
 Marlin/src/lcd/HD44780/ultralcd_HD44780.h                       | 2 +-
 Marlin/src/lcd/dogm/HAL_LCD_class_defines.h                     | 2 +-
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.h                       | 2 +-
 Marlin/src/lcd/dogm/dogm_Bootscreen.h                           | 2 +-
 Marlin/src/lcd/dogm/dogm_Statusscreen.h                         | 2 +-
 Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h              | 2 +-
 Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h              | 2 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp                      | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp       | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp               | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp               | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp            | 2 +-
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp                           | 2 +-
 Marlin/src/lcd/dogm/ultralcd_DOGM.h                             | 2 +-
 Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp          | 2 +-
 Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h            | 2 +-
 Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp           | 2 +-
 Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h             | 2 +-
 Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h   | 2 +-
 .../lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp  | 2 +-
 .../lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h    | 2 +-
 .../lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp | 2 +-
 .../lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h   | 2 +-
 .../lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp  | 2 +-
 .../lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h    | 2 +-
 Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h          | 2 +-
 Marlin/src/lcd/extensible_ui/ui_api.cpp                         | 2 +-
 Marlin/src/lcd/extensible_ui/ui_api.h                           | 2 +-
 Marlin/src/lcd/extui_dgus_lcd.cpp                               | 2 +-
 Marlin/src/lcd/extui_malyan_lcd.cpp                             | 2 +-
 Marlin/src/lcd/language/language_an.h                           | 2 +-
 Marlin/src/lcd/language/language_bg.h                           | 2 +-
 Marlin/src/lcd/language/language_ca.h                           | 2 +-
 Marlin/src/lcd/language/language_cz.h                           | 2 +-
 Marlin/src/lcd/language/language_da.h                           | 2 +-
 Marlin/src/lcd/language/language_de.h                           | 2 +-
 Marlin/src/lcd/language/language_el.h                           | 2 +-
 Marlin/src/lcd/language/language_el_gr.h                        | 2 +-
 Marlin/src/lcd/language/language_en.h                           | 2 +-
 Marlin/src/lcd/language/language_es.h                           | 2 +-
 Marlin/src/lcd/language/language_eu.h                           | 2 +-
 Marlin/src/lcd/language/language_fi.h                           | 2 +-
 Marlin/src/lcd/language/language_fr.h                           | 2 +-
 Marlin/src/lcd/language/language_gl.h                           | 2 +-
 Marlin/src/lcd/language/language_hr.h                           | 2 +-
 Marlin/src/lcd/language/language_it.h                           | 2 +-
 Marlin/src/lcd/language/language_jp_kana.h                      | 2 +-
 Marlin/src/lcd/language/language_ko_KR.h                        | 2 +-
 Marlin/src/lcd/language/language_nl.h                           | 2 +-
 Marlin/src/lcd/language/language_pl.h                           | 2 +-
 Marlin/src/lcd/language/language_pt.h                           | 2 +-
 Marlin/src/lcd/language/language_pt_br.h                        | 2 +-
 Marlin/src/lcd/language/language_ru.h                           | 2 +-
 Marlin/src/lcd/language/language_sk.h                           | 2 +-
 Marlin/src/lcd/language/language_test.h                         | 2 +-
 Marlin/src/lcd/language/language_tr.h                           | 2 +-
 Marlin/src/lcd/language/language_uk.h                           | 2 +-
 Marlin/src/lcd/language/language_vi.h                           | 2 +-
 Marlin/src/lcd/language/language_zh_CN.h                        | 2 +-
 Marlin/src/lcd/language/language_zh_TW.h                        | 2 +-
 Marlin/src/lcd/lcdprint.cpp                                     | 2 +-
 Marlin/src/lcd/menu/game/brickout.cpp                           | 2 +-
 Marlin/src/lcd/menu/game/brickout.h                             | 2 +-
 Marlin/src/lcd/menu/game/game.cpp                               | 2 +-
 Marlin/src/lcd/menu/game/game.h                                 | 2 +-
 Marlin/src/lcd/menu/game/invaders.cpp                           | 2 +-
 Marlin/src/lcd/menu/game/invaders.h                             | 2 +-
 Marlin/src/lcd/menu/game/maze.cpp                               | 2 +-
 Marlin/src/lcd/menu/game/maze.h                                 | 2 +-
 Marlin/src/lcd/menu/game/snake.cpp                              | 2 +-
 Marlin/src/lcd/menu/game/snake.h                                | 2 +-
 Marlin/src/lcd/menu/game/types.h                                | 2 +-
 Marlin/src/lcd/menu/menu.cpp                                    | 2 +-
 Marlin/src/lcd/menu/menu.h                                      | 2 +-
 Marlin/src/lcd/menu/menu_addon.h                                | 2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp                           | 2 +-
 Marlin/src/lcd/menu/menu_backlash.cpp                           | 2 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp                        | 2 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp                       | 2 +-
 Marlin/src/lcd/menu/menu_cancelobject.cpp                       | 2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp                      | 2 +-
 Marlin/src/lcd/menu/menu_custom.cpp                             | 2 +-
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp                    | 2 +-
 Marlin/src/lcd/menu/menu_filament.cpp                           | 2 +-
 Marlin/src/lcd/menu/menu_game.cpp                               | 2 +-
 Marlin/src/lcd/menu/menu_info.cpp                               | 2 +-
 Marlin/src/lcd/menu/menu_job_recovery.cpp                       | 2 +-
 Marlin/src/lcd/menu/menu_led.cpp                                | 2 +-
 Marlin/src/lcd/menu/menu_main.cpp                               | 2 +-
 Marlin/src/lcd/menu/menu_media.cpp                              | 2 +-
 Marlin/src/lcd/menu/menu_mixer.cpp                              | 2 +-
 Marlin/src/lcd/menu/menu_mmu2.cpp                               | 2 +-
 Marlin/src/lcd/menu/menu_mmu2.h                                 | 2 +-
 Marlin/src/lcd/menu/menu_motion.cpp                             | 2 +-
 Marlin/src/lcd/menu/menu_spindle_laser.cpp                      | 2 +-
 Marlin/src/lcd/menu/menu_temperature.cpp                        | 2 +-
 Marlin/src/lcd/menu/menu_tmc.cpp                                | 2 +-
 Marlin/src/lcd/menu/menu_tune.cpp                               | 2 +-
 Marlin/src/lcd/menu/menu_ubl.cpp                                | 2 +-
 Marlin/src/lcd/thermistornames.h                                | 2 +-
 Marlin/src/lcd/ultralcd.cpp                                     | 2 +-
 Marlin/src/lcd/ultralcd.h                                       | 2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp                          | 2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.h                            | 2 +-
 Marlin/src/libs/bresenham.h                                     | 2 +-
 Marlin/src/libs/buzzer.cpp                                      | 2 +-
 Marlin/src/libs/buzzer.h                                        | 2 +-
 Marlin/src/libs/circularqueue.h                                 | 2 +-
 Marlin/src/libs/crc16.cpp                                       | 2 +-
 Marlin/src/libs/crc16.h                                         | 2 +-
 Marlin/src/libs/duration_t.h                                    | 2 +-
 Marlin/src/libs/hex_print_routines.cpp                          | 2 +-
 Marlin/src/libs/hex_print_routines.h                            | 2 +-
 Marlin/src/libs/least_squares_fit.cpp                           | 2 +-
 Marlin/src/libs/least_squares_fit.h                             | 2 +-
 Marlin/src/libs/nozzle.cpp                                      | 2 +-
 Marlin/src/libs/nozzle.h                                        | 2 +-
 Marlin/src/libs/numtostr.cpp                                    | 2 +-
 Marlin/src/libs/numtostr.h                                      | 2 +-
 Marlin/src/libs/private_spi.h                                   | 2 +-
 Marlin/src/libs/softspi.h                                       | 2 +-
 Marlin/src/libs/stopwatch.cpp                                   | 2 +-
 Marlin/src/libs/stopwatch.h                                     | 2 +-
 Marlin/src/libs/vector_3.cpp                                    | 2 +-
 Marlin/src/libs/vector_3.h                                      | 2 +-
 Marlin/src/module/configuration_store.cpp                       | 2 +-
 Marlin/src/module/configuration_store.h                         | 2 +-
 Marlin/src/module/delta.cpp                                     | 2 +-
 Marlin/src/module/delta.h                                       | 2 +-
 Marlin/src/module/endstops.cpp                                  | 2 +-
 Marlin/src/module/endstops.h                                    | 2 +-
 Marlin/src/module/motion.cpp                                    | 2 +-
 Marlin/src/module/motion.h                                      | 2 +-
 Marlin/src/module/planner.cpp                                   | 2 +-
 Marlin/src/module/planner.h                                     | 2 +-
 Marlin/src/module/planner_bezier.cpp                            | 2 +-
 Marlin/src/module/planner_bezier.h                              | 2 +-
 Marlin/src/module/printcounter.cpp                              | 2 +-
 Marlin/src/module/printcounter.h                                | 2 +-
 Marlin/src/module/probe.cpp                                     | 2 +-
 Marlin/src/module/probe.h                                       | 2 +-
 Marlin/src/module/scara.cpp                                     | 2 +-
 Marlin/src/module/scara.h                                       | 2 +-
 Marlin/src/module/servo.cpp                                     | 2 +-
 Marlin/src/module/servo.h                                       | 2 +-
 Marlin/src/module/speed_lookuptable.h                           | 2 +-
 Marlin/src/module/stepper.cpp                                   | 2 +-
 Marlin/src/module/stepper.h                                     | 2 +-
 Marlin/src/module/stepper/L64xx.cpp                             | 2 +-
 Marlin/src/module/stepper/L64xx.h                               | 2 +-
 Marlin/src/module/stepper/TMC26X.cpp                            | 2 +-
 Marlin/src/module/stepper/TMC26X.h                              | 2 +-
 Marlin/src/module/stepper/indirection.cpp                       | 2 +-
 Marlin/src/module/stepper/indirection.h                         | 2 +-
 Marlin/src/module/stepper/trinamic.cpp                          | 2 +-
 Marlin/src/module/stepper/trinamic.h                            | 2 +-
 Marlin/src/module/temperature.cpp                               | 2 +-
 Marlin/src/module/temperature.h                                 | 2 +-
 Marlin/src/module/thermistor/thermistor_1.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_10.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_1010.h                  | 2 +-
 Marlin/src/module/thermistor/thermistor_1047.h                  | 2 +-
 Marlin/src/module/thermistor/thermistor_11.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_110.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_12.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_13.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_147.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_15.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_18.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_2.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_20.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_201.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_21.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_3.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_331.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_332.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_4.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_5.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_501.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_51.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_512.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_52.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_55.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_6.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_60.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_61.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_66.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_666.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_67.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_7.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_70.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_71.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_75.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_8.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_9.h                     | 2 +-
 Marlin/src/module/thermistor/thermistor_99.h                    | 2 +-
 Marlin/src/module/thermistor/thermistor_998.h                   | 2 +-
 Marlin/src/module/thermistor/thermistor_999.h                   | 2 +-
 Marlin/src/module/thermistor/thermistors.h                      | 2 +-
 Marlin/src/module/tool_change.cpp                               | 2 +-
 Marlin/src/module/tool_change.h                                 | 2 +-
 Marlin/src/pins/esp32/pins_E4D.h                                | 2 +-
 Marlin/src/pins/esp32/pins_ESP32.h                              | 2 +-
 Marlin/src/pins/esp32/pins_MRR_ESPA.h                           | 2 +-
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h                        | 2 +-
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h                       | 2 +-
 Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h                   | 2 +-
 Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h                    | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR.h                          | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h                     | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h                     | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h                     | 2 +-
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h                   | 2 +-
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h                        | 2 +-
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h                       | 2 +-
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h                     | 2 +-
 Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h                   | 2 +-
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h                     | 2 +-
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h                   | 2 +-
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h              | 2 +-
 Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h               | 2 +-
 Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h                  | 2 +-
 Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h                 | 2 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN.h                         | 2 +-
 Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h                    | 2 +-
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h                     | 2 +-
 Marlin/src/pins/mega/pins_CHEAPTRONIC.h                         | 2 +-
 Marlin/src/pins/mega/pins_CHEAPTRONICv2.h                       | 2 +-
 Marlin/src/pins/mega/pins_CNCONTROLS_11.h                       | 2 +-
 Marlin/src/pins/mega/pins_CNCONTROLS_12.h                       | 2 +-
 Marlin/src/pins/mega/pins_CNCONTROLS_15.h                       | 2 +-
 Marlin/src/pins/mega/pins_EINSTART-S.h                          | 2 +-
 Marlin/src/pins/mega/pins_ELEFU_3.h                             | 2 +-
 Marlin/src/pins/mega/pins_GT2560_REV_A.h                        | 2 +-
 Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h                   | 2 +-
 Marlin/src/pins/mega/pins_GT2560_V3.h                           | 2 +-
 Marlin/src/pins/mega/pins_GT2560_V3_A20.h                       | 2 +-
 Marlin/src/pins/mega/pins_GT2560_V3_MC2.h                       | 2 +-
 Marlin/src/pins/mega/pins_HJC2560C_REV2.h                       | 2 +-
 Marlin/src/pins/mega/pins_LEAPFROG.h                            | 2 +-
 Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h                   | 2 +-
 Marlin/src/pins/mega/pins_MEGACONTROLLER.h                      | 2 +-
 Marlin/src/pins/mega/pins_MEGATRONICS.h                         | 2 +-
 Marlin/src/pins/mega/pins_MEGATRONICS_2.h                       | 2 +-
 Marlin/src/pins/mega/pins_MEGATRONICS_3.h                       | 2 +-
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h                    | 2 +-
 Marlin/src/pins/mega/pins_MINITRONICS.h                         | 2 +-
 Marlin/src/pins/mega/pins_OVERLORD.h                            | 2 +-
 Marlin/src/pins/mega/pins_SILVER_GATE.h                         | 2 +-
 Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h                      | 2 +-
 Marlin/src/pins/pins.h                                          | 2 +-
 Marlin/src/pins/pinsDebug.h                                     | 2 +-
 Marlin/src/pins/pinsDebug_list.h                                | 2 +-
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h                        | 2 +-
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h                        | 2 +-
 Marlin/src/pins/rambo/pins_MINIRAMBO.h                          | 2 +-
 Marlin/src/pins/rambo/pins_RAMBO.h                              | 2 +-
 Marlin/src/pins/rambo/pins_SCOOVO_X9H.h                         | 2 +-
 Marlin/src/pins/ramps/pins_3DRAG.h                              | 2 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3.h                          | 2 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h                      | 2 +-
 Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h                       | 2 +-
 Marlin/src/pins/ramps/pins_BIQU_KFB_2.h                         | 2 +-
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h                     | 2 +-
 Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h                 | 2 +-
 Marlin/src/pins/ramps/pins_FELIX2.h                             | 2 +-
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h                     | 2 +-
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h                    | 2 +-
 Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h                  | 2 +-
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h                      | 2 +-
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h                       | 2 +-
 Marlin/src/pins/ramps/pins_FYSETC_F6_14.h                       | 2 +-
 Marlin/src/pins/ramps/pins_K8200.h                              | 2 +-
 Marlin/src/pins/ramps/pins_K8400.h                              | 2 +-
 Marlin/src/pins/ramps/pins_K8800.h                              | 2 +-
 Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h                     | 2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE.h                           | 2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_14.h                        | 2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_15.h                        | 2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h                    | 2 +-
 Marlin/src/pins/ramps/pins_MKS_GEN_13.h                         | 2 +-
 Marlin/src/pins/ramps/pins_MKS_GEN_L.h                          | 2 +-
 Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h                       | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h                              | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS_13.h                           | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h                     | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h                       | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h                      | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS_OLD.h                          | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h                         | 2 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD.h                         | 2 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h                      | 2 +-
 Marlin/src/pins/ramps/pins_RL200.h                              | 2 +-
 Marlin/src/pins/ramps/pins_RUMBA.h                              | 2 +-
 Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h                      | 2 +-
 Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h                     | 2 +-
 Marlin/src/pins/ramps/pins_TANGO.h                              | 2 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_13.h                      | 2 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h                      | 2 +-
 Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h                      | 2 +-
 Marlin/src/pins/ramps/pins_TT_OSCAR.h                           | 2 +-
 Marlin/src/pins/ramps/pins_ULTIMAIN_2.h                         | 2 +-
 Marlin/src/pins/ramps/pins_ULTIMAKER.h                          | 2 +-
 Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h                      | 2 +-
 Marlin/src/pins/ramps/pins_VORON.h                              | 2 +-
 Marlin/src/pins/ramps/pins_ZRIB_V20.h                           | 2 +-
 Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h                    | 2 +-
 Marlin/src/pins/sam/pins_ADSK.h                                 | 2 +-
 Marlin/src/pins/sam/pins_ALLIGATOR_R2.h                         | 2 +-
 Marlin/src/pins/sam/pins_ARCHIM1.h                              | 2 +-
 Marlin/src/pins/sam/pins_ARCHIM2.h                              | 2 +-
 Marlin/src/pins/sam/pins_DUE3DOM.h                              | 2 +-
 Marlin/src/pins/sam/pins_DUE3DOM_MINI.h                         | 2 +-
 Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h                       | 2 +-
 Marlin/src/pins/sam/pins_RADDS.h                                | 2 +-
 Marlin/src/pins/sam/pins_RAMPS4DUE.h                            | 2 +-
 Marlin/src/pins/sam/pins_RAMPS_DUO.h                            | 2 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h                          | 2 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V2.h                          | 2 +-
 Marlin/src/pins/sam/pins_RAMPS_SMART.h                          | 2 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h                         | 2 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h                         | 2 +-
 Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h                     | 2 +-
 Marlin/src/pins/sanguino/pins_ANET_10.h                         | 2 +-
 Marlin/src/pins/sanguino/pins_AZTEEG_X1.h                       | 2 +-
 Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h                 | 2 +-
 Marlin/src/pins/sanguino/pins_GEN3_PLUS.h                       | 2 +-
 Marlin/src/pins/sanguino/pins_GEN6.h                            | 2 +-
 Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h                     | 2 +-
 Marlin/src/pins/sanguino/pins_GEN7_12.h                         | 2 +-
 Marlin/src/pins/sanguino/pins_GEN7_13.h                         | 2 +-
 Marlin/src/pins/sanguino/pins_GEN7_14.h                         | 2 +-
 Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h                     | 2 +-
 Marlin/src/pins/sanguino/pins_MELZI.h                           | 2 +-
 Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h                  | 2 +-
 Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h                    | 2 +-
 Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h                    | 2 +-
 Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h                    | 2 +-
 Marlin/src/pins/sanguino/pins_OMCA.h                            | 2 +-
 Marlin/src/pins/sanguino/pins_OMCA_A.h                          | 2 +-
 Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h                 | 2 +-
 Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h                 | 2 +-
 Marlin/src/pins/sanguino/pins_SETHI.h                           | 2 +-
 Marlin/src/pins/sanguino/pins_STB_11.h                          | 2 +-
 Marlin/src/pins/sensitive_pins.h                                | 2 +-
 Marlin/src/pins/stm32/pins_ARMED.h                              | 2 +-
 Marlin/src/pins/stm32/pins_BEAST.h                              | 2 +-
 Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h                  | 2 +-
 Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h                    | 2 +-
 Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h                       | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h                     | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h                    | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h               | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h               | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h                  | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h                   | 2 +-
 Marlin/src/pins/stm32/pins_CHITU3D.h                            | 2 +-
 Marlin/src/pins/stm32/pins_FLYF407ZG.h                          | 2 +-
 Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h                      | 2 +-
 Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h                     | 2 +-
 Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h                 | 2 +-
 Marlin/src/pins/stm32/pins_FYSETC_S6.h                          | 2 +-
 Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h                    | 2 +-
 Marlin/src/pins/stm32/pins_GTM32_MINI.h                         | 2 +-
 Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h                     | 2 +-
 Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h                       | 2 +-
 Marlin/src/pins/stm32/pins_GTM32_REV_B.h                        | 2 +-
 Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h                    | 2 +-
 Marlin/src/pins/stm32/pins_LERDGE_K.h                           | 2 +-
 Marlin/src/pins/stm32/pins_LERDGE_X.h                           | 2 +-
 Marlin/src/pins/stm32/pins_LONGER3D_LK.h                        | 2 +-
 Marlin/src/pins/stm32/pins_MALYAN_M200.h                        | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN.h                          | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN2.h                         | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h                     | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h                    | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h                     | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h                     | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h                      | 2 +-
 Marlin/src/pins/stm32/pins_MORPHEUS.h                           | 2 +-
 Marlin/src/pins/stm32/pins_REMRAM_V1.h                          | 2 +-
 Marlin/src/pins/stm32/pins_RUMBA32.h                            | 2 +-
 Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h                    | 2 +-
 Marlin/src/pins/stm32/pins_STM32F1R.h                           | 2 +-
 Marlin/src/pins/stm32/pins_STM3R_MINI.h                         | 2 +-
 Marlin/src/pins/stm32/pins_THE_BORG.h                           | 2 +-
 Marlin/src/pins/stm32/pins_VAKE403D.h                           | 2 +-
 Marlin/src/pins/teensy2/pins_5DPRINT.h                          | 2 +-
 Marlin/src/pins/teensy2/pins_BRAINWAVE.h                        | 2 +-
 Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h                    | 2 +-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD.h                      | 2 +-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h                 | 2 +-
 Marlin/src/pins/teensy2/pins_SAV_MKI.h                          | 2 +-
 Marlin/src/pins/teensy2/pins_TEENSY2.h                          | 2 +-
 Marlin/src/pins/teensy2/pins_TEENSYLU.h                         | 2 +-
 Marlin/src/pins/teensy3/pins_TEENSY31_32.h                      | 2 +-
 Marlin/src/pins/teensy3/pins_TEENSY35_36.h                      | 2 +-
 Marlin/src/sd/Sd2Card.cpp                                       | 2 +-
 Marlin/src/sd/Sd2Card.h                                         | 2 +-
 Marlin/src/sd/Sd2Card_sdio.h                                    | 2 +-
 Marlin/src/sd/SdBaseFile.cpp                                    | 2 +-
 Marlin/src/sd/SdBaseFile.h                                      | 2 +-
 Marlin/src/sd/SdFatConfig.h                                     | 2 +-
 Marlin/src/sd/SdFatStructs.h                                    | 2 +-
 Marlin/src/sd/SdFatUtil.cpp                                     | 2 +-
 Marlin/src/sd/SdFatUtil.h                                       | 2 +-
 Marlin/src/sd/SdFile.cpp                                        | 2 +-
 Marlin/src/sd/SdFile.h                                          | 2 +-
 Marlin/src/sd/SdInfo.h                                          | 2 +-
 Marlin/src/sd/SdVolume.cpp                                      | 2 +-
 Marlin/src/sd/SdVolume.h                                        | 2 +-
 Marlin/src/sd/cardreader.cpp                                    | 2 +-
 Marlin/src/sd/cardreader.h                                      | 2 +-
 Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp             | 2 +-
 Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h               | 2 +-
 buildroot/bin/generate_version                                  | 2 +-
 buildroot/share/fonts/genallfont.sh                             | 2 +-
 buildroot/share/vscode/auto_build.py                            | 2 +-
 1005 files changed, 1005 insertions(+), 1005 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5728e1f065f1..582f2a5dd9d6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 #
 # Marlin 3D Printer Firmware
-# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 #
 # Based on Sprinter and grbl.
 # Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ba07d3f0881f..28625955af77 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9a979f2528f7..a365b473bded 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/Version.h b/Marlin/Version.h
index d18176f27f74..c2788603fa38 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL.h b/Marlin/src/HAL/HAL.h
index 5ad13931106d..fa2782cfcbad 100644
--- a/Marlin/src/HAL/HAL.h
+++ b/Marlin/src/HAL/HAL.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.cpp b/Marlin/src/HAL/HAL_AVR/HAL.cpp
index 4a10f73dcfab..317d13a5401b 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.cpp
+++ b/Marlin/src/HAL/HAL_AVR/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.h b/Marlin/src/HAL/HAL_AVR/HAL.h
index 5c10ad08e438..ccbeec941ddd 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.h
+++ b/Marlin/src/HAL/HAL_AVR/HAL.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp b/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
index 7a0f7246ee13..29d5e3870027 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp b/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
index 691dab91033d..a0c636a9f976 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h b/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
index d2b3ff155800..33870e2ca657 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/Servo.cpp b/Marlin/src/HAL/HAL_AVR/Servo.cpp
index 33818edb96f9..02c131bd449a 100644
--- a/Marlin/src/HAL/HAL_AVR/Servo.cpp
+++ b/Marlin/src/HAL/HAL_AVR/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/ServoTimers.h b/Marlin/src/HAL/HAL_AVR/ServoTimers.h
index 4991caefe6fd..86007fd102c6 100644
--- a/Marlin/src/HAL/HAL_AVR/ServoTimers.h
+++ b/Marlin/src/HAL/HAL_AVR/ServoTimers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h b/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
index 7053d4b0a1de..8f89c69baf77 100644
--- a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp b/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
index 4884ede63fbe..78a7ad883bd8 100644
--- a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.cpp b/Marlin/src/HAL/HAL_AVR/fastio.cpp
index f0f7688f1b06..9f70b50f7177 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio.cpp
+++ b/Marlin/src/HAL/HAL_AVR/fastio.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.h b/Marlin/src/HAL/HAL_AVR/fastio.h
index a36bf468a099..2246a0f9d09f 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
index 62de534d5371..f9f0d3ceee10 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
index e3d2f12851b9..7552540ffee6 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
index f6ee7a5d0016..549e0246d5af 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
index 180a3c4e3202..3a48c109e97e 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
index 3f17a2e26109..23d16a20e565 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h b/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
index a9b0af5b9959..d24a2781c007 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/math.h b/Marlin/src/HAL/HAL_AVR/math.h
index d397cc4e9a5f..e8be0a04bcf5 100644
--- a/Marlin/src/HAL/HAL_AVR/math.h
+++ b/Marlin/src/HAL/HAL_AVR/math.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
index 116a8288e21d..db63b088f37d 100644
--- a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug.h b/Marlin/src/HAL/HAL_AVR/pinsDebug.h
index 0787076fb7e8..cea82ef3fa28 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_AVR/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h b/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
index 4388430779dc..f6da0777436d 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
+++ b/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h b/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
index e5bb82f226b5..6e7b8fbaa952 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
+++ b/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_AVR/spi_pins.h b/Marlin/src/HAL/HAL_AVR/spi_pins.h
index c7951acfa3c2..daaebb76d701 100644
--- a/Marlin/src/HAL/HAL_AVR/spi_pins.h
+++ b/Marlin/src/HAL/HAL_AVR/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp b/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
index bc08bc379b8c..60b4e8310496 100644
--- a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
+++ b/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.cpp b/Marlin/src/HAL/HAL_AVR/watchdog.cpp
index c7d487ebd14a..c746346192d4 100644
--- a/Marlin/src/HAL/HAL_AVR/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_AVR/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.h b/Marlin/src/HAL/HAL_AVR/watchdog.h
index efd725d7d7a3..57dfcfc0bf68 100644
--- a/Marlin/src/HAL/HAL_AVR/watchdog.h
+++ b/Marlin/src/HAL/HAL_AVR/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp b/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
index 20f10ce40530..3ed9873e66ce 100644
--- a/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
+++ b/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.cpp b/Marlin/src/HAL/HAL_DUE/HAL.cpp
index 2d2eb3b9ffa7..cb381ff4bb61 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.cpp
+++ b/Marlin/src/HAL/HAL_DUE/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/HAL_DUE/HAL.h
index b5bac8956841..ed9b1f3894f4 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.h
+++ b/Marlin/src/HAL/HAL_DUE/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp b/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
index 3524ae86901f..97a6fa05a1f2 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp b/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
index b9f14823f68c..cf523cfe3b45 100644
--- a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
+++ b/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.h b/Marlin/src/HAL/HAL_DUE/InterruptVectors.h
index 87dd04962496..534cd17f42bb 100644
--- a/Marlin/src/HAL/HAL_DUE/InterruptVectors.h
+++ b/Marlin/src/HAL/HAL_DUE/InterruptVectors.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp b/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
index 83a9c64faeb0..3cd6f7d5ed34 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h b/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
index 92806f15b405..af7d2b7adeef 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
index f7f48d5f4246..38cdd8f8a15f 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
index 3d9d4bafaadb..d8b051d37e01 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/Servo.cpp b/Marlin/src/HAL/HAL_DUE/Servo.cpp
index f48fdf57966c..266158bbc6db 100644
--- a/Marlin/src/HAL/HAL_DUE/Servo.cpp
+++ b/Marlin/src/HAL/HAL_DUE/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/Tone.cpp b/Marlin/src/HAL/HAL_DUE/Tone.cpp
index 2af97aac611f..9b580b8b4c0b 100644
--- a/Marlin/src/HAL/HAL_DUE/Tone.cpp
+++ b/Marlin/src/HAL/HAL_DUE/Tone.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
index 2501bab78ec3..0fb8a782e5c4 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
+++ b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
index 47e56fddb084..01320ba9b9a4 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
index e078bc420f57..c4816c3db54d 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+++ b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
index d3609f60ef12..2563cf110fa8 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
+++ b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
index b83247415033..e0f15bfd810d 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
+++ b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h b/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
index 14adc0c1cdcc..f81d9055d5d0 100644
--- a/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/fastio.h b/Marlin/src/HAL/HAL_DUE/fastio.h
index a97a944e33f1..6f1f8d8bf2a8 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio.h
+++ b/Marlin/src/HAL/HAL_DUE/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
index 4afd83ad4bdc..fd2c6ccf9770 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
+++ b/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h b/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
index 4a84dfe64a7b..1a802ed0f376 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
+++ b/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h b/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
index e5ce834f45a9..44b9cb35ee3f 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
+++ b/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h b/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
index 44bf8e4473eb..0de4e705bd2e 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
index fc1baa22ac8b..801719dcd109 100644
--- a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_DUE/pinsDebug.h b/Marlin/src/HAL/HAL_DUE/pinsDebug.h
index ed78f8adbb6b..448c2391d3e9 100644
--- a/Marlin/src/HAL/HAL_DUE/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_DUE/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_DUE/spi_pins.h b/Marlin/src/HAL/HAL_DUE/spi_pins.h
index 64ee17a9d864..a205540bcd33 100644
--- a/Marlin/src/HAL/HAL_DUE/spi_pins.h
+++ b/Marlin/src/HAL/HAL_DUE/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/timers.cpp b/Marlin/src/HAL/HAL_DUE/timers.cpp
index 6925f93498bb..74ae88284380 100644
--- a/Marlin/src/HAL/HAL_DUE/timers.cpp
+++ b/Marlin/src/HAL/HAL_DUE/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_DUE/timers.h b/Marlin/src/HAL/HAL_DUE/timers.h
index b7b2cf7341e0..514466011677 100644
--- a/Marlin/src/HAL/HAL_DUE/timers.h
+++ b/Marlin/src/HAL/HAL_DUE/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.cpp b/Marlin/src/HAL/HAL_DUE/watchdog.cpp
index dd80f8c71397..c245633d76a2 100644
--- a/Marlin/src/HAL/HAL_DUE/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_DUE/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.h b/Marlin/src/HAL/HAL_DUE/watchdog.h
index 6e70adef81a4..7d9665f20e3c 100644
--- a/Marlin/src/HAL/HAL_DUE/watchdog.h
+++ b/Marlin/src/HAL/HAL_DUE/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp b/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
index 544b1b3f6748..4d70d34edb97 100644
--- a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h b/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
index 9fca4fcbea39..703bcbeb73fa 100644
--- a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
+++ b/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
index 3a011e00e1c2..dc6d84e96fa7 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.h b/Marlin/src/HAL/HAL_ESP32/HAL.h
index c4528f7520c0..b59722d87760 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.h
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp b/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
index eba880b4fdfe..981d9b49c1ff 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.cpp b/Marlin/src/HAL/HAL_ESP32/Servo.cpp
index c80c29a4ebe1..68ee3d9098bf 100644
--- a/Marlin/src/HAL/HAL_ESP32/Servo.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.h b/Marlin/src/HAL/HAL_ESP32/Servo.h
index 7b73ef0f3c2c..3f575150ebb1 100644
--- a/Marlin/src/HAL/HAL_ESP32/Servo.h
+++ b/Marlin/src/HAL/HAL_ESP32/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
index 9a38d3996a65..c7ee6951e11c 100644
--- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
index 3d22c4d1b296..e76a2bc68eff 100644
--- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
+++ b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h b/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
index fff53ce60fe6..2da1cc7477cf 100644
--- a/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/fastio.h b/Marlin/src/HAL/HAL_ESP32/fastio.h
index 1641116b9023..9c4efaee9de3 100644
--- a/Marlin/src/HAL/HAL_ESP32/fastio.h
+++ b/Marlin/src/HAL/HAL_ESP32/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/HAL_ESP32/i2s.cpp
index 7a94e1594d7f..de5ef397ddb2 100644
--- a/Marlin/src/HAL/HAL_ESP32/i2s.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/i2s.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.h b/Marlin/src/HAL/HAL_ESP32/i2s.h
index 971405a3430e..63a579a18457 100644
--- a/Marlin/src/HAL/HAL_ESP32/i2s.h
+++ b/Marlin/src/HAL/HAL_ESP32/i2s.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h b/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
index ff9d7342dd83..9f19fd920b66 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.cpp b/Marlin/src/HAL/HAL_ESP32/ota.cpp
index 781854aa8be9..34a2482c9b64 100644
--- a/Marlin/src/HAL/HAL_ESP32/ota.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/ota.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.h b/Marlin/src/HAL/HAL_ESP32/ota.h
index 7e89e93ce237..1780fb32c1b3 100644
--- a/Marlin/src/HAL/HAL_ESP32/ota.h
+++ b/Marlin/src/HAL/HAL_ESP32/ota.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
index a65a4301a0e9..7113b684128e 100644
--- a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/servotimers.h b/Marlin/src/HAL/HAL_ESP32/servotimers.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_ESP32/servotimers.h
+++ b/Marlin/src/HAL/HAL_ESP32/servotimers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/spi_pins.h b/Marlin/src/HAL/HAL_ESP32/spi_pins.h
index 03ab215224f3..0e67615a2bd3 100644
--- a/Marlin/src/HAL/HAL_ESP32/spi_pins.h
+++ b/Marlin/src/HAL/HAL_ESP32/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.cpp b/Marlin/src/HAL/HAL_ESP32/spiffs.cpp
index b76d3810fa00..0013dd6093ad 100644
--- a/Marlin/src/HAL/HAL_ESP32/spiffs.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/spiffs.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.h b/Marlin/src/HAL/HAL_ESP32/spiffs.h
index 8a1ee2f1919f..b9cbb23bdae4 100644
--- a/Marlin/src/HAL/HAL_ESP32/spiffs.h
+++ b/Marlin/src/HAL/HAL_ESP32/spiffs.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.cpp b/Marlin/src/HAL/HAL_ESP32/timers.cpp
index 543889760e04..654df79067ca 100644
--- a/Marlin/src/HAL/HAL_ESP32/timers.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/timers.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.h b/Marlin/src/HAL/HAL_ESP32/timers.h
index 325ab4098bbe..bc4306be20b4 100644
--- a/Marlin/src/HAL/HAL_ESP32/timers.h
+++ b/Marlin/src/HAL/HAL_ESP32/timers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.cpp b/Marlin/src/HAL/HAL_ESP32/watchdog.cpp
index d05e67c856a3..9f681e609585 100644
--- a/Marlin/src/HAL/HAL_ESP32/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.h b/Marlin/src/HAL/HAL_ESP32/watchdog.h
index 9fb39ff9a59b..7e079908658e 100644
--- a/Marlin/src/HAL/HAL_ESP32/watchdog.h
+++ b/Marlin/src/HAL/HAL_ESP32/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/web.cpp b/Marlin/src/HAL/HAL_ESP32/web.cpp
index 6cb2145831df..73f59f2adde9 100644
--- a/Marlin/src/HAL/HAL_ESP32/web.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/web.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/web.h b/Marlin/src/HAL/HAL_ESP32/web.h
index d1d91b9c0f03..8dbefd8eefc9 100644
--- a/Marlin/src/HAL/HAL_ESP32/web.h
+++ b/Marlin/src/HAL/HAL_ESP32/web.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.cpp b/Marlin/src/HAL/HAL_ESP32/wifi.cpp
index 19f1d8fb8541..9203dd62e73d 100644
--- a/Marlin/src/HAL/HAL_ESP32/wifi.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/wifi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.h b/Marlin/src/HAL/HAL_ESP32/wifi.h
index 4cd656cb3399..580c6c87f416 100644
--- a/Marlin/src/HAL/HAL_ESP32/wifi.h
+++ b/Marlin/src/HAL/HAL_ESP32/wifi.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.cpp b/Marlin/src/HAL/HAL_LINUX/HAL.cpp
index a10b1629a043..d38644f1a5e5 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.h b/Marlin/src/HAL/HAL_LINUX/HAL.h
index 63aa8fa11f9b..fffe11111113 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL.h
+++ b/Marlin/src/HAL/HAL_LINUX/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_LINUX/arduino.cpp b/Marlin/src/HAL/HAL_LINUX/arduino.cpp
index 88128dd91a17..008db1559256 100644
--- a/Marlin/src/HAL/HAL_LINUX/arduino.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/arduino.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/fastio.h b/Marlin/src/HAL/HAL_LINUX/fastio.h
index 5c2d6fcb7e3e..8b0526710dc7 100644
--- a/Marlin/src/HAL/HAL_LINUX/fastio.h
+++ b/Marlin/src/HAL/HAL_LINUX/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
index 39dd3d1b3bf5..8265fedbf0f4 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h b/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
index e61051a0a389..17c2fd9501dc 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
index aced7281728d..e49fb13754a1 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h b/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
index 37f3bc7a4411..33eea7773124 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
index 59da64d337a3..7c9bfaf80f0a 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
index e0c250f62c75..bb759da0905f 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
index 675afd4a2140..a79f14f6f5ca 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h b/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
index afc21259710b..f8bca83e30ec 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
index df133e9e1826..ec58fe77e50c 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h b/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
index 1e8e887de5d4..04a5f3d0f7df 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
index 1c930cfce181..e7136bbdeff7 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h b/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
index 740d8ef4e8ac..ebfe8e8b9bb3 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
index 3b18dec730a0..9898c01db424 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h b/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
index 13a8206e1b1c..55bf0f95ee56 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
+++ b/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp b/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
index a4ddb1b1ffc1..0340e681fe44 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h b/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
index a24f0b3ed132..0d99a3811667 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
+++ b/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/include/serial.h b/Marlin/src/HAL/HAL_LINUX/include/serial.h
index c6da82ad5a3f..1036d6539df9 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/serial.h
+++ b/Marlin/src/HAL/HAL_LINUX/include/serial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/main.cpp b/Marlin/src/HAL/HAL_LINUX/main.cpp
index 4231affba778..1155f2a87338 100644
--- a/Marlin/src/HAL/HAL_LINUX/main.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/main.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
index c4965d90e3ad..660ecd56f184 100644
--- a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/pinsDebug.h b/Marlin/src/HAL/HAL_LINUX/pinsDebug.h
index a28d2b60b928..e373d3706784 100644
--- a/Marlin/src/HAL/HAL_LINUX/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_LINUX/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_LINUX/servo_private.h b/Marlin/src/HAL/HAL_LINUX/servo_private.h
index 2aba9a37db21..d576ff9266bd 100644
--- a/Marlin/src/HAL/HAL_LINUX/servo_private.h
+++ b/Marlin/src/HAL/HAL_LINUX/servo_private.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/spi_pins.h b/Marlin/src/HAL/HAL_LINUX/spi_pins.h
index fdd09b1c037b..8abeb312f479 100644
--- a/Marlin/src/HAL/HAL_LINUX/spi_pins.h
+++ b/Marlin/src/HAL/HAL_LINUX/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.cpp b/Marlin/src/HAL/HAL_LINUX/timers.cpp
index f293d7f40884..ebfb9505950e 100644
--- a/Marlin/src/HAL/HAL_LINUX/timers.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.h b/Marlin/src/HAL/HAL_LINUX/timers.h
index 8022aabd264d..b65758492283 100644
--- a/Marlin/src/HAL/HAL_LINUX/timers.h
+++ b/Marlin/src/HAL/HAL_LINUX/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.cpp b/Marlin/src/HAL/HAL_LINUX/watchdog.cpp
index 6338ea3b1d7b..5ffe860f055d 100644
--- a/Marlin/src/HAL/HAL_LINUX/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.h b/Marlin/src/HAL/HAL_LINUX/watchdog.h
index 51d30c8437a1..4771426a0bc3 100644
--- a/Marlin/src/HAL/HAL_LINUX/watchdog.h
+++ b/Marlin/src/HAL/HAL_LINUX/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp b/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
index bd6c59bcb726..2a39e5616807 100644
--- a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
index 4da55c2f3d53..f0559d268a1c 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/HAL_LPC1768/HAL.h
index 69247dfd9b2a..302cf9d376b0 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.h
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
index 5f32c7874d02..1c20e7f65225 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
index a8778f7446b8..382f30bff8c6 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
index 80506855384b..cfddc28406de 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/Servo.h b/Marlin/src/HAL/HAL_LPC1768/Servo.h
index 1bbf84c73e99..71e2bb569541 100644
--- a/Marlin/src/HAL/HAL_LPC1768/Servo.h
+++ b/Marlin/src/HAL/HAL_LPC1768/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h b/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
index fc09189d3296..4c4e9bd3f07d 100644
--- a/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp b/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
index 6c7de9bb1d5e..a1feb2590324 100644
--- a/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/fastio.h b/Marlin/src/HAL/HAL_LPC1768/fastio.h
index 8b90ec20d30c..48de5b8fa079 100644
--- a/Marlin/src/HAL/HAL_LPC1768/fastio.h
+++ b/Marlin/src/HAL/HAL_LPC1768/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
index ffc70b3452d8..8dffb5624cb1 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h b/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
index 559759ea031f..af085f29a90b 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
index dd83c7a97193..1e53be5f6226 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
+++ b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
index db6715e2b67e..6e9ad6f179ee 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c b/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
index f3dc6d230818..b92f3f0453f7 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
+++ b/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h b/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
index 1ca3fc184452..eae275e0f957 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp
index b20841bdeb9c..581dd86716a6 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h b/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
index cafa53b30e1f..55a58fde1dfb 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
+++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
index 3de02022eb65..c7cad4d96c53 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
index 2454dea19577..50d52fb8607d 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h b/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
index 133cd11be26e..6cc824afa3aa 100644
--- a/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h b/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
index acf991a9d790..9b983428bdb0 100644
--- a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
+++ b/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.cpp b/Marlin/src/HAL/HAL_LPC1768/timers.cpp
index 7bf7ff388051..686b251c690d 100644
--- a/Marlin/src/HAL/HAL_LPC1768/timers.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.h b/Marlin/src/HAL/HAL_LPC1768/timers.h
index 5f4e06265eab..30da93352185 100644
--- a/Marlin/src/HAL/HAL_LPC1768/timers.h
+++ b/Marlin/src/HAL/HAL_LPC1768/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
index 360cce7f662f..6d643f5bf6ed 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
index 85ca067441ec..9de3e9327490 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
index 1153329d8987..e7518d698a83 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
index 314e20b43f83..0d9b8d3dcc0f 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
index d441b7b4d06a..67e78f36f056 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
index 569706b483df..8a73b69ded59 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
index 057a1374450a..c0105bc129f8 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
index d19e66d41562..b99abb6867e9 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
index ac289c1a209b..5f3da457aa88 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
index 0a1bd84875cf..a1f8097e5251 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
index 7b6557148ada..a98c5eea9cb9 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp b/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
index c83931745aa3..0af2d8347bb0 100644
--- a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp b/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
index f9518cd25c82..73563a6baa13 100644
--- a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.h b/Marlin/src/HAL/HAL_LPC1768/watchdog.h
index dd6617ea315a..e9e25e4f2af8 100644
--- a/Marlin/src/HAL/HAL_LPC1768/watchdog.h
+++ b/Marlin/src/HAL/HAL_LPC1768/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp b/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
index 6074e4bbd615..2b8da883dcdb 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/HAL_SAMD51/HAL.h
index 37437cb758e9..2eaa40f302b6 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.h
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp b/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
index bbd12912a2c1..4fe4c85b69de 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp b/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
index 2da4d8c07e00..f13b29555af7 100644
--- a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h b/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
index 0768d8a04eff..a9eb0470a24f 100644
--- a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
+++ b/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/SAMD51.h b/Marlin/src/HAL/HAL_SAMD51/SAMD51.h
index d29d134c0056..ef84a2082019 100644
--- a/Marlin/src/HAL/HAL_SAMD51/SAMD51.h
+++ b/Marlin/src/HAL/HAL_SAMD51/SAMD51.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/Servo.cpp b/Marlin/src/HAL/HAL_SAMD51/Servo.cpp
index dbae75042513..b39869ef324c 100644
--- a/Marlin/src/HAL/HAL_SAMD51/Servo.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/Servo.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h b/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
index 8b77d5b50334..3572c608d26d 100644
--- a/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
+++ b/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h b/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
index 4f6b61a0d1e2..4c8f441ce22f 100644
--- a/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/HAL_SAMD51/fastio.h
index ecd9acea44dc..b5045e47bbca 100644
--- a/Marlin/src/HAL/HAL_SAMD51/fastio.h
+++ b/Marlin/src/HAL/HAL_SAMD51/fastio.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
index 0c1e83115eb7..163bf1278c8d 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
index e41dd85c8556..7e7c25378e83 100644
--- a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h b/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
index 64f6929c00a7..07964fb1b3bb 100644
--- a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/spi_pins.h b/Marlin/src/HAL/HAL_SAMD51/spi_pins.h
index 3315fa08ac5f..049aacb57a94 100644
--- a/Marlin/src/HAL/HAL_SAMD51/spi_pins.h
+++ b/Marlin/src/HAL/HAL_SAMD51/spi_pins.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.cpp b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
index 24340439669d..95784c760414 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/HAL_SAMD51/timers.h
index 80c37d14af85..9bd2e03d6f66 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.h
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp b/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
index 69a6de4ef759..13539b4d704d 100644
--- a/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.h b/Marlin/src/HAL/HAL_SAMD51/watchdog.h
index b626b0b06ae1..aa8ef3537112 100644
--- a/Marlin/src/HAL/HAL_SAMD51/watchdog.h
+++ b/Marlin/src/HAL/HAL_SAMD51/watchdog.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp
index 4d3693164d14..f21ec53ce422 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/HAL_STM32/HAL.h
index 995c7144f33a..a62c3f41309b 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp b/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
index de45c8948e13..7b37fff9c249 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.cpp b/Marlin/src/HAL/HAL_STM32/Servo.cpp
index 9af8ba618484..2dcadb88763f 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.cpp
+++ b/Marlin/src/HAL/HAL_STM32/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.h b/Marlin/src/HAL/HAL_STM32/Servo.h
index ec4b6be131d2..1f841f8184aa 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.h
+++ b/Marlin/src/HAL/HAL_STM32/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h b/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
index 96fa444668b1..0b97c3c77412 100644
--- a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.cpp b/Marlin/src/HAL/HAL_STM32/fastio.cpp
index 33685ceddac1..4c8b63fa1039 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.cpp
+++ b/Marlin/src/HAL/HAL_STM32/fastio.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.h b/Marlin/src/HAL/HAL_STM32/fastio.h
index 917ee3a1a630..fa94d4703cfe 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.h
+++ b/Marlin/src/HAL/HAL_STM32/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h b/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
index 9a1727bceb00..b1d0029ba9d4 100644
--- a/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
index 0242b78aeb7d..80ef901ceba9 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
index 44f01cb88f09..2a71c4594876 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
index 6ce63073c4a2..2df90d23288e 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug.h b/Marlin/src/HAL/HAL_STM32/pinsDebug.h
index 4e27cee195d3..8c5d1ec2b61e 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_STM32/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h b/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
index b1c256218596..43f430a48f9d 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
+++ b/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h b/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
index 9d9796eabecb..58b8c32cc76c 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
+++ b/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32/pins_Xref.h b/Marlin/src/HAL/HAL_STM32/pins_Xref.h
index 84278c391683..7e88ec76ba4b 100644
--- a/Marlin/src/HAL/HAL_STM32/pins_Xref.h
+++ b/Marlin/src/HAL/HAL_STM32/pins_Xref.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/spi_pins.h b/Marlin/src/HAL/HAL_STM32/spi_pins.h
index f8c9546b6389..8f46ca12c5fd 100644
--- a/Marlin/src/HAL/HAL_STM32/spi_pins.h
+++ b/Marlin/src/HAL/HAL_STM32/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32/timers.cpp b/Marlin/src/HAL/HAL_STM32/timers.cpp
index c2a4cbdc0e2d..b7b65f714e84 100644
--- a/Marlin/src/HAL/HAL_STM32/timers.cpp
+++ b/Marlin/src/HAL/HAL_STM32/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_STM32/timers.h b/Marlin/src/HAL/HAL_STM32/timers.h
index f1dce173e48b..8a0950a4d755 100644
--- a/Marlin/src/HAL/HAL_STM32/timers.h
+++ b/Marlin/src/HAL/HAL_STM32/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2017 Victor Perez
  *
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.cpp b/Marlin/src/HAL/HAL_STM32/watchdog.cpp
index 4defadaa77d3..2c6b583e83c8 100644
--- a/Marlin/src/HAL/HAL_STM32/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_STM32/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.h b/Marlin/src/HAL/HAL_STM32/watchdog.h
index 6855016737d1..efa7d2b3d038 100644
--- a/Marlin/src/HAL/HAL_STM32/watchdog.h
+++ b/Marlin/src/HAL/HAL_STM32/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
index 0db0371caee2..bde77ec0eccb 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/HAL_STM32F1/HAL.h
index 4d2ff2a0a3af..b7e2921ffa52 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
index 9f3f34239d4a..bfbdf6af40fd 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.cpp b/Marlin/src/HAL/HAL_STM32F1/Servo.cpp
index 5dc21691544c..06abb2c2b907 100644
--- a/Marlin/src/HAL/HAL_STM32F1/Servo.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.h b/Marlin/src/HAL/HAL_STM32F1/Servo.h
index 92f4dd678d34..b3ca09f23808 100644
--- a/Marlin/src/HAL/HAL_STM32F1/Servo.h
+++ b/Marlin/src/HAL/HAL_STM32F1/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp b/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
index 99772a03c209..e9e4a162a59b 100644
--- a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h b/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
index 330d7d632d16..1899a2ae0b93 100644
--- a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
+++ b/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp b/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
index a16b379b3077..cc26a003d19a 100644
--- a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
index 753a5d5e708d..8cf9099c8159 100644
--- a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h b/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
index 9c18ee35ae02..246e29298312 100644
--- a/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/fastio.h b/Marlin/src/HAL/HAL_STM32F1/fastio.h
index 3aafb9de3960..9bf78d4254b0 100644
--- a/Marlin/src/HAL/HAL_STM32F1/fastio.h
+++ b/Marlin/src/HAL/HAL_STM32F1/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
index 7673d8673ac6..25e5d0f1f848 100644
--- a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp b/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
index 81e430fa2adb..a086b82bc36c 100644
--- a/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.h b/Marlin/src/HAL/HAL_STM32F1/msc_sd.h
index 9f06ca5fdbf4..125ba3646634 100644
--- a/Marlin/src/HAL/HAL_STM32F1/msc_sd.h
+++ b/Marlin/src/HAL/HAL_STM32F1/msc_sd.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp b/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
index c5b4f34cd22d..0fd94a91993e 100644
--- a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
@@ -1,7 +1,7 @@
 /**
  * STM32F1: MMCv3/SDv1/SDv2 (SPI mode) control module
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
  * Copyright (C) 2015, ChaN, all right reserved.
  *
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h b/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
index ec73162ba17f..1dc7ec5b3bfa 100644
--- a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
+++ b/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------
-/ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+/ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 / * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
 / * Low level disk interface module include file   (C)ChaN, 2015
 /-----------------------------------------------------------------------*/
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
index babcdeaee31a..19fcc39521ca 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
index bbca1cb3912d..3d6a3b4591f0 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
index 38d5803f5810..0a0d71271822 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h b/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
index a8b632870aa9..8d3eed52d0ba 100644
--- a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.cpp b/Marlin/src/HAL/HAL_STM32F1/sdio.cpp
index c1cab57a9e9f..da6beda85c79 100644
--- a/Marlin/src/HAL/HAL_STM32F1/sdio.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/sdio.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.h b/Marlin/src/HAL/HAL_STM32F1/sdio.h
index ca0aced69581..f51ba6d0a631 100644
--- a/Marlin/src/HAL/HAL_STM32F1/sdio.h
+++ b/Marlin/src/HAL/HAL_STM32F1/sdio.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2017 Victor Perez
  *
diff --git a/Marlin/src/HAL/HAL_STM32F1/spi_pins.h b/Marlin/src/HAL/HAL_STM32F1/spi_pins.h
index edea89cc7d3b..e8e4cbba1167 100644
--- a/Marlin/src/HAL/HAL_STM32F1/spi_pins.h
+++ b/Marlin/src/HAL/HAL_STM32F1/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.cpp b/Marlin/src/HAL/HAL_STM32F1/timers.cpp
index 051f0323c6bd..720bd37ba490 100644
--- a/Marlin/src/HAL/HAL_STM32F1/timers.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.h b/Marlin/src/HAL/HAL_STM32F1/timers.h
index d5d02a3dc65c..d7fe11470c54 100644
--- a/Marlin/src/HAL/HAL_STM32F1/timers.h
+++ b/Marlin/src/HAL/HAL_STM32F1/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2017 Victor Perez
  *
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp b/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
index 17f5aa9725b7..9556d1fa66e8 100644
--- a/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.h b/Marlin/src/HAL/HAL_STM32F1/watchdog.h
index 21f97dd7a159..7218b1a72022 100644
--- a/Marlin/src/HAL/HAL_STM32F1/watchdog.h
+++ b/Marlin/src/HAL/HAL_STM32F1/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
index 5e6ae09bf10a..4852234ba455 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
index e24483f642e2..5acda8af41e8 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
index 41b445d65e23..d92aebeac0e5 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2017 Victor Perez
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
index 2f85182e2033..deb14f2cfefc 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
index 32219962ee75..ffd46dae6053 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
index 726207fbcfc6..c52f5ea21c9b 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2017 Victor Perez
  *
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
index 5a3b32ef5bce..d90f22e03af8 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
index 38ecde30bb94..00428c54f112 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2017 Victor Perez
  *
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
index b3aac77615d4..e7fb15e6b17c 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
index 64fa05025c7c..076a547bb202 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h b/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
index 96fa444668b1..0b97c3c77412 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
index 1e5ef2ef3085..ee64ca833d2e 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
index c647ea0c039b..058c8d9dde6e 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
index 4bd86d225d4f..8ffb689551c6 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h b/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
index 342b875561b5..8672dd0a1b05 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h b/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
index 4aef289a7761..f120e7178b8b 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h b/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
index cf33205bddab..632c05a5ade8 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2017 Victor Perez
  *
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
index 900d1ef6a6fa..347edcd49d21 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
index 9e2a2dc21c45..ece6ef0162fa 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
index 2e15324e3bbd..f226a4a90ebe 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
index 684afa58f466..5a5038287cc1 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
index 4236f02b0f43..83d4d00bf265 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
index 6451f6b1722e..2b01d3d87589 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
index 3eb7d39b2217..9243291e43b3 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h b/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
index 221b721b356a..21fea5bd0115 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h b/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
index d1b5f567d750..8547fe2b7a81 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
index b680a1a44532..04efaaa6701a 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
index 6da102638f63..9781dc62e641 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h b/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
index 8a0ab8f9a494..79230f3d4403 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
index e4ccf33a4bb0..92641742f93d 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.h b/Marlin/src/HAL/HAL_TEENSY31_32/timers.h
index 6dff7701be3c..00f9f0740dce 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/timers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
index d1313e1f5deb..618294591b9d 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
index 861afcbc9148..cb881f859501 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
index 34d2354637b3..86ba40870f71 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
index 97763bf205bf..3fbfeaea64f3 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
index 44ab74cc9bf6..b35533aa9435 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
index d376b80a7df6..f2fd5fe7ffed 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
index cafd323a3846..4962105d79af 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h b/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
index 2b7169641b55..eaaf297ea2d3 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h b/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
index d1b5f567d750..8547fe2b7a81 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
index 85f26f40162e..0285c52ee365 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
index 5cb2cbfc8c41..37ef55e02dcc 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
index 17934f71a327..963f372f547a 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h b/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
index db750cf6ec85..61a54f15ed35 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h b/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
index 9c6a83e3f8bd..b29a9346a1dc 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
index 6bbc16dcb55e..81e23e4d170f 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.h b/Marlin/src/HAL/HAL_TEENSY35_36/timers.h
index 8ae51107c74b..6dc26a966511 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/timers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
index f58217c75054..69afa04a5438 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
index 7c27260906c7..ec3f18f09452 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index e3e7f52cfaec..cbf8a9512bb9 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 4ba14d9681a3..78bf6745ea54 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/HAL_SPI.h b/Marlin/src/HAL/shared/HAL_SPI.h
index d805207047da..0410d70c9361 100644
--- a/Marlin/src/HAL/shared/HAL_SPI.h
+++ b/Marlin/src/HAL/shared/HAL_SPI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/HAL_ST7920.h b/Marlin/src/HAL/shared/HAL_ST7920.h
index de40ade5abb7..12392a5ece23 100644
--- a/Marlin/src/HAL/shared/HAL_ST7920.h
+++ b/Marlin/src/HAL/shared/HAL_ST7920.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
index e740a171d8a6..46e7b71f88d7 100644
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/Marduino.h b/Marlin/src/HAL/shared/Marduino.h
index a2de03a2b6e4..c022fc72edd6 100644
--- a/Marlin/src/HAL/shared/Marduino.h
+++ b/Marlin/src/HAL/shared/Marduino.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/MarlinSerial.h b/Marlin/src/HAL/shared/MarlinSerial.h
index c82bdbee7d81..3770f61b3c26 100644
--- a/Marlin/src/HAL/shared/MarlinSerial.h
+++ b/Marlin/src/HAL/shared/MarlinSerial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/backtrace/backtrace.cpp b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
index dab39682551e..7264969c7437 100644
--- a/Marlin/src/HAL/shared/backtrace/backtrace.cpp
+++ b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/backtrace/backtrace.h b/Marlin/src/HAL/shared/backtrace/backtrace.h
index a2b8eae59412..636eb09a7137 100644
--- a/Marlin/src/HAL/shared/backtrace/backtrace.h
+++ b/Marlin/src/HAL/shared/backtrace/backtrace.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/eeprom_i2c.cpp b/Marlin/src/HAL/shared/eeprom_i2c.cpp
index 2752b7d4ccd5..fac77ac7db46 100644
--- a/Marlin/src/HAL/shared/eeprom_i2c.cpp
+++ b/Marlin/src/HAL/shared/eeprom_i2c.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/eeprom_spi.cpp b/Marlin/src/HAL/shared/eeprom_spi.cpp
index 35e7d9b0a952..ce7479aedb41 100644
--- a/Marlin/src/HAL/shared/eeprom_spi.cpp
+++ b/Marlin/src/HAL/shared/eeprom_spi.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/math_32bit.h b/Marlin/src/HAL/shared/math_32bit.h
index a69992a655e4..d93ab9caf6a8 100644
--- a/Marlin/src/HAL/shared/math_32bit.h
+++ b/Marlin/src/HAL/shared/math_32bit.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/persistent_store_api.cpp b/Marlin/src/HAL/shared/persistent_store_api.cpp
index 9aed03a0c8a1..735fa4278b7f 100644
--- a/Marlin/src/HAL/shared/persistent_store_api.cpp
+++ b/Marlin/src/HAL/shared/persistent_store_api.cpp
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/shared/persistent_store_api.h b/Marlin/src/HAL/shared/persistent_store_api.h
index 02013120a72a..d7bee8a5f3da 100644
--- a/Marlin/src/HAL/shared/persistent_store_api.h
+++ b/Marlin/src/HAL/shared/persistent_store_api.h
@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
diff --git a/Marlin/src/HAL/shared/servo.cpp b/Marlin/src/HAL/shared/servo.cpp
index b5975e58e708..7c078d2f4180 100644
--- a/Marlin/src/HAL/shared/servo.cpp
+++ b/Marlin/src/HAL/shared/servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/servo.h b/Marlin/src/HAL/shared/servo.h
index e4905b7295c8..4e12720553bb 100644
--- a/Marlin/src/HAL/shared/servo.h
+++ b/Marlin/src/HAL/shared/servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index 1d4cdc7e3eb8..63761ce0f40c 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index a1154231c2f6..180bedd87c2d 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 85138268bf12..fb5746225954 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index f4ada7aaf489..43cc3111eccb 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h
index 07bdad7ff2c1..4b2cdf9f77d4 100644
--- a/Marlin/src/core/debug_out.h
+++ b/Marlin/src/core/debug_out.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index a89578f529bc..79cd0b04e7ab 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index ecafd49a8298..a20a4eb270aa 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 2885150d1ca6..9699585c1ecf 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/millis_t.h b/Marlin/src/core/millis_t.h
index 7ff231f82789..39ea17b9f0c8 100644
--- a/Marlin/src/core/millis_t.h
+++ b/Marlin/src/core/millis_t.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 2c37d681eeda..41c400ea62b2 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 1e1eb8c62381..c571faf37b1f 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 97ce5af5ee64..d563963cf75c 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 14f7aa708324..768bc5e9d083 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index f430da50d6a0..d0a5274ce240 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/I2CPositionEncoder.cpp
index 07f3aa21415d..9c1e53df74c4 100644
--- a/Marlin/src/feature/I2CPositionEncoder.cpp
+++ b/Marlin/src/feature/I2CPositionEncoder.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/I2CPositionEncoder.h b/Marlin/src/feature/I2CPositionEncoder.h
index 25350b27873f..0665ee809d41 100644
--- a/Marlin/src/feature/I2CPositionEncoder.h
+++ b/Marlin/src/feature/I2CPositionEncoder.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
index 63013057bce5..f56d98a5bca3 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/Max7219_Debug_LEDs.h
index 9462fb23d9af..d0b242454450 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.h
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index 0b08f8ae4167..c6e7628a154e 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index fbf04a03f945..3322b4a24633 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 43e6d36becd1..84cd0a85b7d7 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/backlash.h b/Marlin/src/feature/backlash.h
index 0ded86565b51..20666c540bb7 100644
--- a/Marlin/src/feature/backlash.h
+++ b/Marlin/src/feature/backlash.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/baricuda.cpp b/Marlin/src/feature/baricuda.cpp
index 354e8482a562..3899348548fb 100644
--- a/Marlin/src/feature/baricuda.cpp
+++ b/Marlin/src/feature/baricuda.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/baricuda.h b/Marlin/src/feature/baricuda.h
index 778d2bef0aa4..567d2253e635 100644
--- a/Marlin/src/feature/baricuda.h
+++ b/Marlin/src/feature/baricuda.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 738a9526f698..5bc08bc69577 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/abl/abl.h b/Marlin/src/feature/bedlevel/abl/abl.h
index 15e988fe0a76..312dc0db80ef 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.h
+++ b/Marlin/src/feature/bedlevel/abl/abl.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 9aa3ae0a57c0..f302d172bf9b 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index 6ba09488801c..fd3ed82e5287 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index af9c671d6a2d..e80b9e9d2f15 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index 3009f4aea4c3..4c8773107f77 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 8327b468a7e3..6583e679cf6c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 2202bb6524a1..370d792fc5d6 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 693a4b9b2389..4bef0dd747cb 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index f464d0fd6ff2..536410824069 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/binary_protocol.cpp b/Marlin/src/feature/binary_protocol.cpp
index 81ccbfbe32e4..e555c0c46329 100644
--- a/Marlin/src/feature/binary_protocol.cpp
+++ b/Marlin/src/feature/binary_protocol.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/binary_protocol.h b/Marlin/src/feature/binary_protocol.h
index 8e69ab7a752b..978d6a2c0217 100644
--- a/Marlin/src/feature/binary_protocol.h
+++ b/Marlin/src/feature/binary_protocol.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 64c052269b72..e5ccb42bf492 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/bltouch.h b/Marlin/src/feature/bltouch.h
index 9f279622294d..f4a921d5ba66 100644
--- a/Marlin/src/feature/bltouch.h
+++ b/Marlin/src/feature/bltouch.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/cancel_object.cpp b/Marlin/src/feature/cancel_object.cpp
index a066815e85e0..e2ee6452151d 100644
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/cancel_object.h b/Marlin/src/feature/cancel_object.h
index f32283b46dd3..41bbfb70fcfc 100644
--- a/Marlin/src/feature/cancel_object.h
+++ b/Marlin/src/feature/cancel_object.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 740dd7183a88..a135cac418d2 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/caselight.h b/Marlin/src/feature/caselight.h
index 322898d06552..de77f0696b57 100644
--- a/Marlin/src/feature/caselight.h
+++ b/Marlin/src/feature/caselight.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/closedloop.cpp b/Marlin/src/feature/closedloop.cpp
index e04014ba60cd..b777243481ca 100644
--- a/Marlin/src/feature/closedloop.cpp
+++ b/Marlin/src/feature/closedloop.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/closedloop.h b/Marlin/src/feature/closedloop.h
index 952d3dcbec94..7e5594447d0e 100644
--- a/Marlin/src/feature/closedloop.h
+++ b/Marlin/src/feature/closedloop.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 57b552f9b0cf..b9d8c394609b 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/controllerfan.h b/Marlin/src/feature/controllerfan.h
index d68393a4b053..f2facc288f30 100644
--- a/Marlin/src/feature/controllerfan.h
+++ b/Marlin/src/feature/controllerfan.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/dac_dac084s085.h b/Marlin/src/feature/dac/dac_dac084s085.h
index 09d5bb857d54..cccc9cbd4545 100644
--- a/Marlin/src/feature/dac/dac_dac084s085.h
+++ b/Marlin/src/feature/dac/dac_dac084s085.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index 9efb9943a713..39f873f0cb82 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/dac_mcp4728.h b/Marlin/src/feature/dac/dac_mcp4728.h
index f25310f7cae7..8e8b25ca691a 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.h
+++ b/Marlin/src/feature/dac/dac_mcp4728.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 320e88c69c7c..cb3856f28704 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/dac/stepper_dac.h b/Marlin/src/feature/dac/stepper_dac.h
index 3496ebec4897..3e77d471a672 100644
--- a/Marlin/src/feature/dac/stepper_dac.h
+++ b/Marlin/src/feature/dac/stepper_dac.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/digipot/digipot.h b/Marlin/src/feature/digipot/digipot.h
index 03c9854153f2..b7c0b6503619 100644
--- a/Marlin/src/feature/digipot/digipot.h
+++ b/Marlin/src/feature/digipot/digipot.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
index 86eeab63b481..888acc55d050 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index 48b4d154be2a..e84bd28d35c6 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/emergency_parser.cpp b/Marlin/src/feature/emergency_parser.cpp
index 97ab9670281c..60fba1f1b617 100644
--- a/Marlin/src/feature/emergency_parser.cpp
+++ b/Marlin/src/feature/emergency_parser.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/emergency_parser.h
index e9ce0f664508..787c82407fc5 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/emergency_parser.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fanmux.cpp b/Marlin/src/feature/fanmux.cpp
index 6c7b56ac5446..b90c72c64813 100644
--- a/Marlin/src/feature/fanmux.cpp
+++ b/Marlin/src/feature/fanmux.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fanmux.h b/Marlin/src/feature/fanmux.h
index 492b9fd7858d..2e5414447813 100644
--- a/Marlin/src/feature/fanmux.h
+++ b/Marlin/src/feature/fanmux.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/filwidth.cpp b/Marlin/src/feature/filwidth.cpp
index fb685bddc1f6..ae8c43d43091 100644
--- a/Marlin/src/feature/filwidth.cpp
+++ b/Marlin/src/feature/filwidth.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/filwidth.h b/Marlin/src/feature/filwidth.h
index 7255428fdf5d..335a49b74f1e 100644
--- a/Marlin/src/feature/filwidth.h
+++ b/Marlin/src/feature/filwidth.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 896e60295091..2436170b3542 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index 374667513de2..e08f8f03af22 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index 30ec8bfb1d50..3633a7b75f5b 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 57af59eb2e4e..939f0be2de67 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 7a8e40f503e2..70c2812a37aa 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/joystick.h b/Marlin/src/feature/joystick.h
index 50196374a762..12f9554a714e 100644
--- a/Marlin/src/feature/joystick.h
+++ b/Marlin/src/feature/joystick.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/blinkm.cpp b/Marlin/src/feature/leds/blinkm.cpp
index 0c5b15befde1..1c7ceeb669df 100644
--- a/Marlin/src/feature/leds/blinkm.cpp
+++ b/Marlin/src/feature/leds/blinkm.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/blinkm.h b/Marlin/src/feature/leds/blinkm.h
index 231dbe810e44..c7c099d3a847 100644
--- a/Marlin/src/feature/leds/blinkm.h
+++ b/Marlin/src/feature/leds/blinkm.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 210aeef0922b..995693ffc50c 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 443ecdcbca5c..22184381fc4d 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/neopixel.cpp b/Marlin/src/feature/leds/neopixel.cpp
index a3ceacb42c75..892ebe15cbc7 100644
--- a/Marlin/src/feature/leds/neopixel.cpp
+++ b/Marlin/src/feature/leds/neopixel.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index e0a3d7c389d7..11e435b83048 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/pca9632.cpp b/Marlin/src/feature/leds/pca9632.cpp
index fc0da10f708d..af9e39b863bf 100644
--- a/Marlin/src/feature/leds/pca9632.cpp
+++ b/Marlin/src/feature/leds/pca9632.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/pca9632.h b/Marlin/src/feature/leds/pca9632.h
index 2abdf7c7af19..749230f6526f 100644
--- a/Marlin/src/feature/leds/pca9632.h
+++ b/Marlin/src/feature/leds/pca9632.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/printer_event_leds.cpp b/Marlin/src/feature/leds/printer_event_leds.cpp
index 3ce7a1af2181..70eee76b3043 100644
--- a/Marlin/src/feature/leds/printer_event_leds.cpp
+++ b/Marlin/src/feature/leds/printer_event_leds.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/printer_event_leds.h b/Marlin/src/feature/leds/printer_event_leds.h
index 07ad653fd0f3..d2888705e7e0 100644
--- a/Marlin/src/feature/leds/printer_event_leds.h
+++ b/Marlin/src/feature/leds/printer_event_leds.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/tempstat.cpp b/Marlin/src/feature/leds/tempstat.cpp
index f19ae0f092ad..2d7afdcf9e75 100644
--- a/Marlin/src/feature/leds/tempstat.cpp
+++ b/Marlin/src/feature/leds/tempstat.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/leds/tempstat.h b/Marlin/src/feature/leds/tempstat.h
index 834f2e491f4e..fefe776cfd7e 100644
--- a/Marlin/src/feature/leds/tempstat.h
+++ b/Marlin/src/feature/leds/tempstat.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index dbdd9558aaeb..de1cda14beca 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/mixing.h b/Marlin/src/feature/mixing.h
index 095f22d13bc9..da5240995c74 100644
--- a/Marlin/src/feature/mixing.h
+++ b/Marlin/src/feature/mixing.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 6a2f148ea394..0bf8fe4b9889 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index 42f70cc60174..f88dd349c59e 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 4a61f8a412f1..f1979c376192 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 1e42365b45a2..0bad7736ef45 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/power_loss_recovery.cpp
index 0cf0fc5885f4..aa7dff36e8c9 100644
--- a/Marlin/src/feature/power_loss_recovery.cpp
+++ b/Marlin/src/feature/power_loss_recovery.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/power_loss_recovery.h
index 24e24e9e20a6..84f0d9f698a9 100644
--- a/Marlin/src/feature/power_loss_recovery.h
+++ b/Marlin/src/feature/power_loss_recovery.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/probe_temp_compensation.cpp b/Marlin/src/feature/probe_temp_compensation.cpp
index 5d266e1d3cad..edb70ff268ad 100644
--- a/Marlin/src/feature/probe_temp_compensation.cpp
+++ b/Marlin/src/feature/probe_temp_compensation.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_compensation.h
index 91f652980b16..ddd178e45559 100644
--- a/Marlin/src/feature/probe_temp_compensation.h
+++ b/Marlin/src/feature/probe_temp_compensation.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/prusa_MMU2/mmu2.cpp
index d96cbf972080..2833735f3e2f 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp
+++ b/Marlin/src/feature/prusa_MMU2/mmu2.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.h b/Marlin/src/feature/prusa_MMU2/mmu2.h
index 9628c4be7f5b..970b0b4338ff 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.h
+++ b/Marlin/src/feature/prusa_MMU2/mmu2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 700854ad2d9f..3acda2f7a254 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 8f43ea39e1e5..813f44e05e7d 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/snmm.cpp b/Marlin/src/feature/snmm.cpp
index 8cfe3bf51a67..e994028d9e76 100644
--- a/Marlin/src/feature/snmm.cpp
+++ b/Marlin/src/feature/snmm.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/snmm.h b/Marlin/src/feature/snmm.h
index f54211a21deb..671542e3bf4a 100644
--- a/Marlin/src/feature/snmm.h
+++ b/Marlin/src/feature/snmm.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index c25e2e5dab8b..a6717b749c0e 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/solenoid.h b/Marlin/src/feature/solenoid.h
index db94c4fe2b6c..5a503b1056a4 100644
--- a/Marlin/src/feature/solenoid.h
+++ b/Marlin/src/feature/solenoid.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 775e7a864aef..0567ba5d3e2f 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 26d7c301b4ee..ea035299be3e 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 84b5c2db7b79..63fa849b1291 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index a6d4447d45d2..2c0a87703e15 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp
index b0ab10e7ce1b..26e25950d869 100644
--- a/Marlin/src/feature/touch/xpt2046.cpp
+++ b/Marlin/src/feature/touch/xpt2046.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/feature/touch/xpt2046.h b/Marlin/src/feature/touch/xpt2046.h
index 384d7904bd48..7f8eece1f497 100644
--- a/Marlin/src/feature/touch/xpt2046.h
+++ b/Marlin/src/feature/touch/xpt2046.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index f4fe512cdf3f..f0687b34b318 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index 211711ba8519..faf9eb38cf18 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/z_stepper_align.cpp b/Marlin/src/feature/z_stepper_align.cpp
index 0e2b7cef2ada..6fccff7cc917 100644
--- a/Marlin/src/feature/z_stepper_align.cpp
+++ b/Marlin/src/feature/z_stepper_align.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/z_stepper_align.h b/Marlin/src/feature/z_stepper_align.h
index 8b31ac4bded9..ade3d6b575e2 100644
--- a/Marlin/src/feature/z_stepper_align.h
+++ b/Marlin/src/feature/z_stepper_align.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 7b580b666f1a..4ef98578c56b 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/G42.cpp b/Marlin/src/gcode/bedlevel/G42.cpp
index bd6715e29d93..ed6d66f002f9 100644
--- a/Marlin/src/gcode/bedlevel/G42.cpp
+++ b/Marlin/src/gcode/bedlevel/G42.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 70f80465e3f4..1d78afaca3e1 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index ff0581886a70..a92e36811472 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index b9470528a189..bec7514409d7 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 92d95f169b6f..0a9a7f439bfc 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/mbl/M421.cpp b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
index f07cafebf80b..f0fbf3021044 100644
--- a/Marlin/src/gcode/bedlevel/mbl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/ubl/G29.cpp b/Marlin/src/gcode/bedlevel/ubl/G29.cpp
index c0f8f20439d3..7b42e6dddf8e 100644
--- a/Marlin/src/gcode/bedlevel/ubl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/G29.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index 153e6018aa61..393eae03b278 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 2b8c15014047..b76d4da96632 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index bfcf9153ea1c..acf668f94018 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 4532da8f8ca6..e7bc63828f1f 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 28a3276dfd39..c0a410fcc426 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index b94b56fd93f2..4340084ec6d4 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index a77583c6e1ec..274caeec1ddc 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M12.cpp b/Marlin/src/gcode/calibrate/M12.cpp
index 2474c4bc412a..26f15bb89213 100644
--- a/Marlin/src/gcode/calibrate/M12.cpp
+++ b/Marlin/src/gcode/calibrate/M12.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index a83ccd65c1bb..a54c7cf746fc 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 707a37fc235e..8fba7a646fe9 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 6234265b3d20..0436736b4a13 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index c2c13a774af1..094b32708b4d 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index 4bb068e5b272..f9fa84a3b3be 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 46a4e6c6c0cf..b9192198bd04 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index d14ceaa0e5d6..44e69c429843 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index 790d7714a370..644a67eeaf6f 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index 3710a30ab9cf..e09a5f7534d6 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M221.cpp b/Marlin/src/gcode/config/M221.cpp
index a7a48c373030..8522b544fc8b 100644
--- a/Marlin/src/gcode/config/M221.cpp
+++ b/Marlin/src/gcode/config/M221.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index a694cb2df4c2..3a07807f3797 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index c0b48d0dab44..31584d61e0d3 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M302.cpp b/Marlin/src/gcode/config/M302.cpp
index 891f3c82584a..aa178ea206e6 100644
--- a/Marlin/src/gcode/config/M302.cpp
+++ b/Marlin/src/gcode/config/M302.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 6510bc03f6ec..2a851494244c 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index b6975409864c..47a81cdb6c81 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 5937b4c72116..0dd0013e05ea 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M540.cpp b/Marlin/src/gcode/config/M540.cpp
index fa04fa059d28..a8ec628d5a2f 100644
--- a/Marlin/src/gcode/config/M540.cpp
+++ b/Marlin/src/gcode/config/M540.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index 0abc8f9fead2..947af14e30ab 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 212b6f83b7e6..642de9672579 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M108_M112_M410.cpp b/Marlin/src/gcode/control/M108_M112_M410.cpp
index 606a39d51cee..cb4220507d85 100644
--- a/Marlin/src/gcode/control/M108_M112_M410.cpp
+++ b/Marlin/src/gcode/control/M108_M112_M410.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index 1c608408f3d0..fd7ca09c6cdf 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M120_M121.cpp b/Marlin/src/gcode/control/M120_M121.cpp
index 7ee6a83fbfd0..b25834cbda4f 100644
--- a/Marlin/src/gcode/control/M120_M121.cpp
+++ b/Marlin/src/gcode/control/M120_M121.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 4908a64ecbc7..d69654a95910 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index 432ab1379af0..782084b711e2 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M226.cpp b/Marlin/src/gcode/control/M226.cpp
index 3dbc5984f9ad..0dfbfd62528e 100644
--- a/Marlin/src/gcode/control/M226.cpp
+++ b/Marlin/src/gcode/control/M226.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index 6b65e9b75310..21a6c9890d9c 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index 81e164519325..56e1e0e4ec9d 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index 44a2dd4943cf..ae448a63ec18 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M380_M381.cpp b/Marlin/src/gcode/control/M380_M381.cpp
index 58d043169808..756021a59b0b 100644
--- a/Marlin/src/gcode/control/M380_M381.cpp
+++ b/Marlin/src/gcode/control/M380_M381.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M400.cpp b/Marlin/src/gcode/control/M400.cpp
index 445aa9c979ea..3926299807bb 100644
--- a/Marlin/src/gcode/control/M400.cpp
+++ b/Marlin/src/gcode/control/M400.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 1ee03f890538..7106ce55027b 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 95d72b65d78f..e45dedf27b65 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M7-M9.cpp b/Marlin/src/gcode/control/M7-M9.cpp
index 91898374fd7b..1fc8a93e2e92 100644
--- a/Marlin/src/gcode/control/M7-M9.cpp
+++ b/Marlin/src/gcode/control/M7-M9.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index d2b395e8d808..76808e9c9d44 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M85.cpp b/Marlin/src/gcode/control/M85.cpp
index 403c0c59ac42..1cdf49f6096c 100644
--- a/Marlin/src/gcode/control/M85.cpp
+++ b/Marlin/src/gcode/control/M85.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 369bba044f19..1d9b12204db8 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/M999.cpp b/Marlin/src/gcode/control/M999.cpp
index ac46311067b1..c498e66cabf0 100644
--- a/Marlin/src/gcode/control/M999.cpp
+++ b/Marlin/src/gcode/control/M999.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp
index db6c173071d4..cb2fce6c25e7 100644
--- a/Marlin/src/gcode/control/T.cpp
+++ b/Marlin/src/gcode/control/T.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
index 79bacf06623d..17f9ff71faa6 100644
--- a/Marlin/src/gcode/eeprom/M500-M504.cpp
+++ b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
index f3d8d0b60f43..b4acb354ccad 100644
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ b/Marlin/src/gcode/feature/L6470/M122.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 5d8d7e8d3429..37fa40fa9192 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp
index 9eb097ad49cb..a3eaf7b26a6b 100644
--- a/Marlin/src/gcode/feature/L6470/M916-918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index f030511422bd..fd500261b6ee 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/baricuda/M126-M129.cpp b/Marlin/src/gcode/feature/baricuda/M126-M129.cpp
index 3c1588d8060a..d96ee03af165 100644
--- a/Marlin/src/gcode/feature/baricuda/M126-M129.cpp
+++ b/Marlin/src/gcode/feature/baricuda/M126-M129.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index 147dfccf0599..804eec205f63 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/cancel/M486.cpp b/Marlin/src/gcode/feature/cancel/M486.cpp
index 2fcb4840f6e7..19216b2cb901 100644
--- a/Marlin/src/gcode/feature/cancel/M486.cpp
+++ b/Marlin/src/gcode/feature/cancel/M486.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/caselight/M355.cpp b/Marlin/src/gcode/feature/caselight/M355.cpp
index e9ee0a4977bd..ff793451bde8 100644
--- a/Marlin/src/gcode/feature/caselight/M355.cpp
+++ b/Marlin/src/gcode/feature/caselight/M355.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin/src/gcode/feature/clean/G12.cpp
index 30c71264eb88..6d13a010be95 100644
--- a/Marlin/src/gcode/feature/clean/G12.cpp
+++ b/Marlin/src/gcode/feature/clean/G12.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index a7546b28339b..a8ded07d774a 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
index 36cac7857c03..41e6e90aa167 100644
--- a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
+++ b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
index 2b2f2f1c659e..75e5b6a5886e 100644
--- a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
+++ b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
index 316433fa461c..6c48774c307c 100644
--- a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
+++ b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/i2c/M260_M261.cpp b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
index 05fa2d346657..ea04d2a293d5 100644
--- a/Marlin/src/gcode/feature/i2c/M260_M261.cpp
+++ b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 405be898ae12..656b7e5f9035 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin/src/gcode/feature/leds/M7219.cpp
index c3d264353511..a02ea0cc3078 100644
--- a/Marlin/src/gcode/feature/leds/M7219.cpp
+++ b/Marlin/src/gcode/feature/leds/M7219.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/macro/M810-M819.cpp b/Marlin/src/gcode/feature/macro/M810-M819.cpp
index ea90229c38d4..c106de298aa2 100644
--- a/Marlin/src/gcode/feature/macro/M810-M819.cpp
+++ b/Marlin/src/gcode/feature/macro/M810-M819.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/mixing/M163-M165.cpp b/Marlin/src/gcode/feature/mixing/M163-M165.cpp
index cc0a46836645..61be64edec9d 100644
--- a/Marlin/src/gcode/feature/mixing/M163-M165.cpp
+++ b/Marlin/src/gcode/feature/mixing/M163-M165.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/mixing/M166.cpp b/Marlin/src/gcode/feature/mixing/M166.cpp
index c1c29a4457df..b4618c811191 100644
--- a/Marlin/src/gcode/feature/mixing/M166.cpp
+++ b/Marlin/src/gcode/feature/mixing/M166.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/G27.cpp b/Marlin/src/gcode/feature/pause/G27.cpp
index 4f4c9e469840..7f2f0d48b7df 100644
--- a/Marlin/src/gcode/feature/pause/G27.cpp
+++ b/Marlin/src/gcode/feature/pause/G27.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 50db01d73c4d..8d2e168afd8b 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index df6345df0f64..ed2cfca4fa20 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 22aaf2c446f1..c55032b11bdd 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 4056a398e4f1..fc7702796be1 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index 60070821d806..620b8f4f27d5 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index 325b748aa9d2..be76814c0d9a 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index b85dc84c43d3..546fea9bdeb5 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index cd1dd801b909..2b3f478b203a 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
index 9ebdcd20707e..b9b74ebf71dd 100644
--- a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
+++ b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 7a5dd65e0e88..f746dddfa1ea 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index a7e6d65172ae..bba6e7e752aa 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 7fddac0d79aa..d7dd1af834d8 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 365988594c5b..be02fdb7cdc7 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 578deac844f1..505ac14d8777 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0c0ab4c24c61..164ae931d3bc 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 5bbc5e862cff..7670a8163950 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/geometry/G17-G19.cpp b/Marlin/src/gcode/geometry/G17-G19.cpp
index bd0192fabf57..14f3e80bbc79 100644
--- a/Marlin/src/gcode/geometry/G17-G19.cpp
+++ b/Marlin/src/gcode/geometry/G17-G19.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index 38f72ae62e7d..e24247b2c5c3 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 2f69654b0e5c..dd87349976ef 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 6e2b46081c34..8f0908595fcf 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M110.cpp b/Marlin/src/gcode/host/M110.cpp
index 4bdafb403a02..f7b6dfd4f44b 100644
--- a/Marlin/src/gcode/host/M110.cpp
+++ b/Marlin/src/gcode/host/M110.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M113.cpp b/Marlin/src/gcode/host/M113.cpp
index 6881837a5bbe..872986561d79 100644
--- a/Marlin/src/gcode/host/M113.cpp
+++ b/Marlin/src/gcode/host/M113.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index dabb14afcf69..56e9cd8f2a9a 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 6d3cf36d52d8..9123bc6e62cc 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M118.cpp b/Marlin/src/gcode/host/M118.cpp
index 3d8a84fb5f7c..ba52a4f81601 100644
--- a/Marlin/src/gcode/host/M118.cpp
+++ b/Marlin/src/gcode/host/M118.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M119.cpp b/Marlin/src/gcode/host/M119.cpp
index a13fa67b7946..b3cb7290b33f 100644
--- a/Marlin/src/gcode/host/M119.cpp
+++ b/Marlin/src/gcode/host/M119.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M16.cpp b/Marlin/src/gcode/host/M16.cpp
index 0a076a7a47b5..fd3320db934b 100644
--- a/Marlin/src/gcode/host/M16.cpp
+++ b/Marlin/src/gcode/host/M16.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 057b010e7259..8e83185e0246 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 6a6d00ed3411..0fc87cf7221d 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M117.cpp b/Marlin/src/gcode/lcd/M117.cpp
index 118b55fe3754..7e314731f8d3 100644
--- a/Marlin/src/gcode/lcd/M117.cpp
+++ b/Marlin/src/gcode/lcd/M117.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index 297ece268e0d..3ba1c3fe7086 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 68c46fcfdd1e..839fd259697c 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M300.cpp b/Marlin/src/gcode/lcd/M300.cpp
index ec2024ae2f77..5d7e766b2de5 100644
--- a/Marlin/src/gcode/lcd/M300.cpp
+++ b/Marlin/src/gcode/lcd/M300.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index 14d4d63813e5..347c42c442c4 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 4dd13ca0171c..73329e7fc9eb 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index c915cc334e40..70043f5386de 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/G4.cpp b/Marlin/src/gcode/motion/G4.cpp
index 50606689a12f..2310c2c72752 100644
--- a/Marlin/src/gcode/motion/G4.cpp
+++ b/Marlin/src/gcode/motion/G4.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/G5.cpp b/Marlin/src/gcode/motion/G5.cpp
index 03dd496c587a..f34be757829f 100644
--- a/Marlin/src/gcode/motion/G5.cpp
+++ b/Marlin/src/gcode/motion/G5.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/G80.cpp b/Marlin/src/gcode/motion/G80.cpp
index e6bc537eca74..700038df0f22 100644
--- a/Marlin/src/gcode/motion/G80.cpp
+++ b/Marlin/src/gcode/motion/G80.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 7d66ae655537..9422307cda1d 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index e5ce7beb1bee..100bbae5eff3 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 2e91216a6402..b4a18b364b2d 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index e31f1fb272bd..8b2ada9ceca8 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/probe/G31_G32.cpp b/Marlin/src/gcode/probe/G31_G32.cpp
index cd71f28d732a..e2e43e35edc9 100644
--- a/Marlin/src/gcode/probe/G31_G32.cpp
+++ b/Marlin/src/gcode/probe/G31_G32.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index cb298bcccb28..11b7ce5af74d 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin/src/gcode/probe/M401_M402.cpp
index 55851f3046bb..a0a6c1cec5d5 100644
--- a/Marlin/src/gcode/probe/M401_M402.cpp
+++ b/Marlin/src/gcode/probe/M401_M402.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index 2c26ebd2a62a..242ea170a72b 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/probe/M951.cpp b/Marlin/src/gcode/probe/M951.cpp
index d8d2e8f8e0cd..c7e4ea8a705c 100644
--- a/Marlin/src/gcode/probe/M951.cpp
+++ b/Marlin/src/gcode/probe/M951.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index d5815099630f..324e6bcb5073 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index d7f30d1bac93..11d41303493e 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/scara/M360-M364.cpp b/Marlin/src/gcode/scara/M360-M364.cpp
index 6fd8306e07e9..cd901d5dd45f 100644
--- a/Marlin/src/gcode/scara/M360-M364.cpp
+++ b/Marlin/src/gcode/scara/M360-M364.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M20.cpp b/Marlin/src/gcode/sdcard/M20.cpp
index 79f2fd800834..9307808b0e6f 100644
--- a/Marlin/src/gcode/sdcard/M20.cpp
+++ b/Marlin/src/gcode/sdcard/M20.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M21_M22.cpp b/Marlin/src/gcode/sdcard/M21_M22.cpp
index 9362db0808e9..2d5bccaf8438 100644
--- a/Marlin/src/gcode/sdcard/M21_M22.cpp
+++ b/Marlin/src/gcode/sdcard/M21_M22.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M23.cpp b/Marlin/src/gcode/sdcard/M23.cpp
index 7dd4ad9203ab..4bf8105f605d 100644
--- a/Marlin/src/gcode/sdcard/M23.cpp
+++ b/Marlin/src/gcode/sdcard/M23.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sdcard/M24_M25.cpp
index d68031c0c920..02ba5acb3928 100644
--- a/Marlin/src/gcode/sdcard/M24_M25.cpp
+++ b/Marlin/src/gcode/sdcard/M24_M25.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M26.cpp b/Marlin/src/gcode/sdcard/M26.cpp
index 000375880440..d2e9e8e72a9d 100644
--- a/Marlin/src/gcode/sdcard/M26.cpp
+++ b/Marlin/src/gcode/sdcard/M26.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M27.cpp b/Marlin/src/gcode/sdcard/M27.cpp
index 64eb91876b95..9c71e510a69e 100644
--- a/Marlin/src/gcode/sdcard/M27.cpp
+++ b/Marlin/src/gcode/sdcard/M27.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M28_M29.cpp b/Marlin/src/gcode/sdcard/M28_M29.cpp
index c64ce7bb8639..9dc192c09b26 100644
--- a/Marlin/src/gcode/sdcard/M28_M29.cpp
+++ b/Marlin/src/gcode/sdcard/M28_M29.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M30.cpp b/Marlin/src/gcode/sdcard/M30.cpp
index 2f318687ad45..2fd407341b30 100644
--- a/Marlin/src/gcode/sdcard/M30.cpp
+++ b/Marlin/src/gcode/sdcard/M30.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M32.cpp b/Marlin/src/gcode/sdcard/M32.cpp
index 2eb0717a4a72..35a6fb1d641b 100644
--- a/Marlin/src/gcode/sdcard/M32.cpp
+++ b/Marlin/src/gcode/sdcard/M32.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M33.cpp b/Marlin/src/gcode/sdcard/M33.cpp
index 409467cd259a..7c6654a02e93 100644
--- a/Marlin/src/gcode/sdcard/M33.cpp
+++ b/Marlin/src/gcode/sdcard/M33.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M34.cpp b/Marlin/src/gcode/sdcard/M34.cpp
index 832b827f3bea..ff1a8939a0f2 100644
--- a/Marlin/src/gcode/sdcard/M34.cpp
+++ b/Marlin/src/gcode/sdcard/M34.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M524.cpp b/Marlin/src/gcode/sdcard/M524.cpp
index 4d4394b4cb1e..401330361494 100644
--- a/Marlin/src/gcode/sdcard/M524.cpp
+++ b/Marlin/src/gcode/sdcard/M524.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/sdcard/M928.cpp b/Marlin/src/gcode/sdcard/M928.cpp
index 87f5af692bb1..b8b9175f02d3 100644
--- a/Marlin/src/gcode/sdcard/M928.cpp
+++ b/Marlin/src/gcode/sdcard/M928.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/stats/M31.cpp b/Marlin/src/gcode/stats/M31.cpp
index fdad76e99a85..019598cb8336 100644
--- a/Marlin/src/gcode/stats/M31.cpp
+++ b/Marlin/src/gcode/stats/M31.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 6891a44df536..41d550cb59ac 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M104_M109.cpp b/Marlin/src/gcode/temperature/M104_M109.cpp
index 8dbb3af235b1..ab99ea940ced 100644
--- a/Marlin/src/gcode/temperature/M104_M109.cpp
+++ b/Marlin/src/gcode/temperature/M104_M109.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temperature/M105.cpp
index 3dbbb5eb7b4e..b45d6928a58a 100644
--- a/Marlin/src/gcode/temperature/M105.cpp
+++ b/Marlin/src/gcode/temperature/M105.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M106_M107.cpp b/Marlin/src/gcode/temperature/M106_M107.cpp
index ede826a3f16d..2415484d5135 100644
--- a/Marlin/src/gcode/temperature/M106_M107.cpp
+++ b/Marlin/src/gcode/temperature/M106_M107.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M140_M190.cpp b/Marlin/src/gcode/temperature/M140_M190.cpp
index f5c3d3683299..8e9778f7f03c 100644
--- a/Marlin/src/gcode/temperature/M140_M190.cpp
+++ b/Marlin/src/gcode/temperature/M140_M190.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M141_M191.cpp b/Marlin/src/gcode/temperature/M141_M191.cpp
index 3c9934659940..66849b99e6be 100644
--- a/Marlin/src/gcode/temperature/M141_M191.cpp
+++ b/Marlin/src/gcode/temperature/M141_M191.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M155.cpp b/Marlin/src/gcode/temperature/M155.cpp
index 12403114e97b..52f9ef2be50a 100644
--- a/Marlin/src/gcode/temperature/M155.cpp
+++ b/Marlin/src/gcode/temperature/M155.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/temperature/M303.cpp b/Marlin/src/gcode/temperature/M303.cpp
index e8f5f604f71c..87bb84b10bce 100644
--- a/Marlin/src/gcode/temperature/M303.cpp
+++ b/Marlin/src/gcode/temperature/M303.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/units/G20_G21.cpp b/Marlin/src/gcode/units/G20_G21.cpp
index 53eac4e9bee3..4961ae160148 100644
--- a/Marlin/src/gcode/units/G20_G21.cpp
+++ b/Marlin/src/gcode/units/G20_G21.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index b21e376f716d..d8d962c5be35 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/gcode/units/M82_M83.cpp b/Marlin/src/gcode/units/M82_M83.cpp
index 11868b6ddc43..bf5aff0b8526 100644
--- a/Marlin/src/gcode/units/M82_M83.cpp
+++ b/Marlin/src/gcode/units/M82_M83.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c372960b2f44..7f387914d362 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 7ac2d167ada8..e5cb00c11228 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 85d2557f9390..3b8393dafedb 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index fc26862853bc..d32506702e2f 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index e11f171c6efd..1385f9e19fa1 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 210c6c897ac2..3668e63341e7 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 89b5d02c6352..c3adb20c9e53 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index bf57f1dfc259..7cee7db4b4df 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.h b/Marlin/src/lcd/HD44780/ultralcd_HD44780.h
index d600dd3c2dd8..12bf86a1618c 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.h
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
index b7b1717e1b2e..4ab165c7a0b6 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index 427685cadb66..e1478ff98ede 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/dogm_Bootscreen.h b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
index ea8ce5e38a3a..f4bf5f5f692b 100644
--- a/Marlin/src/lcd/dogm/dogm_Bootscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index fbc7a8128a72..32a22b9f459c 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
index 42f160676387..fd07e4af1e13 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
index be304b1a14e5..e3087a55dfe5 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 8774b72e4f0f..75f1c8bddb3f 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
index d1d740e23570..1854ac1c674e 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
index 8db341293a66..1542d9db0dca 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
index 87094eb804e0..34712e070651 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
index 39e0c43cdd28..fcfebcbe1288 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
index cd41373ab45c..e6fc310df161 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index ae9614d67744..8dd24e2737f1 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
index 576de494853d..27443d9e7180 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
index 8c4d1cf297c3..41b0c571f03c 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
index 858cbe88240e..6bcf3a94cf5c 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
index 0807ca9a99e4..e62a77ebeea3 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
index 698f825c5d93..165aab7ed674 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
index b79ea2cff632..eebf18e37742 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
index 4522617d801e..6e26e6343479 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
index ca465697f3f6..6eb2369fa1a4 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
index 0a6d9933c601..6ec6cddae469 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
index 776b78f11ada..dbf7b8f631cd 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
index 4d877b6b7244..51f292421a0d 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
index 7c7636309456..756b91ddbdf6 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
index 8a2172f55418..30555bbb9f3a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index f8db5c82098f..63f12ac835af 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h
index 536da132c05a..fe83f3fa5175 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extensible_ui/ui_api.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 04b30acf83a5..7ec280122ccd 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index d5bc48347693..0d2567a20489 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index c4fbbe1be65d..4c9b2deab4d7 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 19e0b90e52fe..094aca8caff5 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index d1cc0cf7bc07..8d29cd95651b 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 6a65f094078c..b185a5e18cb6 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 67baf9d2178c..09802adff761 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 6d5b665dbf3b..8215cd4a05c3 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 6ebae11576ff..c40cdb4ec106 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index c2acbf400a68..982e4bba7813 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index a0e54b5b31e3..22aee12592ce 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 1a54244c1696..22ab93e78e88 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 1ef40626d6f3..ab9b61f13a86 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index a9a65709a845..2517a008fd10 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 2d47744e49de..0b7f84031318 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index d6f6d941b6b2..77d015bef641 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 65562204fc01..184bf20694f5 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 66b45f298700..addd02c7a78f 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 81580b71ed39..d5a5ec33c36d 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index 7d33ccc5086e..f94a182fd764 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 1d9955c811f4..7c017c2c9672 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 972f5044b1bb..ec7295455fc0 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index b96839e1f644..5f2eb046656e 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 93451bc9712e..0c63f63cb2dd 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 51875761bd76..efab82fe9b7c 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index b21e8d05bc0c..fdd1ab8384bd 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h
index 9278283a5ad6..1aa5cb4a095c 100644
--- a/Marlin/src/lcd/language/language_test.h
+++ b/Marlin/src/lcd/language/language_test.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index e68b62228d24..5b7aeb9c56db 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -1,6 +1,6 @@
  /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index f7234fb83f2d..5119b8bc3ece 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index b5ecd019acf2..3dbf922b951f 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 4e730924e2c6..3595aabe83a3 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index f260836916f8..f3cc322a922d 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 9f28e14080dc..b19ab38edb24 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/brickout.cpp b/Marlin/src/lcd/menu/game/brickout.cpp
index 921a6f6e3081..50da0f9cc756 100644
--- a/Marlin/src/lcd/menu/game/brickout.cpp
+++ b/Marlin/src/lcd/menu/game/brickout.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/brickout.h b/Marlin/src/lcd/menu/game/brickout.h
index 9037e538307f..2d23bf4c6ebe 100644
--- a/Marlin/src/lcd/menu/game/brickout.h
+++ b/Marlin/src/lcd/menu/game/brickout.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/game.cpp b/Marlin/src/lcd/menu/game/game.cpp
index 6f8d24769299..18fb3c63dc08 100644
--- a/Marlin/src/lcd/menu/game/game.cpp
+++ b/Marlin/src/lcd/menu/game/game.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/game.h b/Marlin/src/lcd/menu/game/game.h
index f168ccec79d9..3ebee563dea6 100644
--- a/Marlin/src/lcd/menu/game/game.h
+++ b/Marlin/src/lcd/menu/game/game.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/invaders.cpp b/Marlin/src/lcd/menu/game/invaders.cpp
index 4517c5f43c4b..487f5406716f 100644
--- a/Marlin/src/lcd/menu/game/invaders.cpp
+++ b/Marlin/src/lcd/menu/game/invaders.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/invaders.h b/Marlin/src/lcd/menu/game/invaders.h
index f04e91da6406..d2b8790ff080 100644
--- a/Marlin/src/lcd/menu/game/invaders.h
+++ b/Marlin/src/lcd/menu/game/invaders.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/maze.cpp b/Marlin/src/lcd/menu/game/maze.cpp
index 13784f0d76c0..9cfa5da4da6e 100644
--- a/Marlin/src/lcd/menu/game/maze.cpp
+++ b/Marlin/src/lcd/menu/game/maze.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/maze.h b/Marlin/src/lcd/menu/game/maze.h
index 5d7fff66afd6..7917bab0d89d 100644
--- a/Marlin/src/lcd/menu/game/maze.h
+++ b/Marlin/src/lcd/menu/game/maze.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/snake.cpp b/Marlin/src/lcd/menu/game/snake.cpp
index 713c2ddd74ff..8c5280b6898d 100644
--- a/Marlin/src/lcd/menu/game/snake.cpp
+++ b/Marlin/src/lcd/menu/game/snake.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/snake.h b/Marlin/src/lcd/menu/game/snake.h
index ec8524f2ef90..c846d5646647 100644
--- a/Marlin/src/lcd/menu/game/snake.h
+++ b/Marlin/src/lcd/menu/game/snake.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/game/types.h b/Marlin/src/lcd/menu/game/types.h
index 872d034dca46..16ff8d82b675 100644
--- a/Marlin/src/lcd/menu/game/types.h
+++ b/Marlin/src/lcd/menu/game/types.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 269709bf244c..f787e492e86e 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 3e3dcdc12335..4020385a1508 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_addon.h b/Marlin/src/lcd/menu/menu_addon.h
index e7553293a143..5f338c571abf 100644
--- a/Marlin/src/lcd/menu/menu_addon.h
+++ b/Marlin/src/lcd/menu/menu_addon.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 454a56a9a051..1ebd9374c502 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index cc0b3a2c9925..ad9c51d4cfda 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index f09ac1551601..3d0a5bf2aa33 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index d16d4670a808..5834b73ba449 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin/src/lcd/menu/menu_cancelobject.cpp
index 162578a0c4e6..4d445a184837 100644
--- a/Marlin/src/lcd/menu/menu_cancelobject.cpp
+++ b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 31d46816e9b9..eeae0e70270a 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_custom.cpp b/Marlin/src/lcd/menu/menu_custom.cpp
index 8d50a1b25d8c..55297a8b9217 100644
--- a/Marlin/src/lcd/menu/menu_custom.cpp
+++ b/Marlin/src/lcd/menu/menu_custom.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index e26a0966c2cb..2b3cac5bd2b4 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 5248cbbab1aa..5f2ecb9ccd33 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_game.cpp b/Marlin/src/lcd/menu/menu_game.cpp
index 68ccc39aff8d..c2ac9f62a97a 100644
--- a/Marlin/src/lcd/menu/menu_game.cpp
+++ b/Marlin/src/lcd/menu/menu_game.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 5bbc8ce7dc93..cbe406a10e6b 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin/src/lcd/menu/menu_job_recovery.cpp
index 1ac69aff7549..5b57992f457e 100644
--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index e6644c6852fd..b9e75422bcf5 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 85beddb6dc0d..5a56770a177b 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index a12c8b79bbc9..4e68894add26 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index 51e24d935834..65b8af20ca19 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index ad3d649ee43d..c2b8d4ae0a3c 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_mmu2.h b/Marlin/src/lcd/menu/menu_mmu2.h
index 0f47092655a1..0221b4c765f3 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.h
+++ b/Marlin/src/lcd/menu/menu_mmu2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index cb1527cf8122..177acc0797d0 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index 1c480577f17c..fd42522839eb 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index d2483b9d3f4f..40fb88fccaed 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index ff6a50ccfc5c..ed70a3e7f103 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 1610c2d5eb2c..549e41c9c63c 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 5e2bee4d356e..8488c11c7df6 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 9cfb80fba3d8..7a464c30abc1 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index eaeddcd106b0..717a3f05d826 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index c98d3d562788..3317ac805bdf 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 645823a126b7..99da4be76bd1 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index 08315fc68f6c..9cb85891c8fd 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/bresenham.h b/Marlin/src/libs/bresenham.h
index 013e357d081d..e18531498b11 100644
--- a/Marlin/src/libs/bresenham.h
+++ b/Marlin/src/libs/bresenham.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index 549c76008e4d..891d9fd17353 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index 026b9330f96d..3a72a0bd86a6 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/circularqueue.h b/Marlin/src/libs/circularqueue.h
index 6b1923986d7b..54a6edaabe20 100644
--- a/Marlin/src/libs/circularqueue.h
+++ b/Marlin/src/libs/circularqueue.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/crc16.cpp b/Marlin/src/libs/crc16.cpp
index fdb63956072e..71cda50aebaa 100644
--- a/Marlin/src/libs/crc16.cpp
+++ b/Marlin/src/libs/crc16.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/crc16.h b/Marlin/src/libs/crc16.h
index d625acce0761..65e036d08999 100644
--- a/Marlin/src/libs/crc16.h
+++ b/Marlin/src/libs/crc16.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/duration_t.h b/Marlin/src/libs/duration_t.h
index 0df3659b1bdf..897ea1e8694d 100644
--- a/Marlin/src/libs/duration_t.h
+++ b/Marlin/src/libs/duration_t.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/hex_print_routines.cpp b/Marlin/src/libs/hex_print_routines.cpp
index a30410641a63..293192e6efbf 100644
--- a/Marlin/src/libs/hex_print_routines.cpp
+++ b/Marlin/src/libs/hex_print_routines.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/hex_print_routines.h b/Marlin/src/libs/hex_print_routines.h
index 09d6d17013a9..ac47ed7701c6 100644
--- a/Marlin/src/libs/hex_print_routines.h
+++ b/Marlin/src/libs/hex_print_routines.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/least_squares_fit.cpp b/Marlin/src/libs/least_squares_fit.cpp
index 135329679454..aac83f9aca8e 100644
--- a/Marlin/src/libs/least_squares_fit.cpp
+++ b/Marlin/src/libs/least_squares_fit.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/least_squares_fit.h b/Marlin/src/libs/least_squares_fit.h
index acb29402c5a0..721c499decad 100644
--- a/Marlin/src/libs/least_squares_fit.h
+++ b/Marlin/src/libs/least_squares_fit.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index f9b09c2fa9cf..58ba57e42571 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/nozzle.h b/Marlin/src/libs/nozzle.h
index 280f8b1a388a..3ff0670ce837 100644
--- a/Marlin/src/libs/nozzle.h
+++ b/Marlin/src/libs/nozzle.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index 6054f877e54f..e5ddc147489b 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index f18df094a3eb..ee29b26ab08e 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/private_spi.h b/Marlin/src/libs/private_spi.h
index a3f8621f0d93..9ce68c4909b2 100644
--- a/Marlin/src/libs/private_spi.h
+++ b/Marlin/src/libs/private_spi.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/softspi.h b/Marlin/src/libs/softspi.h
index 5623496d9d53..300eb9387118 100644
--- a/Marlin/src/libs/softspi.h
+++ b/Marlin/src/libs/softspi.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/stopwatch.cpp b/Marlin/src/libs/stopwatch.cpp
index b80a1597d5f7..fe80b17462b9 100644
--- a/Marlin/src/libs/stopwatch.cpp
+++ b/Marlin/src/libs/stopwatch.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/stopwatch.h b/Marlin/src/libs/stopwatch.h
index 013c243cfe7b..4aac815c8d4a 100644
--- a/Marlin/src/libs/stopwatch.h
+++ b/Marlin/src/libs/stopwatch.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index c2bb347dacf1..d2af0f3d5630 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/libs/vector_3.h b/Marlin/src/libs/vector_3.h
index e065697f0519..bd596f2343ab 100644
--- a/Marlin/src/libs/vector_3.h
+++ b/Marlin/src/libs/vector_3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 3cca051cd898..98bd29e4cc61 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/configuration_store.h b/Marlin/src/module/configuration_store.h
index b8a64c5c68db..a2c8d97dfad1 100644
--- a/Marlin/src/module/configuration_store.h
+++ b/Marlin/src/module/configuration_store.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index cb2d432e30b8..8821236fd113 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index a506eade1ae3..f263a28ddd31 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 8eaab9bd55c7..47ccc5d5676c 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index a9abf5238124..71353abb34b0 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 4cb4d0a95869..84ab09b76780 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index a159bdd4bfa8..c50da25a3e27 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 9f5a5c5c5e04..72dfeed46ff3 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 5f70c06cc525..37f0112cc81e 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index db1f2044442f..7ea3956436a0 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/planner_bezier.h b/Marlin/src/module/planner_bezier.h
index d0aa82858cb9..e7ef4719e1b0 100644
--- a/Marlin/src/module/planner_bezier.h
+++ b/Marlin/src/module/planner_bezier.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 6753a075eb8a..43c4992ecbed 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index fcc03a570e7d..1630de988dde 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 35aaf93f09bb..c89c5eb08791 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index af01e208cda2..35fb8ceb264e 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index 3a82ef47fd3c..f7eb8d192b93 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/scara.h b/Marlin/src/module/scara.h
index cde1d1bcd684..2f60ebbf1579 100644
--- a/Marlin/src/module/scara.h
+++ b/Marlin/src/module/scara.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index c9d0431538f7..c49f939d0ff4 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 4ead93cd5cf6..5f9291e97d20 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/speed_lookuptable.h b/Marlin/src/module/speed_lookuptable.h
index b4cf8b94b8a3..088cb23c7ff6 100644
--- a/Marlin/src/module/speed_lookuptable.h
+++ b/Marlin/src/module/speed_lookuptable.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 90848c99d177..dcc13eca58e5 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 808f4630d4ac..6b8d0f362890 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
index 40f74c175add..cc6a0bb71123 100644
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ b/Marlin/src/module/stepper/L64xx.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/L64xx.h b/Marlin/src/module/stepper/L64xx.h
index 919e96694026..4449618e0bec 100644
--- a/Marlin/src/module/stepper/L64xx.h
+++ b/Marlin/src/module/stepper/L64xx.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/TMC26X.cpp b/Marlin/src/module/stepper/TMC26X.cpp
index 58d9463a2d13..08c0b3e7828f 100644
--- a/Marlin/src/module/stepper/TMC26X.cpp
+++ b/Marlin/src/module/stepper/TMC26X.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h
index 73cba317064e..d44bc19a7486 100644
--- a/Marlin/src/module/stepper/TMC26X.h
+++ b/Marlin/src/module/stepper/TMC26X.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/indirection.cpp b/Marlin/src/module/stepper/indirection.cpp
index f784d4911cbc..d468a2afdd62 100644
--- a/Marlin/src/module/stepper/indirection.cpp
+++ b/Marlin/src/module/stepper/indirection.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index eef232321662..15c98ed56898 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index ba65c32eb683..aa31499c42b6 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index afa8847108e6..262e20840ef4 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 81068c7f7b1d..16635b39bd08 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index a360394f24e6..66d6bd56e154 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_1.h b/Marlin/src/module/thermistor/thermistor_1.h
index f2eb078081cc..f3226da4754a 100644
--- a/Marlin/src/module/thermistor/thermistor_1.h
+++ b/Marlin/src/module/thermistor/thermistor_1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_10.h b/Marlin/src/module/thermistor/thermistor_10.h
index 0ef9d9d63520..9e89eab84a43 100644
--- a/Marlin/src/module/thermistor/thermistor_10.h
+++ b/Marlin/src/module/thermistor/thermistor_10.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_1010.h b/Marlin/src/module/thermistor/thermistor_1010.h
index ab2b1fb443e9..200d9aed56f5 100644
--- a/Marlin/src/module/thermistor/thermistor_1010.h
+++ b/Marlin/src/module/thermistor/thermistor_1010.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_1047.h b/Marlin/src/module/thermistor/thermistor_1047.h
index 8010d8ebc19a..af41a20a10c7 100644
--- a/Marlin/src/module/thermistor/thermistor_1047.h
+++ b/Marlin/src/module/thermistor/thermistor_1047.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_11.h b/Marlin/src/module/thermistor/thermistor_11.h
index f9a9524a1503..1b2da4a71a8b 100644
--- a/Marlin/src/module/thermistor/thermistor_11.h
+++ b/Marlin/src/module/thermistor/thermistor_11.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_110.h b/Marlin/src/module/thermistor/thermistor_110.h
index a55a19361133..fe8f4fbb8070 100644
--- a/Marlin/src/module/thermistor/thermistor_110.h
+++ b/Marlin/src/module/thermistor/thermistor_110.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_12.h b/Marlin/src/module/thermistor/thermistor_12.h
index 9210bf9131ae..f9e994a959c2 100644
--- a/Marlin/src/module/thermistor/thermistor_12.h
+++ b/Marlin/src/module/thermistor/thermistor_12.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_13.h b/Marlin/src/module/thermistor/thermistor_13.h
index 703ec74159c9..44c5243c1fe2 100644
--- a/Marlin/src/module/thermistor/thermistor_13.h
+++ b/Marlin/src/module/thermistor/thermistor_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_147.h b/Marlin/src/module/thermistor/thermistor_147.h
index b020103a3802..8fead6c42991 100644
--- a/Marlin/src/module/thermistor/thermistor_147.h
+++ b/Marlin/src/module/thermistor/thermistor_147.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_15.h b/Marlin/src/module/thermistor/thermistor_15.h
index aab32c05c086..85602abb3a9c 100644
--- a/Marlin/src/module/thermistor/thermistor_15.h
+++ b/Marlin/src/module/thermistor/thermistor_15.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_18.h b/Marlin/src/module/thermistor/thermistor_18.h
index 46f1be452a85..f6a3edec4974 100644
--- a/Marlin/src/module/thermistor/thermistor_18.h
+++ b/Marlin/src/module/thermistor/thermistor_18.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_2.h b/Marlin/src/module/thermistor/thermistor_2.h
index 4a59e8d818da..f3fe470603c9 100644
--- a/Marlin/src/module/thermistor/thermistor_2.h
+++ b/Marlin/src/module/thermistor/thermistor_2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_20.h b/Marlin/src/module/thermistor/thermistor_20.h
index 44c6a946c93e..49b212da50b0 100644
--- a/Marlin/src/module/thermistor/thermistor_20.h
+++ b/Marlin/src/module/thermistor/thermistor_20.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_201.h b/Marlin/src/module/thermistor/thermistor_201.h
index 21f0e92a41ec..d92f95756175 100644
--- a/Marlin/src/module/thermistor/thermistor_201.h
+++ b/Marlin/src/module/thermistor/thermistor_201.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_21.h b/Marlin/src/module/thermistor/thermistor_21.h
index e65f90b75dca..655f56685dac 100644
--- a/Marlin/src/module/thermistor/thermistor_21.h
+++ b/Marlin/src/module/thermistor/thermistor_21.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_3.h b/Marlin/src/module/thermistor/thermistor_3.h
index bccfcb04c12e..e37c2ace7b8d 100644
--- a/Marlin/src/module/thermistor/thermistor_3.h
+++ b/Marlin/src/module/thermistor/thermistor_3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_331.h b/Marlin/src/module/thermistor/thermistor_331.h
index 8f98d0752345..434492d7e78c 100644
--- a/Marlin/src/module/thermistor/thermistor_331.h
+++ b/Marlin/src/module/thermistor/thermistor_331.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_332.h b/Marlin/src/module/thermistor/thermistor_332.h
index 85ca169a1e73..3112751b95e4 100644
--- a/Marlin/src/module/thermistor/thermistor_332.h
+++ b/Marlin/src/module/thermistor/thermistor_332.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_4.h b/Marlin/src/module/thermistor/thermistor_4.h
index 46462ba56689..00e0d9ed9755 100644
--- a/Marlin/src/module/thermistor/thermistor_4.h
+++ b/Marlin/src/module/thermistor/thermistor_4.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_5.h b/Marlin/src/module/thermistor/thermistor_5.h
index 0d3905ac1c0f..8f414de15e8f 100644
--- a/Marlin/src/module/thermistor/thermistor_5.h
+++ b/Marlin/src/module/thermistor/thermistor_5.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_501.h b/Marlin/src/module/thermistor/thermistor_501.h
index cb178321aa34..3db433644edd 100644
--- a/Marlin/src/module/thermistor/thermistor_501.h
+++ b/Marlin/src/module/thermistor/thermistor_501.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_51.h b/Marlin/src/module/thermistor/thermistor_51.h
index 93306d0f819d..f314777a5285 100644
--- a/Marlin/src/module/thermistor/thermistor_51.h
+++ b/Marlin/src/module/thermistor/thermistor_51.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_512.h b/Marlin/src/module/thermistor/thermistor_512.h
index aa9e9e57f960..5528e56b9763 100644
--- a/Marlin/src/module/thermistor/thermistor_512.h
+++ b/Marlin/src/module/thermistor/thermistor_512.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_52.h b/Marlin/src/module/thermistor/thermistor_52.h
index 0e2b028e45f9..9a54ef4b6f66 100644
--- a/Marlin/src/module/thermistor/thermistor_52.h
+++ b/Marlin/src/module/thermistor/thermistor_52.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_55.h b/Marlin/src/module/thermistor/thermistor_55.h
index b9a462eab342..ead481e8655a 100644
--- a/Marlin/src/module/thermistor/thermistor_55.h
+++ b/Marlin/src/module/thermistor/thermistor_55.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_6.h b/Marlin/src/module/thermistor/thermistor_6.h
index a3e6e69f8539..f84c64413c1f 100644
--- a/Marlin/src/module/thermistor/thermistor_6.h
+++ b/Marlin/src/module/thermistor/thermistor_6.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_60.h b/Marlin/src/module/thermistor/thermistor_60.h
index 78939bfb4450..167e0edcf88b 100644
--- a/Marlin/src/module/thermistor/thermistor_60.h
+++ b/Marlin/src/module/thermistor/thermistor_60.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_61.h b/Marlin/src/module/thermistor/thermistor_61.h
index 3619947117e3..5f8171a1d4b6 100644
--- a/Marlin/src/module/thermistor/thermistor_61.h
+++ b/Marlin/src/module/thermistor/thermistor_61.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_66.h b/Marlin/src/module/thermistor/thermistor_66.h
index c8669c49fc7f..97f082348657 100644
--- a/Marlin/src/module/thermistor/thermistor_66.h
+++ b/Marlin/src/module/thermistor/thermistor_66.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_666.h b/Marlin/src/module/thermistor/thermistor_666.h
index 3b8c68b88d1c..ab8b0380f10b 100644
--- a/Marlin/src/module/thermistor/thermistor_666.h
+++ b/Marlin/src/module/thermistor/thermistor_666.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_67.h b/Marlin/src/module/thermistor/thermistor_67.h
index 9e868111238f..5af203c8abd2 100644
--- a/Marlin/src/module/thermistor/thermistor_67.h
+++ b/Marlin/src/module/thermistor/thermistor_67.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_7.h b/Marlin/src/module/thermistor/thermistor_7.h
index 609317d492e8..e791d0c33304 100644
--- a/Marlin/src/module/thermistor/thermistor_7.h
+++ b/Marlin/src/module/thermistor/thermistor_7.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_70.h b/Marlin/src/module/thermistor/thermistor_70.h
index f05f066bea4a..b49804106970 100644
--- a/Marlin/src/module/thermistor/thermistor_70.h
+++ b/Marlin/src/module/thermistor/thermistor_70.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_71.h b/Marlin/src/module/thermistor/thermistor_71.h
index 0198f326ed7f..c3a9193b79bb 100644
--- a/Marlin/src/module/thermistor/thermistor_71.h
+++ b/Marlin/src/module/thermistor/thermistor_71.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_75.h b/Marlin/src/module/thermistor/thermistor_75.h
index fcc4c60375e3..3a3cdc636409 100644
--- a/Marlin/src/module/thermistor/thermistor_75.h
+++ b/Marlin/src/module/thermistor/thermistor_75.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_8.h b/Marlin/src/module/thermistor/thermistor_8.h
index 8cb9f3aaaa79..f6e407a730da 100644
--- a/Marlin/src/module/thermistor/thermistor_8.h
+++ b/Marlin/src/module/thermistor/thermistor_8.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_9.h b/Marlin/src/module/thermistor/thermistor_9.h
index 44274106b0ef..5023fbe1d01a 100644
--- a/Marlin/src/module/thermistor/thermistor_9.h
+++ b/Marlin/src/module/thermistor/thermistor_9.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_99.h b/Marlin/src/module/thermistor/thermistor_99.h
index b6183e54e413..045a42b73804 100644
--- a/Marlin/src/module/thermistor/thermistor_99.h
+++ b/Marlin/src/module/thermistor/thermistor_99.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_998.h b/Marlin/src/module/thermistor/thermistor_998.h
index 74d0e6e38cb7..6f631d4b9abe 100644
--- a/Marlin/src/module/thermistor/thermistor_998.h
+++ b/Marlin/src/module/thermistor/thermistor_998.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistor_999.h b/Marlin/src/module/thermistor/thermistor_999.h
index 9d5818bc76f8..d750d5597c38 100644
--- a/Marlin/src/module/thermistor/thermistor_999.h
+++ b/Marlin/src/module/thermistor/thermistor_999.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 58e1ef115f25..2a1500eebe3a 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index b42722b87cd8..28baa4047db3 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 613cb1612cbf..025d2997d1cc 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index d457a7be557e..409f38129712 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h
index 0831746f0d19..99a5ea2f76df 100644
--- a/Marlin/src/pins/esp32/pins_ESP32.h
+++ b/Marlin/src/pins/esp32/pins_ESP32.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index 1a7967d5799e..a984ddbe1a9f 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index d21c487e579b..72f2a450a7b4 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 65d3fe73ee81..1f02f9299e35 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
index 823bdba0d359..4ff4ebc73bde 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index a20659f0f5e2..17a9b7d58da8 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR.h
index 516913c2d4dd..fc08a60b91d6 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index abf5e821caa3..816dbb9dc4dc 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 6b439cfa26eb..a3cdf1586cf1 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 13bd2b951f89..01a8bd7e38eb 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 6e45a49a9eef..514da67c643c 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index b830f3dcb80c..b3dba6794c9a 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index a47e9e038326..a7ff58f8da62 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index af08e0a5882e..bf989798fd1d 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 4bc3c86882d9..1a8e997eb2c7 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 0ae4393caca9..5ee0e5856621 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 5cc4d52d3062..2c54bd603527 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
index 3c2a40b4038f..4b731ae9d343 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
index 846f38556e13..937ba56bb729 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 7ab8b5bb4a65..739603e2b644 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index 77cbb197805b..ea40c01c08f0 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index 7586415b43a5..a5a91f6207b9 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 1096ddc629ae..5bf64e9d02fa 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index c2d7d478f1db..d86558a49d2f 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
index e49207a42acb..de064559af70 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
index f2df6e1ecb31..5fd5bfdef13f 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
index d54fbb13b3d0..047dc8ef5afa 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
index 5628df7f10dd..246a5964f063 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
index c62be6befcbf..bf7d65f7e7b0 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h
index fae1d2e94d79..45b500363e92 100644
--- a/Marlin/src/pins/mega/pins_EINSTART-S.h
+++ b/Marlin/src/pins/mega/pins_EINSTART-S.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h
index 5b43acab10b6..30b4ab40af04 100644
--- a/Marlin/src/pins/mega/pins_ELEFU_3.h
+++ b/Marlin/src/pins/mega/pins_ELEFU_3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index 16bd5688df53..6590f06d6cb3 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
index c5c894810b32..3ce4627dce12 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index ce805ddb1f57..4d6cee56f42b 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
index e3b6895af108..037ea1324444 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
index afdcad34352a..7ba9112d4e72 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index a39162ddedcd..b66756668805 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h
index 56eec5e97e14..f04b89d4bcb0 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
index dba2241c4aa9..ab6299a9b05c 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 473e79b2765a..8fecc71bac88 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
index 64337578677d..d3015340de09 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
index 4cd5999604e8..160d9d4b786a 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
index a33b2ecfc515..fe0f4826be32 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 703d5caae0a1..929c3ee68790 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
index 16fad0067f35..5b06e3b83590 100644
--- a/Marlin/src/pins/mega/pins_MINITRONICS.h
+++ b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index b6043c018c50..80f72d04e902 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index 2ea2b09f5aac..bde1f8708892 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
index 1cceef8dab21..c011d9daa765 100644
--- a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
+++ b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 691f6ab4b836..9b49b3956c05 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 1972c3ba94f4..9e6159ee09e0 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index acd74767a385..37f3c528be2d 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index d667032c9c58..4cfa3261655d 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 1cb4cf35663b..2bc577313ecc 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 51c5fab892b2..6aabf594ac20 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 1094e0687e01..2e52e9427c28 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
index e8c9b2ebc0de..2bb6e9b97925 100644
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index e6c3bdc2eae0..3f537a6663f1 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 692d4f8a6ef5..99b75d5e0024 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index 62014217fff4..627eaabfd69e 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 4cadf481f3f5..9945c94d7627 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h b/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
index 7f27df6eb4a7..738b522e6680 100644
--- a/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
+++ b/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index 14013d874c69..bf75c1a2a2ab 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
index 0ffc70aa73b4..6a9897334755 100644
--- a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h
index c2c2b4bbf442..f5a49db53302 100644
--- a/Marlin/src/pins/ramps/pins_FELIX2.h
+++ b/Marlin/src/pins/ramps/pins_FELIX2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 0ff0ec57ba70..d98f3eed1648 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
index 431d4370ba0b..3bbff7f8f212 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 665462c01238..b73acf84acdc 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index a96585eb693c..72e57b4f1839 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index d009630392bc..475551ad6bc1 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index 088955ff0ce1..be5b92d4c17f 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_K8200.h b/Marlin/src/pins/ramps/pins_K8200.h
index 41cc4dfbf83b..605223290780 100644
--- a/Marlin/src/pins/ramps/pins_K8200.h
+++ b/Marlin/src/pins/ramps/pins_K8200.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index a47d21c91462..f0928b0ed11f 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index bfc61d0182e3..8c426af17c5b 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h b/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
index 66dddbef4508..6a31142450ae 100644
--- a/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
+++ b/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE.h b/Marlin/src/pins/ramps/pins_MKS_BASE.h
index 75c7eb284845..dc0485e27432 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index 700e2a410c14..e91b2c2f4410 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
index 12629706f361..fe67e7d78937 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h b/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
index 55448d4c0bf7..1b06657f09a9 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 9596214cb206..82a21118100a 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
index 88973baa1a56..ea45f912381a 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
index ff1314b2bf41..d56bbd1e45c1 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index b7e9df475904..a427ef14c904 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_13.h b/Marlin/src/pins/ramps/pins_RAMPS_13.h
index 508064e66fd4..1eb883f4db0d 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_13.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index 1328354b7dcd..ea2ace7e86fd 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
index 43937e213706..39aecb0bc77a 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
index 0eb3035c1d19..d6b08a1d6806 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
index a55348fec116..36dd6c5690f3 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 02193a5a0374..24aa7b9c9032 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index c69843c62101..da6b6e4187fb 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
index 01ccb5927aaf..eb46ec9eaafc 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RL200.h b/Marlin/src/pins/ramps/pins_RL200.h
index 5bee03bd958b..570a9c26f94b 100644
--- a/Marlin/src/pins/ramps/pins_RL200.h
+++ b/Marlin/src/pins/ramps/pins_RL200.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index cf3bfe226c49..e613b9cb6c03 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h b/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
index 0cc4ebb3baef..7dfa747bf450 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
index 27c746ad252a..2e944904604c 100644
--- a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
+++ b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TANGO.h b/Marlin/src/pins/ramps/pins_TANGO.h
index 2cc8565db2a7..d3b7413fa282 100644
--- a/Marlin/src/pins/ramps/pins_TANGO.h
+++ b/Marlin/src/pins/ramps/pins_TANGO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
index fd0b67c88aac..c0b863035404 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index f3155fdb0997..1c5ea39279d5 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h b/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
index 48b510d8c2bd..92ed852867e9 100644
--- a/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
+++ b/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 145817b48496..5649b95f34f3 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index c182aa96f046..2af64bb2a065 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
index b2594acebced..8a48b07de76b 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index dd9aaf1292ab..e128dc98d276 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_VORON.h b/Marlin/src/pins/ramps/pins_VORON.h
index 43c33171644d..a6cb05928aa4 100644
--- a/Marlin/src/pins/ramps/pins_VORON.h
+++ b/Marlin/src/pins/ramps/pins_VORON.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index bf85bfa12d67..450ad1f82548 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index d94f5e44cb3c..a1005c51ec57 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h
index c502f076718b..3a38e5ce1668 100644
--- a/Marlin/src/pins/sam/pins_ADSK.h
+++ b/Marlin/src/pins/sam/pins_ADSK.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index 75dd0046480f..619d7f62c747 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin/src/pins/sam/pins_ARCHIM1.h
index 83a68e776fd4..ddc9f407ecd6 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM1.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
index 504e937f9fe4..acd515d8c156 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM2.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
index 731e31defad6..4f352ff1523e 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index ed9781388a5b..240204ced958 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
index d5cc3bed6a5f..c05c6169d6d3 100644
--- a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
+++ b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index 819b4002a4bb..41daba4e8e03 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS4DUE.h b/Marlin/src/pins/sam/pins_RAMPS4DUE.h
index 36c0717bce8c..21a2055967e7 100644
--- a/Marlin/src/pins/sam/pins_RAMPS4DUE.h
+++ b/Marlin/src/pins/sam/pins_RAMPS4DUE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
index d63d9a32a812..e0a8d5cd943a 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_DUO.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 5add612cc1ea..2e0350447547 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
index 22fdafd68ec7..6e7d05506930 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 619b2d594daf..f3ae437c1f4b 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 45540e8dad5a..6963a164bbfe 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index c8ff71673bf3..d0c24e68a358 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index 94fb7cddc107..db0826e7c9d7 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index 6e49bad6161e..ebd050371231 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
index 4140dc4b950c..4c991c5e9ef9 100644
--- a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
+++ b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
index 3059f6c898b4..833f99fb7f8f 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
index e370a888f375..c7c037fd4d46 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h
index 294b4df2f5c7..d1b8391bcdf7 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h b/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
index fc4d8b6e10bd..14e1c67b6fe8 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin/src/pins/sanguino/pins_GEN7_12.h
index 53e4e04df86e..4ab53faa98c4 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_12.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_12.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_13.h b/Marlin/src/pins/sanguino/pins_GEN7_13.h
index 7f66ac1a9ab9..728dfd8a5ce4 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_13.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_13.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin/src/pins/sanguino/pins_GEN7_14.h
index df18f6e7812e..5121b7d2e98c 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_14.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_14.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
index 8605f0d4691b..0f8a92f08dea 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index ad0a58509b4f..b73c1150de9e 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 59faeee770bf..958ea78da4b5 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h b/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
index ef1f1332c1c9..59baa2d6dd9b 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index fd3f482c06a9..bf0e34a9ec8d 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index d4b05e316e31..50433f6244db 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_OMCA.h b/Marlin/src/pins/sanguino/pins_OMCA.h
index 8c50483574e4..c2ba1ed7073b 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_OMCA_A.h b/Marlin/src/pins/sanguino/pins_OMCA_A.h
index 94a186241b5c..b8340a3debd8 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA_A.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA_A.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index d6d7efcf7024..977ba16daf22 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
index f4b05e4f6ef1..3254a01a15bd 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_SETHI.h b/Marlin/src/pins/sanguino/pins_SETHI.h
index 79c3209b4bb9..528ec4455f48 100644
--- a/Marlin/src/pins/sanguino/pins_SETHI.h
+++ b/Marlin/src/pins/sanguino/pins_SETHI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sanguino/pins_STB_11.h b/Marlin/src/pins/sanguino/pins_STB_11.h
index 9a79853467d8..774fb00403cb 100644
--- a/Marlin/src/pins/sanguino/pins_STB_11.h
+++ b/Marlin/src/pins/sanguino/pins_STB_11.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 2492f318167e..807ee99e235f 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h
index 495654a82cbf..23ccccdc03db 100644
--- a/Marlin/src/pins/stm32/pins_ARMED.h
+++ b/Marlin/src/pins/stm32/pins_ARMED.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32/pins_BEAST.h
index 7b1f61d918f0..d779994d1926 100644
--- a/Marlin/src/pins/stm32/pins_BEAST.h
+++ b/Marlin/src/pins/stm32/pins_BEAST.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
index 74a715a8d228..869e74f5e39d 100644
--- a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
index 6b8d64dd6783..bfae524743a8 100644
--- a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
index 8ed2e50d253e..aa2152c84fae 100644
--- a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
index 74f6df9da945..33445f7d0f2f 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
index 936c1992449c..9785c7bd410f 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
index bd2078e5d98e..461cd347a658 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
index 67da8571fb16..5701dd5c5629 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
index 3c6b673b6e4d..08f666882eca 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
index dad46716fd1d..8eb7d354b303 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32/pins_CHITU3D.h
index 48b57b35020b..2411500fb2b9 100644
--- a/Marlin/src/pins/stm32/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32/pins_CHITU3D.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
index ea3f5d1146b4..94b67769c729 100644
--- a/Marlin/src/pins/stm32/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
index d55bdcc150d0..db76042ab7f3 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
index 28b37cc8418b..a845ed161b7d 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
index 236bb17f6194..5f7136c15654 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
index 33756e437a86..4b85e6097cd9 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
index a55bd34bcb33..2909b7c53824 100644
--- a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
+++ b/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI.h b/Marlin/src/pins/stm32/pins_GTM32_MINI.h
index 36d7377ffae6..a35bd298884b 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32/pins_GTM32_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
index c4b7b37b94ca..4c14165f799d 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
index 36d7377ffae6..a35bd298884b 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32/pins_GTM32_REV_B.h
index fcb510e161e6..e02b8b9377b5 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32/pins_GTM32_REV_B.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
index d0e082dbd0b6..3849af3ae3a7 100644
--- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_K.h b/Marlin/src/pins/stm32/pins_LERDGE_K.h
index 10a36d8c6fa0..2b3ad6019920 100644
--- a/Marlin/src/pins/stm32/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32/pins_LERDGE_K.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_X.h b/Marlin/src/pins/stm32/pins_LERDGE_X.h
index c9c1da17e8ff..f498b7d0b9f6 100644
--- a/Marlin/src/pins/stm32/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32/pins_LERDGE_X.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
index f43ffa129b82..66c5b55ecb74 100644
--- a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/Marlin/src/pins/stm32/pins_MALYAN_M200.h b/Marlin/src/pins/stm32/pins_MALYAN_M200.h
index 87337c72b6f7..624c59ebea78 100644
--- a/Marlin/src/pins/stm32/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/stm32/pins_MALYAN_M200.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
index b01eb6f7a2fe..3b10bae139e4 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
index 98529e747be9..5d97de12ebf2 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
index c86b62cddd0c..1a7d664899c6 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
index 6d6787903b70..9a404ec64d24 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
index 50f20172014f..16e74b169e97 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
index 95337c07efe3..223f520ebe2e 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
index d080e907444b..ec43ab8fc3c7 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_MORPHEUS.h b/Marlin/src/pins/stm32/pins_MORPHEUS.h
index fd4da1ab7de5..8c583434e486 100644
--- a/Marlin/src/pins/stm32/pins_MORPHEUS.h
+++ b/Marlin/src/pins/stm32/pins_MORPHEUS.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_REMRAM_V1.h b/Marlin/src/pins/stm32/pins_REMRAM_V1.h
index aa9d6ea17813..45a1f68e5a3a 100644
--- a/Marlin/src/pins/stm32/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32/pins_REMRAM_V1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32.h b/Marlin/src/pins/stm32/pins_RUMBA32.h
index 26b4540c2b8c..dcdbd1b40a4b 100644
--- a/Marlin/src/pins/stm32/pins_RUMBA32.h
+++ b/Marlin/src/pins/stm32/pins_RUMBA32.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
index 02c1c66c5a7f..fcfd35e4fe41 100644
--- a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_STM32F1R.h b/Marlin/src/pins/stm32/pins_STM32F1R.h
index ccafcad1f7b4..b43492af21c3 100644
--- a/Marlin/src/pins/stm32/pins_STM32F1R.h
+++ b/Marlin/src/pins/stm32/pins_STM32F1R.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
index 9192ae453e67..99f1cea35ce3 100644
--- a/Marlin/src/pins/stm32/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_THE_BORG.h b/Marlin/src/pins/stm32/pins_THE_BORG.h
index 1f8569e4ea6a..08da40029c5a 100644
--- a/Marlin/src/pins/stm32/pins_THE_BORG.h
+++ b/Marlin/src/pins/stm32/pins_THE_BORG.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/stm32/pins_VAKE403D.h b/Marlin/src/pins/stm32/pins_VAKE403D.h
index df23f3b3186d..35faf076abb2 100644
--- a/Marlin/src/pins/stm32/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32/pins_VAKE403D.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin/src/pins/teensy2/pins_5DPRINT.h
index 80c6975279d1..206e22bb9cb7 100644
--- a/Marlin/src/pins/teensy2/pins_5DPRINT.h
+++ b/Marlin/src/pins/teensy2/pins_5DPRINT.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
index 3c38ad0b0108..22ceb975403f 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
index cd4dd33695f4..88b045b833f6 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index 6f6ba5b8c106..4f10e08084ab 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 6aaa037d25c6..c1198a4d4bad 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
index 1ae186ab598b..0ced699938c5 100644
--- a/Marlin/src/pins/teensy2/pins_SAV_MKI.h
+++ b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_TEENSY2.h b/Marlin/src/pins/teensy2/pins_TEENSY2.h
index a91a019121f8..985cd46df427 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSY2.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSY2.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index 5fde57180b70..72eb21c1aaac 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
index a68b9e31c4d7..6c43c4aaa8a2 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
index b0f0e4d474bb..28fd51b8a058 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index 01cb5ec1b831..f82fab1b50a8 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/Sd2Card.h b/Marlin/src/sd/Sd2Card.h
index f44dbb3124b2..72590451bc0c 100644
--- a/Marlin/src/sd/Sd2Card.h
+++ b/Marlin/src/sd/Sd2Card.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/Sd2Card_sdio.h b/Marlin/src/sd/Sd2Card_sdio.h
index 2aa2e86c035c..50399a3af960 100644
--- a/Marlin/src/sd/Sd2Card_sdio.h
+++ b/Marlin/src/sd/Sd2Card_sdio.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index 5e3e57f0e081..22c0cd2f75b0 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdBaseFile.h b/Marlin/src/sd/SdBaseFile.h
index 4d4062b1cd1f..dbdcf0b58226 100644
--- a/Marlin/src/sd/SdBaseFile.h
+++ b/Marlin/src/sd/SdBaseFile.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatConfig.h b/Marlin/src/sd/SdFatConfig.h
index 8ab6aef1c6c5..5057d16a8d3e 100644
--- a/Marlin/src/sd/SdFatConfig.h
+++ b/Marlin/src/sd/SdFatConfig.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatStructs.h b/Marlin/src/sd/SdFatStructs.h
index ddf6546a0ca3..0412852cdd01 100644
--- a/Marlin/src/sd/SdFatStructs.h
+++ b/Marlin/src/sd/SdFatStructs.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatUtil.cpp b/Marlin/src/sd/SdFatUtil.cpp
index 428ed219af44..08b21e5f352e 100644
--- a/Marlin/src/sd/SdFatUtil.cpp
+++ b/Marlin/src/sd/SdFatUtil.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFatUtil.h b/Marlin/src/sd/SdFatUtil.h
index ff31a10a103b..d820d3cb4d55 100644
--- a/Marlin/src/sd/SdFatUtil.h
+++ b/Marlin/src/sd/SdFatUtil.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFile.cpp b/Marlin/src/sd/SdFile.cpp
index aa9c192e93c4..cc0e7fc347b9 100644
--- a/Marlin/src/sd/SdFile.cpp
+++ b/Marlin/src/sd/SdFile.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdFile.h b/Marlin/src/sd/SdFile.h
index ff33d8715b18..4f235f497686 100644
--- a/Marlin/src/sd/SdFile.h
+++ b/Marlin/src/sd/SdFile.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdInfo.h b/Marlin/src/sd/SdInfo.h
index ecb517ae9ab4..9d6674dfa1fa 100644
--- a/Marlin/src/sd/SdInfo.h
+++ b/Marlin/src/sd/SdInfo.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdVolume.cpp b/Marlin/src/sd/SdVolume.cpp
index 1db562a80aa8..1d4c56a344bd 100644
--- a/Marlin/src/sd/SdVolume.cpp
+++ b/Marlin/src/sd/SdVolume.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/SdVolume.h b/Marlin/src/sd/SdVolume.h
index b5282bdce3ec..1912b7adf665 100644
--- a/Marlin/src/sd/SdVolume.h
+++ b/Marlin/src/sd/SdVolume.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 538a744e46fb..0b3a91f40e2f 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 5d3a2e71b376..54d541c38aeb 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 2d75e75d4c86..c132b4a3b64f 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h
index a429bfd28f7f..f7e59a282afb 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/buildroot/bin/generate_version b/buildroot/bin/generate_version
index c2bcbdc758a4..70efe824a7c3 100755
--- a/buildroot/bin/generate_version
+++ b/buildroot/bin/generate_version
@@ -47,7 +47,7 @@ WEBSITE_URL=$(awk -F'"' \
 cat > "${DIR}/Version.h" <<EOF
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh
index d95d203b5a64..7d4b551776a4 100755
--- a/buildroot/share/fonts/genallfont.sh
+++ b/buildroot/share/fonts/genallfont.sh
@@ -103,7 +103,7 @@ if [ 1 = 1 ]; then
   cat <<EOF >src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/buildroot/share/vscode/auto_build.py b/buildroot/share/vscode/auto_build.py
index da0a47bfddfa..f9258846a57b 100644
--- a/buildroot/share/vscode/auto_build.py
+++ b/buildroot/share/vscode/auto_build.py
@@ -2,7 +2,7 @@
 #######################################
 #
 # Marlin 3D Printer Firmware
-# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 #
 # Based on Sprinter and grbl.
 # Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

From 202840e750b4a94c71a6eafe30d52112825d882b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 3 Feb 2020 08:33:35 -0600
Subject: [PATCH 122/565] Tweak mfqp script

---
 buildroot/share/git/mfqp | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/buildroot/share/git/mfqp b/buildroot/share/git/mfqp
index 59f069977313..5650d08252a2 100755
--- a/buildroot/share/git/mfqp
+++ b/buildroot/share/git/mfqp
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 #
-# mfqp [-q|--quick] [1|2|3]
+# mfqp [1|2|3]
 #
-# Add all changed files, commit as "patch", do `mfrb` and `git push -f`
+#  - git add .
+#  - git commit --amend
+#  - ghpc
 #
 
 MFINFO=$(mfinfo "$@") || exit 1
@@ -15,26 +17,14 @@ IND=6
 while [ $IND -lt ${#INFO[@]} ]; do
   ARG=${INFO[$IND]}
   case "$ARG" in
-    -q|--quick ) QUICK="-q" ;;
      -h|--help ) USAGE=1 ;;
              * ) USAGE=1 ; echo "unknown option: $ARG" ;;
   esac
   let IND+=1
 done
 
-[[ ${INFO[4]} =~ [0-9] ]] && USAGE=1
+[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
 
-[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [-hq] [1|2|3]" 1>&2 ; exit 1 ; }
+[[ $CURR == $TARG && $REPO != "MarlinDocumentation" ]] && { echo "Don't alter the PR Target branch."; exit 1 ; }
 
-git add .
-git commit -m "patch"
-
-if [[ $CURR == $TARG ]]; then
-  if [[ $REPO == "MarlinDocumentation" ]]; then
-    git rebase -i HEAD~2 && git push -f
-  else
-    echo "Don't alter the PR Target branch."; exit 1
-  fi
-else
-  mfrb $QUICK "$@" && git push -f
-fi
+git add . && git commit --amend && git push -f

From ff78f79762085581734e4d24b70a888ee2baf139 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 3 Feb 2020 18:06:04 -0600
Subject: [PATCH 123/565] Use a different Configurations branch for CI

---
 buildroot/bin/use_example_configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index 410091cbd579..4510f689f2b0 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -2,7 +2,7 @@
 
 restore_configs
 
-EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/examples"
+EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.0.x/config/examples"
 
 cd Marlin
 

From 7d4fa9d5046379aaf25ecc73bf8fd5ef581b5cc4 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 4 Feb 2020 13:35:06 +1300
Subject: [PATCH 124/565] Fix LCD Z Move character LCD display line (#16772)

---
 Marlin/src/lcd/menu/menu_motion.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 177acc0797d0..12cc7a331e2b 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -250,7 +250,11 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
     if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
       extern const char NUL_STR[];
       SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
-      MENU_ITEM_ADDON_START(0);
+      MENU_ITEM_ADDON_START(0
+        #if HAS_CHARACTER_LCD
+          + 1
+        #endif
+      );
         char tmp[20], numstr[10];
         // Determine digits needed right of decimal
         const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :

From f1dbfaf706ad2e00e1ca49c09ca8790a950a70c0 Mon Sep 17 00:00:00 2001
From: felixstorm <felix.storm@glueckkanja.com>
Date: Tue, 4 Feb 2020 01:36:51 +0100
Subject: [PATCH 125/565] Fix warning for ESP32 (#16771)

---
 Marlin/src/HAL/HAL_ESP32/timers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_ESP32/timers.cpp b/Marlin/src/HAL/HAL_ESP32/timers.cpp
index 654df79067ca..ef181a438ca6 100644
--- a/Marlin/src/HAL/HAL_ESP32/timers.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/timers.cpp
@@ -106,7 +106,7 @@ void HAL_timer_start(const uint8_t timer_num, uint32_t frequency) {
 
   timer_enable_intr(timer.group, timer.idx);
 
-  timer_isr_register(timer.group, timer.idx, timer_isr, (void*)timer_num, 0, nullptr);
+  timer_isr_register(timer.group, timer.idx, timer_isr, (void*)(uint32_t)timer_num, 0, nullptr);
 
   timer_start(timer.group, timer.idx);
 }

From 3ded99b894117f001418d6d930d474efe8926c60 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 3 Feb 2020 19:53:30 -0600
Subject: [PATCH 126/565] [cron] Bump distribution date

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c3adb20c9e53..00a3d52f0efe 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-01-31"
+  #define STRING_DISTRIBUTION_DATE "2020-02-03"
 #endif
 
 /**

From 62d9e3f50e02d5c8e1f480bce14e9a8d3091f667 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 3 Feb 2020 21:58:44 -0500
Subject: [PATCH 127/565] Force T0 in UBL G29 on all multi-hotend setups
 (#16774)

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 4bef0dd747cb..a0a12ea621d2 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -38,7 +38,7 @@
   #include "../../../gcode/gcode.h"
   #include "../../../libs/least_squares_fit.h"
 
-  #if ENABLED(DUAL_X_CARRIAGE)
+  #if HOTENDS > 1
     #include "../../../module/tool_change.h"
   #endif
 
@@ -305,12 +305,15 @@
 
     const int8_t p_val = parser.intval('P', -1);
     const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen('J');
+    #if HOTENDS > 1
+      const uint8_t old_tool_index = active_extruder;
+    #endif
 
     // Check for commands that require the printer to be homed
     if (may_move) {
       planner.synchronize();
       if (axes_need_homing()) gcode.home_all_axes();
-      #if ENABLED(DUAL_X_CARRIAGE)
+      #if HOTENDS > 1
         if (active_extruder != 0) tool_change(0);
       #endif
     }
@@ -684,6 +687,9 @@
       UNUSED(probe_deployed);
     #endif
 
+    #if HOTENDS > 1
+      tool_change(old_tool_index);
+    #endif
     return;
   }
 

From 38a9706e164bbc9cd97ed17f109639d01b6b4c01 Mon Sep 17 00:00:00 2001
From: felixstorm <felix.storm@glueckkanja.com>
Date: Tue, 4 Feb 2020 06:29:01 +0100
Subject: [PATCH 128/565] Keep secure credentials in a separate config file
 (#16773)

---
 .gitignore                        |  3 +++
 Marlin/Configuration_adv.h        | 12 ++++++++++--
 buildroot/bin/opt_set             |  3 ++-
 buildroot/share/tests/esp32-tests |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 582f2a5dd9d6..80c76ee1e482 100755
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,9 @@ Marlin/*/*/readme.txt
 Marlin/*/*/*/readme.txt
 Marlin/*/*/*/*/readme.txt
 
+# Secure Credentials
+Configuration_Secure.h
+
 #Visual Studio
 *.sln
 *.vcxproj
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a365b473bded..aea9656971b8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3023,11 +3023,19 @@
 //#define ESP3D_WIFISUPPORT   // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
 
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
-  #define WIFI_SSID "Wifi SSID"
-  #define WIFI_PWD  "Wifi Password"
   //#define WEBSUPPORT          // Start a webserver (which may include auto-discovery)
   //#define OTASUPPORT          // Support over-the-air firmware updates
   //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
+
+  /**
+   * To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with
+   * the following defines, customized for your network. This specific file is excluded via
+   * .gitignore to prevent it from accidentally leaking to the public.
+   *
+   *   #define WIFI_SSID "WiFi SSID"
+   *   #define WIFI_PWD  "WiFi Password"
+   */
+  //#include "Configuration_Secure.h" // External file with WiFi SSID / Password
 #endif
 
 /**
diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index 2f6c253c9c16..f23a1d3d0764 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -8,4 +8,5 @@ SED=$(which gsed || which sed)
 # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
 eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
 eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-(echo "ERROR: opt_set Can't find ${1}" >&2 && exit 9)
+eval "echo '#define ${@}' >>Marlin/Configuration_adv.h" ||
+(echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
diff --git a/buildroot/share/tests/esp32-tests b/buildroot/share/tests/esp32-tests
index 123d5c320c6d..47f5d8176144 100755
--- a/buildroot/share/tests/esp32-tests
+++ b/buildroot/share/tests/esp32-tests
@@ -12,8 +12,8 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
 opt_enable WIFISUPPORT GCODE_MACROS BAUD_RATE_GCODE
-opt_set WIFI_SSID "\"ssid\""
-opt_set WIFI_PWD "\"password\""
+opt_add WIFI_SSID "\"ssid\""
+opt_add WIFI_PWD "\"password\""
 opt_set TX_BUFFER_SIZE 64
 opt_add WEBSUPPORT
 exec_test $1 $2 "ESP32 with WIFISUPPORT and WEBSUPPORT"

From 0268c1d02c33e6568aa579cfb9e4058603cbcb3c Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Tue, 4 Feb 2020 01:24:11 -0600
Subject: [PATCH 129/565] STM32duino - Use SDIO for onboard SD (#16756)

---
 .../HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp | 274 ++++++++++++
 Marlin/src/HAL/HAL_STM32F1/timers.h           |   2 +-
 Marlin/src/core/boards.h                      |  29 +-
 Marlin/src/core/macros.h                      |  10 +-
 Marlin/src/inc/SanityCheck.h                  |  28 +-
 Marlin/src/lcd/ultralcd.h                     |   2 +-
 Marlin/src/module/temperature.cpp             |   2 +-
 Marlin/src/pins/pins.h                        |  84 ++--
 Marlin/src/pins/pinsDebug.h                   |   2 +-
 Marlin/src/pins/pinsDebug_list.h              | 399 +-----------------
 Marlin/src/pins/stm32/pins_ARMED.h            |   3 +
 .../src/pins/stm32/pins_BLACK_STM32F407VE.h   |  25 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h |  16 +-
 Marlin/src/pins/stm32/pins_FLYF407ZG.h        |  24 ++
 Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h  |  35 +-
 .../variants/STEVAL_F401VE/variant.h          |   2 +-
 buildroot/share/tests/BIGTREE_BTT002-tests    |   2 +-
 buildroot/share/tests/BIGTREE_SKR_PRO-tests   |   2 +-
 .../share/tests/STM32F103RC_bigtree_USB-tests |   2 +-
 .../share/tests/STM32F103RE_bigtree-tests     |   2 +-
 .../share/tests/STM32F103RE_bigtree_USB-tests |   2 +-
 21 files changed, 486 insertions(+), 461 deletions(-)
 create mode 100644 Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp

diff --git a/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp
new file mode 100644
index 000000000000..ebe15f93915f
--- /dev/null
+++ b/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp
@@ -0,0 +1,274 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SDIO_SUPPORT) && !defined(STM32GENERIC)
+
+#include <stdint.h>
+#include <stdbool.h>
+
+//#include "SdMscDriver.h"
+
+//#include "usbd_msc_bot.h"
+//#include "usbd_msc_scsi.h"
+//#include "usbd_msc_composite.h"
+//#include "usbd_msc_cdc_composite.h"
+
+//#include "usbd_msc_data.h"
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  #include <stm32f1xx_hal_rcc_ex.h>
+  #include <stm32f1xx_hal_sd.h>
+#elif defined(STM32F4xx)
+  #include <stm32f4xx_hal_rcc.h>
+  #include <stm32f4xx_hal_dma.h>
+  #include <stm32f4xx_hal_gpio.h>
+  #include <stm32f4xx_hal_sd.h>
+#elif defined(STM32F7xx)
+  #include <stm32f7xx_hal_rcc.h>
+  #include <stm32f7xx_hal_dma.h>
+  #include <stm32f7xx_hal_gpio.h>
+  #include <stm32f7xx_hal_sd.h>
+#else
+  #error "ERROR - Only STM32F103xE, STM32F103xG, STM32F4xx or STM32F7xx CPUs supported"
+#endif
+
+SD_HandleTypeDef hsd;  // create SDIO structure
+
+#define TRANSFER_CLOCK_DIV ((uint8_t)SDIO_INIT_CLK_DIV/40)
+
+#ifndef USBD_OK
+  #define USBD_OK 0
+#endif
+
+void go_to_transfer_speed() {
+
+  SD_InitTypeDef Init;
+
+  /* Default SDIO peripheral configuration for SD card initialization */
+  Init.ClockEdge           = hsd.Init.ClockEdge;
+  Init.ClockBypass         = hsd.Init.ClockBypass;
+  Init.ClockPowerSave      = hsd.Init.ClockPowerSave;
+  Init.BusWide             = hsd.Init.BusWide;
+  Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
+  Init.ClockDiv            = TRANSFER_CLOCK_DIV;
+
+  /* Initialize SDIO peripheral interface with default configuration */
+  SDIO_Init(hsd.Instance, Init);
+}
+
+void SD_LowLevel_Init(void) {
+
+  uint32_t tempreg;
+
+  GPIO_InitTypeDef  GPIO_InitStruct;
+
+  __HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
+  __HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
+
+  GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12;  // D0 & SCK
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull = 1;  //GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+  #if defined(SDIO_D1_PIN) && defined(SDIO_D2_PIN) && defined(SDIO_D3_PIN)  // define D1-D3 only if have a four bit wide SDIO bus
+    GPIO_InitStruct.Pin = GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11;  // D1-D3
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = 1;  //GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+  #endif
+
+  // Configure PD.02 CMD line
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+  RCC->APB2RSTR  &= ~RCC_APB2RSTR_SDIORST_Msk;  // take SDIO out of reset
+  RCC->APB2ENR |= RCC_APB2RSTR_SDIORST_Msk;  // enable SDIO clock
+
+  // Enable the DMA2 Clock
+
+  //Initialize the SDIO (with initial <400Khz Clock)
+  tempreg = 0;  //Reset value
+  tempreg |= SDIO_CLKCR_CLKEN;  //Clock is enabled
+  tempreg |= (uint32_t)0x76;  //Clock Divider. Clock = 48000/(118+2) = 400Khz
+  //Keep the rest at 0 => HW_Flow Disabled, Rising Clock Edge, Disable CLK ByPass, Bus Width = 0, Power save Disable
+  SDIO->CLKCR = tempreg;
+
+  //Power up the SDIO
+  SDIO->POWER = 0x03;
+}
+
+
+void HAL_SD_MspInit(SD_HandleTypeDef *hsd) { // application specific init
+  UNUSED(hsd);   /* Prevent unused argument(s) compilation warning */
+  __HAL_RCC_SDIO_CLK_ENABLE();  // turn on SDIO clock
+}
+
+constexpr uint8_t SD_RETRY_COUNT = (1
+  #if ENABLED(SD_CHECK_AND_RETRY)
+    + 2
+  #endif
+);
+
+bool SDIO_Init() {
+  //init SDIO and get SD card info
+
+  uint8_t retryCnt = SD_RETRY_COUNT;
+
+  bool status;
+  hsd.Instance = SDIO;
+  hsd.State = (HAL_SD_StateTypeDef) 0;  // HAL_SD_STATE_RESET
+  SD_LowLevel_Init();
+
+  uint8_t retry_Cnt = retryCnt;
+  for (;;) {
+    status = (bool) HAL_SD_Init(&hsd);
+    if (!status) break;
+    if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
+  }
+
+  go_to_transfer_speed();
+
+  #if defined(SDIO_D1_PIN) && defined(SDIO_D2_PIN) && defined(SDIO_D3_PIN) // go to 4 bit wide mode if pins are defined
+    retry_Cnt = retryCnt;
+    for (;;) {
+      if (!HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B)) break;  // some cards are only 1 bit wide so a pass here is not required
+      if (!--retry_Cnt) break;
+    }
+    if (!retry_Cnt) {  // wide bus failed, go back to one bit wide mode
+      hsd.State = (HAL_SD_StateTypeDef) 0;  // HAL_SD_STATE_RESET
+      SD_LowLevel_Init();
+      retry_Cnt = retryCnt;
+      for (;;) {
+        status = (bool) HAL_SD_Init(&hsd);
+        if (!status) break;
+        if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
+      }
+    }
+  #endif
+
+  return true;
+}
+
+void init_SDIO_pins(void) {
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+
+  /**SDIO GPIO Configuration
+  PC8     ------> SDIO_D0
+  PC12    ------> SDIO_CK
+  PD2     ------> SDIO_CMD
+  */
+  GPIO_InitStruct.Pin = GPIO_PIN_8;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Pin = GPIO_PIN_12;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+}
+
+//bool SDIO_init() { return (bool) (SD_SDIO_Init() ? 1 : 0);}
+//bool SDIO_Init_C() { return (bool) (SD_SDIO_Init() ? 1 : 0);}
+
+bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
+  bool status;
+
+  hsd.Instance = SDIO;
+
+  uint8_t retryCnt = SD_RETRY_COUNT;
+
+  for (;;) {
+    bool status = (bool) HAL_SD_ReadBlocks(&hsd, (uint8_t*)dst, block, 1, 1000);  // read one 512 byte block with 500mS timeout
+    status |= (bool) HAL_SD_GetCardState(&hsd);     // make sure all is OK
+    if (!status)     return false;                  // return passing status
+    if (!--retryCnt) return true;                   // return failing status if retries are exhausted
+  }
+
+  /*
+  return (bool) ((status_read | status_card) ? 1 : 0);
+
+  if (SDIO_GetCardState() != SDIO_CARD_TRANSFER) return false;
+  if (blockAddress >= SdCard.LogBlockNbr) return false;
+  if ((0x03 & (uint32_t)data)) return false; // misaligned data
+
+  if (SdCard.CardType != CARD_SDHC_SDXC) { blockAddress *= 512U; }
+
+  if (!SDIO_CmdReadSingleBlock(blockAddress)) {
+    SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS);
+    dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
+    return false;
+  }
+
+  while (!SDIO_GET_FLAG(SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) {}
+
+  dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
+
+  if (SDIO->STA & SDIO_STA_RXDAVL) {
+    while (SDIO->STA & SDIO_STA_RXDAVL) (void)SDIO->FIFO;
+    SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
+    return false;
+  }
+
+  if (SDIO_GET_FLAG(SDIO_STA_TRX_ERROR_FLAGS)) {
+    SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
+    return false;
+  }
+  SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
+  */
+
+  return true;
+}
+
+bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
+  bool status;
+
+  hsd.Instance = SDIO;
+
+  uint8_t retryCnt = SD_RETRY_COUNT;
+
+  for (;;) {
+    status = (bool) HAL_SD_WriteBlocks(&hsd, (uint8_t*)src, block, 1, 500);  // write one 512 byte block with 500mS timeout
+    status |= (bool) HAL_SD_GetCardState(&hsd);     // make sure all is OK
+    if (!status) return (bool) status;              // return passing status
+    if (!--retryCnt) return (bool) status;          // return failing status if retries are exhausted
+  }
+}
+
+#endif // SDIO_SUPPORT
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.h b/Marlin/src/HAL/HAL_STM32F1/timers.h
index d7fe11470c54..e5733cc563f5 100644
--- a/Marlin/src/HAL/HAL_STM32F1/timers.h
+++ b/Marlin/src/HAL/HAL_STM32F1/timers.h
@@ -70,7 +70,7 @@ typedef uint16_t hal_timer_t;
 //#define TEMP_TIMER_NUM 4  // 2->4, Timer 2 for Stepper Current PWM
 #define PULSE_TIMER_NUM STEP_TIMER_NUM
 
-#if MB(BTT_SKR_MINI_E3_V1_0, BIGTREE_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
+#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
   // SKR Mini E3 boards use PA8 as FAN_PIN, so TIMER 1 is used for Fan PWM.
   #ifdef STM32_HIGH_DENSITY
     #define SERVO0_TIMER_NUM 8  // tone.cpp uses Timer 4
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 43cc3111eccb..df79e2e2e15d 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -208,9 +208,9 @@
 #define BOARD_BIQU_B300_V1_0          2009  // BIQU B300_V1.0 (Power outputs: Hotend0, Fan, Bed, SPI Driver)
 #define BOARD_MKS_SGEN_L              2010  // MKS-SGen-L (Power outputs: Hotend0, Hotend1, Bed, Fan)
 #define BOARD_GMARSH_X6_REV1          2011  // GMARSH X6 board, revision 1 prototype
-#define BOARD_BIGTREE_SKR_V1_1        2012  // BigTreeTech SKR v1.1 (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_BIGTREE_SKR_V1_3        2013  // BigTreeTech SKR v1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_BIGTREE_SKR_V1_4        2014  // BigTreeTech SKR v1.4 (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_1            2012  // BigTreeTech SKR v1.1 (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_3            2013  // BigTreeTech SKR v1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_4            2014  // BigTreeTech SKR v1.4 (Power outputs: Hotend0, Hotend1, Fan, Bed)
 
 //
 // LPC1769 ARM Cortex M3
@@ -224,7 +224,7 @@
 #define BOARD_COHESION3D_MINI         2505  // Cohesion3D Mini
 #define BOARD_SMOOTHIEBOARD           2506  // Smoothieboard
 #define BOARD_TH3D_EZBOARD            2507  // TH3D EZBoard v1.0
-#define BOARD_BIGTREE_SKR_V1_4_TURBO  2508  // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_BTT_SKR_V1_4_TURBO      2508  // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
 
 //
 // SAM3X8E ARM Cortex M3
@@ -281,10 +281,10 @@
 #define BOARD_MKS_ROBIN_LITE          4009  // MKS Robin Lite/Lite2 (STM32F103RCT6)
 #define BOARD_MKS_ROBIN_LITE3         4010  // MKS Robin Lite3 (STM32F103RCT6)
 #define BOARD_MKS_ROBIN_PRO           4011  // MKS Robin Pro (STM32F103ZET6)
-#define BOARD_BIGTREE_SKR_MINI_V1_1   4012  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_V1_1       4012  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4013  // BigTreeTech SKR Mini E3 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4014  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
-#define BOARD_BIGTREE_SKR_E3_DIP      4015  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
+#define BOARD_BTT_SKR_E3_DIP          4015  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
 #define BOARD_JGAURORA_A5S_A1         4016  // JGAurora A5S A1 (STM32F103ZET6)
 #define BOARD_FYSETC_AIO_II           4017  // FYSETC AIO_II
 #define BOARD_FYSETC_CHEETAH          4018  // FYSETC Cheetah
@@ -313,14 +313,15 @@
 #define BOARD_BLACK_STM32F407VE       4204  // BLACK_STM32F407VE
 #define BOARD_BLACK_STM32F407ZE       4205  // BLACK_STM32F407ZE
 #define BOARD_STEVAL_3DP001V1         4206  // STEVAL-3DP001V1 3D PRINTER BOARD
-#define BOARD_BIGTREE_SKR_PRO_V1_1    4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
-#define BOARD_BIGTREE_BTT002_V1_0     4208  // BigTreeTech BTT002 v1.0 (STM32F407VE)
-#define BOARD_LERDGE_K                4209  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_X                4210  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4211  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4212  // FYSETC S6 board
-#define BOARD_FLYF407ZG               4213  // FLYF407ZG board (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4214  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_BTT_SKR_PRO_V1_1        4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+#define BOARD_BTT_BTT002_V1_0         4208  // BigTreeTech BTT002 v1.0 (STM32F407VE)
+#define BOARD_BTT_GTR_V1_0            4209  // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_LERDGE_K                4210  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_X                4211  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4212  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4213  // FYSETC S6 board
+#define BOARD_FLYF407ZG               4214  // FLYF407ZG board (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4215  // MKS_ROBIN2 (STM32F407ZE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 9699585c1ecf..5e0797d67c04 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -196,12 +196,14 @@
 #define EITHER(V1,V2)       ANY(V1,V2)
 
 // Macros to support pins/buttons exist testing
-#define _PINEX_1(PN)        (defined(PN##_PIN) && PN##_PIN >= 0)
-#define PIN_EXISTS(V...)    DO(PINEX,&&,V)
+#define PIN_EXISTS(PN)      (defined(PN##_PIN) && PN##_PIN >= 0)
+#define _PINEX_1            PIN_EXISTS
+#define PINS_EXIST(V...)    DO(PINEX,&&,V)
 #define ANY_PIN(V...)       DO(PINEX,||,V)
 
-#define _BTNEX_1(BN)        (defined(BTN_##BN) && BTN_##BN >= 0)
-#define BUTTON_EXISTS(V...) DO(BTNEX,&&,V)
+#define BUTTON_EXISTS(BN)   (defined(BTN_##BN) && BTN_##BN >= 0)
+#define _BTNEX_1            BUTTON_EXISTS
+#define BUTTONS_EXIST(V...) DO(BTNEX,&&,V)
 #define ANY_BUTTON(V...)    DO(BTNEX,||,V)
 
 #define WITHIN(N,L,H)       ((N) >= (L) && (N) <= (H))
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 3668e63341e7..ed5ddce34d3c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -927,7 +927,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif TOOLCHANGE_ZRAISE < 0
     #error "TOOLCHANGE_ZRAISE must be 0 or higher."
   #elif ENABLED(PARKING_EXTRUDER)
-    #if !PIN_EXISTS(SOL0, SOL1)
+    #if !PINS_EXIST(SOL0, SOL1)
       #error "PARKING_EXTRUDER requires SOL0_PIN and SOL1_PIN."
     #elif !defined(PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE) || !WITHIN(PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE, LOW, HIGH)
       #error "PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE must be defined as HIGH or LOW."
@@ -1515,9 +1515,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "HEATER_0_PIN not defined for this board."
 #elif !ANY_PIN(TEMP_0, MAX6675_SS)
   #error "TEMP_0_PIN not defined for this board."
-#elif ((defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && !PIN_EXISTS(E0_STEP, E0_DIR))
+#elif ((defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && !PINS_EXIST(E0_STEP, E0_DIR))
   #error "E0_STEP_PIN or E0_DIR_PIN not defined for this board."
-#elif ( !(defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && (!PIN_EXISTS(E0_STEP, E0_DIR) || !HAS_E0_ENABLE))
+#elif ( !(defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && (!PINS_EXIST(E0_STEP, E0_DIR) || !HAS_E0_ENABLE))
   #error "E0_STEP_PIN, E0_DIR_PIN, or E0_ENABLE_PIN not defined for this board."
 #elif EXTRUDERS && TEMP_SENSOR_0 == 0
   #error "TEMP_SENSOR_0 is required with any extruders."
@@ -1709,35 +1709,35 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if DISABLED(MK2_MULTIPLEXER) // MK2_MULTIPLEXER uses E0 stepper only
   #if E_STEPPERS
-    #if !(PIN_EXISTS(E0_STEP, E0_DIR) && HAS_E0_ENABLE)
+    #if !(PINS_EXIST(E0_STEP, E0_DIR) && HAS_E0_ENABLE)
       #error "E0_STEP_PIN, E0_DIR_PIN, or E0_ENABLE_PIN not defined for this board."
     #endif
     #if E_STEPPERS > 1
-      #if !(PIN_EXISTS(E1_STEP, E1_DIR) && HAS_E1_ENABLE)
+      #if !(PINS_EXIST(E1_STEP, E1_DIR) && HAS_E1_ENABLE)
         #error "E1_STEP_PIN, E1_DIR_PIN, or E1_ENABLE_PIN not defined for this board."
       #endif
       #if E_STEPPERS > 2
-        #if !(PIN_EXISTS(E2_STEP, E2_DIR) && HAS_E2_ENABLE)
+        #if !(PINS_EXIST(E2_STEP, E2_DIR) && HAS_E2_ENABLE)
           #error "E2_STEP_PIN, E2_DIR_PIN, or E2_ENABLE_PIN not defined for this board."
         #endif
         #if E_STEPPERS > 3
-          #if !(PIN_EXISTS(E3_STEP, E3_DIR) && HAS_E3_ENABLE)
+          #if !(PINS_EXIST(E3_STEP, E3_DIR) && HAS_E3_ENABLE)
             #error "E3_STEP_PIN, E3_DIR_PIN, or E3_ENABLE_PIN not defined for this board."
           #endif
           #if E_STEPPERS > 4
-            #if !(PIN_EXISTS(E4_STEP, E4_DIR) && HAS_E4_ENABLE)
+            #if !(PINS_EXIST(E4_STEP, E4_DIR) && HAS_E4_ENABLE)
               #error "E4_STEP_PIN, E4_DIR_PIN, or E4_ENABLE_PIN not defined for this board."
             #endif
             #if E_STEPPERS > 5
-              #if !(PIN_EXISTS(E5_STEP, E5_DIR) && HAS_E5_ENABLE)
+              #if !(PINS_EXIST(E5_STEP, E5_DIR) && HAS_E5_ENABLE)
                 #error "E5_STEP_PIN, E5_DIR_PIN, or E5_ENABLE_PIN not defined for this board."
               #endif
               #if E_STEPPERS > 6
-                #if !(PIN_EXISTS(E6_STEP, E6_DIR) && HAS_E6_ENABLE)
+                #if !(PINS_EXIST(E6_STEP, E6_DIR) && HAS_E6_ENABLE)
                   #error "E6_STEP_PIN, E6_DIR_PIN, or E6_ENABLE_PIN not defined for this board."
                 #endif
                 #if E_STEPPERS > 7
-                  #if !(PIN_EXISTS(E7_STEP, E7_DIR) && HAS_E7_ENABLE)
+                  #if !(PINS_EXIST(E7_STEP, E7_DIR) && HAS_E7_ENABLE)
                     #error "E7_STEP_PIN, E7_DIR_PIN, or E7_ENABLE_PIN not defined for this board."
                   #endif
                 #endif // E_STEPPERS > 7
@@ -1926,7 +1926,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * RGB_LED Requirements
  */
-#define _RGB_TEST (PIN_EXISTS(RGB_LED_R, RGB_LED_G, RGB_LED_B))
+#define _RGB_TEST (PINS_EXIST(RGB_LED_R, RGB_LED_G, RGB_LED_B))
 #if ENABLED(PRINTER_EVENT_LEDS) && !HAS_COLOR_LEDS
   #error "PRINTER_EVENT_LEDS requires BLINKM, PCA9533, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
 #elif ENABLED(RGB_LED)
@@ -2080,7 +2080,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Check existing RX/TX pins against enable TMC UART drivers.
  */
-#define INVALID_TMC_UART(ST) (AXIS_HAS_UART(ST) && !(defined(ST##_HARDWARE_SERIAL) || (PIN_EXISTS(ST##_SERIAL_RX, ST##_SERIAL_TX))))
+#define INVALID_TMC_UART(ST) (AXIS_HAS_UART(ST) && !(defined(ST##_HARDWARE_SERIAL) || (PINS_EXIST(ST##_SERIAL_RX, ST##_SERIAL_TX))))
 #if INVALID_TMC_UART(X)
   #error "TMC2208 or TMC2209 on X requires X_HARDWARE_SERIAL or X_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(X2)
@@ -2442,7 +2442,7 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
   #error "PRINTCOUNTER requires EEPROM_SETTINGS. Please update your Configuration."
 #endif
 
-#if ENABLED(USB_FLASH_DRIVE_SUPPORT) && !PIN_EXISTS(USB_CS, USB_INTR)
+#if ENABLED(USB_FLASH_DRIVE_SUPPORT) && !PINS_EXIST(USB_CS, USB_INTR)
   #error "USB_CS_PIN and USB_INTR_PIN are required for USB_FLASH_DRIVE_SUPPORT."
 #endif
 
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index 3317ac805bdf..8a328c4b9147 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -28,7 +28,7 @@
 #endif
 
 #define HAS_ENCODER_ACTION (HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY))
-#define HAS_ENCODER_WHEEL  ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTON_EXISTS(EN1, EN2))
+#define HAS_ENCODER_WHEEL  ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2))
 #define HAS_DIGITAL_BUTTONS (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT))
 #define HAS_SHIFT_ENCODER   (!HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL))))
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 16635b39bd08..f07f943213c2 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -59,7 +59,7 @@
   );
 #endif
 
-#define MAX6675_SEPARATE_SPI (EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675) && PIN_EXISTS(MAX6675_SCK, MAX6675_DO))
+#define MAX6675_SEPARATE_SPI (EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675) && PINS_EXIST(MAX6675_SCK, MAX6675_DO))
 
 #if MAX6675_SEPARATE_SPI
   #include "../libs/private_spi.h"
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 9b49b3956c05..1515440e71ee 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -361,11 +361,11 @@
   #include "lpc1768/pins_BIQU_B300_V1.0.h"      // LPC1768                                env:LPC1768
 #elif MB(GMARSH_X6_REV1)
   #include "lpc1768/pins_GMARSH_X6_REV1.h"      // LPC1768                                env:LPC1768
-#elif MB(BIGTREE_SKR_V1_1)
+#elif MB(BTT_SKR_V1_1)
   #include "lpc1768/pins_BTT_SKR_V1_1.h"        // LPC1768                                env:LPC1768
-#elif MB(BIGTREE_SKR_V1_3)
+#elif MB(BTT_SKR_V1_3)
   #include "lpc1768/pins_BTT_SKR_V1_3.h"        // LPC1768                                env:LPC1768
-#elif MB(BIGTREE_SKR_V1_4)
+#elif MB(BTT_SKR_V1_4)
   #include "lpc1768/pins_BTT_SKR_V1_4.h"        // LPC1768                                env:LPC1768
 
 //
@@ -388,7 +388,7 @@
   #include "lpc1769/pins_SMOOTHIEBOARD.h"       // LPC1769                                env:LPC1769
 #elif MB(TH3D_EZBOARD)
   #include "lpc1769/pins_TH3D_EZBOARD.h"        // LPC1769                                env:LPC1769
-#elif MB(BIGTREE_SKR_V1_4_TURBO)
+#elif MB(BTT_SKR_V1_4_TURBO)
   #include "lpc1769/pins_BTT_SKR_V1_4_TURBO.h"  // LPC1769                                env:LPC1769
 
 //
@@ -484,13 +484,13 @@
   #include "stm32/pins_MKS_ROBIN_NANO.h"        // STM32F1                                env:mks_robin_nano
 #elif MB(MKS_ROBIN_LITE)
   #include "stm32/pins_MKS_ROBIN_LITE.h"        // STM32F1                                env:mks_robin_lite
-#elif MB(BIGTREE_SKR_MINI_V1_1)
+#elif MB(BTT_SKR_MINI_V1_1)
   #include "stm32/pins_BTT_SKR_MINI_V1_1.h"     // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_0)
   #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_2)
   #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
-#elif MB(BIGTREE_SKR_E3_DIP)
+#elif MB(BTT_SKR_E3_DIP)
   #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RE_bigtree env:STM32F103RE_bigtree_USB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
 #elif MB(JGAURORA_A5S_A1)
   #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
@@ -527,16 +527,16 @@
 #elif MB(ARMED)
   #include "stm32/pins_ARMED.h"                 // STM32F4                                env:ARMED
 #elif MB(RUMBA32)
-  #include "stm32/pins_RUMBA32.h"               // STM32F4                                env:RUMBA32
+  #include "stm32/pins_RUMBA32.h"               // STM32F4                                env:rumba32_f446ve env:mks_rumba32
 #elif MB(BLACK_STM32F407VE)
   #include "stm32/pins_BLACK_STM32F407VE.h"     // STM32F4                                env:STM32F407VE_black
 #elif MB(STEVAL_3DP001V1)
   #include "stm32/pins_STEVAL_3DP001V1.h"       // STM32F4                                env:STM32F401VE_STEVAL
-#elif MB(BIGTREE_SKR_PRO_V1_1)
+#elif MB(BTT_SKR_PRO_V1_1)
   #include "stm32/pins_BTT_SKR_PRO_V1_1.h"      // STM32F4                                env:BIGTREE_SKR_PRO
-#elif MB(BIGTREE_GTR_V1_0)
-  #include "stm32/pins_BTT_GTR_V1_0.h"          // STM32F4                                env:BIGTREE_GTR
-#elif MB(BIGTREE_BTT002_V1_0)
+#elif MB(BTT_GTR_V1_0)
+  #include "stm32/pins_BTT_GTR_V1_0.h"          // STM32F4                                env:BIGTREE_GTR_V1_0
+#elif MB(BTT_BTT002_V1_0)
   #include "stm32/pins_BTT_BTT002_V1_0.h"       // STM32F4                                env:BIGTREE_BTT002
 #elif MB(LERDGE_K)
   #include "stm32/pins_LERDGE_K.h"              // STM32F4                                env:STM32F4
@@ -587,16 +587,24 @@
   // Obsolete or unknown board
   //
 
-  #define BOARD_MKS_13        -1000
-  #define BOARD_TRIGORILLA    -1001
-  #define BOARD_RURAMPS4D     -1002
-  #define BOARD_FORMBOT_TREX2 -1003
-  #define BOARD_BIQU_SKR_V1_1 -1004
-  #define BOARD_STM32F1R      -1005
-  #define BOARD_STM32F103R    -1006
-  #define BOARD_ESP32         -1007
-  #define BOARD_BIGTREE_SKR_MINI_E3 -1008
-  #define BOARD_STEVAL        -1009
+  #define BOARD_MKS_13                  -1000
+  #define BOARD_TRIGORILLA              -1001
+  #define BOARD_RURAMPS4D               -1002
+  #define BOARD_FORMBOT_TREX2           -1003
+  #define BOARD_BIQU_SKR_V1_1           -1004
+  #define BOARD_STM32F1R                -1005
+  #define BOARD_STM32F103R              -1006
+  #define BOARD_ESP32                   -1007
+  #define BOARD_STEVAL                  -1008
+  #define BOARD_BIGTREE_SKR_V1_1        -1009
+  #define BOARD_BIGTREE_SKR_V1_3        -1010
+  #define BOARD_BIGTREE_SKR_V1_4        -1011
+  #define BOARD_BIGTREE_SKR_V1_4_TURBO  -1012
+  #define BOARD_BIGTREE_BTT002_V1_0     -1013
+  #define BOARD_BIGTREE_SKR_PRO_V1_1    -1014
+  #define BOARD_BIGTREE_SKR_MINI_V1_1   -1015
+  #define BOARD_BIGTREE_SKR_MINI_E3     -1016
+  #define BOARD_BIGTREE_SKR_E3_DIP      -1017
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -607,15 +615,33 @@
   #elif MB(FORMBOT_TREX2)
     #error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
   #elif MB(BIQU_SKR_V1_1)
-    #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BIGTREE_SKR_V1_1. Please update your configuration."
+    #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration."
+  #elif MB(BIGTREE_SKR_V1_1)
+    #error "BOARD_BIGTREE_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration."
+  #elif MB(BIGTREE_SKR_V2_2)
+    #error "BOARD_BIGTREE_SKR_V1_2 has been renamed BOARD_BTT_SKR_V1_2. Please update your configuration."
+  #elif MB(BIGTREE_SKR_V1_3)
+    #error "BOARD_BIGTREE_SKR_V1_3 has been renamed BOARD_BTT_SKR_V1_3. Please update your configuration."
+  #elif MB(BIGTREE_SKR_V1_4)
+    #error "BOARD_BIGTREE_SKR_V1_4 has been renamed BOARD_BTT_SKR_V1_4. Please update your configuration."
+  #elif MB(BIGTREE_SKR_V1_4_TURBO)
+    #error "BOARD_BIGTREE_SKR_V1_4_TURBO has been renamed BOARD_BTT_SKR_V1_4_TURBO. Please update your configuration."
+  #elif MB(BIGTREE_BTT002_V1_0)
+    #error "BOARD_BIGTREE_BTT002_V1_0 has been renamed BOARD_BTT_BTT002_V1_0. Please update your configuration."
+  #elif MB(BIGTREE_SKR_PRO_V1_1)
+    #error "BOARD_BIGTREE_SKR_PRO_V1_1 has been renamed BOARD_BTT_SKR_PRO_V1_1. Please update your configuration."
+  #elif MB(BIGTREE_SKR_MINI_V1_1)
+    #error "BOARD_BIGTREE_SKR_MINI_V1_1 has been renamed BOARD_BTT_SKR_MINI_V1_1. Please update your configuration."
+  #elif MB(BIGTREE_SKR_MINI_E3)
+    #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
+  #elif MB(BIGTREE_SKR_E3_DIP)
+    #error "BOARD_BIGTREE_SKR_E3_DIP has been renamed BOARD_BTT_SKR_E3_DIP. Please update your configuration."
   #elif MB(STM32F1R)
     #error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
   #elif MB(STM32F103R)
     #error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
   #elif MOTHERBOARD == BOARD_ESP32
     #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
-  #elif MB(BIGTREE_SKR_MINI_E3)
-    #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
   #elif MB(STEVAL)
     #error "BOARD_STEVAL has been renamed BOARD_STEVAL_3DP001V1. Please update your configuration."
   #else
@@ -630,8 +656,16 @@
   #undef BOARD_STM32F1R
   #undef BOARD_STM32F103R
   #undef BOARD_ESP32
-  #undef BOARD_BIGTREE_SKR_MINI_E3
   #undef BOARD_STEVAL
+  #undef BOARD_BIGTREE_SKR_MINI_E3
+  #undef BOARD_BIGTREE_SKR_V1_1
+  #undef BOARD_BIGTREE_SKR_V1_3
+  #undef BOARD_BIGTREE_SKR_V1_4
+  #undef BOARD_BIGTREE_SKR_V1_4_TURBO
+  #undef BOARD_BIGTREE_BTT002_V1_0
+  #undef BOARD_BIGTREE_SKR_PRO_V1_1
+  #undef BOARD_BIGTREE_SKR_MINI_V1_1
+  #undef BOARD_BIGTREE_SKR_E3_DIP
 
 #endif
 
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 9e6159ee09e0..2006bb8bc34b 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -168,7 +168,7 @@ const PinInfo pin_array[] PROGMEM = {
   #endif
 
   #include "pinsDebug_list.h"
-  #line 98
+  #line 172
 
 };
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 37f3c528be2d..dae4bde450f0 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -26,425 +26,72 @@
 
 #line 28 // set __LINE__ to a known value for both passes
 
-// Undefine pins to suppress warnings
-#if !PIN_EXISTS(X_MS1)
-  #undef X_MS1_PIN
-#endif
-#if !PIN_EXISTS(X_MS2)
-  #undef X_MS2_PIN
-#endif
-#if !PIN_EXISTS(X_MS3)
-  #undef X_MS3_PIN
-#endif
-#if !PIN_EXISTS(X2_MS1)
-  #undef X2_MS1_PIN
-#endif
-#if !PIN_EXISTS(X2_MS2)
-  #undef X2_MS2_PIN
-#endif
-#if !PIN_EXISTS(X2_MS3)
-  #undef X2_MS3_PIN
-#endif
-#if !PIN_EXISTS(Y_MS1)
-  #undef Y_MS1_PIN
-#endif
-#if !PIN_EXISTS(Y_MS2)
-  #undef Y_MS2_PIN
-#endif
-#if !PIN_EXISTS(Y_MS3)
-  #undef Y_MS3_PIN
-#endif
-#if !PIN_EXISTS(Y2_MS1)
-  #undef Y2_MS1_PIN
-#endif
-#if !PIN_EXISTS(Y2_MS2)
-  #undef Y2_MS2_PIN
-#endif
-#if !PIN_EXISTS(Y2_MS3)
-  #undef Y2_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z_MS1)
-  #undef Z_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z_MS2)
-  #undef Z_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z_MS3)
-  #undef Z_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z2_MS1)
-  #undef Z2_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z2_MS2)
-  #undef Z2_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z2_MS3)
-  #undef Z2_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z3_MS1)
-  #undef Z3_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z3_MS2)
-  #undef Z3_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z3_MS3)
-  #undef Z3_MS3_PIN
-#endif
-#if !PIN_EXISTS(Z4_MS1)
-  #undef Z4_MS1_PIN
-#endif
-#if !PIN_EXISTS(Z4_MS2)
-  #undef Z4_MS2_PIN
-#endif
-#if !PIN_EXISTS(Z4_MS3)
-  #undef Z4_MS3_PIN
-#endif
-#if !PIN_EXISTS(E0_MS1)
-  #undef E0_MS1_PIN
-#endif
-#if !PIN_EXISTS(E0_MS2)
-  #undef E0_MS2_PIN
-#endif
-#if !PIN_EXISTS(E0_MS3)
-  #undef E0_MS3_PIN
-#endif
-#if !PIN_EXISTS(E1_MS1)
-  #undef E1_MS1_PIN
-#endif
-#if !PIN_EXISTS(E1_MS2)
-  #undef E1_MS2_PIN
-#endif
-#if !PIN_EXISTS(E1_MS3)
-  #undef E1_MS3_PIN
-#endif
-#if !PIN_EXISTS(E2_MS1)
-  #undef E2_MS1_PIN
-#endif
-#if !PIN_EXISTS(E2_MS2)
-  #undef E2_MS2_PIN
-#endif
-#if !PIN_EXISTS(E2_MS3)
-  #undef E2_MS3_PIN
-#endif
-#if !PIN_EXISTS(E3_MS1)
-  #undef E3_MS1_PIN
-#endif
-#if !PIN_EXISTS(E3_MS2)
-  #undef E3_MS2_PIN
-#endif
-#if !PIN_EXISTS(E3_MS3)
-  #undef E3_MS3_PIN
-#endif
-#if !PIN_EXISTS(E4_MS1)
-  #undef E4_MS1_PIN
-#endif
-#if !PIN_EXISTS(E4_MS2)
-  #undef E4_MS2_PIN
-#endif
-#if !PIN_EXISTS(E4_MS3)
-  #undef E4_MS3_PIN
-#endif
-#if !PIN_EXISTS(E5_MS1)
-  #undef E5_MS1_PIN
-#endif
-#if !PIN_EXISTS(E5_MS2)
-  #undef E5_MS2_PIN
-#endif
-#if !PIN_EXISTS(E5_MS3)
-  #undef E5_MS3_PIN
-#endif
-#if !PIN_EXISTS(E6_MS1)
-  #undef E6_MS1_PIN
-#endif
-#if !PIN_EXISTS(E6_MS2)
-  #undef E6_MS2_PIN
-#endif
-#if !PIN_EXISTS(E6_MS3)
-  #undef E6_MS3_PIN
-#endif
-#if !PIN_EXISTS(E7_MS1)
-  #undef E7_MS1_PIN
-#endif
-#if !PIN_EXISTS(E7_MS2)
-  #undef E7_MS2_PIN
-#endif
-#if !PIN_EXISTS(E7_MS3)
-  #undef E7_MS3_PIN
-#endif
-
-#if !PIN_EXISTS(E0_STEP)
-  #undef E0_STEP_PIN
-#endif
-#if !PIN_EXISTS(E0_DIR)
-  #undef E0_DIR_PIN
-#endif
-#if !PIN_EXISTS(E0_ENABLE)
-  #undef E0_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E1_STEP)
-  #undef E1_STEP_PIN
-#endif
-#if !PIN_EXISTS(E1_DIR)
-  #undef E1_DIR_PIN
-#endif
-#if !PIN_EXISTS(E1_ENABLE)
-  #undef E1_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E2_STEP)
-  #undef E2_STEP_PIN
-#endif
-#if !PIN_EXISTS(E2_DIR)
-  #undef E2_DIR_PIN
-#endif
-#if !PIN_EXISTS(E2_ENABLE)
-  #undef E2_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E3_STEP)
-  #undef E3_STEP_PIN
-#endif
-#if !PIN_EXISTS(E3_DIR)
-  #undef E3_DIR_PIN
-#endif
-#if !PIN_EXISTS(E3_ENABLE)
-  #undef E3_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E4_STEP)
-  #undef E4_STEP_PIN
-#endif
-#if !PIN_EXISTS(E4_DIR)
-  #undef E4_DIR_PIN
-#endif
-#if !PIN_EXISTS(E4_ENABLE)
-  #undef E4_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E5_STEP)
-  #undef E5_STEP_PIN
-#endif
-#if !PIN_EXISTS(E5_DIR)
-  #undef E5_DIR_PIN
-#endif
-#if !PIN_EXISTS(E5_ENABLE)
-  #undef E5_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E6_STEP)
-  #undef E6_STEP_PIN
-#endif
-#if !PIN_EXISTS(E6_DIR)
-  #undef E6_DIR_PIN
-#endif
-#if !PIN_EXISTS(E6_ENABLE)
-  #undef E6_ENABLE_PIN
-#endif
-#if !PIN_EXISTS(E7_STEP)
-  #undef E7_STEP_PIN
-#endif
-#if !PIN_EXISTS(E7_DIR)
-  #undef E7_DIR_PIN
-#endif
-#if !PIN_EXISTS(E7_ENABLE)
-  #undef E7_ENABLE_PIN
-#endif
-
-#if !PIN_EXISTS(X_CS)
-  #undef X_CS_PIN
-#endif
-#if !PIN_EXISTS(Y_CS)
-  #undef Y_CS_PIN
-#endif
-#if !PIN_EXISTS(Z_CS)
-  #undef Z_CS_PIN
-#endif
-#if !PIN_EXISTS(E0_CS)
-  #undef E0_CS_PIN
-#endif
-#if !PIN_EXISTS(E1_CS)
-  #undef E1_CS_PIN
-#endif
-#if !PIN_EXISTS(E2_CS)
-  #undef E2_CS_PIN
-#endif
-#if !PIN_EXISTS(E3_CS)
-  #undef E3_CS_PIN
-#endif
-#if !PIN_EXISTS(E4_CS)
-  #undef E4_CS_PIN
-#endif
-#if !PIN_EXISTS(E5_CS)
-  #undef E5_CS_PIN
-#endif
-#if !PIN_EXISTS(E6_CS)
-  #undef E6_CS_PIN
-#endif
-#if !PIN_EXISTS(E7_CS)
-  #undef E7_CS_PIN
-#endif
-
-#if !PIN_EXISTS(FAN)
-  #undef FAN_PIN
-#endif
-#define FAN0_PIN FAN_PIN
-#if !PIN_EXISTS(FAN1)
-  #undef FAN1_PIN
-#endif
-#if !PIN_EXISTS(FAN2)
-  #undef FAN2_PIN
-#endif
-#if !PIN_EXISTS(FAN3)
-  #undef FAN3_PIN
-#endif
-#if !PIN_EXISTS(FAN4)
-  #undef FAN4_PIN
-#endif
-#if !PIN_EXISTS(FAN5)
-  #undef FAN5_PIN
-#endif
-#if !PIN_EXISTS(FAN6)
-  #undef FAN6_PIN
-#endif
-#if !PIN_EXISTS(FAN7)
-  #undef FAN7_PIN
-#endif
-#if !PIN_EXISTS(CONTROLLER_FAN)
-  #undef CONTROLLER_FAN_PIN
-#endif
-
-#if !PIN_EXISTS(FANMUX0)
-  #undef FANMUX0_PIN
-#endif
-#if !PIN_EXISTS(FANMUX1)
-  #undef FANMUX1_PIN
-#endif
-#if !PIN_EXISTS(FANMUX2)
-  #undef FANMUX2_PIN
-#endif
-
-#if !PIN_EXISTS(HEATER_0)
-  #undef HEATER_0_PIN
-#endif
-#if !PIN_EXISTS(HEATER_1)
-  #undef HEATER_1_PIN
-#endif
-#if !PIN_EXISTS(HEATER_2)
-  #undef HEATER_2_PIN
-#endif
-#if !PIN_EXISTS(HEATER_3)
-  #undef HEATER_3_PIN
-#endif
-#if !PIN_EXISTS(HEATER_4)
-  #undef HEATER_4_PIN
-#endif
-#if !PIN_EXISTS(HEATER_5)
-  #undef HEATER_5_PIN
-#endif
-#if !PIN_EXISTS(HEATER_6)
-  #undef HEATER_6_PIN
-#endif
-#if !PIN_EXISTS(HEATER_7)
-  #undef HEATER_7_PIN
-#endif
-#if !PIN_EXISTS(HEATER_BED)
-  #undef HEATER_BED_PIN
-#endif
-
-#if !PIN_EXISTS(TEMP_0)
-  #undef TEMP_0_PIN
-#endif
-#if !PIN_EXISTS(TEMP_1)
-  #undef TEMP_1_PIN
-#endif
-#if !PIN_EXISTS(TEMP_2)
-  #undef TEMP_2_PIN
-#endif
-#if !PIN_EXISTS(TEMP_3)
-  #undef TEMP_3_PIN
-#endif
-#if !PIN_EXISTS(TEMP_4)
-  #undef TEMP_4_PIN
-#endif
-#if !PIN_EXISTS(TEMP_5)
-  #undef TEMP_5_PIN
-#endif
-#if !PIN_EXISTS(TEMP_6)
-  #undef TEMP_6_PIN
-#endif
-#if !PIN_EXISTS(TEMP_7)
-  #undef TEMP_7_PIN
-#endif
-#if !PIN_EXISTS(TEMP_BED)
-  #undef TEMP_BED_PIN
-#endif
-
-#if !PIN_EXISTS(SD_DETECT)
-  #undef SD_DETECT_PIN
-#endif
-#if !PIN_EXISTS(SDPOWER)
-  #undef SDPOWER_PIN
-#endif
-
 //
 // Analog Pin Assignments
 //
 
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
+#define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_PINS)
+
+#if defined(EXT_AUX_A0) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A1) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
 #endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A2) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
 #endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A3) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
 #endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A4) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
 #endif
-#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(FILWIDTH) && ANALOG_OK(FILWIDTH_PIN)
   REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
 #endif
-#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && ANALOG_OK(MAIN_VOLTAGE_MEASURE_PIN)
   REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
 #endif
-#if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD)  //TC1 & TC2 are macros in the SAM/SAMD tool chain
-  #if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
+#if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD)  // TC1 & TC2 are macros in the SAM/SAMD tool chain
+  #if defined(TC1) && ANALOG_OK(TC1)
     REPORT_NAME_ANALOG(__LINE__, TC1)
   #endif
-  #if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
+  #if defined(TC2) && ANALOG_OK(TC1)
     REPORT_NAME_ANALOG(__LINE__, TC2)
   #endif
 #endif
-#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_0) && ANALOG_OK(TEMP_0_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
 #endif
-#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_1) && ANALOG_OK(TEMP_1_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
 #endif
-#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_2) && ANALOG_OK(TEMP_2_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
 #endif
-#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_3) && ANALOG_OK(TEMP_3_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
 #endif
-#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_4) && ANALOG_OK(TEMP_4_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
 #endif
-#if PIN_EXISTS(TEMP_5) && TEMP_5_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_5) && ANALOG_OK(TEMP_5_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_5_PIN)
 #endif
-#if PIN_EXISTS(TEMP_6) && TEMP_6_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_6) && ANALOG_OK(TEMP_6_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_6_PIN)
 #endif
-#if PIN_EXISTS(TEMP_7) && TEMP_7_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_7) && ANALOG_OK(TEMP_7_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_7_PIN)
 #endif
-#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_BED) && ANALOG_OK(TEMP_BED_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
 #endif
-#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_CHAMBER) && ANALOG_OK(TEMP_CHAMBER_PIN)
   REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
 #endif
-#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(ADC_KEYPAD) && ANALOG_OK(ADC_KEYPAD_PIN)
   REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
 #endif
 
diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h
index 23ccccdc03db..03f267a3a456 100644
--- a/Marlin/src/pins/stm32/pins_ARMED.h
+++ b/Marlin/src/pins/stm32/pins_ARMED.h
@@ -19,6 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+//  https://github.com/ktand/Armed
+
 #pragma once
 
 #ifndef STM32F4
diff --git a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
index 869e74f5e39d..d0edf897f407 100644
--- a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
@@ -108,7 +108,6 @@
 //
 // Misc. Functions
 //
-#define SDSS               PB12
 #define LED_PIN            PA6
 //#define LED_PIN          PA7
 #define KILL_PIN           PB1
@@ -116,7 +115,7 @@
 //
 // LCD / Controller
 //
-#define SD_DETECT_PIN      PC5
+//#define SD_DETECT_PIN      PC5
 //#define SD_DETECT_PIN      PA8  // SDIO SD_DETECT_PIN, external SDIO card reader only
 
 #define BEEPER_PIN         PD10
@@ -132,3 +131,25 @@
 
 #define DOGLCD_CS          LCD_PINS_D5
 #define DOGLCD_A0          LCD_PINS_D6
+
+//
+// Onboard SD support
+//
+#define SDIO_D0_PIN        PC8
+#define SDIO_D1_PIN        PC9
+#define SDIO_D2_PIN        PC10
+#define SDIO_D3_PIN        PC11
+#define SDIO_CK_PIN        PC12
+#define SDIO_CMD_PIN       PD2
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+
+  #ifndef SDIO_SUPPORT
+    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
+    #define SDSS           SDIO_D3_PIN
+    #define SCK_PIN        SDIO_CK_PIN
+    #define MISO_PIN       SDIO_D0_PIN
+    #define MOSI_PIN       SDIO_CMD_PIN
+  #endif
+#endif
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
index 8eb7d354b303..b523874cb95c 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
@@ -181,7 +181,21 @@
 //
 // Misc. Functions
 //
-#define SDSS               PB12
+
+//
+// Onboard SD card
+//   NOT compatible with LCD
+//
+#if SDCARD_CONNECTION == ONBOARD && !defined(HAS_SPI_LCD)
+  #define SOFTWARE_SPI            // Use soft SPI for onboard SD
+  #define SDSS             PA4
+  #define SCK_PIN          PA5
+  #define MISO_PIN         PA6
+  #define MOSI_PIN         PB5
+#else
+  #define SDSS             PB12
+#endif
+
 
 /**
  *               _____                                             _____
diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
index 94b67769c729..97aaf3fdfc6a 100644
--- a/Marlin/src/pins/stm32/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
@@ -152,6 +152,30 @@
 #define FAN4_PIN           PE13
 #define FAN5_PIN           PB11
 
+//
+// Onboard SD support
+//
+
+#define SDIO_D0_PIN        PC8
+#define SDIO_D1_PIN        PC9
+//#define SD_CARD_DETECT_PIN PC13
+#define SDIO_D2_PIN        PC10
+#define SDIO_D3_PIN        PC11
+#define SDIO_CK_PIN        PC12
+#define SDIO_CMD_PIN       PD2
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+
+  #ifndef SDIO_SUPPORT
+    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
+    #define SDSS           SDIO_D3_PIN
+    #define SCK_PIN        SDIO_CK_PIN
+    #define MISO_PIN       SDIO_D0_PIN
+    #define MOSI_PIN       SDIO_CMD_PIN
+  #endif
+#endif
+
 //
 // Trinamic Software SPI
 //
diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
index fcfd35e4fe41..e65367971abe 100644
--- a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
@@ -226,22 +226,27 @@
 // 22   // PB3   JTAG_TDO/SWO
 
 //
-// SD support
+// Onboard SD support
 //
-//#define SDIO_SUPPORT
-// 23   // PC8   SDIO_D0
-// 24   // PC9   SDIO_D1
-// 25   // PA15  SD_CARD_DETECT
-// 26   // PC10  SDIO_D2
-// 27   // PC11  SDIO_D3
-// 28   // PC12  SDIO_CK
-// 29   // PD2   SDIO_CMD
-
-#define SOFTWARE_SPI            // Use soft SPI for onboard SD
-#define SDSS               27   // PC11  SDIO_D3
-#define SCK_PIN            28   // PC12  SDIO_CK
-#define MISO_PIN           23   // PC8   SDIO_D0
-#define MOSI_PIN           29   // PD2   SDIO_CMD
+#define SDIO_D0_PIN       23   // PC8   SDIO_D0
+#define SDIO_D1_PIN       24   // PC9   SDIO_D1
+//#define SD_CARD_DETECT_PIN 25   // PA15  SD_CARD_DETECT
+#define SDIO_D2_PIN       26   // PC10  SDIO_D2
+#define SDIO_D3_PIN       27   // PC11  SDIO_D3
+#define SDIO_CK_PIN       28   // PC12  SDIO_CK
+#define SDIO_CMD_PIN      29   // PD2   SDIO_CMD
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+
+  #ifndef SDIO_SUPPORT
+    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
+    #define SDSS           SDIO_D3_PIN
+    #define SCK_PIN        SDIO_CK_PIN
+    #define MISO_PIN       SDIO_D0_PIN
+    #define MOSI_PIN       SDIO_CMD_PIN
+  #endif
+#endif
 
 // OTG
 // 30   // PA11  OTG_DM
diff --git a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
index 5cee7888b940..ffdb81a636ed 100644
--- a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
@@ -195,7 +195,7 @@ extern "C" {
   #define PIN_SERIAL2_RX        PD6
   #define PIN_SERIAL2_TX        PD5
 #else
-  #error'Invaqlid setting for SERIAL_UART_INSTANCE'
+  #error'Invalid setting for SERIAL_UART_INSTANCE'
 #endif
 
 // Timer Definitions
diff --git a/buildroot/share/tests/BIGTREE_BTT002-tests b/buildroot/share/tests/BIGTREE_BTT002-tests
index 45366e3f5a5d..858957154def 100644
--- a/buildroot/share/tests/BIGTREE_BTT002-tests
+++ b/buildroot/share/tests/BIGTREE_BTT002-tests
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BIGTREE_BTT002_V1_0
+opt_set MOTHERBOARD BOARD_BTT_BTT002_V1_0
 opt_set SERIAL_PORT 1
 exec_test $1 $2 "BigTreeTech BTT002 Default Configuration"
 
diff --git a/buildroot/share/tests/BIGTREE_SKR_PRO-tests b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
index ef4dc606107a..094e01d9c73a 100644
--- a/buildroot/share/tests/BIGTREE_SKR_PRO-tests
+++ b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BIGTREE_SKR_PRO_V1_1
+opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
 opt_set SERIAL_PORT 1
 exec_test $1 $2 "BigTreeTech SKR Pro Default Configuration"
 
diff --git a/buildroot/share/tests/STM32F103RC_bigtree_USB-tests b/buildroot/share/tests/STM32F103RC_bigtree_USB-tests
index 06b7465a6659..8f7fff0b322a 100644
--- a/buildroot/share/tests/STM32F103RC_bigtree_USB-tests
+++ b/buildroot/share/tests/STM32F103RC_bigtree_USB-tests
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BIGTREE_SKR_MINI_V1_1
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1
 opt_set SERIAL_PORT 1
 opt_set SERIAL_PORT_2 -1
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration"
diff --git a/buildroot/share/tests/STM32F103RE_bigtree-tests b/buildroot/share/tests/STM32F103RE_bigtree-tests
index e516b96aacb0..77751d776e9c 100644
--- a/buildroot/share/tests/STM32F103RE_bigtree-tests
+++ b/buildroot/share/tests/STM32F103RE_bigtree-tests
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BIGTREE_SKR_E3_DIP
+opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP
 opt_set SERIAL_PORT 1
 opt_set SERIAL_PORT_2 -1
 exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration"
diff --git a/buildroot/share/tests/STM32F103RE_bigtree_USB-tests b/buildroot/share/tests/STM32F103RE_bigtree_USB-tests
index e516b96aacb0..77751d776e9c 100644
--- a/buildroot/share/tests/STM32F103RE_bigtree_USB-tests
+++ b/buildroot/share/tests/STM32F103RE_bigtree_USB-tests
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BIGTREE_SKR_E3_DIP
+opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP
 opt_set SERIAL_PORT 1
 opt_set SERIAL_PORT_2 -1
 exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration"

From 15b6ad41bc0ba5693e68e1a8778302b9cc5c04c9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 4 Feb 2020 02:39:19 -0600
Subject: [PATCH 130/565] Fix E stepper stays on bug

Fixes #16753
---
 Marlin/src/module/stepper/indirection.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 15c98ed56898..295c3aca2e90 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -872,7 +872,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E0
-  #if E_STEPPERS > 0 && HAS_E0_DISABLE
+  #if E_STEPPERS > 0 && HAS_E0_ENABLE
     #define DISABLE_AXIS_E0() DISABLE_STEPPER_E0()
   #else
     #define DISABLE_AXIS_E0() NOOP
@@ -887,7 +887,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E1
-  #if E_STEPPERS > 1 && HAS_E1_DISABLE
+  #if E_STEPPERS > 1 && HAS_E1_ENABLE
     #define DISABLE_AXIS_E1() DISABLE_STEPPER_E1()
   #else
     #define DISABLE_AXIS_E1() NOOP
@@ -902,7 +902,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E2
-  #if E_STEPPERS > 2 && HAS_E2_DISABLE
+  #if E_STEPPERS > 2 && HAS_E2_ENABLE
     #define DISABLE_AXIS_E2() DISABLE_STEPPER_E2()
   #else
     #define DISABLE_AXIS_E2() NOOP
@@ -917,7 +917,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E3
-  #if E_STEPPERS > 3 && HAS_E3_DISABLE
+  #if E_STEPPERS > 3 && HAS_E3_ENABLE
     #define DISABLE_AXIS_E3() DISABLE_STEPPER_E3()
   #else
     #define DISABLE_AXIS_E3() NOOP
@@ -932,7 +932,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E4
-  #if E_STEPPERS > 4 && HAS_E4_DISABLE
+  #if E_STEPPERS > 4 && HAS_E4_ENABLE
     #define DISABLE_AXIS_E4() DISABLE_STEPPER_E4()
   #else
     #define DISABLE_AXIS_E4() NOOP
@@ -947,7 +947,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E5
-  #if E_STEPPERS > 5 && HAS_E5_DISABLE
+  #if E_STEPPERS > 5 && HAS_E5_ENABLE
     #define DISABLE_AXIS_E5() DISABLE_STEPPER_E5()
   #else
     #define DISABLE_AXIS_E5() NOOP
@@ -962,7 +962,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E6
-  #if E_STEPPERS > 6 && HAS_E6_DISABLE
+  #if E_STEPPERS > 6 && HAS_E6_ENABLE
     #define DISABLE_AXIS_E6() DISABLE_STEPPER_E6()
   #else
     #define DISABLE_AXIS_E6() NOOP
@@ -977,7 +977,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 #ifndef DISABLE_AXIS_E7
-  #if E_STEPPERS > 7 && HAS_E7_DISABLE
+  #if E_STEPPERS > 7 && HAS_E7_ENABLE
     #define DISABLE_AXIS_E7() DISABLE_STEPPER_E7()
   #else
     #define DISABLE_AXIS_E7() NOOP

From 081ef46e7692d027b0fe8c4667da4315e9e20e81 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 4 Feb 2020 08:23:42 -0600
Subject: [PATCH 131/565] Fix Arduino IDE compile for DUE

Fixes #16767
---
 Marlin/src/module/probe.h | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 35fb8ceb264e..d424f4d283a4 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -43,14 +43,6 @@ class Probe {
 
     static xyz_pos_t offset;
 
-    // Use offset_xy for read only access
-    // More optimal the XY offset is known to always be zero.
-    #if HAS_PROBE_XY_OFFSET
-      static const xyz_pos_t &offset_xy;
-    #else
-      static constexpr xy_pos_t offset_xy{0};
-    #endif
-
     static bool set_deployed(const bool deploy);
 
     #ifdef Z_AFTER_PROBING
@@ -66,13 +58,20 @@ class Probe {
 
   #else
 
-    static constexpr xyz_pos_t offset{0};
-    static constexpr xy_pos_t offset_xy{0};
+    static constexpr xyz_pos_t offset = xyz_pos_t({ 0, 0, 0 }); // See #16767
 
     static bool set_deployed(const bool) { return false; }
 
   #endif
 
+  // Use offset_xy for read only access
+  // More optimal the XY offset is known to always be zero.
+  #if HAS_PROBE_XY_OFFSET
+    static const xyz_pos_t &offset_xy;
+  #else
+    static constexpr xy_pos_t offset_xy = xy_pos_t({ 0, 0 });   // See #16767
+  #endif
+
   static inline bool deploy() { return set_deployed(true); }
   static inline bool stow() { return set_deployed(false); }
 

From 7bf2190f03228666fdec3e1f8f0d8548a1ab2e95 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 4 Feb 2020 08:32:43 -0600
Subject: [PATCH 132/565] Fix CALIBRATION_GCODE pin handling

---
 Marlin/Configuration_adv.h                 |  4 ++--
 Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp | 21 ++++++++++++++++
 Marlin/src/gcode/calibrate/G425.cpp        | 16 +++++++------
 Marlin/src/inc/Conditionals_post.h         |  1 -
 Marlin/src/lcd/language/language_tr.h      |  2 +-
 Marlin/src/module/endstops.cpp             |  2 +-
 Marlin/src/pins/sam/pins_CNCONTROLS_15D.h  | 28 +++++++++++++++++++++-
 7 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index aea9656971b8..51a6b4508b4d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -840,8 +840,8 @@
 
   // Define the pin to read during calibration
   #ifndef CALIBRATION_PIN
-    #define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
-    #define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin
+    //#define CALIBRATION_PIN -1            // Define here to override the default pin
+    #define CALIBRATION_PIN_INVERTING false // Set to true to invert the custom pin
     //#define CALIBRATION_PIN_PULLDOWN
     #define CALIBRATION_PIN_PULLUP
   #endif
diff --git a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp b/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
index c7b7007053ac..926307935863 100644
--- a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
+++ b/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
@@ -1,3 +1,24 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 /* EEPROM emulation over flash with reduced wear
  *
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index c0a410fcc426..d2db4ce30869 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -128,13 +128,15 @@ inline void park_above_object(measurements_t &m, const float uncertainty) {
 #endif
 
 inline bool read_calibration_pin() {
-  #if HAS_CALIBRATION_PIN
-    return (READ(CALIBRATION_PIN) != CALIBRATION_PIN_INVERTING);
-  #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-    return (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
-  #else
-    return (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING);
-  #endif
+  return (
+    #if PIN_EXISTS(CALIBRATION)
+      READ(CALIBRATION_PIN) != CALIBRATION_PIN_INVERTING
+    #elif HAS_CUSTOM_PROBE_PIN
+      READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING
+    #else
+      READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING
+    #endif
+  );
 }
 
 /**
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 3b8393dafedb..ef7df41a1c68 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1443,7 +1443,6 @@
 #define HAS_Z4_MIN (PIN_EXISTS(Z4_MIN))
 #define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
 #define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
-#define HAS_CALIBRATION_PIN (PIN_EXISTS(CALIBRATION))
 
 //
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 5b7aeb9c56db..5ddc72df17da 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -1,4 +1,4 @@
- /**
+/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 47ccc5d5676c..f3f73f3da11a 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -256,7 +256,7 @@ void Endstops::init() {
     #endif
   #endif
 
-  #if HAS_CALIBRATION_PIN
+  #if PIN_EXISTS(CALIBRATION)
     #if ENABLED(CALIBRATION_PIN_PULLUP)
       SET_INPUT_PULLUP(CALIBRATION_PIN);
     #elif ENABLED(CALIBRATION_PIN_PULLDOWN)
diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
index 6238b8258849..69fb2a3dfc52 100644
--- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
+++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
@@ -1,3 +1,25 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * CNControls V15 for HMS434 with DUE pin assignments
  */
@@ -92,6 +114,10 @@
 //#define PWM_2_PIN          13
 //#define SPARE_IO           17
 #define BEEPER_PIN         13
-#define CALIBRATION_PIN    66
 #define STAT_LED_BLUE_PIN  -1
 #define STAT_LED_RED_PIN   31
+
+// G425 CALIBRATION_GCODE default pin
+#ifndef CALIBRATION_PIN
+  #define CALIBRATION_PIN  66
+#endif

From 793939a365df14d1bd4a787a8cb738387eb6c76e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 4 Feb 2020 08:46:37 -0600
Subject: [PATCH 133/565] Upgrade an ifdef

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 51a6b4508b4d..f5a561b4c24f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1573,7 +1573,7 @@
 
   // Add additional compensation depending on hotend temperature
   // Note: this values cannot be calibrated and have to be set manually
-  #ifdef PROBE_TEMP_COMPENSATION
+  #if ENABLED(PROBE_TEMP_COMPENSATION)
     // Max temperature that can be reached by heated bed.
     // This is required only for the calibration process.
     #define PTC_MAX_BED_TEMP 110

From f312ddfa4fd5772d825908f8e376dedf29442893 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 4 Feb 2020 12:37:20 -0600
Subject: [PATCH 134/565] More updates for 8 extruders, REPEAT

---
 Marlin/src/core/drivers.h                  | 25 ++++++------
 Marlin/src/feature/tmc_util.cpp            | 36 ++++++++++++++++++
 Marlin/src/gcode/feature/L6470/M122.cpp    |  6 +++
 Marlin/src/gcode/feature/L6470/M906.cpp    | 12 ++++++
 Marlin/src/gcode/feature/trinamic/M569.cpp | 12 ++++++
 Marlin/src/gcode/feature/trinamic/M906.cpp | 12 ++++++
 Marlin/src/gcode/host/M114.cpp             |  6 +++
 Marlin/src/lcd/extensible_ui/ui_api.cpp    | 12 ++++++
 Marlin/src/lcd/extensible_ui/ui_api.h      |  2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp     | 44 ++++++++++++++++++----
 Marlin/src/libs/L64XX/L64XX_Marlin.h       |  2 +-
 Marlin/src/module/configuration_store.cpp  | 40 ++++++++++++++++++++
 Marlin/src/module/stepper/L64xx.cpp        | 12 ++++++
 Marlin/src/module/stepper/trinamic.cpp     |  6 +++
 14 files changed, 206 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 79cd0b04e7ab..7e0f3b65510a 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -57,6 +57,7 @@
 #define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
 #define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)
 #define AXIS_DRIVER_TYPE_Z(T) _AXIS_DRIVER_TYPE(Z,T)
+
 #if EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE)
   #define AXIS_DRIVER_TYPE_X2(T) _AXIS_DRIVER_TYPE(X2,T)
 #else
@@ -66,21 +67,21 @@
 #define AXIS_DRIVER_TYPE_Z2(T) (NUM_Z_STEPPER_DRIVERS >= 2 && _AXIS_DRIVER_TYPE(Z2,T))
 #define AXIS_DRIVER_TYPE_Z3(T) (NUM_Z_STEPPER_DRIVERS >= 3 && _AXIS_DRIVER_TYPE(Z3,T))
 #define AXIS_DRIVER_TYPE_Z4(T) (NUM_Z_STEPPER_DRIVERS >= 4 && _AXIS_DRIVER_TYPE(Z4,T))
-#define AXIS_DRIVER_TYPE_E0(T) (E_STEPPERS > 0 && _AXIS_DRIVER_TYPE(E0,T))
-#define AXIS_DRIVER_TYPE_E1(T) (E_STEPPERS > 1 && _AXIS_DRIVER_TYPE(E1,T))
-#define AXIS_DRIVER_TYPE_E2(T) (E_STEPPERS > 2 && _AXIS_DRIVER_TYPE(E2,T))
-#define AXIS_DRIVER_TYPE_E3(T) (E_STEPPERS > 3 && _AXIS_DRIVER_TYPE(E3,T))
-#define AXIS_DRIVER_TYPE_E4(T) (E_STEPPERS > 4 && _AXIS_DRIVER_TYPE(E4,T))
-#define AXIS_DRIVER_TYPE_E5(T) (E_STEPPERS > 5 && _AXIS_DRIVER_TYPE(E5,T))
-#define AXIS_DRIVER_TYPE_E6(T) (E_STEPPERS > 6 && _AXIS_DRIVER_TYPE(E6,T))
-#define AXIS_DRIVER_TYPE_E7(T) (E_STEPPERS > 7 && _AXIS_DRIVER_TYPE(E7,T))
+
+#define AXIS_DRIVER_TYPE_E(N,T) (E_STEPPERS > N && _AXIS_DRIVER_TYPE(E##N,T))
+#define AXIS_DRIVER_TYPE_E0(T) AXIS_DRIVER_TYPE_E(0,T)
+#define AXIS_DRIVER_TYPE_E1(T) AXIS_DRIVER_TYPE_E(1,T)
+#define AXIS_DRIVER_TYPE_E2(T) AXIS_DRIVER_TYPE_E(2,T)
+#define AXIS_DRIVER_TYPE_E3(T) AXIS_DRIVER_TYPE_E(3,T)
+#define AXIS_DRIVER_TYPE_E4(T) AXIS_DRIVER_TYPE_E(4,T)
+#define AXIS_DRIVER_TYPE_E5(T) AXIS_DRIVER_TYPE_E(5,T)
+#define AXIS_DRIVER_TYPE_E6(T) AXIS_DRIVER_TYPE_E(6,T)
+#define AXIS_DRIVER_TYPE_E7(T) AXIS_DRIVER_TYPE_E(7,T)
 
 #define AXIS_DRIVER_TYPE(A,T) AXIS_DRIVER_TYPE_##A(T)
 
-#define HAS_E_DRIVER(T) (  AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) \
-                        || AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) \
-                        || AXIS_DRIVER_TYPE_E4(T) || AXIS_DRIVER_TYPE_E5(T) \
-                        || AXIS_DRIVER_TYPE_E6(T) || AXIS_DRIVER_TYPE_E7(T) )
+#define _OR_ADTE(N,T)   || AXIS_DRIVER_TYPE_E(N,T)
+#define HAS_E_DRIVER(T) (0 RREPEAT2(E_STEPPERS, _OR_ADTE, T))
 
 #define HAS_DRIVER(T) (    AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_X2(T) \
                         || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Y2(T) \
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 63fa849b1291..c09939173a23 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -439,6 +439,12 @@
       #if AXIS_IS_TMC(E5)
         (void)monitor_tmc_driver(stepperE5, need_update_error_counters, need_debug_reporting);
       #endif
+      #if AXIS_IS_TMC(E6)
+        (void)monitor_tmc_driver(stepperE6, need_update_error_counters, need_debug_reporting);
+      #endif
+      #if AXIS_IS_TMC(E7)
+        (void)monitor_tmc_driver(stepperE7, need_update_error_counters, need_debug_reporting);
+      #endif
 
       #if ENABLED(TMC_DEBUG)
         if (need_debug_reporting) SERIAL_EOL();
@@ -782,6 +788,12 @@
       #if AXIS_IS_TMC(E5)
         tmc_status(stepperE5, i);
       #endif
+      #if AXIS_IS_TMC(E6)
+        tmc_status(stepperE6, i);
+      #endif
+      #if AXIS_IS_TMC(E7)
+        tmc_status(stepperE7, i);
+      #endif
     }
 
     SERIAL_EOL();
@@ -840,6 +852,12 @@
       #if AXIS_IS_TMC(E5)
         tmc_parse_drv_status(stepperE5, i);
       #endif
+      #if AXIS_IS_TMC(E6)
+        tmc_parse_drv_status(stepperE6, i);
+      #endif
+      #if AXIS_IS_TMC(E7)
+        tmc_parse_drv_status(stepperE7, i);
+      #endif
     }
 
     SERIAL_EOL();
@@ -1018,6 +1036,12 @@
       #if AXIS_IS_TMC(E5)
         tmc_get_registers(stepperE5, i);
       #endif
+      #if AXIS_IS_TMC(E6)
+        tmc_get_registers(stepperE6, i);
+      #endif
+      #if AXIS_IS_TMC(E7)
+        tmc_get_registers(stepperE7, i);
+      #endif
     }
 
     SERIAL_EOL();
@@ -1124,6 +1148,12 @@
     #if AXIS_HAS_SPI(E5)
       SET_CS_PIN(E5);
     #endif
+    #if AXIS_HAS_SPI(E6)
+      SET_CS_PIN(E6);
+    #endif
+    #if AXIS_HAS_SPI(E7)
+      SET_CS_PIN(E7);
+    #endif
   }
 #endif // TMC_HAS_SPI
 
@@ -1204,6 +1234,12 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
     #if AXIS_IS_TMC(E5)
       axis_connection += test_connection(stepperE5);
     #endif
+    #if AXIS_IS_TMC(E6)
+      axis_connection += test_connection(stepperE6);
+    #endif
+    #if AXIS_IS_TMC(E7)
+      axis_connection += test_connection(stepperE7);
+    #endif
   }
 
   if (axis_connection) ui.set_status_P(GET_TEXT(MSG_ERROR_TMC));
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
index b4acb354ccad..ec5f9aea287d 100644
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ b/Marlin/src/gcode/feature/L6470/M122.cpp
@@ -136,6 +136,12 @@ void GcodeSuite::M122() {
   #if AXIS_IS_L64XX(E5)
     L6470_say_status(E5);
   #endif
+  #if AXIS_IS_L64XX(E6)
+    L6470_say_status(E6);
+  #endif
+  #if AXIS_IS_L64XX(E7)
+    L6470_say_status(E7);
+  #endif
 
   L64xxManager.spi_active = false;   // done with all SPI transfers - clear handshake flags
   L64xxManager.spi_abort = false;
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 37fa40fa9192..497fa7562295 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -298,6 +298,12 @@ void GcodeSuite::M906() {
           #if AXIS_IS_L64XX(E5)
             case 5: L6470_SET_KVAL_HOLD(E5); break;
           #endif
+          #if AXIS_IS_L64XX(E6)
+            case 6: L6470_SET_KVAL_HOLD(E6); break;
+          #endif
+          #if AXIS_IS_L64XX(E7)
+            case 7: L6470_SET_KVAL_HOLD(E7); break;
+          #endif
         }
       } break;
     }
@@ -350,6 +356,12 @@ void GcodeSuite::M906() {
     #if AXIS_IS_L64XX(E5)
       L64XX_REPORT_CURRENT(E5);
     #endif
+    #if AXIS_IS_L64XX(E6)
+      L64XX_REPORT_CURRENT(E6);
+    #endif
+    #if AXIS_IS_L64XX(E7)
+      L64XX_REPORT_CURRENT(E7);
+    #endif
 
     L64xxManager.spi_active = false;   // done with all SPI transfers - clear handshake flags
     L64xxManager.spi_abort = false;
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index d7dd1af834d8..f88e116839d6 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -104,6 +104,12 @@ static void set_stealth_status(const bool enable, const int8_t target_extruder)
           #if AXIS_HAS_STEALTHCHOP(E5)
             case 5: TMC_SET_STEALTH(E5); break;
           #endif
+          #if AXIS_HAS_STEALTHCHOP(E6)
+            case 6: TMC_SET_STEALTH(E6); break;
+          #endif
+          #if AXIS_HAS_STEALTHCHOP(E7)
+            case 7: TMC_SET_STEALTH(E7); break;
+          #endif
         }
       } break;
     }
@@ -155,6 +161,12 @@ static void say_stealth_status() {
   #if AXIS_HAS_STEALTHCHOP(E5)
     TMC_SAY_STEALTH_STATUS(E5);
   #endif
+  #if AXIS_HAS_STEALTHCHOP(E6)
+    TMC_SAY_STEALTH_STATUS(E6);
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(E7)
+    TMC_SAY_STEALTH_STATUS(E7);
+  #endif
 }
 
 /**
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index be02fdb7cdc7..bb2659913ac7 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -107,6 +107,12 @@ void GcodeSuite::M906() {
           #if AXIS_IS_TMC(E5)
             case 5: TMC_SET_CURRENT(E5); break;
           #endif
+          #if AXIS_IS_TMC(E6)
+            case 6: TMC_SET_CURRENT(E6); break;
+          #endif
+          #if AXIS_IS_TMC(E7)
+            case 7: TMC_SET_CURRENT(E7); break;
+          #endif
         }
       } break;
     }
@@ -155,6 +161,12 @@ void GcodeSuite::M906() {
     #if AXIS_IS_TMC(E5)
       TMC_SAY_CURRENT(E5);
     #endif
+    #if AXIS_IS_TMC(E6)
+      TMC_SAY_CURRENT(E6);
+    #endif
+    #if AXIS_IS_TMC(E7)
+      TMC_SAY_CURRENT(E7);
+    #endif
   }
 }
 
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 56e9cd8f2a9a..acdd925301a7 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -142,6 +142,12 @@
       #if AXIS_IS_L64XX(E5)
         REPORT_ABSOLUTE_POS(E5);
       #endif
+      #if AXIS_IS_L64XX(E6)
+        REPORT_ABSOLUTE_POS(E6);
+      #endif
+      #if AXIS_IS_L64XX(E7)
+        REPORT_ABSOLUTE_POS(E7);
+      #endif
       SERIAL_EOL();
     #endif // HAS_L64XX
 
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 63f12ac835af..d6b4a9670648 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -481,6 +481,12 @@ namespace ExtUI {
         #if AXIS_IS_TMC(E5)
           case E5: return stepperE5.getMilliamps();
         #endif
+        #if AXIS_IS_TMC(E6)
+          case E6: return stepperE6.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(E7)
+          case E7: return stepperE7.getMilliamps();
+        #endif
         default: return NAN;
       };
     }
@@ -520,6 +526,12 @@ namespace ExtUI {
         #if AXIS_IS_TMC(E5)
           case E5: stepperE5.rms_current(constrain(mA, 500, 1500)); break;
         #endif
+        #if AXIS_IS_TMC(E6)
+          case E6: stepperE6.rms_current(constrain(mA, 500, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(E7)
+          case E7: stepperE7.rms_current(constrain(mA, 500, 1500)); break;
+        #endif
         default: break;
       };
     }
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h
index fe83f3fa5175..7a20411ed948 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extensible_ui/ui_api.h
@@ -53,7 +53,7 @@ namespace ExtUI {
   static constexpr size_t eeprom_data_size = 48;
 
   enum axis_t     : uint8_t { X, Y, Z };
-  enum extruder_t : uint8_t { E0, E1, E2, E3, E4, E5 };
+  enum extruder_t : uint8_t { E0, E1, E2, E3, E4, E5, E6, E7 };
   enum heater_t   : uint8_t { H0, H1, H2, H3, H4, H5, BED, CHAMBER };
   enum fan_t      : uint8_t { FAN0, FAN1, FAN2, FAN3, FAN4, FAN5, FAN6, FAN7 };
   enum result_t   : uint8_t { PID_BAD_EXTRUDER_NUM, PID_TEMP_TOO_HIGH, PID_TUNING_TIMEOUT, PID_DONE };
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 99da4be76bd1..37fbf021d17f 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -127,6 +127,12 @@ void L6470_populate_chain_array() {
   #if AXIS_IS_L64XX(E5)
     _L6470_INIT_SPI(E5);
   #endif
+  #if AXIS_IS_L64XX(E6)
+    _L6470_INIT_SPI(E6);
+  #endif
+  #if AXIS_IS_L64XX(E7)
+    _L6470_INIT_SPI(E7);
+  #endif
 }
 
 
@@ -240,6 +246,12 @@ uint16_t L64XX_Marlin::get_status(const L64XX_axis_t axis) {
     #if AXIS_IS_L64XX(E5)
       case E5: return STATUS_L6470(E5);
     #endif
+    #if AXIS_IS_L64XX(E6)
+      case E6: return STATUS_L6470(E6);
+    #endif
+    #if AXIS_IS_L64XX(E7)
+      case E7: return STATUS_L6470(E7);
+    #endif
   }
 
   return 0; // Not needed but kills a compiler warning
@@ -293,6 +305,12 @@ uint32_t L64XX_Marlin::get_param(const L64XX_axis_t axis, const uint8_t param) {
     #if AXIS_IS_L64XX(E5)
       case E5: return GET_L6470_PARAM(E5);
     #endif
+    #if AXIS_IS_L64XX(E6)
+      case E6: return GET_L6470_PARAM(E6);
+    #endif
+    #if AXIS_IS_L64XX(E7)
+      case E7: return GET_L6470_PARAM(E7);
+    #endif
   }
 
   return 0; // not needed but kills a compiler warning
@@ -346,6 +364,12 @@ void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const
     #if AXIS_IS_L64XX(E5)
       case E5: SET_L6470_PARAM(E5); break;
     #endif
+    #if AXIS_IS_L64XX(E6)
+      case E6: SET_L6470_PARAM(E6); break;
+    #endif
+    #if AXIS_IS_L64XX(E7)
+      case E7: SET_L6470_PARAM(E7); break;
+    #endif
   }
 }
 
@@ -694,25 +718,31 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
       {  6, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Z4)
-      {  6, 0, 0, 0, 0, 0, 0 },
+      {  7, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E0)
-      {  7, 0, 0, 0, 0, 0, 0 },
+      {  8, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E1)
-      {  8, 0, 0, 0, 0, 0, 0 },
+      {  9, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E2)
-      {  9, 0, 0, 0, 0, 0, 0 },
+      { 10, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E3)
-      { 10, 0, 0, 0, 0, 0, 0 },
+      { 11, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E4)
-      { 11, 0, 0, 0, 0, 0, 0 },
+      { 12, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E5)
-      { 12, 0, 0, 0, 0, 0, 0 }
+      { 13, 0, 0, 0, 0, 0, 0 }
+    #endif
+    #if AXIS_IS_L64XX(E6)
+      { 14, 0, 0, 0, 0, 0, 0 }
+    #endif
+    #if AXIS_IS_L64XX(E7)
+      { 16, 0, 0, 0, 0, 0, 0 }
     #endif
   };
 
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index 9cb85891c8fd..371f0991c23c 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -33,7 +33,7 @@
 #define dSPIN_STEP_CLOCK      0x58
 #define dSPIN_STEP_CLOCK_FWD dSPIN_STEP_CLOCK
 #define dSPIN_STEP_CLOCK_REV dSPIN_STEP_CLOCK+1
-#define HAS_L64XX_EXTRUDER (AXIS_IS_L64XX(E0) || AXIS_IS_L64XX(E1) || AXIS_IS_L64XX(E2) || AXIS_IS_L64XX(E3) || AXIS_IS_L64XX(E4) || AXIS_IS_L64XX(E5))
+#define HAS_L64XX_EXTRUDER (AXIS_IS_L64XX(E0) || AXIS_IS_L64XX(E1) || AXIS_IS_L64XX(E2) || AXIS_IS_L64XX(E3) || AXIS_IS_L64XX(E4) || AXIS_IS_L64XX(E5) || AXIS_IS_L64XX(E6) || AXIS_IS_L64XX(E7))
 
 enum L64XX_axis_t : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7, MAX_L64XX };
 
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 98bd29e4cc61..a0294433288c 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1905,6 +1905,12 @@ void MarlinSettings::postprocess() {
             #if AXIS_IS_TMC(E5)
               SET_CURR(E5);
             #endif
+            #if AXIS_IS_TMC(E6)
+              SET_CURR(E6);
+            #endif
+            #if AXIS_IS_TMC(E7)
+              SET_CURR(E7);
+            #endif
           }
         #endif
       }
@@ -1959,6 +1965,12 @@ void MarlinSettings::postprocess() {
             #if AXIS_HAS_STEALTHCHOP(E5)
               stepperE5.set_pwm_thrs(tmc_hybrid_threshold.E5);
             #endif
+            #if AXIS_HAS_STEALTHCHOP(E6)
+              stepperE6.set_pwm_thrs(tmc_hybrid_threshold.E6);
+            #endif
+            #if AXIS_HAS_STEALTHCHOP(E7)
+              stepperE7.set_pwm_thrs(tmc_hybrid_threshold.E7);
+            #endif
           }
         #endif
       }
@@ -2065,6 +2077,12 @@ void MarlinSettings::postprocess() {
             #if AXIS_HAS_STEALTHCHOP(E5)
               SET_STEPPING_MODE(E5);
             #endif
+            #if AXIS_HAS_STEALTHCHOP(E6)
+              SET_STEPPING_MODE(E6);
+            #endif
+            #if AXIS_HAS_STEALTHCHOP(E7)
+              SET_STEPPING_MODE(E7);
+            #endif
           }
         #endif
       }
@@ -3333,6 +3351,14 @@ void MarlinSettings::reset() {
         say_M906(forReplay);
         SERIAL_ECHOLNPAIR(" T5 E", stepperE5.getMilliamps());
       #endif
+      #if AXIS_IS_TMC(E6)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T6 E", stepperE6.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E7)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T7 E", stepperE7.getMilliamps());
+      #endif
       SERIAL_EOL();
 
       /**
@@ -3407,6 +3433,14 @@ void MarlinSettings::reset() {
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
         #endif
+        #if AXIS_HAS_STEALTHCHOP(E6)
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
+        #endif
+        #if AXIS_HAS_STEALTHCHOP(E7)
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
+        #endif
         SERIAL_EOL();
       #endif // HYBRID_THRESHOLD
 
@@ -3539,6 +3573,12 @@ void MarlinSettings::reset() {
         #if AXIS_HAS_STEALTHCHOP(E5)
           if (stepperE5.get_stealthChop_status()) { say_M569(forReplay, PSTR("T5 E"), true); }
         #endif
+        #if AXIS_HAS_STEALTHCHOP(E6)
+          if (stepperE6.get_stealthChop_status()) { say_M569(forReplay, PSTR("T6 E"), true); }
+        #endif
+        #if AXIS_HAS_STEALTHCHOP(E7)
+          if (stepperE7.get_stealthChop_status()) { say_M569(forReplay, PSTR("T7 E"), true); }
+        #endif
 
       #endif // HAS_STEALTHCHOP
 
diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
index cc6a0bb71123..74f2e12feda9 100644
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ b/Marlin/src/module/stepper/L64xx.cpp
@@ -73,6 +73,12 @@
 #if AXIS_IS_L64XX(E5)
   L64XX_CLASS(E5) stepperE5(L6470_CHAIN_SS_PIN);
 #endif
+#if AXIS_IS_L64XX(E6)
+  L64XX_CLASS(E6) stepperE6(L6470_CHAIN_SS_PIN);
+#endif
+#if AXIS_IS_L64XX(E7)
+  L64XX_CLASS(E7) stepperE7(L6470_CHAIN_SS_PIN);
+#endif
 
 // Not using L64XX class init method because it
 // briefly sends power to the steppers
@@ -208,6 +214,12 @@ void L64XX_Marlin::init_to_defaults() {
   #if AXIS_IS_L64XX(E5)
     L6470_INIT_CHIP(E5);
   #endif
+  #if AXIS_IS_L64XX(E6)
+    L6470_INIT_CHIP(E6);
+  #endif
+  #if AXIS_IS_L64XX(E7)
+    L6470_INIT_CHIP(E7);
+  #endif
 }
 
 #endif // HAS_L64XX
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index aa31499c42b6..69eaaa5c5ceb 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -109,6 +109,12 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 #if AXIS_HAS_SPI(E5)
   TMC_SPI_DEFINE_E(5);
 #endif
+#if AXIS_HAS_SPI(E6)
+  TMC_SPI_DEFINE_E(6);
+#endif
+#if AXIS_HAS_SPI(E7)
+  TMC_SPI_DEFINE_E(7);
+#endif
 
 #ifndef TMC_BAUD_RATE
   #define TMC_BAUD_RATE 115200

From 0ebd2f44d4fc88948d941f3b16a08c027208dd6c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 5 Feb 2020 00:02:59 +0000
Subject: [PATCH 135/565] [cron] Bump distribution date (2020-02-05)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 00a3d52f0efe..23d9cd399274 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-03"
+  #define STRING_DISTRIBUTION_DATE "2020-02-05"
 #endif
 
 /**

From 9b4192cdd0755786a8d1892dfdffe3b875385681 Mon Sep 17 00:00:00 2001
From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 21:21:05 -0800
Subject: [PATCH 136/565] Add MKS Base 1.6 board (#16783)

---
 Marlin/Makefile                          | 85 ++++++++++++-----------
 Marlin/src/core/boards.h                 | 87 ++++++++++++------------
 Marlin/src/pins/pins.h                   |  2 +
 Marlin/src/pins/ramps/pins_MKS_BASE.h    |  4 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_14.h |  2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_15.h |  6 ++
 Marlin/src/pins/ramps/pins_MKS_BASE_16.h | 48 +++++++++++++
 7 files changed, 149 insertions(+), 85 deletions(-)
 create mode 100644 Marlin/src/pins/ramps/pins_MKS_BASE_16.h

diff --git a/Marlin/Makefile b/Marlin/Makefile
index 1a9bb2208798..fcd763881eef 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -180,88 +180,93 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1105)
 else ifeq ($(HARDWARE_MOTHERBOARD),1106)
 # MKS v1.5 with Allegro A4982 stepper drivers
 else ifeq ($(HARDWARE_MOTHERBOARD),1107)
-# MKS BASE 1.0 with Heroic HR4982 stepper drivers
+# MKS v1.6 with Allegro A4982 stepper drivers
 else ifeq ($(HARDWARE_MOTHERBOARD),1108)
-# MKS GEN v1.3 or 1.4
+
+# MKS BASE 1.0 with Heroic HR4982 stepper drivers
 else ifeq ($(HARDWARE_MOTHERBOARD),1109)
-# MKS GEN L
+# MKS GEN v1.3 or 1.4
 else ifeq ($(HARDWARE_MOTHERBOARD),1110)
-# zrib V2.0 control board (Chinese knock off RAMPS replica)
+# MKS GEN L
 else ifeq ($(HARDWARE_MOTHERBOARD),1111)
-# BigTreeTech or BIQU KFB2.0
+# zrib V2.0 control board (Chinese knock off RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1112)
-# Felix 2.0+ Electronics Board (RAMPS like)
+# BigTreeTech or BIQU KFB2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
-# Invent-A-Part RigidBoard
+# Felix 2.0+ Electronics Board (RAMPS like)
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# Invent-A-Part RigidBoard V2
+# Invent-A-Part RigidBoard
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
-# Sainsmart 2-in-1 board
+# Invent-A-Part RigidBoard V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
-# Ultimaker
+# Sainsmart 2-in-1 board
 else ifeq ($(HARDWARE_MOTHERBOARD),1117)
-# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+# Ultimaker
 else ifeq ($(HARDWARE_MOTHERBOARD),1118)
+# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
   MCU ?= atmega1280
 
 # Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
-# Azteeg X3 Pro
 else ifeq ($(HARDWARE_MOTHERBOARD),1120)
-# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+# Azteeg X3 Pro
 else ifeq ($(HARDWARE_MOTHERBOARD),1121)
-# Rumba
+# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
 else ifeq ($(HARDWARE_MOTHERBOARD),1122)
-# Raise3D Rumba
+# Rumba
 else ifeq ($(HARDWARE_MOTHERBOARD),1123)
-# Rapide Lite RL200 Rumba
+# Raise3D Rumba
 else ifeq ($(HARDWARE_MOTHERBOARD),1124)
-# Formbot T-Rex 2 Plus
+# Rapide Lite RL200 Rumba
 else ifeq ($(HARDWARE_MOTHERBOARD),1125)
-# Formbot T-Rex 3
+# Formbot T-Rex 2 Plus
 else ifeq ($(HARDWARE_MOTHERBOARD),1126)
-# Formbot Raptor
+# Formbot T-Rex 3
 else ifeq ($(HARDWARE_MOTHERBOARD),1127)
-# Formbot Raptor 2
+# Formbot Raptor
 else ifeq ($(HARDWARE_MOTHERBOARD),1128)
-# bq ZUM Mega 3D
+# Formbot Raptor 2
 else ifeq ($(HARDWARE_MOTHERBOARD),1129)
-# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
+# bq ZUM Mega 3D
 else ifeq ($(HARDWARE_MOTHERBOARD),1130)
-# TriGorilla Anycubic version 1.3 based on RAMPS EFB
+# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
 else ifeq ($(HARDWARE_MOTHERBOARD),1131)
-# TriGorilla Anycubic version 1.4 based on RAMPS EFB
+# TriGorilla Anycubic version 1.3 based on RAMPS EFB
 else ifeq ($(HARDWARE_MOTHERBOARD),1132)
-# TriGorilla Anycubic version 1.4 Rev 1.1
+# TriGorilla Anycubic version 1.4 based on RAMPS EFB
 else ifeq ($(HARDWARE_MOTHERBOARD),1133)
-# Creality: Ender-4, CR-8
+# TriGorilla Anycubic version 1.4 Rev 1.1
 else ifeq ($(HARDWARE_MOTHERBOARD),1134)
-# Creality: CR10S, CR20, CR-X
+# Creality: Ender-4, CR-8
 else ifeq ($(HARDWARE_MOTHERBOARD),1135)
-# Dagoma F5
+# Creality: CR10S, CR20, CR-X
 else ifeq ($(HARDWARE_MOTHERBOARD),1136)
-# FYSETC F6
+# Dagoma F5
 else ifeq ($(HARDWARE_MOTHERBOARD),1137)
-# Duplicator i3 Plus
+# FYSETC F6 1.3
 else ifeq ($(HARDWARE_MOTHERBOARD),1138)
-# VORON
+# FYSETC F6 1.5
 else ifeq ($(HARDWARE_MOTHERBOARD),1139)
-# TRONXY V3 1.0
+# Duplicator i3 Plus
 else ifeq ($(HARDWARE_MOTHERBOARD),1140)
-# Z-Bolt X Series
+# VORON
 else ifeq ($(HARDWARE_MOTHERBOARD),1141)
-# TT OSCAR
+# TRONXY V3 1.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1142)
-# Overlord/Overlord Pro
+# Z-Bolt X Series
 else ifeq ($(HARDWARE_MOTHERBOARD),1143)
-# ADIMLab Gantry v1
+# TT OSCAR
 else ifeq ($(HARDWARE_MOTHERBOARD),1144)
-# ADIMLab Gantry v2
+# Overlord/Overlord Pro
 else ifeq ($(HARDWARE_MOTHERBOARD),1145)
-# BIQU Tango V1
+# ADIMLab Gantry v1
 else ifeq ($(HARDWARE_MOTHERBOARD),1146)
-# MKS GEN L V2
+# ADIMLab Gantry v2
 else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+# BIQU Tango V1
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+# MKS GEN L V2
+else ifeq ($(HARDWARE_MOTHERBOARD),1149)
 
 #
 # RAMBo and derivatives
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index df79e2e2e15d..4e6829342df5 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -59,49 +59,50 @@
 #define BOARD_BAM_DICE                1103  // 2PrintBeta BAM&DICE with STK drivers
 #define BOARD_BAM_DICE_DUE            1104  // 2PrintBeta BAM&DICE Due with STK drivers
 #define BOARD_MKS_BASE                1105  // MKS BASE v1.0
-#define BOARD_MKS_BASE_14             1106  // MKS v1.4 with A4982 stepper drivers
-#define BOARD_MKS_BASE_15             1107  // MKS v1.5 with Allegro A4982 stepper drivers
-#define BOARD_MKS_BASE_HEROIC         1108  // MKS BASE 1.0 with Heroic HR4982 stepper drivers
-#define BOARD_MKS_GEN_13              1109  // MKS GEN v1.3 or 1.4
-#define BOARD_MKS_GEN_L               1110  // MKS GEN L
-#define BOARD_KFB_2                   1111  // BigTreeTech or BIQU KFB2.0
-#define BOARD_ZRIB_V20                1112  // zrib V2.0 control board (Chinese knock off RAMPS replica)
-#define BOARD_FELIX2                  1113  // Felix 2.0+ Electronics Board (RAMPS like)
-#define BOARD_RIGIDBOARD              1114  // Invent-A-Part RigidBoard
-#define BOARD_RIGIDBOARD_V2           1115  // Invent-A-Part RigidBoard V2
-#define BOARD_SAINSMART_2IN1          1116  // Sainsmart 2-in-1 board
-#define BOARD_ULTIMAKER               1117  // Ultimaker
-#define BOARD_ULTIMAKER_OLD           1118  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-#define BOARD_AZTEEG_X3               1119  // Azteeg X3
-#define BOARD_AZTEEG_X3_PRO           1120  // Azteeg X3 Pro
-#define BOARD_ULTIMAIN_2              1121  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-#define BOARD_RUMBA                   1122  // Rumba
-#define BOARD_RUMBA_RAISE3D           1123  // Raise3D N series Rumba derivative
-#define BOARD_RL200                   1124  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-#define BOARD_FORMBOT_TREX2PLUS       1125  // Formbot T-Rex 2 Plus
-#define BOARD_FORMBOT_TREX3           1126  // Formbot T-Rex 3
-#define BOARD_FORMBOT_RAPTOR          1127  // Formbot Raptor
-#define BOARD_FORMBOT_RAPTOR2         1128  // Formbot Raptor 2
-#define BOARD_BQ_ZUM_MEGA_3D          1129  // bq ZUM Mega 3D
-#define BOARD_MAKEBOARD_MINI          1130  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
-#define BOARD_TRIGORILLA_13           1131  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
-#define BOARD_TRIGORILLA_14           1132  //   ... Ver 1.4
-#define BOARD_TRIGORILLA_14_11        1133  //   ... Rev 1.1 (new servo pin order)
-#define BOARD_RAMPS_ENDER_4           1134  // Creality: Ender-4, CR-8
-#define BOARD_RAMPS_CREALITY          1135  // Creality: CR10S, CR20, CR-X
-#define BOARD_RAMPS_DAGOMA            1136  // Dagoma F5
-#define BOARD_FYSETC_F6_13            1137  // FYSETC F6 1.3
-#define BOARD_FYSETC_F6_14            1138  // FYSETC F6 1.4
-#define BOARD_DUPLICATOR_I3_PLUS      1139  // Wanhao Duplicator i3 Plus
-#define BOARD_VORON                   1140  // VORON Design
-#define BOARD_TRONXY_V3_1_0           1141  // Tronxy TRONXY-V3-1.0
-#define BOARD_Z_BOLT_X_SERIES         1142  // Z-Bolt X Series
-#define BOARD_TT_OSCAR                1143  // TT OSCAR
-#define BOARD_OVERLORD                1144  // Overlord/Overlord Pro
-#define BOARD_HJC2560C_REV1           1145  // ADIMLab Gantry v1
-#define BOARD_HJC2560C_REV2           1146  // ADIMLab Gantry v2
-#define BOARD_TANGO                   1147  // BIQU Tango V1
-#define BOARD_MKS_GEN_L_V2            1148  // MKS GEN L V2
+#define BOARD_MKS_BASE_14             1106  // MKS BASE v1.4 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_15             1107  // MKS BASE v1.5 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_16             1108  // MKS BASE v1.6 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_HEROIC         1109  // MKS BASE 1.0 with Heroic HR4982 stepper drivers
+#define BOARD_MKS_GEN_13              1110  // MKS GEN v1.3 or 1.4
+#define BOARD_MKS_GEN_L               1111  // MKS GEN L
+#define BOARD_KFB_2                   1112  // BigTreeTech or BIQU KFB2.0
+#define BOARD_ZRIB_V20                1113  // zrib V2.0 control board (Chinese knock off RAMPS replica)
+#define BOARD_FELIX2                  1114  // Felix 2.0+ Electronics Board (RAMPS like)
+#define BOARD_RIGIDBOARD              1115  // Invent-A-Part RigidBoard
+#define BOARD_RIGIDBOARD_V2           1116  // Invent-A-Part RigidBoard V2
+#define BOARD_SAINSMART_2IN1          1117  // Sainsmart 2-in-1 board
+#define BOARD_ULTIMAKER               1118  // Ultimaker
+#define BOARD_ULTIMAKER_OLD           1119  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+#define BOARD_AZTEEG_X3               1120  // Azteeg X3
+#define BOARD_AZTEEG_X3_PRO           1121  // Azteeg X3 Pro
+#define BOARD_ULTIMAIN_2              1122  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+#define BOARD_RUMBA                   1123  // Rumba
+#define BOARD_RUMBA_RAISE3D           1124  // Raise3D N series Rumba derivative
+#define BOARD_RL200                   1125  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
+#define BOARD_FORMBOT_TREX2PLUS       1126  // Formbot T-Rex 2 Plus
+#define BOARD_FORMBOT_TREX3           1127  // Formbot T-Rex 3
+#define BOARD_FORMBOT_RAPTOR          1128  // Formbot Raptor
+#define BOARD_FORMBOT_RAPTOR2         1129  // Formbot Raptor 2
+#define BOARD_BQ_ZUM_MEGA_3D          1130  // bq ZUM Mega 3D
+#define BOARD_MAKEBOARD_MINI          1131  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
+#define BOARD_TRIGORILLA_13           1132  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
+#define BOARD_TRIGORILLA_14           1133  //   ... Ver 1.4
+#define BOARD_TRIGORILLA_14_11        1134  //   ... Rev 1.1 (new servo pin order)
+#define BOARD_RAMPS_ENDER_4           1135  // Creality: Ender-4, CR-8
+#define BOARD_RAMPS_CREALITY          1136  // Creality: CR10S, CR20, CR-X
+#define BOARD_RAMPS_DAGOMA            1137  // Dagoma F5
+#define BOARD_FYSETC_F6_13            1138  // FYSETC F6 1.3
+#define BOARD_FYSETC_F6_14            1139  // FYSETC F6 1.4
+#define BOARD_DUPLICATOR_I3_PLUS      1140  // Wanhao Duplicator i3 Plus
+#define BOARD_VORON                   1141  // VORON Design
+#define BOARD_TRONXY_V3_1_0           1142  // Tronxy TRONXY-V3-1.0
+#define BOARD_Z_BOLT_X_SERIES         1143  // Z-Bolt X Series
+#define BOARD_TT_OSCAR                1144  // TT OSCAR
+#define BOARD_OVERLORD                1145  // Overlord/Overlord Pro
+#define BOARD_HJC2560C_REV1           1146  // ADIMLab Gantry v1
+#define BOARD_HJC2560C_REV2           1147  // ADIMLab Gantry v2
+#define BOARD_TANGO                   1148  // BIQU Tango V1
+#define BOARD_MKS_GEN_L_V2            1149  // MKS GEN L V2
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1515440e71ee..def3e2681b1c 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -110,6 +110,8 @@
   #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_15)
   #include "ramps/pins_MKS_BASE_15.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+#elif MB(MKS_BASE_16)
+  #include "ramps/pins_MKS_BASE_16.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE_HEROIC)
   #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_GEN_13)
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE.h b/Marlin/src/pins/ramps/pins_MKS_BASE.h
index dc0485e27432..72e062e635ea 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE.h
@@ -31,7 +31,9 @@
   #error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
 #endif
 
-#define BOARD_INFO_NAME "MKS BASE 1.0"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "MKS BASE 1.0"
+#endif
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index e91b2c2f4410..a4fe6f90c12a 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS BASE v1.4
+ * MKS BASE v1.4 with A4982 stepper drivers and digital micro-stepping
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
index fe67e7d78937..efb7bb23eb1a 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
@@ -25,6 +25,12 @@
  * MKS BASE v1.5 with A4982 stepper drivers and digital micro-stepping
  */
 
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS BASE 1.5 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS BASE 1.5"
+
 #include "pins_MKS_BASE.h"
 
 /**
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
new file mode 100644
index 000000000000..1cf2345e051c
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -0,0 +1,48 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS BASE v1.6 with A4982 stepper drivers and digital micro-stepping
+ */
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS BASE 1.6 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS BASE 1.6"
+
+#include "pins_MKS_BASE.h"
+
+/**
+ * Microstepping pins
+ */
+#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
+#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
+#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
+#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
+#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
+#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
+#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
+#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
+#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
+#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN

From 00d71ff0ebaa432ded081199ba7ff1e3841e0a2c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 5 Feb 2020 00:45:38 -0600
Subject: [PATCH 137/565] Direct download link for configs

---
 config/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/README.md b/config/README.md
index 7101025a4316..be986b7058a6 100644
--- a/config/README.md
+++ b/config/README.md
@@ -1,3 +1,3 @@
 # Where have all the configurations gone?
 
-## https://github.com/MarlinFirmware/Configurations
+## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.0.x.zip

From bb68eaa69ed0d0e461aaada15af63e6d6f02cda1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 6 Feb 2020 00:02:49 +0000
Subject: [PATCH 138/565] [cron] Bump distribution date (2020-02-06)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 23d9cd399274..a93ce86aa9d8 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-05"
+  #define STRING_DISTRIBUTION_DATE "2020-02-06"
 #endif
 
 /**

From 78fea4a9ca198b737e00025ff42fc2ddace38092 Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Wed, 5 Feb 2020 20:28:28 -0600
Subject: [PATCH 139/565] Split up MKS_RUMBA32 into two variants (#16781)

---
 Marlin/src/core/boards.h                      |  27 ++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |   2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |   2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |   2 +-
 .../{pins_BTT_SKR.h => pins_BTT_SKR_common.h} |   0
 Marlin/src/pins/pins.h                        |  10 +-
 Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h    |  42 +++++++
 Marlin/src/pins/stm32/pins_RUMBA32_MKS.h      | 109 ++++++++++++++++++
 .../{pins_RUMBA32.h => pins_RUMBA32_common.h} |  41 +++++--
 platformio.ini                                |   4 +-
 10 files changed, 208 insertions(+), 31 deletions(-)
 rename Marlin/src/pins/lpc1768/{pins_BTT_SKR.h => pins_BTT_SKR_common.h} (100%)
 create mode 100644 Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h
 create mode 100644 Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
 rename Marlin/src/pins/stm32/{pins_RUMBA32.h => pins_RUMBA32_common.h} (82%)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 4e6829342df5..904c25d86849 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -310,19 +310,20 @@
 #define BOARD_BEAST                   4200  // STM32F4xxVxT6 Libmaple-based STM32F4 controller
 #define BOARD_GENERIC_STM32F4         4201  // STM32 STM32GENERIC-based STM32F4 controller
 #define BOARD_ARMED                   4202  // Arm'ed STM32F4-based controller
-#define BOARD_RUMBA32                 4203  // RUMBA32 STM32F4-based controller
-#define BOARD_BLACK_STM32F407VE       4204  // BLACK_STM32F407VE
-#define BOARD_BLACK_STM32F407ZE       4205  // BLACK_STM32F407ZE
-#define BOARD_STEVAL_3DP001V1         4206  // STEVAL-3DP001V1 3D PRINTER BOARD
-#define BOARD_BTT_SKR_PRO_V1_1        4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
-#define BOARD_BTT_BTT002_V1_0         4208  // BigTreeTech BTT002 v1.0 (STM32F407VE)
-#define BOARD_BTT_GTR_V1_0            4209  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_LERDGE_K                4210  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_X                4211  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4212  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4213  // FYSETC S6 board
-#define BOARD_FLYF407ZG               4214  // FLYF407ZG board (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4215  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_RUMBA32_AUS3D           4203  // RUMBA32 STM32F446VET6 based controller from Aus3D
+#define BOARD_RUMBA32_MKS             4204  // RUMBA32 STM32F446VET6 based controller from Makerbase
+#define BOARD_BLACK_STM32F407VE       4205  // BLACK_STM32F407VE
+#define BOARD_BLACK_STM32F407ZE       4206  // BLACK_STM32F407ZE
+#define BOARD_STEVAL_3DP001V1         4207  // STEVAL-3DP001V1 3D PRINTER BOARD
+#define BOARD_BTT_SKR_PRO_V1_1        4208  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+#define BOARD_BTT_BTT002_V1_0         4209  // BigTreeTech BTT002 v1.0 (STM32F407VE)
+#define BOARD_BTT_GTR_V1_0            4210  // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_LERDGE_K                4211  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_X                4212  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4213  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4214  // FYSETC S6 board
+#define BOARD_FLYF407ZG               4215  // FLYF407ZG board (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4216  // MKS_ROBIN2 (STM32F407ZE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index 816dbb9dc4dc..15b63494094b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -230,4 +230,4 @@
 #endif
 
 // Include common SKR pins
-#include "pins_BTT_SKR.h"
+#include "pins_BTT_SKR_common.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index a3cdf1586cf1..d7af23242723 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -369,4 +369,4 @@
  */
 
 // Include common SKR pins
-#include "pins_BTT_SKR.h"
+#include "pins_BTT_SKR_common.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 01a8bd7e38eb..2bb57c09fd4e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -153,7 +153,7 @@
 //
 // Include common SKR pins
 //
-#include "pins_BTT_SKR.h"
+#include "pins_BTT_SKR_common.h"
 
 //
 // Software SPI pins for TMC2130 stepper drivers
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
similarity index 100%
rename from Marlin/src/pins/lpc1768/pins_BTT_SKR.h
rename to Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index def3e2681b1c..35e73e9d3f35 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -528,8 +528,10 @@
   #include "stm32/pins_GENERIC_STM32F4.h"       // STM32F4                                env:STM32F4
 #elif MB(ARMED)
   #include "stm32/pins_ARMED.h"                 // STM32F4                                env:ARMED
-#elif MB(RUMBA32)
-  #include "stm32/pins_RUMBA32.h"               // STM32F4                                env:rumba32_f446ve env:mks_rumba32
+#elif MB(RUMBA32_AUS3D)
+  #include "stm32/pins_RUMBA32_AUS3D.h"         // STM32F4                                env:rumba32_f446ve
+#elif MB(RUMBA32_MKS)
+  #include "stm32/pins_RUMBA32_MKS.h"           // STM32F4                                env:rumba32_mks
 #elif MB(BLACK_STM32F407VE)
   #include "stm32/pins_BLACK_STM32F407VE.h"     // STM32F4                                env:STM32F407VE_black
 #elif MB(STEVAL_3DP001V1)
@@ -607,6 +609,7 @@
   #define BOARD_BIGTREE_SKR_MINI_V1_1   -1015
   #define BOARD_BIGTREE_SKR_MINI_E3     -1016
   #define BOARD_BIGTREE_SKR_E3_DIP      -1017
+  #define BOARD_RUMBA32                 -1018
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -646,6 +649,8 @@
     #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
   #elif MB(STEVAL)
     #error "BOARD_STEVAL has been renamed BOARD_STEVAL_3DP001V1. Please update your configuration."
+  #elif MB(RUMBA32)
+    #error "BOARD_RUMBA32 is now BOARD_RUMBA32_MKS or BOARD_RUMBA32_AUS3D. Please update your configuration."
   #else
     #error "Unknown MOTHERBOARD value set in Configuration.h"
   #endif
@@ -668,6 +673,7 @@
   #undef BOARD_BIGTREE_SKR_PRO_V1_1
   #undef BOARD_BIGTREE_SKR_MINI_V1_1
   #undef BOARD_BIGTREE_SKR_E3_DIP
+  #undef BOARD_RUMBA32
 
 #endif
 
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h
new file mode 100644
index 000000000000..cff34a2d860b
--- /dev/null
+++ b/Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h
@@ -0,0 +1,42 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Pin assignments for the MKS RUMBA32
+ *
+ * https://aus3d.com.au/rumba32
+ * https://github.com/Aus3D/RUMBA32
+ *
+ * The MKS and Aus3D versions have the same pinout but the MKS version
+ * has some added resistors and LEDs.  The resistors needed for the
+ * TMC2208/9 UART interface are among the additions.  Also added were
+ * connectors and resistors dedicated to the TMC2130 sensorless homing
+ * interface.
+ */
+
+#define BOARD_INFO_NAME "Aus3D RUMBA32"
+
+#define RUMBA32_V1_0
+//#define I2C_EEPROM
+
+#include "pins_RUMBA32_common.h"
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
new file mode 100644
index 000000000000..8e2bb3b8afbd
--- /dev/null
+++ b/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
@@ -0,0 +1,109 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Pin assignments for the MKS RUMBA32
+ *
+ * https://github.com/makerbase-mks/MKS-RUMBA32
+ *
+ * The MKS and Aus3D versions have the same pinout but the MKS version
+ * has some added resistors and LEDs.  The resistors needed for the
+ * TMC2208/9  UART interface are among the additions.  Also added were
+ * connectors and resistors dedicated to the TMC2130 sensorless homing
+ * interface.
+ */
+
+#define BOARD_INFO_NAME "MKS RUMBA32"
+
+#define RUMBA32_V1_0
+#define ENABLE_SPI1
+//#define I2C_EEPROM
+
+#include "pins_RUMBA32_common.h"
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI    PA7
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO    PA6
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK     PA5
+  #endif
+#endif
+
+#if HAS_TMC220x
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN  PA3
+  #define X_SERIAL_RX_PIN  PC14
+
+  #define Y_SERIAL_TX_PIN  PA4
+  #define Y_SERIAL_RX_PIN  PE4
+
+  #define Z_SERIAL_TX_PIN  PD13
+  #define Z_SERIAL_RX_PIN  PE0
+
+  #define E0_SERIAL_TX_PIN PD14
+  #define E0_SERIAL_RX_PIN PC13
+
+  #define E1_SERIAL_TX_PIN PD15
+  #define E1_SERIAL_RX_PIN PD5
+
+  #define E2_SERIAL_TX_PIN PD12
+  #define E2_SERIAL_RX_PIN PD1
+#endif
+
+//
+// LCD / Controller
+//
+
+// Alter timing for graphical display
+#if HAS_GRAPHICAL_LCD
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+#endif
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32.h b/Marlin/src/pins/stm32/pins_RUMBA32_common.h
similarity index 82%
rename from Marlin/src/pins/stm32/pins_RUMBA32.h
rename to Marlin/src/pins/stm32/pins_RUMBA32_common.h
index dcdbd1b40a4b..0fb469112d41 100644
--- a/Marlin/src/pins/stm32/pins_RUMBA32.h
+++ b/Marlin/src/pins/stm32/pins_RUMBA32_common.h
@@ -21,17 +21,23 @@
  */
 #pragma once
 
+/**
+ * Common pin assignments for all RUMBA32 boards
+ */
+
 #ifndef STM32F4
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 #elif HOTENDS > 3 || E_STEPPERS > 3
-  #error "RUMBA32 supports up to 3 hotends / E-steppers."
+  #error "RUMBA32 boards support up to 3 hotends / E-steppers."
 #endif
 
 #define RUMBA32_V1_0
-#define BOARD_INFO_NAME      "RUMBA32"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 //#define I2C_EEPROM
+#ifdef E2END
+  #undef E2END
+#endif
 #define E2END 0xFFF // 4KB
 
 //
@@ -119,12 +125,25 @@
 //
 // LCD / Controller
 //
-#define LCD_PINS_RS        PE10
-#define LCD_PINS_ENABLE    PE9
-#define LCD_PINS_D4        PE12
-#define LCD_PINS_D5        PE13
-#define LCD_PINS_D6        PE14
-#define LCD_PINS_D7        PE15
-#define BTN_EN1            PB1
-#define BTN_EN2            PB2
-#define BTN_ENC            PE7
+#if HAS_SPI_LCD
+
+  #define BTN_EN1          PB2
+  #define BTN_EN2          PB1
+  #define BTN_ENC          PE7
+
+  #define LCD_PINS_RS      PE10
+  #define LCD_PINS_ENABLE  PE9
+  #define LCD_PINS_D4      PE12
+
+  #if ENABLED(MKS_MINI_12864)
+    #define DOGLCD_CS      PE13
+    #define DOGLCD_A0      PE14
+  #endif
+
+  #if ENABLED(ULTIPANEL)
+    #define LCD_PINS_D5    PE13
+    #define LCD_PINS_D6    PE14
+    #define LCD_PINS_D7    PE15
+  #endif
+
+#endif
diff --git a/platformio.ini b/platformio.ini
index df3dcb0f667b..2e57e7d773fa 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -822,9 +822,9 @@ monitor_speed = 500000
 upload_protocol = dfu
 
 #
-# MKS RUMBA32(add TMC2208/2209 UART interface and AUX-1)
+# MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
 #
-[env:mks_rumba32]
+[env:rumba32_mks]
 platform      = ststm32
 board         = rumba32_f446ve
 build_flags   = ${common.build_flags}

From 54aff831791e50a1cfb4cf7ccef36f5fefff5494 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 6 Feb 2020 03:33:39 +0100
Subject: [PATCH 140/565] G26: Allow to set retraction for UBL mesh test
 (#16511)

---
 Marlin/Configuration.h            | 1 +
 Marlin/src/gcode/bedlevel/G26.cpp | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 28625955af77..99a254969c1b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1234,6 +1234,7 @@
     #define MESH_TEST_HOTEND_TEMP  205    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
     #define MESH_TEST_BED_TEMP      60    // (°C) Default bed temperature for the G26 Mesh Validation Tool.
     #define G26_XY_FEEDRATE         20    // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
+    #define G26_RETRACT_MULTIPLIER   1.0  // G26 Q (retraction) used by default between mesh test elements.
   #endif
 
 #endif
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 4ef98578c56b..b8ec262693f6 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -43,13 +43,16 @@
 #include "../../lcd/ultralcd.h"
 
 #define EXTRUSION_MULTIPLIER 1.0
-#define RETRACTION_MULTIPLIER 1.0
 #define PRIME_LENGTH 10.0
 #define OOZE_AMOUNT 0.3
 
 #define INTERSECTION_CIRCLE_RADIUS 5
 #define CROSSHAIRS_SIZE 3
 
+#ifndef G26_RETRACT_MULTIPLIER
+  #define G26_RETRACT_MULTIPLIER 1.0 // x 1mm
+#endif
+
 #ifndef G26_XY_FEEDRATE
   #define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE() / 3.0)
 #endif
@@ -509,7 +512,7 @@ void GcodeSuite::G26() {
   if (parser.seenval('T')) tool_change(parser.value_int());
 
   g26_extrusion_multiplier    = EXTRUSION_MULTIPLIER;
-  g26_retraction_multiplier   = RETRACTION_MULTIPLIER;
+  g26_retraction_multiplier   = G26_RETRACT_MULTIPLIER;
   g26_layer_height            = MESH_TEST_LAYER_HEIGHT;
   g26_prime_length            = PRIME_LENGTH;
   g26_bed_temp                = MESH_TEST_BED_TEMP;

From 86812432f39ee836ae568f60d5d9bfa85680b69f Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Fri, 7 Feb 2020 03:11:49 +0700
Subject: [PATCH 141/565] Remove extraneous Serial init (#16794)

---
 Marlin/src/HAL/HAL_LPC1768/main.cpp | 9 ---------
 Marlin/src/MarlinCore.cpp           | 7 +------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp
index 581dd86716a6..d7ba62fe5e98 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp
@@ -136,15 +136,6 @@ void HAL_init() {
     #endif
   }
 
-  #if NUM_SERIAL > 0
-    MYSERIAL0.begin(BAUDRATE);
-    #if NUM_SERIAL > 1
-      MYSERIAL1.begin(BAUDRATE);
-    #endif
-    SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
-    SERIAL_FLUSHTX();
-  #endif
-
   HAL_timer_init();
 }
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 180bedd87c2d..bb418b1e9d2a 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -880,15 +880,10 @@ void setup() {
 
   #if NUM_SERIAL > 0
     MYSERIAL0.begin(BAUDRATE);
-    #if NUM_SERIAL > 1
-      MYSERIAL1.begin(BAUDRATE);
-    #endif
-  #endif
-
-  #if NUM_SERIAL > 0
     uint32_t serial_connect_timeout = millis() + 1000UL;
     while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
     #if NUM_SERIAL > 1
+      MYSERIAL1.begin(BAUDRATE);
       serial_connect_timeout = millis() + 1000UL;
       while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
     #endif

From 3a3429b1ef2fdaf1e793fff17a89b069e3384fbc Mon Sep 17 00:00:00 2001
From: Robert Stein <robert.stein@requisis.com>
Date: Thu, 6 Feb 2020 22:28:46 +0100
Subject: [PATCH 142/565] Fix probe with multi-endstops (#16793)

---
 Marlin/src/module/endstops.cpp | 111 +++++++++++++++------------------
 1 file changed, 50 insertions(+), 61 deletions(-)

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index f3f73f3da11a..1491d881d526 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -529,11 +529,11 @@ void Endstops::update() {
   // With Dual X, endstops are only checked in the homing direction for the active extruder
   #if ENABLED(DUAL_X_CARRIAGE)
     #define E0_ACTIVE stepper.movement_extruder() == 0
-    #define X_MIN_TEST ((X_HOME_DIR < 0 && E0_ACTIVE) || (X2_HOME_DIR < 0 && !E0_ACTIVE))
-    #define X_MAX_TEST ((X_HOME_DIR > 0 && E0_ACTIVE) || (X2_HOME_DIR > 0 && !E0_ACTIVE))
+    #define X_MIN_TEST() ((X_HOME_DIR < 0 && E0_ACTIVE) || (X2_HOME_DIR < 0 && !E0_ACTIVE))
+    #define X_MAX_TEST() ((X_HOME_DIR > 0 && E0_ACTIVE) || (X2_HOME_DIR > 0 && !E0_ACTIVE))
   #else
-    #define X_MIN_TEST true
-    #define X_MAX_TEST true
+    #define X_MIN_TEST() true
+    #define X_MAX_TEST() true
   #endif
 
   // Use HEAD for core axes, AXIS for others
@@ -690,7 +690,7 @@ void Endstops::update() {
   #define _ENDSTOP_HIT(AXIS, MINMAX) SBI(hit_state, _ENDSTOP(AXIS, MINMAX))
 
   // Call the endstop triggered routine for single endstops
-  #define PROCESS_ENDSTOP(AXIS,MINMAX) do { \
+  #define PROCESS_ENDSTOP(AXIS, MINMAX) do { \
     if (TEST_ENDSTOP(_ENDSTOP(AXIS, MINMAX))) { \
       _ENDSTOP_HIT(AXIS, MINMAX); \
       planner.endstop_triggered(_AXIS(AXIS)); \
@@ -698,36 +698,58 @@ void Endstops::update() {
   }while(0)
 
   // Call the endstop triggered routine for dual endstops
-  #define PROCESS_DUAL_ENDSTOP(AXIS1, AXIS2, MINMAX) do { \
-    const byte dual_hit = TEST_ENDSTOP(_ENDSTOP(AXIS1, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(AXIS2, MINMAX)) << 1); \
+  #define PROCESS_DUAL_ENDSTOP(A, MINMAX) do { \
+    const byte dual_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1); \
     if (dual_hit) { \
-      _ENDSTOP_HIT(AXIS1, MINMAX); \
+      _ENDSTOP_HIT(A, MINMAX); \
       /* if not performing home or if both endstops were trigged during homing... */ \
       if (!stepper.separate_multi_axis || dual_hit == 0b11) \
-        planner.endstop_triggered(_AXIS(AXIS1)); \
+        planner.endstop_triggered(_AXIS(A)); \
     } \
   }while(0)
 
-  #define PROCESS_TRIPLE_ENDSTOP(AXIS1, AXIS2, AXIS3, MINMAX) do { \
-    const byte triple_hit = TEST_ENDSTOP(_ENDSTOP(AXIS1, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(AXIS2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(AXIS3, MINMAX)) << 2); \
+  #define PROCESS_TRIPLE_ENDSTOP(A, MINMAX) do { \
+    const byte triple_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(A##3, MINMAX)) << 2); \
     if (triple_hit) { \
-      _ENDSTOP_HIT(AXIS1, MINMAX); \
+      _ENDSTOP_HIT(A, MINMAX); \
       /* if not performing home or if both endstops were trigged during homing... */ \
       if (!stepper.separate_multi_axis || triple_hit == 0b111) \
-        planner.endstop_triggered(_AXIS(AXIS1)); \
+        planner.endstop_triggered(_AXIS(A)); \
     } \
   }while(0)
 
-  #define PROCESS_QUAD_ENDSTOP(AXIS1, AXIS2, AXIS3, AXIS4, MINMAX) do { \
-    const byte quad_hit = TEST_ENDSTOP(_ENDSTOP(AXIS1, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(AXIS2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(AXIS3, MINMAX)) << 2) | (TEST_ENDSTOP(_ENDSTOP(AXIS4, MINMAX)) << 3); \
+  #define PROCESS_QUAD_ENDSTOP(A, MINMAX) do { \
+    const byte quad_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1) | (TEST_ENDSTOP(_ENDSTOP(A##3, MINMAX)) << 2) | (TEST_ENDSTOP(_ENDSTOP(A##4, MINMAX)) << 3); \
     if (quad_hit) { \
-      _ENDSTOP_HIT(AXIS1, MINMAX); \
+      _ENDSTOP_HIT(A, MINMAX); \
       /* if not performing home or if both endstops were trigged during homing... */ \
       if (!stepper.separate_multi_axis || quad_hit == 0b1111) \
-        planner.endstop_triggered(_AXIS(AXIS1)); \
+        planner.endstop_triggered(_AXIS(A)); \
     } \
   }while(0)
 
+  #if ENABLED(X_DUAL_ENDSTOPS)
+    #define PROCESS_ENDSTOP_X(MINMAX) PROCESS_DUAL_ENDSTOP(X, MINMAX)
+  #else
+    #define PROCESS_ENDSTOP_X(MINMAX) if (X_##MINMAX##_TEST()) PROCESS_ENDSTOP(X, MINMAX)
+  #endif
+
+  #if ENABLED(Y_DUAL_ENDSTOPS)
+    #define PROCESS_ENDSTOP_Y(MINMAX) PROCESS_DUAL_ENDSTOP(Y, MINMAX)
+  #else
+    #define PROCESS_ENDSTOP_Y(MINMAX) PROCESS_ENDSTOP(Y, MINMAX)
+  #endif
+
+  #if DISABLED(Z_MULTI_ENDSTOPS)
+    #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_ENDSTOP(Z, MINMAX)
+  #elif NUM_Z_STEPPER_DRIVERS == 4
+    #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_QUAD_ENDSTOP(Z, MINMAX)
+  #elif NUM_Z_STEPPER_DRIVERS == 3
+    #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_TRIPLE_ENDSTOP(Z, MINMAX)
+  #else
+    #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_DUAL_ENDSTOP(Z, MINMAX)
+  #endif
+
   #if ENABLED(G38_PROBE_TARGET) && PIN_EXISTS(Z_MIN_PROBE) && !(CORE_IS_XY || CORE_IS_XZ)
     #if ENABLED(G38_PROBE_AWAY)
       #define _G38_OPEN_STATE (G38_move >= 4)
@@ -747,20 +769,12 @@ void Endstops::update() {
   if (stepper.axis_is_moving(X_AXIS)) {
     if (stepper.motor_direction(X_AXIS_HEAD)) { // -direction
       #if HAS_X_MIN || (X_SPI_SENSORLESS && X_HOME_DIR < 0)
-        #if ENABLED(X_DUAL_ENDSTOPS)
-          PROCESS_DUAL_ENDSTOP(X, X2, MIN);
-        #else
-          if (X_MIN_TEST) PROCESS_ENDSTOP(X, MIN);
-        #endif
+        PROCESS_ENDSTOP_X(MIN);
       #endif
     }
     else { // +direction
       #if HAS_X_MAX || (X_SPI_SENSORLESS && X_HOME_DIR > 0)
-        #if ENABLED(X_DUAL_ENDSTOPS)
-          PROCESS_DUAL_ENDSTOP(X, X2, MAX);
-        #else
-          if (X_MAX_TEST) PROCESS_ENDSTOP(X, MAX);
-        #endif
+        PROCESS_ENDSTOP_X(MAX);
       #endif
     }
   }
@@ -768,44 +782,27 @@ void Endstops::update() {
   if (stepper.axis_is_moving(Y_AXIS)) {
     if (stepper.motor_direction(Y_AXIS_HEAD)) { // -direction
       #if HAS_Y_MIN || (Y_SPI_SENSORLESS && Y_HOME_DIR < 0)
-        #if ENABLED(Y_DUAL_ENDSTOPS)
-          PROCESS_DUAL_ENDSTOP(Y, Y2, MIN);
-        #else
-          PROCESS_ENDSTOP(Y, MIN);
-        #endif
+        PROCESS_ENDSTOP_Y(MIN);
       #endif
     }
     else { // +direction
       #if HAS_Y_MAX || (Y_SPI_SENSORLESS && Y_HOME_DIR > 0)
-        #if ENABLED(Y_DUAL_ENDSTOPS)
-          PROCESS_DUAL_ENDSTOP(Y, Y2, MAX);
-        #else
-          PROCESS_ENDSTOP(Y, MAX);
-        #endif
+        PROCESS_ENDSTOP_Y(MAX);
       #endif
     }
   }
 
   if (stepper.axis_is_moving(Z_AXIS)) {
     if (stepper.motor_direction(Z_AXIS_HEAD)) { // Z -direction. Gantry down, bed up.
+
       #if HAS_Z_MIN || (Z_SPI_SENSORLESS && Z_HOME_DIR < 0)
-        #if ENABLED(Z_MULTI_ENDSTOPS)
-          #if NUM_Z_STEPPER_DRIVERS == 4
-            PROCESS_QUAD_ENDSTOP(Z, Z2, Z3, Z4, MIN);
-          #elif NUM_Z_STEPPER_DRIVERS == 3
-            PROCESS_TRIPLE_ENDSTOP(Z, Z2, Z3, MIN);
-          #else
-            PROCESS_DUAL_ENDSTOP(Z, Z2, MIN);
-          #endif
-        #else
+        if (true
           #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-            if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN);
+            && z_probe_enabled
           #elif HAS_CUSTOM_PROBE_PIN
-            if (!z_probe_enabled) PROCESS_ENDSTOP(Z, MIN);
-          #else
-            PROCESS_ENDSTOP(Z, MIN);
+            && !z_probe_enabled
           #endif
-        #endif
+        ) PROCESS_ENDSTOP_Z(MIN);
       #endif
 
       // When closing the gap check the enabled probe
@@ -816,16 +813,8 @@ void Endstops::update() {
     else { // Z +direction. Gantry up, bed down.
       #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_DIR > 0)
         #if ENABLED(Z_MULTI_ENDSTOPS)
-          #if NUM_Z_STEPPER_DRIVERS == 4
-            PROCESS_QUAD_ENDSTOP(Z, Z2, Z3, Z4, MAX);
-          #elif NUM_Z_STEPPER_DRIVERS == 3
-            PROCESS_TRIPLE_ENDSTOP(Z, Z2, Z3, MAX);
-          #else
-            PROCESS_DUAL_ENDSTOP(Z, Z2, MAX);
-          #endif
-        #elif !HAS_CUSTOM_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN
-          // If this pin is not hijacked for the bed probe
-          // then it belongs to the Z endstop
+          PROCESS_ENDSTOP_Z(MAX);
+        #elif !HAS_CUSTOM_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN  // No probe or probe is Z_MIN || Probe is not Z_MAX
           PROCESS_ENDSTOP(Z, MAX);
         #endif
       #endif

From 12b3807a7f443470c290ec8b6fb6eefdc5b39280 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 7 Feb 2020 00:02:48 +0000
Subject: [PATCH 143/565] [cron] Bump distribution date (2020-02-07)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a93ce86aa9d8..ee239f5a6edb 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-06"
+  #define STRING_DISTRIBUTION_DATE "2020-02-07"
 #endif
 
 /**

From 38bf5523e147e10f1454498d2260573c48a2aab4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 8 Feb 2020 00:02:22 +0000
Subject: [PATCH 144/565] [cron] Bump distribution date (2020-02-08)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ee239f5a6edb..a5ae4710fe3d 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-07"
+  #define STRING_DISTRIBUTION_DATE "2020-02-08"
 #endif
 
 /**

From f55abfeb952cf422e09b49a8b0d0b931f475e6f8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 17:39:18 -0600
Subject: [PATCH 145/565] Clean up Makefle indentation

---
 Marlin/Makefile | 56 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Marlin/Makefile b/Marlin/Makefile
index fcd763881eef..df44b6f718e3 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -789,11 +789,11 @@ sym: $(BUILD_DIR)/$(TARGET).sym
 # Do not try to reset an Arduino if it's not one
 upload: $(BUILD_DIR)/$(TARGET).hex
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
-	stty hup < $(UPLOAD_PORT); true
+  stty hup < $(UPLOAD_PORT); true
 endif
-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+  $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
-	stty -hup < $(UPLOAD_PORT); true
+  stty -hup < $(UPLOAD_PORT); true
 endif
 
 # Display size of file.
@@ -801,10 +801,10 @@ HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
 ELFSIZE = $(SIZE)  $(SIZE_FLAGS) $(BUILD_DIR)/$(TARGET).elf; \
           $(SIZE)  $(BUILD_DIR)/$(TARGET).elf
 sizebefore:
-	$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
+  $P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
 
 sizeafter: build
-	$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
+  $P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
 
 
 # Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
@@ -816,71 +816,71 @@ COFFCONVERT=$(OBJCOPY) --debugging \
 
 
 coff: $(BUILD_DIR)/$(TARGET).elf
-	$(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
+  $(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
 
 
 extcoff: $(TARGET).elf
-	$(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
+  $(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
 
 
 .SUFFIXES: .elf .hex .eep .lss .sym .bin
 .PRECIOUS: .o
 
 .elf.hex:
-	$(Pecho) "  COPY  $@"
-	$P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+  $(Pecho) "  COPY  $@"
+  $P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
 
 .elf.bin:
-	$(Pecho) "  COPY  $@"
-	$P $(OBJCOPY) -O binary -R .eeprom $< $@
+  $(Pecho) "  COPY  $@"
+  $P $(OBJCOPY) -O binary -R .eeprom $< $@
 
 .elf.eep:
-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+  -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
     --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
 
 # Create extended listing file from ELF output file.
 .elf.lss:
-	$(OBJDUMP) -h -S $< > $@
+  $(OBJDUMP) -h -S $< > $@
 
 # Create a symbol table from ELF output file.
 .elf.sym:
-	$(NM) -n $< > $@
+  $(NM) -n $< > $@
 
 # Link: create ELF output file from library.
 
 $(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
-	$(Pecho) "  CXX   $@"
-	$P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
+  $(Pecho) "  CXX   $@"
+  $P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
 
 # Object files that were found in "src" will be stored in $(BUILD_DIR)
 # in directories that mirror the structure of "src"
 
 $(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
-	$(Pecho) "  CC    $<"
-	$P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
+  $(Pecho) "  CC    $<"
+  $P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
 
 $(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
-	$(Pecho) "  CXX   $<"
-	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
+  $(Pecho) "  CXX   $<"
+  $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
 
 # Object files for Arduino libs will be created in $(BUILD_DIR)/arduino
 
 $(BUILD_DIR)/arduino/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
-	$(Pecho) "  CC    $<"
-	$P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
+  $(Pecho) "  CC    $<"
+  $P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
 
 $(BUILD_DIR)/arduino/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
-	$(Pecho) "  CXX   $<"
-	$P $(CXX) -MMD -c $(ALL_CXXFLAGS)  $(LIBWARN) $< -o $@
+  $(Pecho) "  CXX   $<"
+  $P $(CXX) -MMD -c $(ALL_CXXFLAGS)  $(LIBWARN) $< -o $@
 
 $(BUILD_DIR)/arduino/%.o: %.S $(MAKEFILE)
-	$(Pecho) "  CXX   $<"
-	$P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
+  $(Pecho) "  CXX   $<"
+  $P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
 
 # Target: clean project.
 clean:
-	$(Pecho) "  RMDIR $(BUILD_DIR)/"
-	$P rm -rf $(BUILD_DIR)
+  $(Pecho) "  RMDIR $(BUILD_DIR)/"
+  $P rm -rf $(BUILD_DIR)
 
 
 .PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter

From 5d3cfbdc9b086d81419afa814a41595e79435445 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 17:39:04 -0600
Subject: [PATCH 146/565] Add .editorconfig file

---
 .editorconfig | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..a0fa3eff170e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# editorconfig.org
+root = true
+
+[{*.patch,syntax_test_*}]
+trim_trailing_whitespace = false
+
+[{*.c,*.cpp,*.h}]
+charset = utf-8
+
+[{*.c,*.cpp,*.h,Makefile}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+
+[{*.py,*.conf,*.sublime-project}]
+indent_style = tab
+indent_size = 4

From 130e36d76659182f50565243ad331e8f7765165c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 17:47:54 -0600
Subject: [PATCH 147/565] Tweak ABL logging, document probing

---
 Marlin/src/feature/bedlevel/abl/abl.cpp |  5 +----
 Marlin/src/gcode/bedlevel/abl/G29.cpp   |  8 ++++----
 Marlin/src/module/probe.cpp             | 22 ++++++++++++++++------
 Marlin/src/module/probe.h               |  2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 5bc08bc69577..74821ba2ec5f 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -43,6 +43,7 @@ bed_mesh_t z_values;
  * Extrapolate a single point from its neighbors
  */
 static void extrapolate_one_point(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir) {
+  if (!isnan(z_values[x][y])) return;
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOPGM("Extrapolate [");
     if (x < 10) DEBUG_CHAR(' ');
@@ -54,10 +55,6 @@ static void extrapolate_one_point(const uint8_t x, const uint8_t y, const int8_t
     DEBUG_CHAR(ydir ? (ydir > 0 ? '+' : '-') : ' ');
     DEBUG_ECHOLNPGM("]");
   }
-  if (!isnan(z_values[x][y])) {
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" (done)");
-    return;  // Don't overwrite good values.
-  }
 
   // Get X neighbors, Y neighbors, and XY neighbors
   const uint8_t x1 = x + xdir, y1 = y + ydir, x2 = x1 + xdir, y2 = y1 + ydir;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a92e36811472..5173505164fb 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -958,10 +958,8 @@ G29_TYPE GcodeSuite::G29() {
   // Restore state after probing
   if (!faux) restore_feedrate_and_scaling();
 
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
-
-  if (planner.leveling_active)
-    sync_plan_position();
+  // Sync the planner from the current_position
+  if (planner.leveling_active) sync_plan_position();
 
   #if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
     probe.move_z_after_probing();
@@ -975,6 +973,8 @@ G29_TYPE GcodeSuite::G29() {
 
   report_current_position();
 
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
+
   G29_RETURN(isnan(measured_z));
 }
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index c89c5eb08791..4bb434a922b4 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -459,8 +459,18 @@ bool Probe::set_deployed(const bool deploy) {
   const char Probe::msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
 #endif
 
-bool Probe::move_to_z(const float z, const feedRate_t fr_mm_s) {
-  if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::move_to_z", current_position);
+/**
+ * @brief Move down until the probe triggers or the low limit is reached
+ *
+ * @details Used by run_z_probe to get each bed Z height measurement.
+ *          Sets current_position.z to the height where the probe triggered
+ *          (according to the Z stepper count). The float Z is propagated
+ *          back to the planner.position to preempt any rounding error.
+ *
+ * @return TRUE if the probe failed to trigger.
+ */
+bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
+  if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::probe_down_to_z", current_position);
 
   #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
     // Wait for bed to heat back up between probing points
@@ -536,7 +546,7 @@ bool Probe::move_to_z(const float z, const feedRate_t fr_mm_s) {
   // Tell the planner where we actually are
   sync_plan_position();
 
-  if (DEBUGGING(LEVELING)) DEBUG_POS("<<< Probe::move_to_z", current_position);
+  if (DEBUGGING(LEVELING)) DEBUG_POS("<<< Probe::probe_down_to_z", current_position);
 
   return !probe_triggered;
 }
@@ -561,7 +571,7 @@ float Probe::run_z_probe() {
   #if TOTAL_PROBING == 2
 
     // Do a first probe at the fast speed
-    if (move_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
+    if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOLNPGM("FAST Probe fail!");
         DEBUG_POS("<<< run_z_probe", current_position);
@@ -583,7 +593,7 @@ float Probe::run_z_probe() {
     const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (offset.z < 0 ? -offset.z : 0);
     if (current_position.z > z) {
       // Probe down fast. If the probe never triggered, raise for probe clearance
-      if (!move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
+      if (!probe_down_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
         do_blocking_move_to_z(current_position.z + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
     }
   #endif
@@ -604,7 +614,7 @@ float Probe::run_z_probe() {
   #endif
     {
       // Probe downward slowly to find the bed
-      if (move_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
+      if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
         if (DEBUGGING(LEVELING)) {
           DEBUG_ECHOLNPGM("SLOW Probe fail!");
           DEBUG_POS("<<< run_z_probe", current_position);
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index d424f4d283a4..b70c01364ab3 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -162,7 +162,7 @@ class Probe {
   #endif
 
 private:
-  static bool move_to_z(const float z, const feedRate_t fr_mm_s);
+  static bool probe_down_to_z(const float z, const feedRate_t fr_mm_s);
   static void do_z_raise(const float z_raise);
   static float run_z_probe();
 };

From f0cbc85a07ab52d8b7af906640fe281694cd657b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 9 Feb 2020 00:03:30 +0000
Subject: [PATCH 148/565] [cron] Bump distribution date (2020-02-09)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a5ae4710fe3d..b6db9de532c8 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-08"
+  #define STRING_DISTRIBUTION_DATE "2020-02-09"
 #endif
 
 /**

From 894762259b072407504ee584103680b103310026 Mon Sep 17 00:00:00 2001
From: Fabio Santos <fabiosan@live.com>
Date: Sat, 8 Feb 2020 19:01:57 -0800
Subject: [PATCH 149/565] Coolstep for TMC2130, 2209, 5130, 5160 (#16790)

---
 Marlin/Configuration.h                        |   5 -
 Marlin/Configuration_adv.h                    | 160 +++++++++++++++
 Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h      |   2 +-
 Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h      |   2 +-
 Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h    |   2 +-
 Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h    |   2 +-
 Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h   |   2 +-
 Marlin/src/HAL/HAL_STM32/HAL.cpp              |   4 +-
 Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h  |   2 +-
 .../src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h |   2 +-
 .../src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h |   2 +-
 .../src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h |   2 +-
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/core/drivers.h                     |  29 ++-
 Marlin/src/feature/tmc_util.cpp               |  31 +--
 Marlin/src/feature/tmc_util.h                 |  23 ++-
 Marlin/src/inc/SanityCheck.h                  |  58 +++++-
 Marlin/src/module/stepper.cpp                 |   2 +-
 Marlin/src/module/stepper/trinamic.cpp        | 185 ++++++++++++++----
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h |   2 +-
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   |   4 +-
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h  |   6 +-
 Marlin/src/pins/pins.h                        |  22 +++
 Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h  |   4 +-
 .../pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h    |   4 +-
 25 files changed, 473 insertions(+), 86 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 99a254969c1b..a8e518098d19 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -674,11 +674,6 @@
 //#define X_DRIVER_TYPE  A4988
 //#define Y_DRIVER_TYPE  A4988
 //#define Z_DRIVER_TYPE  A4988
-//#define X2_DRIVER_TYPE A4988
-//#define Y2_DRIVER_TYPE A4988
-//#define Z2_DRIVER_TYPE A4988
-//#define Z3_DRIVER_TYPE A4988
-//#define Z4_DRIVER_TYPE A4988
 //#define E0_DRIVER_TYPE A4988
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f5a561b4c24f..2d4931a722d1 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2275,6 +2275,166 @@
   #define E6_HYBRID_THRESHOLD     30
   #define E7_HYBRID_THRESHOLD     30
 
+  /**
+   * CoolStep. Currently supported for TMC2130, TMC2209, TMC5130 and TMC5160 only.
+   * This mode allows for cooler steppers and energy savings.
+   * The driver will switch to coolStep when stepper speed is over COOLSTEP_THRESHOLD mm/s.
+   *
+   * If SG_RESULT goes below COOLSTEP_LOWER_LOAD_THRESHOLD * 32 stepper current will be increased.
+   * Set to 0 to disable CoolStep.
+   *
+   * If SG_RESULT goes above (COOLSTEP_LOWER_LOAD_THRESHOLD + COOLSTEP_UPPER_LOAD_THRESHOLD + 1) * 32
+   * stepper current will be decreased.
+   *
+   * SEUP sets the increase step width. Value range is 0..3 and computed as 2^SEUP.
+   * SEDN sets the decrease delay. Value range is 0..3, 0 being the slowest.
+   * SEIMIN sets the lower current limit. 0: 1/2 of IRUN, 1:1/4 of IRUN
+   */
+
+  #if AXIS_HAS_COOLSTEP(X)
+    #define X_COOLSTEP_SPEED_THRESHOLD        5
+    #define X_COOLSTEP_LOWER_LOAD_THRESHOLD   7
+    #define X_COOLSTEP_UPPER_LOAD_THRESHOLD   0
+    #define X_COOLSTEP_SEUP                   2
+    #define X_COOLSTEP_SEDN                   0
+    #define X_COOLSTEP_SEIMIN                 1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(X2)
+    #define X2_COOLSTEP_SPEED_THRESHOLD       5
+    #define X2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define X2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define X2_COOLSTEP_SEUP                  2
+    #define X2_COOLSTEP_SEDN                  0
+    #define X2_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(Y)
+    #define Y_COOLSTEP_SPEED_THRESHOLD        5
+    #define Y_COOLSTEP_LOWER_LOAD_THRESHOLD   7
+    #define Y_COOLSTEP_UPPER_LOAD_THRESHOLD   0
+    #define Y_COOLSTEP_SEUP                   2
+    #define Y_COOLSTEP_SEDN                   0
+    #define Y_COOLSTEP_SEIMIN                 1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(Y2)
+    #define Y2_COOLSTEP_SPEED_THRESHOLD       5
+    #define Y2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define Y2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define Y2_COOLSTEP_SEUP                  2
+    #define Y2_COOLSTEP_SEDN                  0
+    #define Y2_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(Z)
+    #define Z_COOLSTEP_SPEED_THRESHOLD        5
+    #define Z_COOLSTEP_LOWER_LOAD_THRESHOLD   7
+    #define Z_COOLSTEP_UPPER_LOAD_THRESHOLD   0
+    #define Z_COOLSTEP_SEUP                   2
+    #define Z_COOLSTEP_SEDN                   0
+    #define Z_COOLSTEP_SEIMIN                 1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(Z2)
+    #define Z2_COOLSTEP_SPEED_THRESHOLD       5
+    #define Z2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define Z2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define Z2_COOLSTEP_SEUP                  2
+    #define Z2_COOLSTEP_SEDN                  0
+    #define Z2_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(Z3)
+    #define Z3_COOLSTEP_SPEED_THRESHOLD       5
+    #define Z3_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define Z3_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define Z3_COOLSTEP_SEUP                  2
+    #define Z3_COOLSTEP_SEDN                  0
+    #define Z3_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(Z4)
+    #define Z4_COOLSTEP_SPEED_THRESHOLD       5
+    #define Z4_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define Z4_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define Z4_COOLSTEP_SEUP                  2
+    #define Z4_COOLSTEP_SEDN                  0
+    #define Z4_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E0)
+    #define E0_COOLSTEP_SPEED_THRESHOLD       5
+    #define E0_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E0_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E0_COOLSTEP_SEUP                  2
+    #define E0_COOLSTEP_SEDN                  0
+    #define E0_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E1)
+    #define E1_COOLSTEP_SPEED_THRESHOLD       5
+    #define E1_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E1_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E1_COOLSTEP_SEUP                  2
+    #define E1_COOLSTEP_SEDN                  0
+    #define E1_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E2)
+    #define E2_COOLSTEP_SPEED_THRESHOLD       5
+    #define E2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E2_COOLSTEP_SEUP                  2
+    #define E2_COOLSTEP_SEDN                  0
+    #define E2_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E3)
+    #define E3_COOLSTEP_SPEED_THRESHOLD       5
+    #define E3_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E3_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E3_COOLSTEP_SEUP                  2
+    #define E3_COOLSTEP_SEDN                  0
+    #define E3_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E4)
+    #define E4_COOLSTEP_SPEED_THRESHOLD       5
+    #define E4_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E4_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E4_COOLSTEP_SEUP                  2
+    #define E4_COOLSTEP_SEDN                  0
+    #define E4_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E5)
+    #define E5_COOLSTEP_SPEED_THRESHOLD       5
+    #define E5_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E5_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E5_COOLSTEP_SEUP                  2
+    #define E5_COOLSTEP_SEDN                  0
+    #define E5_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E6)
+    #define E6_COOLSTEP_SPEED_THRESHOLD       5
+    #define E6_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E6_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E6_COOLSTEP_SEUP                  2
+    #define E6_COOLSTEP_SEDN                  0
+    #define E6_COOLSTEP_SEIMIN                1
+  #endif
+
+  #if AXIS_HAS_COOLSTEP(E7)
+    #define E7_COOLSTEP_SPEED_THRESHOLD       5
+    #define E7_COOLSTEP_LOWER_LOAD_THRESHOLD  7
+    #define E7_COOLSTEP_UPPER_LOAD_THRESHOLD  0
+    #define E7_COOLSTEP_SEUP                  2
+    #define E7_COOLSTEP_SEDN                  0
+    #define E7_COOLSTEP_SEIMIN                1
+  #endif
+
   /**
    * Use StallGuard2 to home / probe X, Y, Z.
    *
diff --git a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h b/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
index d24a2781c007..87864bcaf67b 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
@@ -60,6 +60,6 @@
   #error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
 #endif
 
-#if TMC_HAS_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
+#if HAS_TMC_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
   #error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
 #endif
diff --git a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h b/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
index 0de4e705bd2e..0f7be7955fa8 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
@@ -56,6 +56,6 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h b/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
index 9f19fd920b66..b6ad7a3c4bff 100644
--- a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
@@ -29,7 +29,7 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
 
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
index 9898c01db424..a3238b088b83 100644
--- a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
@@ -34,6 +34,6 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
index 163bf1278c8d..d0bc2275bf6c 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
@@ -47,6 +47,6 @@
   #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Activator"
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp
index f21ec53ce422..5d8c686af30e 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp
@@ -28,7 +28,7 @@
 #include "../../inc/MarlinConfig.h"
 #include "../shared/Delay.h"
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #include "SoftwareSerial.h"
 #endif
 
@@ -87,7 +87,7 @@ void HAL_init() {
   while (!LL_PWR_IsActiveFlag_BRR());
   #endif // EEPROM_EMULATED_SRAM
 
-  #if TMC_HAS_SW_SERIAL
+  #if HAS_TMC_SW_SERIAL
     SoftwareSerial::setInterruptPriority(SWSERIAL_TIMER_IRQ_PRIO, 0);
   #endif
 }
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
index 25e5d0f1f848..b8ebc446d6db 100644
--- a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
@@ -37,7 +37,7 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if !defined(HAVE_SW_SERIAL) && TMC_HAS_SW_SERIAL
+#if !defined(HAVE_SW_SERIAL) && HAS_TMC_SW_SERIAL
   #warning "With TMC2208/9 consider using SoftwareSerialM with HAVE_SW_SERIAL and appropriate SS_TIMER."
   #error "Missing SoftwareSerial implementation."
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
index 058c8d9dde6e..e04258fa078a 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
@@ -36,6 +36,6 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
index 04efaaa6701a..92688685966e 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
@@ -33,6 +33,6 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
index 37ef55e02dcc..f42bd63b1781 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
@@ -33,6 +33,6 @@
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
 
-#if TMC_HAS_SW_SERIAL
+#if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index bb418b1e9d2a..08b9e8a162be 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -892,7 +892,7 @@ void setup() {
   SERIAL_ECHOLNPGM("start");
   SERIAL_ECHO_START();
 
-  #if TMC_HAS_SPI
+  #if HAS_TMC_SPI
     #if DISABLED(TMC_USE_SW_SPI)
       SPI.begin();
     #endif
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 7e0f3b65510a..a9a3d5bcc4c4 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -52,7 +52,7 @@
 #define _TMC5160_STANDALONE 0x5160B
 
 #define _DRIVER_ID(V) _CAT(_, V)
-#define _AXIS_DRIVER_TYPE(A,T) (_DRIVER_ID(A##_DRIVER_TYPE) == _CAT(_, T))
+#define _AXIS_DRIVER_TYPE(A,T) (_DRIVER_ID(A##_DRIVER_TYPE) == _DRIVER_ID(T))
 
 #define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
 #define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)
@@ -148,19 +148,32 @@
                                    || AXIS_DRIVER_TYPE(A,TMC5130) \
                                    || AXIS_DRIVER_TYPE(A,TMC5160) )
 
+#define AXIS_HAS_SG_RESULT(A)    (    AXIS_DRIVER_TYPE(A,TMC2130) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2208) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2209) )
+
+#define AXIS_HAS_COOLSTEP(A)     (    AXIS_DRIVER_TYPE(A,TMC2130) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2209) \
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
+                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+
+#define _OR_EAH(N,T)    || AXIS_HAS_##T(E##N)
+#define E_AXIS_HAS(T)   (0 RREPEAT2(E_STEPPERS, _OR_EAH, T))
+
 #define ANY_AXIS_HAS(T) (    AXIS_HAS_##T(X)  || AXIS_HAS_##T(X2) \
                           || AXIS_HAS_##T(Y)  || AXIS_HAS_##T(Y2) \
                           || AXIS_HAS_##T(Z)  || AXIS_HAS_##T(Z2) \
-                          || AXIS_HAS_##T(Z3) \
-                          || AXIS_HAS_##T(E0) || AXIS_HAS_##T(E1) \
-                          || AXIS_HAS_##T(E2) || AXIS_HAS_##T(E3) \
-                          || AXIS_HAS_##T(E4) || AXIS_HAS_##T(E5) \
-                          || AXIS_HAS_##T(E6) || AXIS_HAS_##T(E7) )
+                          || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) \
+                          || E_AXIS_HAS(T) )
 
 #define HAS_STEALTHCHOP    ANY_AXIS_HAS(STEALTHCHOP)
 #define HAS_STALLGUARD     ANY_AXIS_HAS(STALLGUARD)
-#define TMC_HAS_SPI        ANY_AXIS_HAS(SPI)
-#define TMC_HAS_SW_SERIAL  ANY_AXIS_HAS(SW_SERIAL)
+#define HAS_SG_RESULT      ANY_AXIS_HAS(SG_RESULT)
+#define HAS_COOLSTEP       ANY_AXIS_HAS(COOLSTEP)
+#define HAS_TMC_UART       ANY_AXIS_HAS(UART)
+#define HAS_TMC_SPI        ANY_AXIS_HAS(SPI)
+#define HAS_TMC_SW_SERIAL  ANY_AXIS_HAS(SW_SERIAL)
 
 //
 // Stretching 'drivers.h' to include LPC/SAMD51 SD options
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index c09939173a23..11a81559df9e 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -629,6 +629,15 @@
         default: break;
       }
     }
+
+    #if HAS_DRIVER(TMC2209)
+      static void _tmc_parse_drv_status(TMC2209Stepper &st, const TMC_drv_status_enum i) {
+        switch (i) {
+          case TMC_SG_RESULT: SERIAL_PRINT(st.SG_RESULT(), DEC); break;
+          default:            _tmc_parse_drv_status(static_cast<TMC2208Stepper &>(st), i); break;
+        }
+      }
+    #endif
   #endif
 
   #if HAS_DRIVER(TMC2660)
@@ -891,24 +900,24 @@
     TMC_REPORT("stealthChop",        TMC_STEALTHCHOP);
     TMC_REPORT("msteps\t",           TMC_MICROSTEPS);
     TMC_REPORT("tstep\t",            TMC_TSTEP);
-    TMC_REPORT("pwm\nthreshold",     TMC_TPWMTHRS);
+    TMC_REPORT("PWM thresh.",        TMC_TPWMTHRS);
     TMC_REPORT("[mm/s]\t",           TMC_TPWMTHRS_MMS);
     TMC_REPORT("OT prewarn",         TMC_OTPW);
     #if ENABLED(MONITOR_DRIVER_STATUS)
-      TMC_REPORT("OT prewarn has\n"
-                 "been triggered",   TMC_OTPW_TRIGGERED);
+      TMC_REPORT("triggered\n OTP\t", TMC_OTPW_TRIGGERED);
     #endif
     TMC_REPORT("off time",           TMC_TOFF);
     TMC_REPORT("blank time",         TMC_TBL);
-    TMC_REPORT("hysteresis\n-end\t", TMC_HEND);
-    TMC_REPORT("-start\t",           TMC_HSTRT);
+    TMC_REPORT("hysteresis\n -end\t", TMC_HEND);
+    TMC_REPORT(" -start\t",          TMC_HSTRT);
     TMC_REPORT("Stallguard thrs",    TMC_SGT);
-
     DRV_REPORT("DRVSTATUS",          TMC_DRV_CODES);
-    #if HAS_TMCX1X0
-      DRV_REPORT("stallguard\t",     TMC_STALLGUARD);
+    #if HAS_TMCX1X0 || HAS_TMC220x
       DRV_REPORT("sg_result",        TMC_SG_RESULT);
-      DRV_REPORT("fsactive\t",       TMC_FSACTIVE);
+    #endif
+    #if HAS_TMCX1X0
+      DRV_REPORT("stallguard",       TMC_STALLGUARD);
+      DRV_REPORT("fsactive",         TMC_FSACTIVE);
     #endif
     DRV_REPORT("stst\t",             TMC_STST);
     DRV_REPORT("olb\t",              TMC_OLB);
@@ -1103,7 +1112,7 @@
 
 #endif // USE_SENSORLESS
 
-#if TMC_HAS_SPI
+#if HAS_TMC_SPI
   #define SET_CS_PIN(st) OUT_WRITE(st##_CS_PIN, HIGH)
   void tmc_init_cs_pins() {
     #if AXIS_HAS_SPI(X)
@@ -1155,7 +1164,7 @@
       SET_CS_PIN(E7);
     #endif
   }
-#endif // TMC_HAS_SPI
+#endif // HAS_TMC_SPI
 
 template<typename TMC>
 static bool test_connection(TMC &st) {
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 2c0a87703e15..584076e478da 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -110,6 +110,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
       inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
       inline bool get_stealthChop_status() { return this->en_pwm_mode(); }
     #endif
+
     #if ENABLED(HYBRID_THRESHOLD)
       uint32_t get_pwm_thrs() {
         return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -121,6 +122,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
         #endif
       }
     #endif
+
     #if USE_SENSORLESS
       inline int16_t homing_threshold() { return TMC::sgt(); }
       void homing_threshold(int16_t sgt_val) {
@@ -135,6 +137,13 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
       #endif
     #endif
 
+    uint32_t get_cool_thrs() {
+      return _tmc_thrs(this->microsteps(), this->TCOOLTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
+    }
+    void set_cool_thrs(const uint32_t thrs) {
+      TMC::TCOOLTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
+    }
+
     #if HAS_LCD_MENU
       inline void refresh_stepper_current() { rms_current(this->val_mA); }
 
@@ -149,6 +158,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
     static constexpr int8_t sgt_min = -64,
                             sgt_max =  63;
 };
+
 template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
 class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC2208Stepper, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
   public:
@@ -172,6 +182,7 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
       inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
     #endif
+
     #if ENABLED(HYBRID_THRESHOLD)
       uint32_t get_pwm_thrs() {
         return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -217,6 +228,7 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
       inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
     #endif
+
     #if ENABLED(HYBRID_THRESHOLD)
       uint32_t get_pwm_thrs() {
         return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -228,6 +240,14 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
         #endif
       }
     #endif
+
+    uint32_t get_cool_thrs() {
+      return _tmc_thrs(this->microsteps(), this->TCOOLTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
+    }
+    void set_cool_thrs(const uint32_t thrs) {
+      TMC2209Stepper::TCOOLTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
+    }
+
     #if USE_SENSORLESS
       inline int16_t homing_threshold() { return TMC2209Stepper::SGTHRS(); }
       void homing_threshold(int16_t sgt_val) {
@@ -241,7 +261,6 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
 
     #if HAS_LCD_MENU
       inline void refresh_stepper_current() { rms_current(this->val_mA); }
-
       #if ENABLED(HYBRID_THRESHOLD)
         inline void refresh_hybrid_thrs() { set_pwm_thrs(this->stored.hybrid_thrs); }
       #endif
@@ -391,7 +410,7 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
 
 #endif // USE_SENSORLESS
 
-#if TMC_HAS_SPI
+#if HAS_TMC_SPI
   void tmc_init_cs_pins();
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ed5ddce34d3c..7d7592cb194b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2040,6 +2040,62 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "LED_USER_PRESET_STARTUP is required for FYSETC_MINI_12864 2.x displays."
 #endif
 
+/**
+ * Make sure CoolStep settings exist
+ */
+#if HAS_COOLSTEP
+  #define NEEDS_COOLSTEP(A) AXIS_HAS_COOLSTEP(A) && !(defined(A##_COOLSTEP_SPEED_THRESHOLD) && defined(A##_COOLSTEP_LOWER_LOAD_THRESHOLD) && defined(A##_COOLSTEP_UPPER_LOAD_THRESHOLD) && defined(A##_COOLSTEP_SEUP) && defined(A##_COOLSTEP_SEDN) && defined(A##_COOLSTEP_SEIMIN))
+  #if NEEDS_COOLSTEP(X)
+    #error "X COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(X2)
+    #error "X2 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(Y)
+    #error "Y COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(Y2)
+    #error "Y2 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(Z)
+    #error "Z COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(Z2)
+    #error "Z2 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(Z3)
+    #error "Z3 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(Z4)
+    #error "Z4 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E0)
+    #error "E0 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E1)
+    #error "E1 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E2)
+    #error "E2 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E3)
+    #error "E3 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E4)
+    #error "E4 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E5)
+    #error "E5 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E6)
+    #error "E6 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #if NEEDS_COOLSTEP(E7)
+    #error "E7 COOLSTEP settings must be defined in Configuration_adv.h."
+  #endif
+  #undef NEEDS_COOLSTEP
+#endif
+
 /**
  * Check existing CS pins against enabled TMC SPI drivers.
  */
@@ -2650,6 +2706,6 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
  * Check to make sure MONITOR_DRIVER_STATUS isn't enabled
  * on boards where TMC drivers share the SPI bus with SD.
  */
-#if TMC_HAS_SPI && ALL(MONITOR_DRIVER_STATUS, SDSUPPORT, USES_SHARED_SPI)
+#if HAS_TMC_SPI && ALL(MONITOR_DRIVER_STATUS, SDSUPPORT, USES_SHARED_SPI)
   #error "MONITOR_DRIVER_STATUS and SDSUPPORT cannot be used together on boards with shared SPI."
 #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index dcc13eca58e5..c739abe26a42 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1496,7 +1496,7 @@ void Stepper::stepper_pulse_phase_isr() {
     #define _APPLY_STEP(AXIS) AXIS ##_APPLY_STEP
     #define _INVERT_STEP_PIN(AXIS) INVERT_## AXIS ##_STEP_PIN
 
-    // Determine if pulses are needed
+    // Determine if a pulse is needed using Bresenham
     #define PULSE_PREP(AXIS) do{ \
       delta_error[_AXIS(AXIS)] += advance_dividend[_AXIS(AXIS)]; \
       step_needed[_AXIS(AXIS)] = (delta_error[_AXIS(AXIS)] >= 0); \
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 69eaaa5c5ceb..a9f6f08f4828 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -36,7 +36,19 @@
 #include <SPI.h>
 
 enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
-#define _TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX])
+#define _TMC_INIT_1(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS)
+#define _TMC_INIT_2(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, stealthchop_by_axis[STEALTH_INDEX], ST##_HYBRID_THRESHOLD)
+#define _TMC_INIT_3(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, stealthchop_by_axis[STEALTH_INDEX], ST##_HYBRID_THRESHOLD, ST##_COOLSTEP_SPEED_THRESHOLD, ST##_COOLSTEP_LOWER_LOAD_THRESHOLD, ST##_COOLSTEP_UPPER_LOAD_THRESHOLD, ST##_COOLSTEP_SEUP, ST##_COOLSTEP_SEDN, ST##_COOLSTEP_SEIMIN)
+#define _TMC_INIT_TMC2660(ST, STEALTH_INDEX) _TMC_INIT_1(ST, STEALTH_INDEX)
+#define _TMC_INIT_TMC2160(ST, STEALTH_INDEX) _TMC_INIT_2(ST, STEALTH_INDEX)
+#define _TMC_INIT_TMC2208(ST, STEALTH_INDEX) _TMC_INIT_2(ST, STEALTH_INDEX)
+#define _TMC_INIT_TMC5130(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
+#define _TMC_INIT_TMC5160(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
+#define _TMC_INIT_TMC2130(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
+#define _TMC_INIT_TMC2209(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
+#define __TMC_INIT(DRV, ST, STEALTH_INDEX) _TMC_INIT_##DRV(ST, STEALTH_INDEX)
+#define _TMC_INIT(DRV, ST, STEALTH_INDEX) __TMC_INIT(DRV, ST, STEALTH_INDEX)
+#define TMC_INIT(ST, STEALTH_INDEX) _TMC_INIT(ST##_DRIVER_TYPE, ST, STEALTH_INDEX)
 
 //   IC = TMC model number
 //   ST = Stepper object letter
@@ -122,7 +134,19 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2130)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC2130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+  void tmc_init(
+    TMCMarlin<TMC2130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps,
+    const bool stealth,
+    const uint32_t hyb_thrs,
+    const uint32_t cool_thrs,
+    const uint8_t cool_semin,
+    const uint8_t cool_semax,
+    const uint8_t cool_seup,
+    const uint8_t cool_sedn,
+    const bool cool_seimin
+  ) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -152,18 +176,33 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     st.PWMCONF(pwmconf.sr);
 
     #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(thrs);
+      st.set_pwm_thrs(hyb_thrs);
     #else
-      UNUSED(thrs);
+      UNUSED(hyb_thrs);
     #endif
 
+    st.set_cool_thrs(cool_thrs);  // (mm/s)
+    COOLCONF_t coolconf{0};
+    coolconf.semin = cool_semin;
+    coolconf.semax = cool_semax;
+    coolconf.seup = cool_seup;
+    coolconf.sedn = cool_sedn;
+    coolconf.seimin = cool_seimin;
+    st.COOLCONF(coolconf.sr);
+
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC2130
 
 #if HAS_DRIVER(TMC2160)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC2160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+  void tmc_init(
+    TMCMarlin<TMC2160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps,
+    const bool stealth,
+    const uint32_t hyb_thrs
+  ) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -196,9 +235,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     st.PWMCONF(pwmconf.sr);
 
     #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(thrs);
+      st.set_pwm_thrs(hyb_thrs);
     #else
-      UNUSED(thrs);
+      UNUSED(hyb_thrs);
     #endif
 
     st.GSTAT(); // Clear GSTAT
@@ -440,7 +479,13 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2208)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+  void tmc_init(
+    TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps,
+    const bool stealth,
+    const uint32_t hyb_thrs
+  ) {
     TMC2208_n::GCONF_t gconf{0};
     gconf.pdn_disable = true; // Use UART
     gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -476,9 +521,9 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     st.PWMCONF(pwmconf.sr);
 
     #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(thrs);
+      st.set_pwm_thrs(hyb_thrs);
     #else
-      UNUSED(thrs);
+      UNUSED(hyb_thrs);
     #endif
 
     st.GSTAT(0b111); // Clear
@@ -488,7 +533,19 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2209)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+  void tmc_init(
+    TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps,
+    const bool stealth,
+    const uint32_t hyb_thrs,
+    const uint32_t cool_thrs,
+    const uint8_t cool_semin,
+    const uint8_t cool_semax,
+    const uint8_t cool_seup,
+    const uint8_t cool_sedn,
+    const bool cool_seimin
+  ) {
     TMC2208_n::GCONF_t gconf{0};
     gconf.pdn_disable = true; // Use UART
     gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -524,11 +581,20 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     st.PWMCONF(pwmconf.sr);
 
     #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(thrs);
+      st.set_pwm_thrs(hyb_thrs);
     #else
-      UNUSED(thrs);
+      UNUSED(hyb_thrs);
     #endif
 
+    st.set_cool_thrs(cool_thrs);  // (mm/s)
+    COOLCONF_t coolconf{0};
+    coolconf.semin = cool_semin;
+    coolconf.semax = cool_semax;
+    coolconf.seup = cool_seup;
+    coolconf.sedn = cool_sedn;
+    coolconf.seimin = cool_seimin;
+    st.COOLCONF(coolconf.sr);
+
     st.GSTAT(0b111); // Clear
     delay(200);
   }
@@ -536,7 +602,11 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2660)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t, const bool) {
+  void tmc_init(
+    TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps
+  ) {
     st.begin();
 
     TMC2660_n::CHOPCONF_t chopconf{0};
@@ -563,7 +633,19 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC5130)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC5130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+  void tmc_init(
+    TMCMarlin<TMC5130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps,
+    const bool stealth,
+    const uint32_t hyb_thrs,
+    const uint32_t cool_thrs,
+    const uint8_t cool_semin,
+    const uint8_t cool_semax,
+    const uint8_t cool_seup,
+    const uint8_t cool_sedn,
+    const bool cool_seimin
+  ) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -593,18 +675,39 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     st.PWMCONF(pwmconf.sr);
 
     #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(thrs);
+      st.set_pwm_thrs(hyb_thrs);
     #else
-      UNUSED(thrs);
+      UNUSED(hyb_thrs);
     #endif
 
+    st.set_cool_thrs(cool_thrs);  // (mm/s)
+    COOLCONF_t coolconf{0};
+    coolconf.semin = cool_semin;
+    coolconf.semax = cool_semax;
+    coolconf.seup = cool_seup;
+    coolconf.sedn = cool_sedn;
+    coolconf.seimin = cool_seimin;
+    st.COOLCONF(coolconf.sr);
+
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC5130
 
 #if HAS_DRIVER(TMC5160)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(TMCMarlin<TMC5160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t thrs, const bool stealth) {
+  void tmc_init(
+    TMCMarlin<TMC5160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
+    const uint16_t mA,
+    const uint16_t microsteps,
+    const bool stealth,
+    const uint32_t hyb_thrs,
+    const uint32_t cool_thrs,
+    const uint8_t cool_semin,
+    const uint8_t cool_semax,
+    const uint8_t cool_seup,
+    const uint8_t cool_sedn,
+    const bool cool_seimin
+  ) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -637,10 +740,20 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     st.PWMCONF(pwmconf.sr);
 
     #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(thrs);
+      st.set_pwm_thrs(hyb_thrs);
     #else
-      UNUSED(thrs);
+      UNUSED(hyb_thrs);
     #endif
+
+    st.set_cool_thrs(cool_thrs);  // (mm/s)
+    COOLCONF_t coolconf{0};
+    coolconf.semin = cool_semin;
+    coolconf.semax = cool_semax;
+    coolconf.seup = cool_seup;
+    coolconf.sedn = cool_sedn;
+    coolconf.seimin = cool_seimin;
+    st.COOLCONF(coolconf.sr);
+
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC5160
@@ -718,52 +831,52 @@ void reset_trinamic_drivers() {
   };
 
   #if AXIS_IS_TMC(X)
-    _TMC_INIT(X, STEALTH_AXIS_XY);
+    TMC_INIT(X, STEALTH_AXIS_XY);
   #endif
   #if AXIS_IS_TMC(X2)
-    _TMC_INIT(X2, STEALTH_AXIS_XY);
+    TMC_INIT(X2, STEALTH_AXIS_XY);
   #endif
   #if AXIS_IS_TMC(Y)
-    _TMC_INIT(Y, STEALTH_AXIS_XY);
+    TMC_INIT(Y, STEALTH_AXIS_XY);
   #endif
   #if AXIS_IS_TMC(Y2)
-    _TMC_INIT(Y2, STEALTH_AXIS_XY);
+    TMC_INIT(Y2, STEALTH_AXIS_XY);
   #endif
   #if AXIS_IS_TMC(Z)
-    _TMC_INIT(Z, STEALTH_AXIS_Z);
+    TMC_INIT(Z, STEALTH_AXIS_Z);
   #endif
   #if AXIS_IS_TMC(Z2)
-    _TMC_INIT(Z2, STEALTH_AXIS_Z);
+    TMC_INIT(Z2, STEALTH_AXIS_Z);
   #endif
   #if AXIS_IS_TMC(Z3)
-    _TMC_INIT(Z3, STEALTH_AXIS_Z);
+    TMC_INIT(Z3, STEALTH_AXIS_Z);
   #endif
   #if AXIS_IS_TMC(Z4)
-    _TMC_INIT(Z4, STEALTH_AXIS_Z);
+    TMC_INIT(Z4, STEALTH_AXIS_Z);
   #endif
   #if AXIS_IS_TMC(E0)
-    _TMC_INIT(E0, STEALTH_AXIS_E);
+    TMC_INIT(E0, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E1)
-    _TMC_INIT(E1, STEALTH_AXIS_E);
+    TMC_INIT(E1, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E2)
-    _TMC_INIT(E2, STEALTH_AXIS_E);
+    TMC_INIT(E2, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E3)
-    _TMC_INIT(E3, STEALTH_AXIS_E);
+    TMC_INIT(E3, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E4)
-    _TMC_INIT(E4, STEALTH_AXIS_E);
+    TMC_INIT(E4, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E5)
-    _TMC_INIT(E5, STEALTH_AXIS_E);
+    TMC_INIT(E5, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E6)
-    _TMC_INIT(E6, STEALTH_AXIS_E);
+    TMC_INIT(E6, STEALTH_AXIS_E);
   #endif
   #if AXIS_IS_TMC(E7)
-    _TMC_INIT(E7, STEALTH_AXIS_E);
+    TMC_INIT(E7, STEALTH_AXIS_E);
   #endif
 
   #if USE_SENSORLESS
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 514da67c643c..28445962ac7b 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -82,7 +82,7 @@
 //
 // TMC2208 UART pins
 //
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
   #define X_SERIAL_TX_PIN  P1_00
   #define X_SERIAL_RX_PIN  P1_00
   #define Y_SERIAL_TX_PIN  P1_09
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index d86558a49d2f..8f7d00bb3bdd 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -74,9 +74,9 @@
 #define E1_DIR_PIN         P2_13
 #define E1_ENABLE_PIN      P4_29
 
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
   //
-  // TMC2208 stepper drivers
+  // TMC220x stepper drivers
   // Software serial
   //
   #define X_SERIAL_TX_PIN  P0_04
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 929c3ee68790..6d3102172bb8 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -264,11 +264,11 @@
 #define SD_DETECT_PIN       9   // H6
 
 //
-//TMC 2208
+// TMC 220x
 //
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
   /**
-   * TMC2208 stepper drivers
+   * TMC220x stepper drivers
    *
    * Hardware serial communication ports.
    * If undefined software serial is used according to the pins below
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 35e73e9d3f35..a1c2ad6b83a4 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1189,12 +1189,18 @@
 #define _PEXI(p,q) __PEXI(p,q)
 #define __EPIN(p,q) E##p##_##q##_PIN
 #define _EPIN(p,q) __EPIN(p,q)
+#define __EDRV(p) E##p##_DRIVER_TYPE
+#define _EDRV(p) __EDRV(p)
 #define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
 
 // The X2 axis, if any, should be the next open extruder port
 #define X2_E_INDEX E_STEPPERS
 
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
+  #ifndef X2_DRIVER_TYPE
+    #define X2_DRIVER_TYPE _EDRV(X2_E_INDEX)
+  #endif
+
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
     #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)
@@ -1268,6 +1274,10 @@
 
 // The Y2 axis, if any, should be the next open extruder port
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+  #ifndef Y2_DRIVER_TYPE
+    #define Y2_DRIVER_TYPE _EDRV(Y2_E_INDEX)
+  #endif
+
   #ifndef Y2_STEP_PIN
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
     #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
@@ -1336,6 +1346,10 @@
 
 // The Z2 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 2
+  #ifndef Z2_DRIVER_TYPE
+    #define Z2_DRIVER_TYPE _EDRV(Z2_E_INDEX)
+  #endif
+
   #ifndef Z2_STEP_PIN
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
     #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
@@ -1403,6 +1417,10 @@
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 3
+  #ifndef Z3_DRIVER_TYPE
+    #define Z3_DRIVER_TYPE _EDRV(Z3_E_INDEX)
+  #endif
+
   #ifndef Z3_STEP_PIN
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
     #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
@@ -1470,6 +1488,10 @@
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 4
+  #ifndef Z4_DRIVER_TYPE
+    #define Z4_DRIVER_TYPE _EDRV(Z4_E_INDEX)
+  #endif
+
   #ifndef Z4_STEP_PIN
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
     #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index a1005c51ec57..9808646d32db 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -193,9 +193,9 @@
   #endif
 #endif
 
-#if HAS_DRIVER(TMC2208)
+#if HAS_TMC_UART
   /**
-   * TMC2208 stepper drivers
+   * TMC220x stepper drivers
    *
    * Hardware serial communication ports.
    * If undefined software serial is used according to the pins below
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
index 461cd347a658..f909cce83a31 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
@@ -26,10 +26,10 @@
 #define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
 
 /**
- * TMC2209 stepper drivers
+ * TMC220x stepper drivers
  * Hardware serial communication ports.
  */
-#if HAS_DRIVER(TMC2209)
+#if HAS_TMC_UART
   #define X_HARDWARE_SERIAL  Serial4
   #define Y_HARDWARE_SERIAL  Serial4
   #define Z_HARDWARE_SERIAL  Serial4

From 84b6e11bd53acbfde0ad82445e21d7bce1cc14f6 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 9 Feb 2020 08:46:38 -0500
Subject: [PATCH 150/565] Better probe fail handling (#16811)

---
 Marlin/src/feature/bltouch.h |  3 ++-
 Marlin/src/module/probe.cpp  | 35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/feature/bltouch.h b/Marlin/src/feature/bltouch.h
index f4a921d5ba66..58c5b9ad36bc 100644
--- a/Marlin/src/feature/bltouch.h
+++ b/Marlin/src/feature/bltouch.h
@@ -91,13 +91,14 @@ class BLTouch {
   FORCE_INLINE static void mode_conv_5V()        { mode_conv_proc(true); }
   FORCE_INLINE static void mode_conv_OD()        { mode_conv_proc(false); }
 
+  static bool triggered();
+
 private:
   FORCE_INLINE static bool _deploy_query_alarm() { return command(BLTOUCH_DEPLOY, BLTOUCH_DEPLOY_DELAY); }
   FORCE_INLINE static bool _stow_query_alarm()   { return command(BLTOUCH_STOW, BLTOUCH_STOW_DELAY); }
 
   static void clear();
   static bool command(const BLTCommand cmd, const millis_t &ms);
-  static bool triggered();
   static bool deploy_proc();
   static bool stow_proc();
   static bool status_proc();
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 4bb434a922b4..f01599cdc30f 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -571,7 +571,9 @@ float Probe::run_z_probe() {
   #if TOTAL_PROBING == 2
 
     // Do a first probe at the fast speed
-    if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) {
+    if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))         // No probe trigger?
+      || current_position.z > -offset.z + _MAX(Z_CLEARANCE_BETWEEN_PROBES, 4) / 2  // Probe triggered too high?
+    ) {
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOLNPGM("FAST Probe fail!");
         DEBUG_POS("<<< run_z_probe", current_position);
@@ -614,7 +616,9 @@ float Probe::run_z_probe() {
   #endif
     {
       // Probe downward slowly to find the bed
-      if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) {
+      if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))      // No probe trigger?
+        || current_position.z > -offset.z + _MAX(Z_CLEARANCE_MULTI_PROBE, 4) / 2  // Probe triggered too high?
+      ) {
         if (DEBUGGING(LEVELING)) {
           DEBUG_ECHOLNPGM("SLOW Probe fail!");
           DEBUG_POS("<<< run_z_probe", current_position);
@@ -716,6 +720,10 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
     DEBUG_POS("", current_position);
   }
 
+  #if BOTH(BLTOUCH, BLTOUCH_HS_MODE)
+    if (bltouch.triggered()) bltouch._reset();
+  #endif
+
   // TODO: Adapt for SCARA, where the offset rotates
   xyz_pos_t npos = { rx, ry };
   if (probe_relative) {                                     // The given position is in terms of the probe
@@ -743,20 +751,21 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
   do_blocking_move_to(npos);
 
   float measured_z = NAN;
-  if (!deploy()) {
-    measured_z = run_z_probe() + offset.z;
-
+  if (!deploy()) measured_z = run_z_probe() + offset.z;
+  if (!isnan(measured_z)) {
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
-    if (big_raise || raise_after == PROBE_PT_RAISE)
-      do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
+    if (big_raise || raise_after == PROBE_PT_RAISE) {
+      if (current_position.z < Z_PROBE_OFFSET_RANGE_MAX) // Only raise when in probing range (else error)
+        do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
+    }
     else if (raise_after == PROBE_PT_STOW)
-      if (stow()) measured_z = NAN;
-  }
+      if (stow()) measured_z = NAN;   // Error on stow?
 
-  if (verbose_level > 2) {
-    SERIAL_ECHOPAIR_F("Bed X: ", LOGICAL_X_POSITION(rx), 3);
-    SERIAL_ECHOPAIR_F(   " Y: ", LOGICAL_Y_POSITION(ry), 3);
-    SERIAL_ECHOLNPAIR_F( " Z: ", measured_z, 3);
+    if (verbose_level > 2) {
+      SERIAL_ECHOPAIR_F("Bed X: ", LOGICAL_X_POSITION(rx), 3);
+      SERIAL_ECHOPAIR_F(   " Y: ", LOGICAL_Y_POSITION(ry), 3);
+      SERIAL_ECHOLNPAIR_F( " Z: ", measured_z, 3);
+    }
   }
 
   feedrate_mm_s = old_feedrate_mm_s;

From 90e2c420312675521ce10def0a8c16a2d4b2c6bf Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 9 Feb 2020 16:57:22 +0100
Subject: [PATCH 151/565] Adafruit Grand Central M4 fixes (#16812)

---
 Marlin/src/HAL/HAL_SAMD51/HAL.cpp     | 9 ++++-----
 Marlin/src/HAL/HAL_SAMD51/HAL.h       | 6 +++---
 Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp | 3 ---
 Marlin/src/HAL/HAL_SAMD51/fastio.h    | 1 +
 Marlin/src/HAL/HAL_SAMD51/pinsDebug.h | 1 +
 Marlin/src/inc/Conditionals_post.h    | 4 ++--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp b/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
index 2b8da883dcdb..4828c40ff705 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
@@ -427,7 +427,6 @@ void HAL_init() {
     dma_init();
   #endif
   #if ENABLED(SDSUPPORT)
-    // SD_DETECT_PIN may be removed if NO_SD_HOST_DRIVE is not defined in Configuration_adv.h
     #if SD_CONNECTION_IS(ONBOARD) && PIN_EXISTS(SD_DETECT)
       SET_INPUT_PULLUP(SD_DETECT_PIN);
     #endif
@@ -496,14 +495,14 @@ void HAL_adc_init() {
       // Preloaded data (fixed for all ADC instances hence not loaded by DMA)
       adc->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;               // VRefA pin
       SYNC(adc->SYNCBUSY.bit.REFCTRL);
-      adc->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_12BIT_Val;
+      adc->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_10BIT_Val;                   // ... ADC_CTRLB_RESSEL_16BIT_Val
       SYNC(adc->SYNCBUSY.bit.CTRLB);
       adc->SAMPCTRL.bit.SAMPLEN = (6 - 1);                                  // Sampling clocks
-      adc->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_16 | ADC_AVGCTRL_ADJRES(4);  // 16 Accumulated conversions and shift 4 to get oversampled 12 bits result
-      SYNC(adc->SYNCBUSY.bit.AVGCTRL);
+      //adc->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_16 | ADC_AVGCTRL_ADJRES(4);  // 16 Accumulated conversions and shift 4 to get oversampled 12 bits result
+      //SYNC(adc->SYNCBUSY.bit.AVGCTRL);
+
       // Registers loaded by DMA
       adc->DSEQCTRL.bit.INPUTCTRL = true;
-
       adc->DSEQCTRL.bit.AUTOSTART = true;                                   // Start conversion after DMA sequence
 
       adc->CTRLA.bit.ENABLE = true;                                         // Enable ADC
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/HAL_SAMD51/HAL.h
index 2eaa40f302b6..209514a70402 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.h
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL.h
@@ -122,14 +122,14 @@ uint8_t eeprom_read_byte(uint8_t *pos);
 //
 // ADC
 //
-extern uint16_t HAL_adc_result;     // result of last ADC conversion
+extern uint16_t HAL_adc_result;     // Most recent ADC conversion
 
 #define HAL_ANALOG_SELECT(pin)
 
 void HAL_adc_init();
 
-#define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
-#define HAL_ADC_RESOLUTION  12
+//#define HAL_ADC_FILTERED          // Disable Marlin's oversampling. The HAL filters ADC values.
+#define HAL_ADC_RESOLUTION  10      // ... 12
 #define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
 #define HAL_READ_ADC()      HAL_adc_result
 #define HAL_ADC_READY()     true
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp b/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
index 4fe4c85b69de..83226daa481b 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
@@ -46,9 +46,6 @@
   // ------------------------
   #error "Software SPI not supported for SAMD51. Use Hardware SPI."
 
-  #if SD_CONNECTION_IS(ONBOARD)
-  #endif
-
 #else // !SOFTWARE_SPI
 
   #ifdef ADAFRUIT_GRAND_CENTRAL_M4
diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/HAL_SAMD51/fastio.h
index b5045e47bbca..c91965e19e0b 100644
--- a/Marlin/src/HAL/HAL_SAMD51/fastio.h
+++ b/Marlin/src/HAL/HAL_SAMD51/fastio.h
@@ -245,6 +245,7 @@
   #define DIO17_PIN   PIN_PC23
   #define DIO88_PIN   PIN_PC24    // NEOPIXEL
   // PORTD
+  #define DIO53_PIN   PIN_PD10
   #define DIO22_PIN   PIN_PD12
   #define DIO6_PIN    PIN_PD20
   #define DIO7_PIN    PIN_PD21
diff --git a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h b/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
index 07964fb1b3bb..15b647338261 100644
--- a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
@@ -149,5 +149,6 @@ void pwm_details(int32_t pin) {
  *  92             |  PA9   | QSPI: IO1
  *  93             |  PA10  | QSPI: IO2
  *  94             |  PA11  | QSPI: IO3
+ *  95             |  PB31  | SD: DETECT
  *
  */
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ef7df41a1c68..624de26a0ba5 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -300,7 +300,7 @@
 /**
  * Override here because this is set in Configuration_adv.h
  */
-#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && !(defined(ARDUINO_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(ONBOARD))
   #undef SD_DETECT_INVERTED
 #endif
 
@@ -2218,7 +2218,7 @@
 #endif
 
 #if ENABLED(SDSUPPORT)
-  #if SD_CONNECTION_IS(ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
+  #if SD_CONNECTION_IS(ONBOARD) && DISABLED(NO_SD_HOST_DRIVE) && !defined(ARDUINO_GRAND_CENTRAL_M4)
     //
     // The external SD card is not used. Hardware SPI is used to access the card.
     // When sharing the SD card with a PC we want the menu options to

From b9b07387d7eac1a02f068069d783a85775ae4e64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 19:59:33 -0600
Subject: [PATCH 152/565] Minor HAL cleanup

---
 Marlin/src/HAL/HAL_STM32F1/HAL.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
index bde77ec0eccb..bc5479b60ce0 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
@@ -261,14 +261,6 @@ void HAL_idletask() {
   #endif
 }
 
-/* VGPV Done with defines
-// disable interrupts
-void cli() { noInterrupts(); }
-
-// enable interrupts
-void sei() { interrupts(); }
-*/
-
 void HAL_clear_reset_source() { }
 
 /**

From ffcbba4447c15d702c5aa37bc21ba3abea822cef Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 22:25:24 -0600
Subject: [PATCH 153/565] Move MSG_MARLIN

---
 Marlin/src/MarlinCore.cpp             | 2 +-
 Marlin/src/core/language.h            | 9 +--------
 Marlin/src/lcd/language/language_en.h | 1 +
 Marlin/src/lcd/menu/menu_info.cpp     | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 08b9e8a162be..f439fb73a8ca 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -912,7 +912,7 @@ void setup() {
   if (mcu & 32) SERIAL_ECHOLNPGM(MSG_SOFTWARE_RESET);
   HAL_clear_reset_source();
 
-  SERIAL_ECHOPGM(MSG_MARLIN);
+  serialprintPGM(GET_TEXT(MSG_MARLIN));
   SERIAL_CHAR(' ');
   SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
   SERIAL_EOL();
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index a20a4eb270aa..47245fa89030 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -135,14 +135,7 @@
 
 #endif
 
-// Common LCD messages
-
-  /* nothing here yet */
-
-// Common serial messages
-#define MSG_MARLIN "Marlin"
-
-// Serial Console Messages (do not translate those!)
+// Common Serial Console Messages (do not translate those!)
 
 #define MSG_ENQUEUEING                      "enqueueing \""
 #define MSG_POWERUP                         "PowerUp"
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 22aee12592ce..4f4e32bd088a 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -40,6 +40,7 @@ namespace Language_en {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Ready.");
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
   PROGMEM Language_Str MSG_YES                             = _UxGT("YES");
   PROGMEM Language_Str MSG_NO                              = _UxGT("NO");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Back");
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index cbe406a10e6b..284c3eb1a5ea 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -265,7 +265,7 @@ void menu_info_board() {
   void menu_info_printer() {
     if (ui.use_click()) return ui.go_back();
     START_SCREEN();
-    STATIC_ITEM_P(PSTR(MSG_MARLIN), SS_CENTER|SS_INVERT);       // Marlin
+    STATIC_ITEM(MSG_MARLIN, SS_CENTER|SS_INVERT);               // Marlin
     STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION));                   // x.x.x-Branch
     STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE));              // YYYY-MM-DD HH:MM
     STATIC_ITEM_P(PSTR(MACHINE_NAME));                          // My3DPrinter

From 38873596ece459ae1d3b65bb8d7905287c3dae6a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 23:11:45 -0600
Subject: [PATCH 154/565] Tweak parser warning

---
 Marlin/src/core/serial.h    |  5 ++---
 Marlin/src/gcode/gcode.cpp  |  6 +++---
 Marlin/src/gcode/parser.cpp | 10 ++++++----
 Marlin/src/gcode/parser.h   |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index c571faf37b1f..812ff5471fab 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -260,8 +260,8 @@ extern uint8_t marlin_debug_flags;
 #define SERIAL_ERROR_START()        serial_error_start()
 #define SERIAL_EOL()                SERIAL_CHAR('\n')
 
-#define SERIAL_ECHO_MSG(S)          do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPGM(S); }while(0)
-#define SERIAL_ERROR_MSG(S)         do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(S); }while(0)
+#define SERIAL_ECHO_MSG(V...)       do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
+#define SERIAL_ERROR_MSG(V...)      do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPAIR(V); }while(0)
 
 #define SERIAL_ECHO_SP(C)           serial_spaces(C)
 
@@ -292,7 +292,6 @@ void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
 
 void print_bin(const uint16_t val);
-
 void print_xyz(const float &x, const float &y, const float &z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
 
 inline void print_xyz(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 164ae931d3bc..06ab3af52afe 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -353,7 +353,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 800: parser.debug(); break;                          // G800: GCode Parser Test for G
       #endif
 
-      default: parser.unknown_command_error(); break;
+      default: parser.unknown_command_warning(); break;
     }
     break;
 
@@ -856,7 +856,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 7219: M7219(); break;                                // M7219: Set LEDs, columns, and rows
       #endif
 
-      default: parser.unknown_command_error(); break;
+      default: parser.unknown_command_warning(); break;
     }
     break;
 
@@ -866,7 +866,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       #if ENABLED(WIFI_CUSTOM_COMMAND)
         if (wifi_custom_command(parser.command_ptr)) break;
       #endif
-      parser.unknown_command_error();
+      parser.unknown_command_warning();
   }
 
   if (!no_ok) queue.ok_to_send();
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 100bbae5eff3..75f88df76b54 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -333,9 +333,8 @@ void GCodeParser::parse(char *p) {
 
 #endif // CNC_COORDINATE_SYSTEMS
 
-void GCodeParser::unknown_command_error() {
-  SERIAL_ECHO_START();
-  SERIAL_ECHOLNPAIR(MSG_UNKNOWN_COMMAND, command_ptr, "\"");
+void GCodeParser::unknown_command_warning() {
+  SERIAL_ECHO_MSG(MSG_UNKNOWN_COMMAND, command_ptr, "\"");
 }
 
 #if ENABLED(DEBUG_GCODE_PARSER)
@@ -351,7 +350,10 @@ void GCodeParser::unknown_command_error() {
     #else
       SERIAL_ECHOPAIR(" args: { ", command_args, " }");
     #endif
-    if (string_arg) SERIAL_ECHOPAIR(" string: \"", string_arg, "\"");
+    if (string_arg) {
+      SERIAL_ECHOPAIR(" string: \"", string_arg);
+      SERIAL_CHAR('"');
+    }
     SERIAL_ECHOLNPGM("\n");
     for (char c = 'A'; c <= 'Z'; ++c) {
       if (seen(c)) {
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index b4a18b364b2d..cce8abe5fdfc 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -366,7 +366,7 @@ class GCodeParser {
 
   static inline feedRate_t value_feedrate() { return MMM_TO_MMS(value_linear_units()); }
 
-  void unknown_command_error();
+  void unknown_command_warning();
 
   // Provide simple value accessors with default option
   static inline float    floatval(const char c, const float dval=0.0)   { return seenval(c) ? value_float()        : dval; }

From 0ce83dee9560fc30f27fdddc450d3861725d9a22 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 Feb 2020 23:10:01 -0600
Subject: [PATCH 155/565] Show print time with PRINTER_EVENT_LEDS

---
 Marlin/src/gcode/lcd/M0_M1.cpp | 10 +++-------
 Marlin/src/gcode/queue.cpp     |  5 ++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 0fc87cf7221d..9ed7b2af42fc 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() {
 
     if (has_message)
       ui.set_status(args, true);
-    else {
+    else if (!parser.seenval('Q')) {
       LCD_MESSAGEPGM(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
         ui.reset_progress_bar_timeout();
@@ -101,12 +101,8 @@ void GcodeSuite::M0_M1() {
     host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), CONTINUE_STR);
   #endif
 
-  if (ms > 0) {
-    ms += millis();  // wait until this time for a click
-    while (PENDING(millis(), ms) && wait_for_user) idle();
-  }
-  else
-    while (wait_for_user) idle();
+  if (ms > 0) ms += millis();  // wait until this time for a click
+  while (wait_for_user && (ms > 0 || PENDING(millis(), ms))) idle();
 
   #if HAS_LEDS_OFF_FLAG
     printerEventLEDs.onResumeAfterWait();
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 324e6bcb5073..5d317b6ca5fe 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -163,8 +163,7 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
   if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
 
   if (_enqueue(cmd)) {
-    SERIAL_ECHO_START();
-    SERIAL_ECHOLNPAIR(MSG_ENQUEUEING, cmd, "\"");
+    SERIAL_ECHO_MSG(MSG_ENQUEUEING, cmd, "\"");
     return true;
   }
   return false;
@@ -517,7 +516,7 @@ void GCodeQueue::get_serial_commands() {
             #if ENABLED(PRINTER_EVENT_LEDS)
               printerEventLEDs.onPrintCompleted();
               #if HAS_RESUME_CONTINUE
-                inject_P(PSTR("M0 S"
+                inject_P(PSTR("M0 Q S"
                   #if HAS_LCD_MENU
                     "1800"
                   #else

From cc1ff2725677c3707a5d9c3e0a45437cd0f04e34 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 9 Feb 2020 13:13:52 -0500
Subject: [PATCH 156/565] Bump config version to 020004 (#16816)

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 2 +-
 Marlin/src/inc/Version.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a8e518098d19..0a9df1feca0a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -36,7 +36,7 @@
  * Advanced settings can be found in Configuration_adv.h
  *
  */
-#define CONFIGURATION_H_VERSION 020000
+#define CONFIGURATION_H_VERSION 020004
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2d4931a722d1..ee97cdf20478 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -31,7 +31,7 @@
  * Basic settings can be found in Configuration.h
  *
  */
-#define CONFIGURATION_ADV_H_VERSION 020000
+#define CONFIGURATION_ADV_H_VERSION 020004
 
 // @section temperature
 
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b6db9de532c8..41d3424e1737 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -52,7 +52,7 @@
  * to alert users to major changes.
  */
 
-#define MARLIN_HEX_VERSION 020000
+#define MARLIN_HEX_VERSION 020004
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From a9549f7a08381e786b6232297c4a0c5de4f9c9d8 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 9 Feb 2020 13:22:54 -0500
Subject: [PATCH 157/565] Add PID, probe offsets to ExtUI (#16792)

---
 Marlin/src/lcd/extensible_ui/ui_api.cpp | 50 +++++++++++++++++++++++++
 Marlin/src/lcd/extensible_ui/ui_api.h   | 18 +++++++++
 2 files changed, 68 insertions(+)

diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index d6b4a9670648..21c99d94a6ec 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -826,6 +826,15 @@ namespace ExtUI {
 
   #endif // HAS_HOTEND_OFFSET
 
+  #if HAS_BED_PROBE
+    float getProbeOffset_mm(const axis_t axis) {
+      return probe.offset.pos[axis];
+    }
+    void setProbeOffset_mm(const float val, const axis_t axis) {
+      probe.offset.pos[axis] = val;
+    }
+  #endif
+
   #if ENABLED(BACKLASH_GCODE)
     float getAxisBacklash_mm(const axis_t axis)       { return backlash.distance_mm[axis]; }
     void setAxisBacklash_mm(const float value, const axis_t axis)
@@ -885,6 +894,47 @@ namespace ExtUI {
 
   float getFeedrate_percent() { return feedrate_percentage; }
 
+  #if HAS_PID_HEATING
+    float getPIDValues_Kp(const extruder_t tool) {
+      return PID_PARAM(Kp, tool);
+    }
+    float getPIDValues_Ki(const extruder_t tool) {
+      return unscalePID_i(PID_PARAM(Ki, tool));
+    }
+    float getPIDValues_Kd(const extruder_t tool) {
+      return unscalePID_d(PID_PARAM(Kd, tool));
+    }
+    float getBedPIDValues_Kp() {
+      return thermalManager.temp_bed.pid.Kp;
+    }
+    float getBedPIDValues_Ki() {
+      return unscalePID_i(thermalManager.temp_bed.pid.Ki);
+    }
+    float getBedPIDValues_Kd() {
+      return unscalePID_d(thermalManager.temp_bed.pid.Kd);
+    }
+
+    void setPIDValues(const float p, const float i, const float d, extruder_t tool) {
+      thermalManager.temp_hotend[tool].pid.Kp = p;
+      thermalManager.temp_hotend[tool].pid.Ki = scalePID_i(i);
+      thermalManager.temp_hotend[tool].pid.Kd = scalePID_d(d);
+      thermalManager.updatePID();
+    }
+    void setBedPIDValues(const float p, const float i, const float d) {
+      thermalManager.temp_bed.pid.Kp = p;
+      thermalManager.temp_bed.pid.Ki = scalePID_i(i);
+      thermalManager.temp_bed.pid.Kd = scalePID_d(d);
+      thermalManager.updatePID();
+    }
+
+    void startPIDTune(const float temp, extruder_t tool){
+      thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
+    }
+    void startBedPIDTune(const float temp) {
+      thermalManager.PID_autotune(temp, H_BED, 4, true);
+    }
+  #endif
+
   void injectCommands_P(PGM_P const gcode) {
     queue.inject_P(gcode);
   }
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h
index 7a20411ed948..4f88b4606e14 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extensible_ui/ui_api.h
@@ -211,6 +211,11 @@ namespace ExtUI {
   float getZOffset_mm();
   void setZOffset_mm(const float);
 
+  #if HAS_BED_PROBE
+    float getProbeOffset_mm(const axis_t);
+    void setProbeOffset_mm(const float, const axis_t);
+  #endif
+
   #if ENABLED(BACKLASH_GCODE)
     float getAxisBacklash_mm(const axis_t);
     void setAxisBacklash_mm(const float, const axis_t);
@@ -244,6 +249,19 @@ namespace ExtUI {
     #endif
   #endif
 
+  #if HAS_PID_HEATING
+    float getPIDValues_Kp(const extruder_t);
+    float getPIDValues_Ki(const extruder_t);
+    float getPIDValues_Kd(const extruder_t);
+    float getBedPIDValues_Kp();
+    float getBedPIDValues_Ki();
+    float getBedPIDValues_Kd();
+    void setPIDValues(const float, const float, const float, extruder_t);
+    void setBedPIDValues(const float, const float, const float);
+    void startPIDTune(const float, extruder_t);
+    void startBedPIDTune(const float);
+  #endif
+
   /**
    * Delay and timing routines
    * Should be used by the EXTENSIBLE_UI to safely pause or measure time

From 15e6ee6c7c5ede548708dbd296f7d3623a3c8f29 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 10 Feb 2020 00:03:46 +0000
Subject: [PATCH 158/565] [cron] Bump distribution date (2020-02-10)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 41d3424e1737..fe72b696404c 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-09"
+  #define STRING_DISTRIBUTION_DATE "2020-02-10"
 #endif
 
 /**

From a33d08928afac98a9bd8213dfc550dd9529b3f65 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Feb 2020 12:48:46 -0600
Subject: [PATCH 159/565] Tweak LPC1768 upload py script

---
 .../HAL/HAL_LPC1768/upload_extra_script.py    | 229 +++++++++---------
 1 file changed, 115 insertions(+), 114 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py b/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
index 79c5d43eaa84..9b0d0617a0c9 100755
--- a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
@@ -16,129 +16,130 @@
 Import("env")
 
 def print_error(e):
-    print('\nUnable to find destination disk (' + e + ')\n' \
-          'Please select it in platformio.ini using the upload_port keyword ' \
-          '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html) ' \
-          'or copy the firmware (.pio/build/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n')
+	print('\nUnable to find destination disk (%s)\n' \
+		  'Please select it in platformio.ini using the upload_port keyword ' \
+		  '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html) ' \
+		  'or copy the firmware (.pio/build/%s/firmware.bin) manually to the appropriate disk\n' \
+		  %(e, env.get('PIOENV')))
 
 try:
-    if current_OS == 'Windows':
-        #
-        # platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:'
-        #   Windows - doesn't care about the disk's name, only cares about the drive letter
-        #
+	if current_OS == 'Windows':
+		#
+		# platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:'
+		#   Windows - doesn't care about the disk's name, only cares about the drive letter
+		#
 
-        #
-        # get all drives on this computer
-        #
-        import subprocess
-        # typical result (string): 'Drives: C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
-        driveStr = str(subprocess.check_output("fsutil fsinfo drives"))
-        # typical result (string): 'C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
-        # driveStr = driveStr.strip().lstrip('Drives: ') <- Doesn't work in other Languages as English. In German is "Drives:" = "Laufwerke:"
-        FirstFound = driveStr.find(':',0,-1)         # Find the first ":" and
-        driveStr = driveStr[FirstFound + 1 : -1]     # truncate to the rest
-        # typical result (array of stings): ['C:\\', 'D:\\', 'E:\\', 'F:\\',
-        # 'G:\\', 'H:\\', 'I:\\', 'J:\\', 'K:\\', 'L:\\', 'M:\\', 'Y:\\', 'Z:\\']
-        drives = driveStr.split()
+		#
+		# get all drives on this computer
+		#
+		import subprocess
+		# typical result (string): 'Drives: C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
+		driveStr = str(subprocess.check_output("fsutil fsinfo drives"))
+		# typical result (string): 'C:\ D:\ E:\ F:\ G:\ H:\ I:\ J:\ K:\ L:\ M:\ Y:\ Z:\'
+		# driveStr = driveStr.strip().lstrip('Drives: ') <- Doesn't work in other Languages as English. In German is "Drives:" = "Laufwerke:"
+		FirstFound = driveStr.find(':',0,-1)         # Find the first ":" and
+		driveStr = driveStr[FirstFound + 1 : -1]     # truncate to the rest
+		# typical result (array of stings): ['C:\\', 'D:\\', 'E:\\', 'F:\\',
+		# 'G:\\', 'H:\\', 'I:\\', 'J:\\', 'K:\\', 'L:\\', 'M:\\', 'Y:\\', 'Z:\\']
+		drives = driveStr.split()
 
-        upload_disk = 'Disk not found'
-        target_file_found = False
-        target_drive_found = False
-        for drive in drives:
-            final_drive_name = drive.strip().rstrip('\\')   # typical result (string): 'C:'
-            try:
-                volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
-            except Exception as e:
-                continue
-            else:
-                if target_drive in volume_info and target_file_found == False:  # set upload if not found target file yet
-                    target_drive_found = True
-                    upload_disk = final_drive_name
-                if target_filename in volume_info:
-                    if target_file_found == False:
-                        upload_disk = final_drive_name
-                    target_file_found = True
+		upload_disk = 'Disk not found'
+		target_file_found = False
+		target_drive_found = False
+		for drive in drives:
+			final_drive_name = drive.strip().rstrip('\\')   # typical result (string): 'C:'
+			try:
+				volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
+			except Exception as e:
+				continue
+			else:
+				if target_drive in volume_info and target_file_found == False:  # set upload if not found target file yet
+					target_drive_found = True
+					upload_disk = final_drive_name
+				if target_filename in volume_info:
+					if target_file_found == False:
+						upload_disk = final_drive_name
+					target_file_found = True
 
-        #
-        # set upload_port to drive if found
-        #
+		#
+		# set upload_port to drive if found
+		#
 
-        if target_file_found == True or target_drive_found == True:
-            env.Replace(
-                UPLOAD_PORT=upload_disk
-            )
-            print('upload disk: ', upload_disk)
-        else:
-            print_error('Autodetect Error')
+		if target_file_found == True or target_drive_found == True:
+			env.Replace(
+				UPLOAD_PORT=upload_disk
+			)
+			print('upload disk: ', upload_disk)
+		else:
+			print_error('Autodetect Error')
 
-    elif current_OS == 'Linux':
-        #
-        # platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
-        #
-        upload_disk = 'Disk not found'
-        target_file_found = False
-        target_drive_found = False
-        drives = os.listdir(os.path.join(os.sep, 'media', getpass.getuser()))
-        if target_drive in drives:  # If target drive is found, use it.
-            target_drive_found = True
-            upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), target_drive) + os.sep
-        else:
-            for drive in drives:
-                try:
-                    files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
-                except:
-                    continue
-                else:
-                    if target_filename in files:
-                        upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
-                        target_file_found = True
-                        break
-        #
-        # set upload_port to drive if found
-        #
+	elif current_OS == 'Linux':
+		#
+		# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
+		#
+		upload_disk = 'Disk not found'
+		target_file_found = False
+		target_drive_found = False
+		drives = os.listdir(os.path.join(os.sep, 'media', getpass.getuser()))
+		if target_drive in drives:  # If target drive is found, use it.
+			target_drive_found = True
+			upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), target_drive) + os.sep
+		else:
+			for drive in drives:
+				try:
+					files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
+				except:
+					continue
+				else:
+					if target_filename in files:
+						upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
+						target_file_found = True
+						break
+		#
+		# set upload_port to drive if found
+		#
 
-        if target_file_found or target_drive_found:
-            env.Replace(
-                UPLOAD_FLAGS="-P$UPLOAD_PORT",
-                UPLOAD_PORT=upload_disk
-            )
-            print('upload disk: ', upload_disk)
-        else:
-            print_error('Autodetect Error')
+		if target_file_found or target_drive_found:
+			env.Replace(
+				UPLOAD_FLAGS="-P$UPLOAD_PORT",
+				UPLOAD_PORT=upload_disk
+			)
+			print('upload disk: ', upload_disk)
+		else:
+			print_error('Autodetect Error')
 
-    elif current_OS == 'Darwin':  # MAC
-        #
-        # platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
-        #
-        upload_disk = 'Disk not found'
-        drives = os.listdir('/Volumes')  # human readable names
-        target_file_found = False
-        target_drive_found = False
-        if target_drive in drives and target_file_found == False:  # set upload if not found target file yet
-            target_drive_found = True
-            upload_disk = '/Volumes/' + target_drive + '/'
-        for drive in drives:
-            try:
-                filenames = os.listdir('/Volumes/' + drive + '/')   # will get an error if the drive is protected
-            except:
-                continue
-            else:
-                if target_filename in filenames:
-                    if target_file_found == False:
-                        upload_disk = '/Volumes/' + drive + '/'
-                    target_file_found = True
-        #
-        # set upload_port to drive if found
-        #
+	elif current_OS == 'Darwin':  # MAC
+		#
+		# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
+		#
+		upload_disk = 'Disk not found'
+		drives = os.listdir('/Volumes')  # human readable names
+		target_file_found = False
+		target_drive_found = False
+		if target_drive in drives and target_file_found == False:  # set upload if not found target file yet
+			target_drive_found = True
+			upload_disk = '/Volumes/' + target_drive + '/'
+		for drive in drives:
+			try:
+				filenames = os.listdir('/Volumes/' + drive + '/')   # will get an error if the drive is protected
+			except:
+				continue
+			else:
+				if target_filename in filenames:
+					if target_file_found == False:
+						upload_disk = '/Volumes/' + drive + '/'
+					target_file_found = True
+		#
+		# set upload_port to drive if found
+		#
 
-        if target_file_found == True or target_drive_found == True:
-            env.Replace(
-                UPLOAD_PORT=upload_disk
-            )
-            print('\nupload disk: ', upload_disk, '\n')
-        else:
-            print_error('Autodetect Error')
+		if target_file_found == True or target_drive_found == True:
+			env.Replace(
+				UPLOAD_PORT=upload_disk
+			)
+			print('\nupload disk: ', upload_disk, '\n')
+		else:
+			print_error('Autodetect Error')
 
 except Exception as e:
-    print_error(str(e))
+	print_error(str(e))

From 10b4fa91eb32f436feb44d1387bc57cb6ae12eb4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Feb 2020 20:48:03 -0600
Subject: [PATCH 160/565] Add mftest -b (auto-build) and -u (upload)

- Implement the equivalent of auto-build for the shell environment by using the MOTHERBOARD setting to look up the env: entries.
---
 buildroot/share/git/mftest | 103 +++++++++++++++++++++++++++++--------
 1 file changed, 81 insertions(+), 22 deletions(-)

diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index d80b9ed810f4..6db441478675 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 #
-# mftest [name] [index]
-#
-# Set configuration options based on a test
-# By default it will do megaatmega2560
-# Use 'mftest -' to pick from the list.
+#  mftest                             Select a test to apply and build
+#  mftest -b                          Build the auto-detected environment
+#  mftest -u                          Upload the auto-detected environment
+#  mftest [name] [index] [-y]         Set config options and optionally build a test
 #
 
 MFINFO=$(mfinfo) || exit 1
@@ -12,16 +11,24 @@ MFINFO=$(mfinfo) || exit 1
 
 TESTPATH=buildroot/share/tests
 STATE_FILE=$( echo ./.pio/.mftestrc )
+SED=$(which gsed || which sed)
 
 shopt -s extglob nocasematch
 
+# Matching patterns
+ISNUM='^[0-9]+$'
+ISCMD='^(restore|opt|exec|use|pins|env)_'
+ISEXEC='^exec_'
+ISCONT='\\ *$'
+
 # Get the environment and test number from the command
 TESTENV=${1:-'-'}
 CHOICE=${2:-0}
+AUTOENV=0
 
 # Allow shorthand for test name
 case $TESTENV in
-    tree) platformio run --project-dir . -e include_tree ; exit 1 ;;
+    tree) pio run -d . -e include_tree ; exit 1 ;;
      due) TESTENV='DUE' ;;
      esp) TESTENV='esp32' ;;
     lin*) TESTENV='linux_native' ;;
@@ -43,22 +50,72 @@ case $TESTENV in
           # Build with the last-built env
       -r) [[ -f "$STATE_FILE" ]] || { echo "No previous (-r) build state found." ; exit 1 ; }
           read TESTENV <"$STATE_FILE"
-          platformio run --project-dir . -e $TESTENV
+          pio run -d . -e $TESTENV
+          exit
+          ;;
+
+   -[bu]) MB=$( grep "define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//' )
+          [[ -z $MB ]] && { echo "Error - Unable to read MOTHERBOARD setting." ; exit 1 ; }
+          BLINE=$( grep "define BOARD_$MB" Marlin/src/core/boards.h )
+          BNUM=$( $SED -E 's/^.+BOARD_[^ ]+ +([0-9]+).+$/\1/' <<<"$BLINE" )
+          BDESC=$( $SED -E 's/^.+\/\/ *(.+)$/\1/' <<<"$BLINE" )
+          [[ -z $BNUM ]] && { echo "Error - Unable to $MB in boards list." ; exit 1 ; }
+          readarray -t ENVS <<< $( grep -A1 "MB($MB)" Marlin/src/pins/pins.h | $SED -n '2 p' | grep -oE 'env:[^ ]+' | $SED -E 's/env://' )
+          [[ -z $ENVS ]] && { echo "Error - Unable to find target(s) for $MB ($BNUM)." ; exit 1 ; }
+          ECOUNT=${#ENVS[*]}
+
+          if [[ $ECOUNT == 1 ]]; then
+            TARGET=$ENVS
+          else
+            #
+            # List env names and numbers. Get selection.
+            #
+            if [[ $CHOICE == 0 ]]; then
+              echo "Available targets for \"$BDESC\" | $MB ($BNUM):"
+
+              IND=0 ; for ENV in "${ENVS[@]}"; do echo " $IND) $ENV" ; done
+
+              if [[ $ECOUNT > 1 ]]; then
+                for (( ; ; ))
+                do
+                  read -p "Select a target for '$MB' (1-$ECOUNT) : " CHOICE
+                  [[ -z "$CHOICE" ]] && { echo '(canceled)' ; exit 1 ; }
+                  [[ $CHOICE =~ $ISNUM ]] && ((CHOICE >= 1 && CHOICE <= ECOUNT)) && break
+                  echo ">>> Invalid environment choice '$CHOICE'."
+                done
+                echo
+              fi
+            else
+              echo "Detected \"$BDESC\" | $MB ($BNUM)."
+              [[ $CHOICE > $ECOUNT ]] && { echo "Environment selection is out of range." ; exit 1 ; }
+            fi
+            TARGET="${ENVS[$CHOICE-1]}"
+            echo "Selected $TARGET"
+          fi
+
+          echo "$TARGET" >"$STATE_FILE"
+
+          if [[ $TESTENV == "-u" ]]; then
+            echo "Build/Uploading environment $TARGET for board $MB ($BNUM)..." ; echo
+            pio run -t upload -e $TARGET
+          else
+            echo "Building environment $TARGET for board $MB ($BNUM)..." ; echo
+            pio run -e $TARGET
+          fi
           exit
           ;;
-          # A -y may come first
+
+          # The -y flag may come first
       -y) TESTENV=${2:-'-'} ; CHOICE=${3:-0} ;;
+
   -[a-z]) echo "Unknown flag $TESTENV" ; exit 1 ;;
        -) ;;
 esac
 
-# Matching patterns
-ISNUM='^[0-9]+$'
-ISCMD='^(restore|opt|exec|use|pins|env)_'
-ISEXEC='^exec_'
-ISCONT='\\ *$'
-
+#
 # List available tests and ask for selection
+#
+
 if [[ $TESTENV == '-' ]]; then
   IND=0
   NAMES=()
@@ -86,17 +143,17 @@ fi
 OUT=$( cat $TESTPATH/$TESTENV-tests 2>/dev/null ) || { echo "Can't find test '$TESTENV'." ; exit 1 ; }
 
 # Count up the number of tests
-# TODO: List test descriptions with numbers
 TESTCOUNT=$( awk "/$ISEXEC/{a++}END{print a}" <<<"$OUT" )
 
 # User entered a number?
-(( CHOICE && CHOICE > TESTCOUNT )) && { echo "Invalid test index '$CHOICE' (1-$TESTCOUNT)." ; exit 1 ; }
+(( CHOICE && CHOICE > TESTCOUNT )) && { echo "Invalid test selection '$CHOICE' (1-$TESTCOUNT)." ; exit 1 ; }
 
 if [[ $CHOICE == 0 ]]; then
-  # List test descriptions with numbers
+  #
+  # List test descriptions with numbers and get selection
+  #
   echo "Available '$TESTENV' tests:" ; echo "$OUT" | {
     IND=0
-    SED=$(which gsed || which sed)
     while IFS= read -r LINE
     do
       if [[ $LINE =~ $ISEXEC ]]; then
@@ -113,12 +170,14 @@ if [[ $CHOICE == 0 ]]; then
       read -p "Select a '$TESTENV' test (1-$TESTCOUNT) : " CHOICE
       [[ -z "$CHOICE" ]] && { echo '(canceled)' ; exit 1 ; }
       [[ $CHOICE =~ $ISNUM ]] && ((CHOICE >= 1 && CHOICE <= TESTCOUNT)) && break
-      echo ">>> Invalid test index '$CHOICE'."
+      echo ">>> Invalid test selection '$CHOICE'."
     done
   fi
 fi
 
-# Finally, run the specified test lines
+#
+# Run the specified test lines
+#
 echo "$OUT" | {
   IND=0
   GOTX=0
@@ -136,7 +195,7 @@ echo "$OUT" | {
         }
         ((IND == CHOICE)) && {
           GOTX=1
-          [[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | sed -e 's/\\//g' )
+          [[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | $SED -e 's/\\//g' )
           [[ $LINE =~ $ISCONT ]] || { echo $CMD ; eval "$CMD" ; CMD="" ; }
         }
       fi
@@ -154,6 +213,6 @@ if [[ $BUILD_YES != 'Y' ]]; then
 fi
 
 [[ $BUILD_YES == 'Y' || $BUILD_YES == 'Yes' ]] && {
-  platformio run --project-dir . -e $TESTENV
+  pio run -d . -e $TESTENV
   echo "$TESTENV" >"$STATE_FILE"
 }

From 28b48fc9bbc29279f49446fbcc54fcafcb1729f9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Feb 2020 20:49:55 -0600
Subject: [PATCH 161/565] Revert change to AXIS_DRIVER_TYPE_X2

- Revisit this to figure out why it breaks
---
 Marlin/src/core/drivers.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index a9a3d5bcc4c4..f0338b535d3d 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -58,11 +58,7 @@
 #define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)
 #define AXIS_DRIVER_TYPE_Z(T) _AXIS_DRIVER_TYPE(Z,T)
 
-#if EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE)
-  #define AXIS_DRIVER_TYPE_X2(T) _AXIS_DRIVER_TYPE(X2,T)
-#else
-  #define AXIS_DRIVER_TYPE_X2(T) false
-#endif
+#define AXIS_DRIVER_TYPE_X2(T) (EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE) && _AXIS_DRIVER_TYPE(X2,T))
 #define AXIS_DRIVER_TYPE_Y2(T) (ENABLED(Y_DUAL_STEPPER_DRIVERS) && _AXIS_DRIVER_TYPE(Y2,T))
 #define AXIS_DRIVER_TYPE_Z2(T) (NUM_Z_STEPPER_DRIVERS >= 2 && _AXIS_DRIVER_TYPE(Z2,T))
 #define AXIS_DRIVER_TYPE_Z3(T) (NUM_Z_STEPPER_DRIVERS >= 3 && _AXIS_DRIVER_TYPE(Z3,T))

From 18a7276909a3e2aa1761ba0c46577a8f6e7baedb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Feb 2020 21:22:26 -0600
Subject: [PATCH 162/565] Revert "Coolstep for TMC2130, 2209, 5130, 5160"

Reverting #16790 as not ready for primetime.
---
 Marlin/Configuration_adv.h             | 160 -------------------------
 Marlin/src/feature/tmc_util.h          |  16 +--
 Marlin/src/inc/SanityCheck.h           |  56 ---------
 Marlin/src/module/stepper/trinamic.cpp | 129 ++------------------
 4 files changed, 9 insertions(+), 352 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ee97cdf20478..2c3cd38def08 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2275,166 +2275,6 @@
   #define E6_HYBRID_THRESHOLD     30
   #define E7_HYBRID_THRESHOLD     30
 
-  /**
-   * CoolStep. Currently supported for TMC2130, TMC2209, TMC5130 and TMC5160 only.
-   * This mode allows for cooler steppers and energy savings.
-   * The driver will switch to coolStep when stepper speed is over COOLSTEP_THRESHOLD mm/s.
-   *
-   * If SG_RESULT goes below COOLSTEP_LOWER_LOAD_THRESHOLD * 32 stepper current will be increased.
-   * Set to 0 to disable CoolStep.
-   *
-   * If SG_RESULT goes above (COOLSTEP_LOWER_LOAD_THRESHOLD + COOLSTEP_UPPER_LOAD_THRESHOLD + 1) * 32
-   * stepper current will be decreased.
-   *
-   * SEUP sets the increase step width. Value range is 0..3 and computed as 2^SEUP.
-   * SEDN sets the decrease delay. Value range is 0..3, 0 being the slowest.
-   * SEIMIN sets the lower current limit. 0: 1/2 of IRUN, 1:1/4 of IRUN
-   */
-
-  #if AXIS_HAS_COOLSTEP(X)
-    #define X_COOLSTEP_SPEED_THRESHOLD        5
-    #define X_COOLSTEP_LOWER_LOAD_THRESHOLD   7
-    #define X_COOLSTEP_UPPER_LOAD_THRESHOLD   0
-    #define X_COOLSTEP_SEUP                   2
-    #define X_COOLSTEP_SEDN                   0
-    #define X_COOLSTEP_SEIMIN                 1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(X2)
-    #define X2_COOLSTEP_SPEED_THRESHOLD       5
-    #define X2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define X2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define X2_COOLSTEP_SEUP                  2
-    #define X2_COOLSTEP_SEDN                  0
-    #define X2_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(Y)
-    #define Y_COOLSTEP_SPEED_THRESHOLD        5
-    #define Y_COOLSTEP_LOWER_LOAD_THRESHOLD   7
-    #define Y_COOLSTEP_UPPER_LOAD_THRESHOLD   0
-    #define Y_COOLSTEP_SEUP                   2
-    #define Y_COOLSTEP_SEDN                   0
-    #define Y_COOLSTEP_SEIMIN                 1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(Y2)
-    #define Y2_COOLSTEP_SPEED_THRESHOLD       5
-    #define Y2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define Y2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define Y2_COOLSTEP_SEUP                  2
-    #define Y2_COOLSTEP_SEDN                  0
-    #define Y2_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(Z)
-    #define Z_COOLSTEP_SPEED_THRESHOLD        5
-    #define Z_COOLSTEP_LOWER_LOAD_THRESHOLD   7
-    #define Z_COOLSTEP_UPPER_LOAD_THRESHOLD   0
-    #define Z_COOLSTEP_SEUP                   2
-    #define Z_COOLSTEP_SEDN                   0
-    #define Z_COOLSTEP_SEIMIN                 1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(Z2)
-    #define Z2_COOLSTEP_SPEED_THRESHOLD       5
-    #define Z2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define Z2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define Z2_COOLSTEP_SEUP                  2
-    #define Z2_COOLSTEP_SEDN                  0
-    #define Z2_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(Z3)
-    #define Z3_COOLSTEP_SPEED_THRESHOLD       5
-    #define Z3_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define Z3_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define Z3_COOLSTEP_SEUP                  2
-    #define Z3_COOLSTEP_SEDN                  0
-    #define Z3_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(Z4)
-    #define Z4_COOLSTEP_SPEED_THRESHOLD       5
-    #define Z4_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define Z4_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define Z4_COOLSTEP_SEUP                  2
-    #define Z4_COOLSTEP_SEDN                  0
-    #define Z4_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E0)
-    #define E0_COOLSTEP_SPEED_THRESHOLD       5
-    #define E0_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E0_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E0_COOLSTEP_SEUP                  2
-    #define E0_COOLSTEP_SEDN                  0
-    #define E0_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E1)
-    #define E1_COOLSTEP_SPEED_THRESHOLD       5
-    #define E1_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E1_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E1_COOLSTEP_SEUP                  2
-    #define E1_COOLSTEP_SEDN                  0
-    #define E1_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E2)
-    #define E2_COOLSTEP_SPEED_THRESHOLD       5
-    #define E2_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E2_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E2_COOLSTEP_SEUP                  2
-    #define E2_COOLSTEP_SEDN                  0
-    #define E2_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E3)
-    #define E3_COOLSTEP_SPEED_THRESHOLD       5
-    #define E3_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E3_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E3_COOLSTEP_SEUP                  2
-    #define E3_COOLSTEP_SEDN                  0
-    #define E3_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E4)
-    #define E4_COOLSTEP_SPEED_THRESHOLD       5
-    #define E4_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E4_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E4_COOLSTEP_SEUP                  2
-    #define E4_COOLSTEP_SEDN                  0
-    #define E4_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E5)
-    #define E5_COOLSTEP_SPEED_THRESHOLD       5
-    #define E5_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E5_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E5_COOLSTEP_SEUP                  2
-    #define E5_COOLSTEP_SEDN                  0
-    #define E5_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E6)
-    #define E6_COOLSTEP_SPEED_THRESHOLD       5
-    #define E6_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E6_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E6_COOLSTEP_SEUP                  2
-    #define E6_COOLSTEP_SEDN                  0
-    #define E6_COOLSTEP_SEIMIN                1
-  #endif
-
-  #if AXIS_HAS_COOLSTEP(E7)
-    #define E7_COOLSTEP_SPEED_THRESHOLD       5
-    #define E7_COOLSTEP_LOWER_LOAD_THRESHOLD  7
-    #define E7_COOLSTEP_UPPER_LOAD_THRESHOLD  0
-    #define E7_COOLSTEP_SEUP                  2
-    #define E7_COOLSTEP_SEDN                  0
-    #define E7_COOLSTEP_SEIMIN                1
-  #endif
-
   /**
    * Use StallGuard2 to home / probe X, Y, Z.
    *
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 584076e478da..5102a9d5bfa0 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -137,13 +137,6 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
       #endif
     #endif
 
-    uint32_t get_cool_thrs() {
-      return _tmc_thrs(this->microsteps(), this->TCOOLTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
-    }
-    void set_cool_thrs(const uint32_t thrs) {
-      TMC::TCOOLTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
-    }
-
     #if HAS_LCD_MENU
       inline void refresh_stepper_current() { rms_current(this->val_mA); }
 
@@ -240,14 +233,6 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
         #endif
       }
     #endif
-
-    uint32_t get_cool_thrs() {
-      return _tmc_thrs(this->microsteps(), this->TCOOLTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
-    }
-    void set_cool_thrs(const uint32_t thrs) {
-      TMC2209Stepper::TCOOLTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
-    }
-
     #if USE_SENSORLESS
       inline int16_t homing_threshold() { return TMC2209Stepper::SGTHRS(); }
       void homing_threshold(int16_t sgt_val) {
@@ -261,6 +246,7 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
 
     #if HAS_LCD_MENU
       inline void refresh_stepper_current() { rms_current(this->val_mA); }
+
       #if ENABLED(HYBRID_THRESHOLD)
         inline void refresh_hybrid_thrs() { set_pwm_thrs(this->stored.hybrid_thrs); }
       #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7d7592cb194b..4c1dd38471a7 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2040,62 +2040,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "LED_USER_PRESET_STARTUP is required for FYSETC_MINI_12864 2.x displays."
 #endif
 
-/**
- * Make sure CoolStep settings exist
- */
-#if HAS_COOLSTEP
-  #define NEEDS_COOLSTEP(A) AXIS_HAS_COOLSTEP(A) && !(defined(A##_COOLSTEP_SPEED_THRESHOLD) && defined(A##_COOLSTEP_LOWER_LOAD_THRESHOLD) && defined(A##_COOLSTEP_UPPER_LOAD_THRESHOLD) && defined(A##_COOLSTEP_SEUP) && defined(A##_COOLSTEP_SEDN) && defined(A##_COOLSTEP_SEIMIN))
-  #if NEEDS_COOLSTEP(X)
-    #error "X COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(X2)
-    #error "X2 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(Y)
-    #error "Y COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(Y2)
-    #error "Y2 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(Z)
-    #error "Z COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(Z2)
-    #error "Z2 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(Z3)
-    #error "Z3 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(Z4)
-    #error "Z4 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E0)
-    #error "E0 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E1)
-    #error "E1 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E2)
-    #error "E2 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E3)
-    #error "E3 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E4)
-    #error "E4 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E5)
-    #error "E5 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E6)
-    #error "E6 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #if NEEDS_COOLSTEP(E7)
-    #error "E7 COOLSTEP settings must be defined in Configuration_adv.h."
-  #endif
-  #undef NEEDS_COOLSTEP
-#endif
-
 /**
  * Check existing CS pins against enabled TMC SPI drivers.
  */
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index a9f6f08f4828..1103e12f63ed 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -36,19 +36,7 @@
 #include <SPI.h>
 
 enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
-#define _TMC_INIT_1(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS)
-#define _TMC_INIT_2(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, stealthchop_by_axis[STEALTH_INDEX], ST##_HYBRID_THRESHOLD)
-#define _TMC_INIT_3(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, stealthchop_by_axis[STEALTH_INDEX], ST##_HYBRID_THRESHOLD, ST##_COOLSTEP_SPEED_THRESHOLD, ST##_COOLSTEP_LOWER_LOAD_THRESHOLD, ST##_COOLSTEP_UPPER_LOAD_THRESHOLD, ST##_COOLSTEP_SEUP, ST##_COOLSTEP_SEDN, ST##_COOLSTEP_SEIMIN)
-#define _TMC_INIT_TMC2660(ST, STEALTH_INDEX) _TMC_INIT_1(ST, STEALTH_INDEX)
-#define _TMC_INIT_TMC2160(ST, STEALTH_INDEX) _TMC_INIT_2(ST, STEALTH_INDEX)
-#define _TMC_INIT_TMC2208(ST, STEALTH_INDEX) _TMC_INIT_2(ST, STEALTH_INDEX)
-#define _TMC_INIT_TMC5130(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
-#define _TMC_INIT_TMC5160(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
-#define _TMC_INIT_TMC2130(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
-#define _TMC_INIT_TMC2209(ST, STEALTH_INDEX) _TMC_INIT_3(ST, STEALTH_INDEX)
-#define __TMC_INIT(DRV, ST, STEALTH_INDEX) _TMC_INIT_##DRV(ST, STEALTH_INDEX)
-#define _TMC_INIT(DRV, ST, STEALTH_INDEX) __TMC_INIT(DRV, ST, STEALTH_INDEX)
-#define TMC_INIT(ST, STEALTH_INDEX) _TMC_INIT(ST##_DRIVER_TYPE, ST, STEALTH_INDEX)
+#define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX])
 
 //   IC = TMC model number
 //   ST = Stepper object letter
@@ -134,19 +122,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2130)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC2130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps,
-    const bool stealth,
-    const uint32_t hyb_thrs,
-    const uint32_t cool_thrs,
-    const uint8_t cool_semin,
-    const uint8_t cool_semax,
-    const uint8_t cool_seup,
-    const uint8_t cool_sedn,
-    const bool cool_seimin
-  ) {
+  void tmc_init(TMCMarlin<TMC2130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -181,28 +157,13 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
       UNUSED(hyb_thrs);
     #endif
 
-    st.set_cool_thrs(cool_thrs);  // (mm/s)
-    COOLCONF_t coolconf{0};
-    coolconf.semin = cool_semin;
-    coolconf.semax = cool_semax;
-    coolconf.seup = cool_seup;
-    coolconf.sedn = cool_sedn;
-    coolconf.seimin = cool_seimin;
-    st.COOLCONF(coolconf.sr);
-
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC2130
 
 #if HAS_DRIVER(TMC2160)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC2160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps,
-    const bool stealth,
-    const uint32_t hyb_thrs
-  ) {
+  void tmc_init(TMCMarlin<TMC2160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -479,13 +440,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2208)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps,
-    const bool stealth,
-    const uint32_t hyb_thrs
-  ) {
+  void tmc_init(TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
     TMC2208_n::GCONF_t gconf{0};
     gconf.pdn_disable = true; // Use UART
     gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -533,19 +488,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2209)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps,
-    const bool stealth,
-    const uint32_t hyb_thrs,
-    const uint32_t cool_thrs,
-    const uint8_t cool_semin,
-    const uint8_t cool_semax,
-    const uint8_t cool_seup,
-    const uint8_t cool_sedn,
-    const bool cool_seimin
-  ) {
+  void tmc_init(TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
     TMC2208_n::GCONF_t gconf{0};
     gconf.pdn_disable = true; // Use UART
     gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -586,15 +529,6 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
       UNUSED(hyb_thrs);
     #endif
 
-    st.set_cool_thrs(cool_thrs);  // (mm/s)
-    COOLCONF_t coolconf{0};
-    coolconf.semin = cool_semin;
-    coolconf.semax = cool_semax;
-    coolconf.seup = cool_seup;
-    coolconf.sedn = cool_sedn;
-    coolconf.seimin = cool_seimin;
-    st.COOLCONF(coolconf.sr);
-
     st.GSTAT(0b111); // Clear
     delay(200);
   }
@@ -602,11 +536,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC2660)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps
-  ) {
+  void tmc_init(TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t, const bool) {
     st.begin();
 
     TMC2660_n::CHOPCONF_t chopconf{0};
@@ -633,19 +563,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 
 #if HAS_DRIVER(TMC5130)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC5130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps,
-    const bool stealth,
-    const uint32_t hyb_thrs,
-    const uint32_t cool_thrs,
-    const uint8_t cool_semin,
-    const uint8_t cool_semax,
-    const uint8_t cool_seup,
-    const uint8_t cool_sedn,
-    const bool cool_seimin
-  ) {
+  void tmc_init(TMCMarlin<TMC5130Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -680,34 +598,13 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
       UNUSED(hyb_thrs);
     #endif
 
-    st.set_cool_thrs(cool_thrs);  // (mm/s)
-    COOLCONF_t coolconf{0};
-    coolconf.semin = cool_semin;
-    coolconf.semax = cool_semax;
-    coolconf.seup = cool_seup;
-    coolconf.sedn = cool_sedn;
-    coolconf.seimin = cool_seimin;
-    st.COOLCONF(coolconf.sr);
-
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC5130
 
 #if HAS_DRIVER(TMC5160)
   template<char AXIS_LETTER, char DRIVER_ID, AxisEnum AXIS_ID>
-  void tmc_init(
-    TMCMarlin<TMC5160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st,
-    const uint16_t mA,
-    const uint16_t microsteps,
-    const bool stealth,
-    const uint32_t hyb_thrs,
-    const uint32_t cool_thrs,
-    const uint8_t cool_semin,
-    const uint8_t cool_semax,
-    const uint8_t cool_seup,
-    const uint8_t cool_sedn,
-    const bool cool_seimin
-  ) {
+  void tmc_init(TMCMarlin<TMC5160Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> &st, const uint16_t mA, const uint16_t microsteps, const uint32_t hyb_thrs, const bool stealth) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -744,16 +641,6 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     #else
       UNUSED(hyb_thrs);
     #endif
-
-    st.set_cool_thrs(cool_thrs);  // (mm/s)
-    COOLCONF_t coolconf{0};
-    coolconf.semin = cool_semin;
-    coolconf.semax = cool_semax;
-    coolconf.seup = cool_seup;
-    coolconf.sedn = cool_sedn;
-    coolconf.seimin = cool_seimin;
-    st.COOLCONF(coolconf.sr);
-
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC5160

From 0b45493557863f6a78738d91a13630c51b3f9628 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Feb 2020 21:58:12 -0600
Subject: [PATCH 163/565] Add a caution to drivers.h

---
 Marlin/src/core/drivers.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index f0338b535d3d..ad2c755bae34 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -21,7 +21,10 @@
  */
 #pragma once
 
-#include "../inc/MarlinConfigPre.h"
+//
+// Included by MarlinConfigPre.h ahead of Configuration_adv.h.
+// Don't use #if in this file for anything not defined early!
+//
 
 #define _A4988              0x4988
 #define _A5984              0x5984

From e561f744fa67d562d4841f4e3c418a99599b1c3d Mon Sep 17 00:00:00 2001
From: Daniel Mazurkiewicz <daniel@latanie.info>
Date: Mon, 10 Feb 2020 22:12:11 +0200
Subject: [PATCH 164/565] Update MKS BASE and v1.6 pins (#16806)

---
 Marlin/src/pins/pins.h                        |  2 +-
 .../{pins_MKS_BASE.h => pins_MKS_BASE_10.h}   | 22 +-----
 Marlin/src/pins/ramps/pins_MKS_BASE_14.h      | 43 +++--------
 Marlin/src/pins/ramps/pins_MKS_BASE_15.h      | 17 +----
 Marlin/src/pins/ramps/pins_MKS_BASE_16.h      | 39 ++++++----
 Marlin/src/pins/ramps/pins_MKS_BASE_common.h  | 75 +++++++++++++++++++
 6 files changed, 117 insertions(+), 81 deletions(-)
 rename Marlin/src/pins/ramps/{pins_MKS_BASE.h => pins_MKS_BASE_10.h} (74%)
 create mode 100644 Marlin/src/pins/ramps/pins_MKS_BASE_common.h

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a1c2ad6b83a4..e05bfeed0498 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -105,7 +105,7 @@
 #elif MB(BAM_DICE_DUE)
   #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE)
-  #include "ramps/pins_MKS_BASE.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_10.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE_14)
   #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_15)
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE.h b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
similarity index 74%
rename from Marlin/src/pins/ramps/pins_MKS_BASE.h
rename to Marlin/src/pins/ramps/pins_MKS_BASE_10.h
index 72e062e635ea..b1010482c168 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
@@ -31,23 +31,7 @@
   #error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
 #endif
 
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "MKS BASE 1.0"
-#endif
-
-//
-// Heaters / Fans
-//
-// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN              7
-
-#define CASE_LIGHT_PIN            2
-
-//
-// M3/M4/M5 - Spindle/Laser Control
-//
-#define SPINDLE_LASER_PWM_PIN     2   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    15   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define BOARD_INFO_NAME "MKS BASE 1.0"
+#define MKS_BASE_VERSION 10
 
-#include "pins_RAMPS.h"
+#include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index a4fe6f90c12a..b1564ea2c326 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -30,52 +30,31 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.4"
+#define MKS_BASE_VERSION 14
 
 //
 // Heaters / Fans
 //
-#define MOSFET_D_PIN              7   // PH4 ** Pin16 ** PWM7   //E1
-#define FAN_PIN                   9   // PH6 ** Pin18 ** PWM9
+#define FAN_PIN             9   // PH6 ** Pin18 ** PWM9
 
 // Other Mods
-#define CASE_LIGHT_PIN           11   // PB5 ** Pin24 ** PWM11
-#define SERVO3_PIN               12   // PB6 ** Pin25 ** D12
-#define PS_ON_PIN                 2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
-#define FILWIDTH_PIN             15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
-#define FIL_RUNOUT_PIN           19   // Z+ // PD2 ** Pin45 ** USART1_RX
-
-//
-// M3/M4/M5 - Spindle/Laser Control
-//
-#define SPINDLE_LASER_PWM_PIN     2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENA_PIN    15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
-#define SPINDLE_DIR_PIN          19   // Z+ // PD2 ** Pin45 ** USART1_RX
-
-//
-// Microstepping pins
-//
-#define X_MS1_PIN                 5   // PE3 ** Pin5  ** PWM5
-#define X_MS2_PIN                 6   // PH3 ** Pin15 ** PWM6
-#define Y_MS1_PIN                59   // PF5 ** Pin92 ** A5
-#define Y_MS2_PIN                58   // PF4 ** Pin93 ** A4
-#define Z_MS1_PIN                22   // PA0 ** Pin78 ** D22
-#define Z_MS2_PIN                39   // PG2 ** Pin70 ** D39
-#define E0_MS1_PIN               64   // PK2 ** Pin87 ** A10
-#define E0_MS2_PIN               63   // PK1 ** Pin88 ** A9
-#define E1_MS1_PIN               57   // PF3 ** Pin94 ** A3
-#define E1_MS2_PIN                4   // PG5 ** Pin1  ** PWM4
+#define CASE_LIGHT_PIN     11   // PB5 ** Pin24 ** PWM11
+#define SERVO3_PIN         12   // PB6 ** Pin25 ** D12
+#define PS_ON_PIN           2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
+#define FILWIDTH_PIN       15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
+#define FIL_RUNOUT_PIN     19   // Z+ // PD2 ** Pin45 ** USART1_RX
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN          50
+  #define RGB_LED_R_PIN    50
 #endif
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_G_PIN          51
+  #define RGB_LED_G_PIN    51
 #endif
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_B_PIN          52
+  #define RGB_LED_B_PIN    52
 #endif
 
-#include "pins_RAMPS.h"
+#include "pins_MKS_BASE_common.h"
 
 /*
   Available connectors on MKS BASE v1.4
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
index efb7bb23eb1a..683c6b7d0ee9 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
@@ -30,19 +30,6 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.5"
+#define MKS_BASE_VERSION 15
 
-#include "pins_MKS_BASE.h"
-
-/**
- * Microstepping pins
- */
-#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
-#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
-#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
-#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
-#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
-#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
-#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
-#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
-#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
-#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN
+#include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
index 1cf2345e051c..985aa056b81a 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -30,19 +30,30 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.6"
+#define MKS_BASE_VERSION 16
 
-#include "pins_MKS_BASE.h"
+//
+// Servos
+//
+#define SERVO1_PIN         12   // Digital 12 / Pin 25
 
-/**
- * Microstepping pins
- */
-#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
-#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
-#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
-#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
-#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
-#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
-#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
-#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
-#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
-#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN
+//
+// Omitted RAMPS pins
+//
+#ifndef SERVO2_PIN
+  #define SERVO2_PIN       -1
+#endif
+#ifndef SERVO3_PIN
+  #define SERVO3_PIN       -1
+#endif
+#ifndef FILWIDTH_PIN
+  #define FILWIDTH_PIN     -1
+#endif
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN   -1
+#endif
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN        -1
+#endif
+
+#include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
new file mode 100644
index 000000000000..0406da560503
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
@@ -0,0 +1,75 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS BASE – Arduino Mega2560 with RAMPS pin assignments
+ */
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "MKS BASE"
+#endif
+
+#if MKS_BASE_VERSION == 14 || MKS_BASE_VERSION == 15
+  //
+  // Heaters / Fans
+  //
+  // Power outputs EFBF or EFBE
+  #define MOSFET_D_PIN      7
+
+  //
+  // M3/M4/M5 - Spindle/Laser Control
+  //
+  #if HAS_CUTTER
+    #define SPINDLE_LASER_PWM_PIN  2   // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN 15   // Pullup!
+    #define SPINDLE_DIR_PIN       19
+  #endif
+
+  #ifndef CASE_LIGHT_PIN
+    #define CASE_LIGHT_PIN  2
+  #endif
+
+#endif
+
+//
+// Microstepping pins
+//
+#if MKS_BASE_VERSION >= 14      //     |===== 1.4 =====|===== 1.5+ =====|
+  #define X_MS1_PIN         5   // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
+  #define X_MS2_PIN         6   // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
+  #define Y_MS1_PIN        59   // PF5 | Pin 92 | A5   |        |       |
+  #define Y_MS2_PIN        58   // PF4 | Pin 93 | A4   |        |       |
+  #define Z_MS1_PIN        22   // PA0 | Pin 78 | D22  |        |       |
+  #define Z_MS2_PIN        39   // PG2 | Pin 70 | D39  |        |       |
+  #if MKS_BASE_VERSION == 14
+    #define E0_MS1_PIN     64   // PK2 | Pin 87 | A10  |        |       |
+    #define E0_MS2_PIN     63   // PK1 | Pin 88 | A9   |        |       |
+  #else
+    #define E0_MS1_PIN     63   // PK1 |        |      | Pin 86 | A9    |
+    #define E0_MS2_PIN     64   // PK2 |        |      | Pin 87 | A10   |
+  #endif
+  #define E1_MS1_PIN       57   // PF3 | Pin 94 | A3   | Pin 93 | A3    |
+  #define E1_MS2_PIN        4   // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
+#endif
+
+#include "pins_RAMPS.h"

From 3bef7a445080fcb133dfa49aefddc0f28057b226 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 10 Feb 2020 14:52:15 -0600
Subject: [PATCH 165/565] Add g-code quoted strings, improve stream code
 (#16818)

---
 Marlin/Configuration_adv.h                 |   4 +
 Marlin/src/gcode/host/M115.cpp             |  15 +-
 Marlin/src/gcode/parser.cpp                |  70 ++++++---
 Marlin/src/gcode/parser.h                  |  10 ++
 Marlin/src/gcode/queue.cpp                 | 174 ++++++++++-----------
 buildroot/share/tests/megaatmega1280-tests |   2 +-
 6 files changed, 163 insertions(+), 112 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2c3cd38def08..2e0a5b5c50fc 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2784,6 +2784,10 @@
  */
 #define FASTER_GCODE_PARSER
 
+#if ENABLED(FASTER_GCODE_PARSER)
+  //#define GCODE_QUOTED_STRINGS  // Support for quoted string parameters
+#endif
+
 /**
  * CNC G-code options
  * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 9123bc6e62cc..bce0c891842e 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -33,7 +33,9 @@
 #endif
 
 /**
- * M115: Capabilities string
+ * M115: Capabilities string and extended capabilities report
+ *       If a capability is not reported, hosts should assume
+ *       the capability is not present.
  */
 void GcodeSuite::M115() {
 
@@ -41,6 +43,16 @@ void GcodeSuite::M115() {
 
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
 
+    // PAREN_COMMENTS
+    #if ENABLED(PAREN_COMMENTS)
+      cap_line(PSTR("PAREN_COMMENTS"), true);
+    #endif
+
+    // QUOTED_STRINGS
+    #if ENABLED(GCODE_QUOTED_STRINGS)
+      cap_line(PSTR("QUOTED_STRINGS"), true);
+    #endif
+
     // SERIAL_XON_XOFF
     cap_line(PSTR("SERIAL_XON_XOFF")
       #if ENABLED(SERIAL_XON_XOFF)
@@ -171,6 +183,5 @@ void GcodeSuite::M115() {
       #endif
     );
 
-
   #endif // EXTENDED_CAPABILITIES_REPORT
 }
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 75f88df76b54..8218ee53d887 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -92,6 +92,26 @@ void GCodeParser::reset() {
   #endif
 }
 
+#if ENABLED(GCODE_QUOTED_STRINGS)
+
+  // Pass the address after the first quote (if any)
+  char* GCodeParser::unescape_string(char* &src) {
+    if (*src == '"') ++src;     // Skip the leading quote
+    char * const out = src;     // Start of the string
+    char *dst = src;            // Prepare to unescape and terminate
+    for (;;) {
+      char c = *src++;          // Get the next char
+      switch (c) {
+        case '\\': c = *src++; break; // Get the escaped char
+        case '"' : c = '\0'; break;   // Convert bare quote to nul
+      }
+      if (!(*dst++ = c)) break; // Copy and break on nul
+    }
+    return out;
+  }
+
+#endif
+
 // Populate all fields by parsing a single line of GCode
 // 58 bytes of SRAM are used to speed up seen/value
 void GCodeParser::parse(char *p) {
@@ -229,17 +249,12 @@ void GCodeParser::parse(char *p) {
     #if ENABLED(EXPECTED_PRINTER_CHECK)
       case 16:
     #endif
-    case 23: case 28: case 30: case 117: case 118: case 928: string_arg = p; return;
-    default: break;
-  }
-/*
-  #if ENABLED(CANCEL_OBJECTS)
-  if (letter == 'O') switch (codenum) {
-    case 1:  string_arg = p; return;
+    case 23: case 28: case 30: case 117: case 118: case 928:
+      string_arg = unescape_string(p);
+      return;
     default: break;
   }
-  #endif
-*/
+
   #if ENABLED(DEBUG_GCODE_PARSER)
     const bool debug = codenum == 800;
   #endif
@@ -252,21 +267,31 @@ void GCodeParser::parse(char *p) {
    * This allows M0/M1 with expire time to work: "M0 S5 You Win!"
    * For 'M118' you must use 'E1' and 'A1' rather than just 'E' or 'A'
    */
+  #if ENABLED(GCODE_QUOTED_STRINGS)
+    bool quoted_string_arg = false;
+  #endif
   string_arg = nullptr;
-  while (const char code = *p++) {              // Get the next parameter. A NUL ends the loop
+  while (const char param = *p++) {              // Get the next parameter. A NUL ends the loop
 
     // Special handling for M32 [P] !/path/to/file.g#
     // The path must be the last parameter
-    if (code == '!' && letter == 'M' && codenum == 32) {
+    if (param == '!' && letter == 'M' && codenum == 32) {
       string_arg = p;                           // Name starts after '!'
       char * const lb = strchr(p, '#');         // Already seen '#' as SD char (to pause buffering)
       if (lb) *lb = '\0';                       // Safe to mark the end of the filename
       return;
     }
 
+    #if ENABLED(GCODE_QUOTED_STRINGS)
+      if (!quoted_string_arg && param == '"') {
+        quoted_string_arg = true;
+        string_arg = unescape_string(p);
+      }
+    #endif
+
     // Arguments MUST be uppercase for fast GCode parsing
     #if ENABLED(FASTER_GCODE_PARSER)
-      #define PARAM_TEST WITHIN(code, 'A', 'Z')
+      #define PARAM_TEST WITHIN(param, 'A', 'Z')
     #else
       #define PARAM_TEST true
     #endif
@@ -275,16 +300,22 @@ void GCodeParser::parse(char *p) {
 
       while (*p == ' ') p++;                    // Skip spaces between parameters & values
 
-      const bool has_num = valid_float(p);
+      #if ENABLED(GCODE_QUOTED_STRINGS)
+        const bool is_str = (*p == '"'), has_val = is_str || valid_float(p);
+        char * const valptr = has_val ? is_str ? unescape_string(p) : p : nullptr;
+      #else
+        const bool has_val = valid_float(p);
+        char * const valptr = has_val ? p : nullptr;
+      #endif
 
       #if ENABLED(DEBUG_GCODE_PARSER)
         if (debug) {
-          SERIAL_ECHOPAIR("Got letter ", code, " at index ", (int)(p - command_ptr - 1));
-          if (has_num) SERIAL_ECHOPGM(" (has_num)");
+          SERIAL_ECHOPAIR("Got param ", param, " at index ", (int)(p - command_ptr - 1));
+          if (has_val) SERIAL_ECHOPGM(" (has_val)");
         }
       #endif
 
-      if (!has_num && !string_arg) {            // No value? First time, keep as string_arg
+      if (!has_val && !string_arg) {            // No value? First time, keep as string_arg
         string_arg = p - 1;
         #if ENABLED(DEBUG_GCODE_PARSER)
           if (debug) SERIAL_ECHOPAIR(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
@@ -296,7 +327,7 @@ void GCodeParser::parse(char *p) {
       #endif
 
       #if ENABLED(FASTER_GCODE_PARSER)
-        set(code, has_num ? p : nullptr);       // Set parameter exists and pointer (nullptr for no number)
+        set(param, valptr);                     // Set parameter exists and pointer (nullptr for no value)
       #endif
     }
     else if (!string_arg) {                     // Not A-Z? First time, keep as the string_arg
@@ -359,7 +390,7 @@ void GCodeParser::unknown_command_warning() {
       if (seen(c)) {
         SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
         if (has_value()) {
-          SERIAL_ECHOPAIR(
+          SERIAL_ECHOLNPAIR(
             "\n    float: ", value_float(),
             "\n     long: ", value_long(),
             "\n    ulong: ", value_ulong(),
@@ -374,8 +405,7 @@ void GCodeParser::unknown_command_warning() {
           );
         }
         else
-          SERIAL_ECHOPGM(" (no value)");
-        SERIAL_ECHOLNPGM("\n");
+          SERIAL_ECHOLNPGM(" (no value)");
       }
     }
   }
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index cce8abe5fdfc..08f8613c1718 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -208,6 +208,12 @@ class GCodeParser {
     return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
   }
 
+  #if ENABLED(GCODE_QUOTED_STRINGS)
+    static char* unescape_string(char* &src);
+  #else
+    FORCE_INLINE static char* unescape_string(char* &src) { return src; }
+  #endif
+
   // Populate all fields by parsing a single line of GCode
   // This uses 54 bytes of SRAM to speed up seen/value
   static void parse(char * p);
@@ -223,6 +229,9 @@ class GCodeParser {
   // Seen a parameter with a value
   static inline bool seenval(const char c) { return seen(c) && has_value(); }
 
+  // Float removes 'E' to prevent scientific notation interpretation
+  static inline char* value_string() { return value_ptr; }
+
   // Float removes 'E' to prevent scientific notation interpretation
   static inline float value_float() {
     if (value_ptr) {
@@ -369,6 +378,7 @@ class GCodeParser {
   void unknown_command_warning();
 
   // Provide simple value accessors with default option
+  static inline char*    stringval(const char c, char * const dval=nullptr) { return seenval(c) ? value_string()   : dval; }
   static inline float    floatval(const char c, const float dval=0.0)   { return seenval(c) ? value_float()        : dval; }
   static inline bool     boolval(const char c, const bool dval=false)   { return seenval(c) ? value_bool()         : (seen(c) ? true : dval); }
   static inline uint8_t  byteval(const char c, const uint8_t dval=0)    { return seenval(c) ? value_byte()         : dval; }
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 5d317b6ca5fe..b83a211967f7 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -309,6 +309,66 @@ FORCE_INLINE bool is_M29(const char * const cmd) {  // matches "M29" & "M29 ", b
   return m29 && !NUMERIC(m29[3]);
 }
 
+#define PS_NORMAL 0
+#define PS_EOL    1
+#define PS_QUOTED 2
+#define PS_PAREN  3
+#define PS_ESC    4
+
+inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
+
+  if (sis == PS_EOL) return;    // EOL comment or overflow
+
+  #if ENABLED(PAREN_COMMENTS)
+    else if (sis == PS_PAREN) { // Inline comment
+      if (c == ')') sis = PS_NORMAL;
+      return;
+    }
+  #endif
+
+  else if (sis >= PS_ESC)       // End escaped char
+    sis -= PS_ESC;
+
+  else if (c == '\\') {         // Start escaped char
+    sis += PS_ESC;
+    if (sis == PS_ESC) return;  // Keep if quoting
+  }
+
+  #if ENABLED(GCODE_QUOTED_STRINGS)
+
+    else if (sis == PS_QUOTED) {
+      if (c == '"') sis = PS_NORMAL; // End quoted string
+    }
+    else if (c == '"')          // Start quoted string
+      sis = PS_QUOTED;
+
+  #endif
+
+  else if (c == ';') {          // Start end-of-line comment
+    sis = PS_EOL;
+    return;
+  }
+
+  #if ENABLED(PAREN_COMMENTS)
+    else if (c == '(') {        // Start inline comment
+      sis = PS_PAREN;
+      return;
+    }
+  #endif
+
+  buff[ind++] = c;
+  if (ind >= MAX_CMD_SIZE - 1)
+    sis = PS_EOL;               // Skip the rest on overflow
+}
+
+inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
+  sis = PS_NORMAL;
+  if (!ind) { thermalManager.manage_heater(); return true; }
+  buff[ind] = 0;
+  ind = 0;
+  return false;
+}
+
 /**
  * Get all commands waiting on the serial port and queue them.
  * Exit when the buffer is full or when no more characters are
@@ -316,11 +376,8 @@ FORCE_INLINE bool is_M29(const char * const cmd) {  // matches "M29" & "M29 ", b
  */
 void GCodeQueue::get_serial_commands() {
   static char serial_line_buffer[NUM_SERIAL][MAX_CMD_SIZE];
-  static bool serial_comment_mode[NUM_SERIAL] = { false }
-              #if ENABLED(PAREN_COMMENTS)
-                , serial_comment_paren_mode[NUM_SERIAL] = { false }
-              #endif
-            ;
+
+  static uint8_t serial_input_state[NUM_SERIAL] = { 0 };
 
   #if ENABLED(BINARY_FILE_TRANSFER)
     if (card.flag.binary_mode) {
@@ -350,27 +407,15 @@ void GCodeQueue::get_serial_commands() {
    */
   while (length < BUFSIZE && serial_data_available()) {
     for (uint8_t i = 0; i < NUM_SERIAL; ++i) {
-      int c;
-      if ((c = read_serial(i)) < 0) continue;
 
-      char serial_char = c;
+      const int c = read_serial(i);
+      if (c < 0) continue;
 
-      /**
-       * If the character ends the line
-       */
-      if (serial_char == '\n' || serial_char == '\r') {
-
-        // Start with comment mode off
-        serial_comment_mode[i] = false;
-        #if ENABLED(PAREN_COMMENTS)
-          serial_comment_paren_mode[i] = false;
-        #endif
+      const char serial_char = c;
 
-        // Skip empty lines and comments
-        if (!serial_count[i]) { thermalManager.manage_heater(); continue; }
+      if (serial_char == '\n' || serial_char == '\r') {
 
-        serial_line_buffer[i][serial_count[i]] = 0;       // Terminate string
-        serial_count[i] = 0;                              // Reset buffer
+        process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]);
 
         char* command = serial_line_buffer[i];
 
@@ -409,16 +454,17 @@ void GCodeQueue::get_serial_commands() {
             return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
         #endif
 
-        // Movement commands alert when stopped
+        //
+        // Movement commands give an alert when the machine is stopped
+        //
+
         if (IsStopped()) {
           char* gpos = strchr(command, 'G');
           if (gpos) {
             switch (strtol(gpos + 1, nullptr, 10)) {
-              case 0:
-              case 1:
+              case 0: case 1:
               #if ENABLED(ARC_SUPPORT)
-                case 2:
-                case 3:
+                case 2: case 3:
               #endif
               #if ENABLED(BEZIER_CURVE_SUPPORT)
                 case 5:
@@ -453,31 +499,9 @@ void GCodeQueue::get_serial_commands() {
           #endif
         );
       }
-      else if (serial_count[i] >= MAX_CMD_SIZE - 1) {
-        // Keep fetching, but ignore normal characters beyond the max length
-        // The command will be injected when EOL is reached
-      }
-      else if (serial_char == '\\') {  // Handle escapes
-        // if we have one more character, copy it over
-        if ((c = read_serial(i)) >= 0 && !serial_comment_mode[i]
-          #if ENABLED(PAREN_COMMENTS)
-            && !serial_comment_paren_mode[i]
-          #endif
-        )
-          serial_line_buffer[i][serial_count[i]++] = (char)c;
-      }
-      else { // it's not a newline, carriage return or escape char
-        if (serial_char == ';') serial_comment_mode[i] = true;
-        #if ENABLED(PAREN_COMMENTS)
-          else if (serial_char == '(') serial_comment_paren_mode[i] = true;
-          else if (serial_char == ')') serial_comment_paren_mode[i] = false;
-        #endif
-        else if (!serial_comment_mode[i]
-          #if ENABLED(PAREN_COMMENTS)
-            && ! serial_comment_paren_mode[i]
-          #endif
-        ) serial_line_buffer[i][serial_count[i]++] = serial_char;
-      }
+      else
+        process_stream_char(serial_char, serial_input_state[i], serial_line_buffer[i], serial_count[i]);
+
     } // for NUM_SERIAL
   } // queue has space, serial has data
 }
@@ -490,21 +514,17 @@ void GCodeQueue::get_serial_commands() {
    * can also interrupt buffering.
    */
   inline void GCodeQueue::get_sdcard_commands() {
-    static bool sd_comment_mode = false
-                #if ENABLED(PAREN_COMMENTS)
-                  , sd_comment_paren_mode = false
-                #endif
-              ;
+    static uint8_t sd_input_state = PS_NORMAL;
 
     if (!IS_SD_PRINTING()) return;
 
-    uint16_t sd_count = 0;
+    int sd_count = 0;
     bool card_eof = card.eof();
     while (length < BUFSIZE && !card_eof) {
       const int16_t n = card.get();
-      char sd_char = (char)n;
       card_eof = card.eof();
-      if (card_eof || n == -1 || sd_char == '\n' || sd_char == '\r') {
+      const char sd_char = (char)n;
+      if (card_eof || n < 0 || sd_char == '\n' || sd_char == '\r') {
         if (card_eof) {
 
           card.printingHasFinished();
@@ -527,19 +547,10 @@ void GCodeQueue::get_serial_commands() {
             #endif // PRINTER_EVENT_LEDS
           }
         }
-        else if (n == -1)
+        else if (n < 0)
           SERIAL_ERROR_MSG(MSG_SD_ERR_READ);
 
-        sd_comment_mode = false; // for new command
-        #if ENABLED(PAREN_COMMENTS)
-          sd_comment_paren_mode = false;
-        #endif
-
-        // Skip empty lines and comments
-        if (!sd_count) { thermalManager.manage_heater(); continue; }
-
-        command_buffer[index_w][sd_count] = '\0'; // terminate string
-        sd_count = 0; // clear sd line buffer
+        process_line_done(sd_input_state, command_buffer[index_w], sd_count);
 
         _commit_command(false);
 
@@ -547,24 +558,9 @@ void GCodeQueue::get_serial_commands() {
           recovery.cmd_sdpos = card.getIndex(); // Prime for the next _commit_command
         #endif
       }
-      else if (sd_count >= MAX_CMD_SIZE - 1) {
-        /**
-         * Keep fetching, but ignore normal characters beyond the max length
-         * The command will be injected when EOL is reached
-         */
-      }
-      else {
-        if (sd_char == ';') sd_comment_mode = true;
-        #if ENABLED(PAREN_COMMENTS)
-          else if (sd_char == '(') sd_comment_paren_mode = true;
-          else if (sd_char == ')') sd_comment_paren_mode = false;
-        #endif
-        else if (!sd_comment_mode
-          #if ENABLED(PAREN_COMMENTS)
-            && ! sd_comment_paren_mode
-          #endif
-        ) command_buffer[index_w][sd_count++] = sd_char;
-      }
+      else
+        process_stream_char(sd_char, sd_input_state, command_buffer[index_w], sd_count);
+
     }
   }
 
diff --git a/buildroot/share/tests/megaatmega1280-tests b/buildroot/share/tests/megaatmega1280-tests
index 05e262f6e73f..4e5ad253552f 100644
--- a/buildroot/share/tests/megaatmega1280-tests
+++ b/buildroot/share/tests/megaatmega1280-tests
@@ -19,7 +19,7 @@ restore_configs
 opt_set LCD_LANGUAGE an
 opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
            MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
-           G26_MESH_VALIDATION MESH_EDIT_MENU
+           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
 exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
 
 

From fa4a6cdb5c05abc812a9dce5f20956c0dd42386a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Feb 2020 16:33:21 -0600
Subject: [PATCH 166/565] Fix out-of-order M0 after SD printing

Fixes #14774

Co-Authored-By: tol2cj <tol2cj@users.noreply.github.com>
---
 Marlin/src/gcode/queue.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index b83a211967f7..c01a92ab10c3 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -536,7 +536,7 @@ void GCodeQueue::get_serial_commands() {
             #if ENABLED(PRINTER_EVENT_LEDS)
               printerEventLEDs.onPrintCompleted();
               #if HAS_RESUME_CONTINUE
-                inject_P(PSTR("M0 Q S"
+                enqueue_now_P(PSTR("M0 Q S"
                   #if HAS_LCD_MENU
                     "1800"
                   #else
@@ -544,7 +544,7 @@ void GCodeQueue::get_serial_commands() {
                   #endif
                 ));
               #endif
-            #endif // PRINTER_EVENT_LEDS
+            #endif
           }
         }
         else if (n < 0)

From 3f87f912c5b78a08b17dca07840333c882ceada2 Mon Sep 17 00:00:00 2001
From: proferabg <proferabg@users.noreply.github.com>
Date: Mon, 10 Feb 2020 17:48:22 -0500
Subject: [PATCH 167/565] Enable hotend / bed PID separately in ExtUI (#16827)

---
 Marlin/src/lcd/extensible_ui/ui_api.cpp | 33 ++++++++++++++++---------
 Marlin/src/lcd/extensible_ui/ui_api.h   |  9 ++++---
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 21c99d94a6ec..31d195c95de4 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -894,42 +894,51 @@ namespace ExtUI {
 
   float getFeedrate_percent() { return feedrate_percentage; }
 
-  #if HAS_PID_HEATING
+  #if ENABLED(PIDTEMP)
     float getPIDValues_Kp(const extruder_t tool) {
       return PID_PARAM(Kp, tool);
     }
+    
     float getPIDValues_Ki(const extruder_t tool) {
       return unscalePID_i(PID_PARAM(Ki, tool));
     }
+    
     float getPIDValues_Kd(const extruder_t tool) {
       return unscalePID_d(PID_PARAM(Kd, tool));
     }
+
+    void setPIDValues(const float p, const float i, const float d, extruder_t tool) {
+      thermalManager.temp_hotend[tool].pid.Kp = p;
+      thermalManager.temp_hotend[tool].pid.Ki = scalePID_i(i);
+      thermalManager.temp_hotend[tool].pid.Kd = scalePID_d(d);
+      thermalManager.updatePID();
+    }
+
+    void startPIDTune(const float temp, extruder_t tool){
+      thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
+    }
+  #endif
+  
+  #if ENABLED(PIDTEMPBED)
     float getBedPIDValues_Kp() {
       return thermalManager.temp_bed.pid.Kp;
     }
+    
     float getBedPIDValues_Ki() {
       return unscalePID_i(thermalManager.temp_bed.pid.Ki);
     }
+    
     float getBedPIDValues_Kd() {
       return unscalePID_d(thermalManager.temp_bed.pid.Kd);
     }
-
-    void setPIDValues(const float p, const float i, const float d, extruder_t tool) {
-      thermalManager.temp_hotend[tool].pid.Kp = p;
-      thermalManager.temp_hotend[tool].pid.Ki = scalePID_i(i);
-      thermalManager.temp_hotend[tool].pid.Kd = scalePID_d(d);
-      thermalManager.updatePID();
-    }
+    
     void setBedPIDValues(const float p, const float i, const float d) {
       thermalManager.temp_bed.pid.Kp = p;
       thermalManager.temp_bed.pid.Ki = scalePID_i(i);
       thermalManager.temp_bed.pid.Kd = scalePID_d(d);
       thermalManager.updatePID();
     }
-
-    void startPIDTune(const float temp, extruder_t tool){
-      thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
-    }
+    
     void startBedPIDTune(const float temp) {
       thermalManager.PID_autotune(temp, H_BED, 4, true);
     }
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h
index 4f88b4606e14..d99cfcedb4f6 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extensible_ui/ui_api.h
@@ -249,16 +249,19 @@ namespace ExtUI {
     #endif
   #endif
 
-  #if HAS_PID_HEATING
+  #if ENABLED(PIDTEMP)
     float getPIDValues_Kp(const extruder_t);
     float getPIDValues_Ki(const extruder_t);
     float getPIDValues_Kd(const extruder_t);
+    void setPIDValues(const float, const float, const float, extruder_t);
+    void startPIDTune(const float, extruder_t);
+  #endif
+  
+  #if ENABLED(PIDTEMPBED)
     float getBedPIDValues_Kp();
     float getBedPIDValues_Ki();
     float getBedPIDValues_Kd();
-    void setPIDValues(const float, const float, const float, extruder_t);
     void setBedPIDValues(const float, const float, const float);
-    void startPIDTune(const float, extruder_t);
     void startBedPIDTune(const float);
   #endif
 

From d8b2726fd3248c90da719b2ec1bf87eb0bb5aadd Mon Sep 17 00:00:00 2001
From: darksiah <siatam@gmail.com>
Date: Mon, 10 Feb 2020 19:49:36 -0300
Subject: [PATCH 168/565] Fix MKS Robin Nano platformio.ini entry (#16826)

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 2e57e7d773fa..db8f5dd6b7d7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -489,7 +489,7 @@ build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
-lib_deps =
+lib_deps = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
 

From 2836834d7ef2043ccd80b8a76560c21f2eb8fe74 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:58:21 -0600
Subject: [PATCH 169/565] Unify step pulse timing of ISR / babystep (#16813)

---
 Marlin/src/module/stepper.cpp | 160 ++++++++++++++++------------------
 1 file changed, 73 insertions(+), 87 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index c739abe26a42..a4a457c0a78a 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -402,6 +402,7 @@ constexpr uint32_t NS_TO_PULSE_TIMER_TICKS(uint32_t NS) { return (NS + (NS_PER_P
 #define PULSE_HIGH_TICK_COUNT hal_timer_t(NS_TO_PULSE_TIMER_TICKS(_MIN_PULSE_HIGH_NS - _MIN(_MIN_PULSE_HIGH_NS, TIMER_SETUP_NS)))
 #define PULSE_LOW_TICK_COUNT hal_timer_t(NS_TO_PULSE_TIMER_TICKS(_MIN_PULSE_LOW_NS - _MIN(_MIN_PULSE_LOW_NS, TIMER_SETUP_NS)))
 
+#define USING_TIMED_PULSE() hal_timer_t end_tick_count = 0
 #define START_TIMED_PULSE(DIR) (end_tick_count = HAL_timer_get_count(PULSE_TIMER_NUM) + PULSE_##DIR##_TICK_COUNT)
 #define AWAIT_TIMED_PULSE() while (HAL_timer_get_count(PULSE_TIMER_NUM) < end_tick_count) { }
 #define START_HIGH_PULSE()  START_TIMED_PULSE(HIGH)
@@ -409,6 +410,18 @@ constexpr uint32_t NS_TO_PULSE_TIMER_TICKS(uint32_t NS) { return (NS + (NS_PER_P
 #define AWAIT_HIGH_PULSE()  AWAIT_TIMED_PULSE()
 #define AWAIT_LOW_PULSE()   AWAIT_TIMED_PULSE()
 
+#if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
+  #define DIR_WAIT_BEFORE() DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY)
+#else
+  #define DIR_WAIT_BEFORE()
+#endif
+
+#if MINIMUM_STEPPER_POST_DIR_DELAY > 0
+  #define DIR_WAIT_AFTER() DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY)
+#else
+  #define DIR_WAIT_AFTER()
+#endif
+
 void Stepper::wake_up() {
   // TCNT1 = 0;
   ENABLE_STEPPER_DRIVER_INTERRUPT();
@@ -423,9 +436,7 @@ void Stepper::wake_up() {
  */
 void Stepper::set_directions() {
 
-  #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
-    DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
-  #endif
+  DIR_WAIT_BEFORE();
 
   #define SET_STEP_DIR(A)                       \
     if (motor_direction(_AXIS(A))) {            \
@@ -494,10 +505,7 @@ void Stepper::set_directions() {
     }
   #endif
 
-  // A small delay may be needed after changing direction
-  #if MINIMUM_STEPPER_POST_DIR_DELAY > 0
-    DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);
-  #endif
+  DIR_WAIT_AFTER();
 }
 
 #if ENABLED(S_CURVE_ACCELERATION)
@@ -1488,12 +1496,12 @@ void Stepper::stepper_pulse_phase_isr() {
   // Take multiple steps per interrupt (For high speed moves)
   #if ISR_MULTI_STEPS
     bool firstStep = true;
-    hal_timer_t end_tick_count = 0;
+    USING_TIMED_PULSE();
   #endif
   xyze_bool_t step_needed{0};
 
   do {
-    #define _APPLY_STEP(AXIS) AXIS ##_APPLY_STEP
+    #define _APPLY_STEP(AXIS, INV, ALWAYS) AXIS ##_APPLY_STEP(INV, ALWAYS)
     #define _INVERT_STEP_PIN(AXIS) INVERT_## AXIS ##_STEP_PIN
 
     // Determine if a pulse is needed using Bresenham
@@ -1509,14 +1517,14 @@ void Stepper::stepper_pulse_phase_isr() {
     // Start an active pulse, if Bresenham says so, and update position
     #define PULSE_START(AXIS) do{ \
       if (step_needed[_AXIS(AXIS)]) { \
-        _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), 0); \
+        _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), 0); \
       } \
     }while(0)
 
     // Stop an active pulse, if any, and adjust error term
     #define PULSE_STOP(AXIS) do { \
       if (step_needed[_AXIS(AXIS)]) { \
-        _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS), 0); \
+        _APPLY_STEP(AXIS, _INVERT_STEP_PIN(AXIS), 0); \
       } \
     }while(0)
 
@@ -1978,9 +1986,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
     else
       interval = LA_ADV_NEVER;
 
-    #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
-      DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
-    #endif
+    DIR_WAIT_BEFORE();
 
     #if ENABLED(MIXING_EXTRUDER)
       // We don't know which steppers will be stepped because LA loop follows,
@@ -1996,17 +2002,14 @@ uint32_t Stepper::stepper_block_phase_isr() {
         REV_E_DIR(stepper_extruder);
     #endif
 
-    // A small delay may be needed after changing direction
-    #if MINIMUM_STEPPER_POST_DIR_DELAY > 0
-      DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);
-    #endif
+    DIR_WAIT_AFTER();
 
     //const hal_timer_t added_step_ticks = hal_timer_t(ADDED_STEP_TICKS);
 
     // Step E stepper if we have steps
     #if ISR_MULTI_STEPS
       bool firstStep = true;
-      hal_timer_t end_tick_count = 0;
+      USING_TIMED_PULSE();
     #endif
 
     while (LA_steps) {
@@ -2424,57 +2427,52 @@ void Stepper::report_positions() {
 
 #if ENABLED(BABYSTEPPING)
 
-  #if MINIMUM_STEPPER_PULSE
-    #define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
-  #else
-    #define STEP_PULSE_CYCLES 0
-  #endif
-
-  #if ENABLED(DELTA)
-    #define CYCLES_EATEN_BABYSTEP (2 * 15)
-  #else
-    #define CYCLES_EATEN_BABYSTEP 0
-  #endif
-  #define EXTRA_CYCLES_BABYSTEP (STEP_PULSE_CYCLES - (CYCLES_EATEN_BABYSTEP))
-
   #define _ENABLE_AXIS(AXIS) ENABLE_AXIS_## AXIS()
   #define _READ_DIR(AXIS) AXIS ##_DIR_READ()
   #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
   #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
 
-  #if EXTRA_CYCLES_BABYSTEP > 20
-    #define _SAVE_START const hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM)
-    #define _PULSE_WAIT while (EXTRA_CYCLES_BABYSTEP > (uint32_t)(HAL_timer_get_count(PULSE_TIMER_NUM) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
-  #else
-    #define _SAVE_START NOOP
-    #if EXTRA_CYCLES_BABYSTEP > 0
-      #define _PULSE_WAIT DELAY_NS(EXTRA_CYCLES_BABYSTEP * NANOSECONDS_PER_CYCLE)
-    #elif ENABLED(DELTA)
-      #define _PULSE_WAIT DELAY_US(2);
-    #elif STEP_PULSE_CYCLES > 0
-      #define _PULSE_WAIT NOOP
-    #else
-      #define _PULSE_WAIT DELAY_US(4);
-    #endif
-  #endif
-
-  #define BABYSTEP_AXIS(AXIS, INVERT, DIR) {            \
+  #if DISABLED(DELTA)
+    #define BABYSTEP_AXIS(AXIS, INV, DIR) do{           \
       const uint8_t old_dir = _READ_DIR(AXIS);          \
       _ENABLE_AXIS(AXIS);                               \
-      DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);          \
-      _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT);   \
-      DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);         \
-      _SAVE_START;                                      \
-      _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
-      _PULSE_WAIT;                                      \
-      _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS), true);  \
+      DIR_WAIT_BEFORE();                                \
+      _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INV);      \
+      DIR_WAIT_AFTER();                                 \
+      USING_TIMED_PULSE();                              \
+      START_HIGH_PULSE();                               \
+      _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), true); \
+      AWAIT_HIGH_PULSE();                               \
+      _APPLY_STEP(AXIS,  _INVERT_STEP_PIN(AXIS), true); \
       _APPLY_DIR(AXIS, old_dir);                        \
-    }
+    }while(0)
+  #endif
+
+  #if IS_CORE
+    #define BABYSTEP_CORE(A, B, INV, DIR) do{     \
+      const xy_byte_t old_dir = { _READ_DIR(A), _READ_DIR(B) }; \
+      _ENABLE_AXIS(A); _ENABLE_AXIS(B);           \
+      DIR_WAIT_BEFORE();                          \
+      _APPLY_DIR(A, _INVERT_DIR(A)^DIR^INV);      \
+      _APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^(CORESIGN(1)<0)); \
+      DIR_WAIT_AFTER();                           \
+      USING_TIMED_PULSE();                        \
+      START_HIGH_PULSE();                         \
+      _APPLY_STEP(A, !_INVERT_STEP_PIN(A), true); \
+      _APPLY_STEP(B, !_INVERT_STEP_PIN(B), true); \
+      AWAIT_HIGH_PULSE();                         \
+      _APPLY_STEP(A,  _INVERT_STEP_PIN(A), true); \
+      _APPLY_STEP(B,  _INVERT_STEP_PIN(B), true); \
+      _APPLY_DIR(A, old_dir.a); _APPLY_DIR(B, old_dir.b); \
+    }while(0)
+  #endif
 
   // MUST ONLY BE CALLED BY AN ISR,
   // No other ISR should ever interrupt this!
   void Stepper::babystep(const AxisEnum axis, const bool direction) {
-    cli();
+    DISABLE_ISRS();
+
+    USING_TIMED_PULSE();
 
     switch (axis) {
 
@@ -2482,11 +2480,9 @@ void Stepper::report_positions() {
 
         case X_AXIS:
           #if CORE_IS_XY
-            BABYSTEP_AXIS(X, false, direction);
-            BABYSTEP_AXIS(Y, false, direction);
+            BABYSTEP_CORE(X, Y, false, direction);
           #elif CORE_IS_XZ
-            BABYSTEP_AXIS(X, false, direction);
-            BABYSTEP_AXIS(Z, false, direction);
+            BABYSTEP_CORE(X, Z, false, direction);
           #else
             BABYSTEP_AXIS(X, false, direction);
           #endif
@@ -2494,11 +2490,9 @@ void Stepper::report_positions() {
 
         case Y_AXIS:
           #if CORE_IS_XY
-            BABYSTEP_AXIS(X, false, direction);
-            BABYSTEP_AXIS(Y, false, direction^(CORESIGN(1)<0));
+            BABYSTEP_CORE(X, Y, false, direction);
           #elif CORE_IS_YZ
-            BABYSTEP_AXIS(Y, false, direction);
-            BABYSTEP_AXIS(Z, false, direction^(CORESIGN(1)<0));
+            BABYSTEP_CORE(Y, Z, false, direction);
           #else
             BABYSTEP_AXIS(Y, false, direction);
           #endif
@@ -2509,13 +2503,9 @@ void Stepper::report_positions() {
       case Z_AXIS: {
 
         #if CORE_IS_XZ
-          BABYSTEP_AXIS(X, BABYSTEP_INVERT_Z, direction);
-          BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction^(CORESIGN(1)<0));
-
+          BABYSTEP_CORE(X, Z, BABYSTEP_INVERT_Z, direction);
         #elif CORE_IS_YZ
-          BABYSTEP_AXIS(Y, BABYSTEP_INVERT_Z, direction);
-          BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction^(CORESIGN(1)<0));
-
+          BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction);
         #elif DISABLED(DELTA)
           BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction);
 
@@ -2527,38 +2517,32 @@ void Stepper::report_positions() {
           ENABLE_AXIS_Y();
           ENABLE_AXIS_Z();
 
-          #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
-            DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);
-          #endif
+          DIR_WAIT_BEFORE();
 
-          const uint8_t old_x_dir_pin = X_DIR_READ(),
-                        old_y_dir_pin = Y_DIR_READ(),
-                        old_z_dir_pin = Z_DIR_READ();
+          const xyz_byte_t old_dir = { X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ() };
 
           X_DIR_WRITE(INVERT_X_DIR ^ z_direction);
           Y_DIR_WRITE(INVERT_Y_DIR ^ z_direction);
           Z_DIR_WRITE(INVERT_Z_DIR ^ z_direction);
 
-          #if MINIMUM_STEPPER_POST_DIR_DELAY > 0
-            DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);
-          #endif
+          DIR_WAIT_AFTER();
 
-          _SAVE_START;
+          START_HIGH_PULSE();
 
           X_STEP_WRITE(!INVERT_X_STEP_PIN);
           Y_STEP_WRITE(!INVERT_Y_STEP_PIN);
           Z_STEP_WRITE(!INVERT_Z_STEP_PIN);
 
-          _PULSE_WAIT;
+          AWAIT_HIGH_PULSE();
 
           X_STEP_WRITE(INVERT_X_STEP_PIN);
           Y_STEP_WRITE(INVERT_Y_STEP_PIN);
           Z_STEP_WRITE(INVERT_Z_STEP_PIN);
 
           // Restore direction bits
-          X_DIR_WRITE(old_x_dir_pin);
-          Y_DIR_WRITE(old_y_dir_pin);
-          Z_DIR_WRITE(old_z_dir_pin);
+          X_DIR_WRITE(old_dir.x);
+          Y_DIR_WRITE(old_dir.y);
+          Z_DIR_WRITE(old_dir.z);
 
         #endif
 
@@ -2566,7 +2550,9 @@ void Stepper::report_positions() {
 
       default: break;
     }
-    sei();
+
+    START_LOW_PULSE(); AWAIT_LOW_PULSE();  // Prevent Stepper::ISR pulsing too soon
+    ENABLE_ISRS();                         // Now it's ok for the ISR to run
   }
 
 #endif // BABYSTEPPING

From b26f7fca3fb085a502195319e04101b38d61dba1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 11 Feb 2020 00:04:03 +0000
Subject: [PATCH 170/565] [cron] Bump distribution date (2020-02-11)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fe72b696404c..1d263f0eeaee 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-10"
+  #define STRING_DISTRIBUTION_DATE "2020-02-11"
 #endif
 
 /**

From d5790e09a5cff1a4088e7d6828b7a02175539f63 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 11 Feb 2020 09:05:58 +0100
Subject: [PATCH 171/565] Update SAMD51 EEPROM repo link (#16832)

---
 Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
index d0bc2275bf6c..ddea64f2d01f 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
@@ -44,7 +44,7 @@
 #endif
 
 #if ENABLED(EEPROM_SETTINGS) && NONE(SPI_EEPROM, I2C_EEPROM)
-  #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Activator"
+  #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
 #endif
 
 #if HAS_TMC_SW_SERIAL

From 71539bcbeb68284663d0627207ffd5a9a377e920 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 11 Feb 2020 02:29:47 -0600
Subject: [PATCH 172/565] Undo driver type auto-assignment for now

Good general concept but needs more time to develop and group with a stepper suite.
---
 Marlin/Configuration.h |  5 +++++
 Marlin/src/pins/pins.h | 22 ----------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 0a9df1feca0a..fd3687a7fc45 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -674,6 +674,11 @@
 //#define X_DRIVER_TYPE  A4988
 //#define Y_DRIVER_TYPE  A4988
 //#define Z_DRIVER_TYPE  A4988
+//#define X2_DRIVER_TYPE A4988
+//#define Y2_DRIVER_TYPE A4988
+//#define Z2_DRIVER_TYPE A4988
+//#define Z3_DRIVER_TYPE A4988
+//#define Z4_DRIVER_TYPE A4988
 //#define E0_DRIVER_TYPE A4988
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index e05bfeed0498..941b21bbbf87 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -1189,18 +1189,12 @@
 #define _PEXI(p,q) __PEXI(p,q)
 #define __EPIN(p,q) E##p##_##q##_PIN
 #define _EPIN(p,q) __EPIN(p,q)
-#define __EDRV(p) E##p##_DRIVER_TYPE
-#define _EDRV(p) __EDRV(p)
 #define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
 
 // The X2 axis, if any, should be the next open extruder port
 #define X2_E_INDEX E_STEPPERS
 
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
-  #ifndef X2_DRIVER_TYPE
-    #define X2_DRIVER_TYPE _EDRV(X2_E_INDEX)
-  #endif
-
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
     #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)
@@ -1274,10 +1268,6 @@
 
 // The Y2 axis, if any, should be the next open extruder port
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
-  #ifndef Y2_DRIVER_TYPE
-    #define Y2_DRIVER_TYPE _EDRV(Y2_E_INDEX)
-  #endif
-
   #ifndef Y2_STEP_PIN
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
     #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
@@ -1346,10 +1336,6 @@
 
 // The Z2 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 2
-  #ifndef Z2_DRIVER_TYPE
-    #define Z2_DRIVER_TYPE _EDRV(Z2_E_INDEX)
-  #endif
-
   #ifndef Z2_STEP_PIN
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
     #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
@@ -1417,10 +1403,6 @@
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 3
-  #ifndef Z3_DRIVER_TYPE
-    #define Z3_DRIVER_TYPE _EDRV(Z3_E_INDEX)
-  #endif
-
   #ifndef Z3_STEP_PIN
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
     #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
@@ -1488,10 +1470,6 @@
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 4
-  #ifndef Z4_DRIVER_TYPE
-    #define Z4_DRIVER_TYPE _EDRV(Z4_E_INDEX)
-  #endif
-
   #ifndef Z4_STEP_PIN
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
     #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)

From e442663e2aaaa5f71d16c947b3ace277ab80fbea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 11 Feb 2020 04:15:10 -0600
Subject: [PATCH 173/565] No Z sensorless req'd if homing with probe

Fixes #16674
---
 Marlin/src/inc/SanityCheck.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4c1dd38471a7..d14551c4b4a1 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2239,11 +2239,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 
 // Sensorless homing is required for both combined steppers in an H-bot
 #if CORE_IS_XY && X_SENSORLESS != Y_SENSORLESS
-  #error "CoreXY requires both X and Y to use sensorless homing if either does."
-#elif CORE_IS_XZ && X_SENSORLESS != Z_SENSORLESS
-  #error "CoreXZ requires both X and Z to use sensorless homing if either does."
-#elif CORE_IS_YZ && Y_SENSORLESS != Z_SENSORLESS
-  #error "CoreYZ requires both Y and Z to use sensorless homing if either does."
+  #error "CoreXY requires both X and Y to use sensorless homing if either one does."
+#elif CORE_IS_XZ && X_SENSORLESS != Z_SENSORLESS && !HOMING_Z_WITH_PROBE
+  #error "CoreXZ requires both X and Z to use sensorless homing if either one does."
+#elif CORE_IS_YZ && Y_SENSORLESS != Z_SENSORLESS && !HOMING_Z_WITH_PROBE
+  #error "CoreYZ requires both Y and Z to use sensorless homing if either one does."
 #endif
 
 // Other TMC feature requirements

From 1c556cd90dc2ee5d8643bbe9bfbe363b8bf57d0e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 11 Feb 2020 07:40:07 -0600
Subject: [PATCH 174/565] Recommend Z Safe Homing

Co-Authored-By: Vertabreaker <opyrus@hotmail.com>
---
 Marlin/src/inc/SanityCheck.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index d14551c4b4a1..a94300d45e84 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1227,6 +1227,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "Z_PROBE_LOW_POINT must be less than or equal to 0."
   #endif
 
+  #if HOMING_Z_WITH_PROBE && DISABLED(Z_SAFE_HOMING)
+    #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue."
+  #endif
+
 #else
 
   /**

From 189c101793c72780fdff2b8cd693d4a53040a0e8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 11 Feb 2020 08:52:11 -0600
Subject: [PATCH 175/565] Use prior babystep delay method (#16833)

---
 Marlin/src/module/stepper.cpp | 85 +++++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index a4a457c0a78a..bc08e3537747 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2432,47 +2432,78 @@ void Stepper::report_positions() {
   #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
   #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
 
+  #if MINIMUM_STEPPER_PULSE
+    #define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
+  #else
+    #define STEP_PULSE_CYCLES 0
+  #endif
+
+  #if ENABLED(DELTA)
+    #define CYCLES_EATEN_BABYSTEP (2 * 15)
+  #else
+    #define CYCLES_EATEN_BABYSTEP 0
+  #endif
+  #define EXTRA_CYCLES_BABYSTEP (STEP_PULSE_CYCLES - (CYCLES_EATEN_BABYSTEP))
+
+  #if EXTRA_CYCLES_BABYSTEP > 20
+    #define _SAVE_START() const hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM)
+    #define _PULSE_WAIT() while (EXTRA_CYCLES_BABYSTEP > (uint32_t)(HAL_timer_get_count(PULSE_TIMER_NUM) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
+  #else
+    #define _SAVE_START() NOOP
+    #if EXTRA_CYCLES_BABYSTEP > 0
+      #define _PULSE_WAIT() DELAY_NS(EXTRA_CYCLES_BABYSTEP * NANOSECONDS_PER_CYCLE)
+    #elif ENABLED(DELTA)
+      #define _PULSE_WAIT() DELAY_US(2);
+    #elif STEP_PULSE_CYCLES > 0
+      #define _PULSE_WAIT() NOOP
+    #else
+      #define _PULSE_WAIT() DELAY_US(4);
+    #endif
+  #endif
+
   #if DISABLED(DELTA)
+
     #define BABYSTEP_AXIS(AXIS, INV, DIR) do{           \
       const uint8_t old_dir = _READ_DIR(AXIS);          \
       _ENABLE_AXIS(AXIS);                               \
       DIR_WAIT_BEFORE();                                \
       _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INV);      \
       DIR_WAIT_AFTER();                                 \
-      USING_TIMED_PULSE();                              \
-      START_HIGH_PULSE();                               \
+      _SAVE_START();                                    \
       _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), true); \
-      AWAIT_HIGH_PULSE();                               \
-      _APPLY_STEP(AXIS,  _INVERT_STEP_PIN(AXIS), true); \
+      _PULSE_WAIT();                                    \
+      _APPLY_STEP(AXIS, _INVERT_STEP_PIN(AXIS), true);  \
+      DIR_WAIT_BEFORE();                                \
       _APPLY_DIR(AXIS, old_dir);                        \
+      DIR_WAIT_AFTER();                                 \
     }while(0)
-  #endif
 
-  #if IS_CORE
-    #define BABYSTEP_CORE(A, B, INV, DIR) do{     \
+  #elif IS_CORE
+
+    #define BABYSTEP_CORE(A, B, INV, DIR) do{                   \
       const xy_byte_t old_dir = { _READ_DIR(A), _READ_DIR(B) }; \
-      _ENABLE_AXIS(A); _ENABLE_AXIS(B);           \
-      DIR_WAIT_BEFORE();                          \
-      _APPLY_DIR(A, _INVERT_DIR(A)^DIR^INV);      \
-      _APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^(CORESIGN(1)<0)); \
-      DIR_WAIT_AFTER();                           \
-      USING_TIMED_PULSE();                        \
-      START_HIGH_PULSE();                         \
-      _APPLY_STEP(A, !_INVERT_STEP_PIN(A), true); \
-      _APPLY_STEP(B, !_INVERT_STEP_PIN(B), true); \
-      AWAIT_HIGH_PULSE();                         \
-      _APPLY_STEP(A,  _INVERT_STEP_PIN(A), true); \
-      _APPLY_STEP(B,  _INVERT_STEP_PIN(B), true); \
-      _APPLY_DIR(A, old_dir.a); _APPLY_DIR(B, old_dir.b); \
+      _ENABLE_AXIS(A); _ENABLE_AXIS(B);                         \
+      DIR_WAIT_BEFORE();                                        \
+      _APPLY_DIR(A, _INVERT_DIR(A)^DIR^INV);                    \
+      _APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^(CORESIGN(1)<0));    \
+      DIR_WAIT_AFTER();                                         \
+      _SAVE_START();                                            \
+      _APPLY_STEP(A, !_INVERT_STEP_PIN(A), true);               \
+      _APPLY_STEP(B, !_INVERT_STEP_PIN(B), true);               \
+      _PULSE_WAIT();                                            \
+      _APPLY_STEP(A, _INVERT_STEP_PIN(A), true);                \
+      _APPLY_STEP(B, _INVERT_STEP_PIN(B), true);                \
+      DIR_WAIT_BEFORE();                                        \
+      _APPLY_DIR(A, old_dir.a); _APPLY_DIR(B, old_dir.b);       \
+      DIR_WAIT_AFTER();                                         \
     }while(0)
+
   #endif
 
   // MUST ONLY BE CALLED BY AN ISR,
   // No other ISR should ever interrupt this!
   void Stepper::babystep(const AxisEnum axis, const bool direction) {
-    DISABLE_ISRS();
-
-    USING_TIMED_PULSE();
+    cli();
 
     switch (axis) {
 
@@ -2527,13 +2558,13 @@ void Stepper::report_positions() {
 
           DIR_WAIT_AFTER();
 
-          START_HIGH_PULSE();
+          _SAVE_START();
 
           X_STEP_WRITE(!INVERT_X_STEP_PIN);
           Y_STEP_WRITE(!INVERT_Y_STEP_PIN);
           Z_STEP_WRITE(!INVERT_Z_STEP_PIN);
 
-          AWAIT_HIGH_PULSE();
+          _PULSE_WAIT();
 
           X_STEP_WRITE(INVERT_X_STEP_PIN);
           Y_STEP_WRITE(INVERT_Y_STEP_PIN);
@@ -2550,9 +2581,7 @@ void Stepper::report_positions() {
 
       default: break;
     }
-
-    START_LOW_PULSE(); AWAIT_LOW_PULSE();  // Prevent Stepper::ISR pulsing too soon
-    ENABLE_ISRS();                         // Now it's ok for the ISR to run
+    sei();
   }
 
 #endif // BABYSTEPPING

From 7b02a62da82034e9c1e2a6098f1bca39e06811a5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 11 Feb 2020 09:05:45 -0600
Subject: [PATCH 176/565] Fix up tests

---
 Marlin/src/inc/Conditionals_LCD.h          | 2 +-
 buildroot/share/tests/DUE-tests            | 3 ++-
 buildroot/share/tests/LPC1769-tests        | 2 +-
 buildroot/share/tests/megaatmega2560-tests | 6 +++---
 buildroot/share/tests/teensy35-tests       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7f387914d362..67130d21e45f 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -490,7 +490,7 @@
 #endif
 
 /**
- * Set a flag for a servo probe
+ * Set a flag for a servo probe (or BLTouch)
  */
 #define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
 
diff --git a/buildroot/share/tests/DUE-tests b/buildroot/share/tests/DUE-tests
index e3ef7d453495..cfce93a92eeb 100755
--- a/buildroot/share/tests/DUE-tests
+++ b/buildroot/share/tests/DUE-tests
@@ -37,7 +37,8 @@ exec_test $1 $2 "RAMPS4DUE_EFB with ABL (Bilinear), EXTENSIBLE_UI, S-Curve, many
 restore_configs
 opt_set MOTHERBOARD BOARD_RADDS
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
-           Z_MULTI_ENDSTOPS Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
+           Z_MULTI_ENDSTOPS Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS \
+           Z_SAFE_HOMING
            #TOUCH_UI_FTDI_EVE LCD_ALEPHOBJECTS_CLCD_UI OTHER_PIN_LAYOUT
 opt_set NUM_Z_STEPPER_DRIVERS 3
 opt_add Z2_MAX_ENDSTOP_INVERTING false
diff --git a/buildroot/share/tests/LPC1769-tests b/buildroot/share/tests/LPC1769-tests
index 6b7ef9725f3c..0cdb2f313b55 100755
--- a/buildroot/share/tests/LPC1769-tests
+++ b/buildroot/share/tests/LPC1769-tests
@@ -49,7 +49,7 @@ opt_set Y_DRIVER_TYPE TMC2130
 opt_set Z_DRIVER_TYPE TMC2130
 opt_enable AUTO_BED_LEVELING_BILINEAR EEPROM_SETTINGS EEPROM_CHITCHAT \
            TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z HYBRID_THRESHOLD \
-           SENSORLESS_PROBING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY TMC_DEBUG
+           SENSORLESS_PROBING Z_SAFE_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY TMC_DEBUG
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN PSU_CONTROL
 exec_test $1 $2 "Cohesion3D Remix DELTA + ABL Bilinear + EEPROM + SENSORLESS_PROBING"
 
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests
index 039e023e314b..9509806d1a1a 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/megaatmega2560-tests
@@ -108,7 +108,7 @@ opt_set NUM_SERVOS 1
 opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
            NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
-           PRUSA_MMU2 MMU2_MENUS NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
+           PRUSA_MMU2 MMU2_MENUS NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE Z_SAFE_HOMING
 exec_test $1 $2 "RAMPS | ZONESTAR_LCD | MMU2 | Servo Probe | ABL 3-Pt | Debug Leveling | EEPROM | G38 ..."
 
 #
@@ -182,7 +182,7 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
            REPRAP_DISCOUNT_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
            ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE FILAMENT_WIDTH_SENSOR \
-           SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
+           Z_SAFE_HOMING SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT ADVANCED_OK M114_DETAIL \
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT
 opt_set FAN_MIN_PWM 50
@@ -345,7 +345,7 @@ exec_test $1 $2 "RAMPS 1.3 | DELTA | FLSUN AC Config"
 use_example_configs SCARA/Morgan
 opt_set LCD_LANGUAGE es
 opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
-           MKS_12864OLED EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
+           MKS_12864OLED EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
            STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
 opt_set X_MAX_ENDSTOP_INVERTING false
 opt_set X_DRIVER_TYPE TMC2209
diff --git a/buildroot/share/tests/teensy35-tests b/buildroot/share/tests/teensy35-tests
index e367e7ca4728..f2a098e7cd1c 100755
--- a/buildroot/share/tests/teensy35-tests
+++ b/buildroot/share/tests/teensy35-tests
@@ -36,7 +36,7 @@ exec_test $1 $2 "Teensy3.5 with many features"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY35_36
-opt_enable EEPROM_SETTINGS Z_PROBE_SLED AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE GCODE_MACROS
+opt_enable EEPROM_SETTINGS Z_PROBE_SLED Z_SAFE_HOMING AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE GCODE_MACROS
 exec_test $1 $2 "Sled Z Probe with Linear leveling"
 
 #

From fa6e7cb733d07bc3f387987ea3f44ec75986eb0c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 11 Feb 2020 01:13:02 -0600
Subject: [PATCH 177/565] Function-style critical section macros

---
 Marlin/src/HAL/HAL_AVR/HAL.h                |  4 ++--
 Marlin/src/HAL/HAL_DUE/HAL.h                |  4 ++--
 Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp |  8 ++++----
 Marlin/src/HAL/HAL_ESP32/HAL.h              |  4 ++--
 Marlin/src/HAL/HAL_LINUX/HAL.h              |  4 ++--
 Marlin/src/HAL/HAL_LPC1768/HAL.h            |  4 ++--
 Marlin/src/HAL/HAL_SAMD51/HAL.h             |  4 ++--
 Marlin/src/HAL/HAL_STM32/HAL.h              |  4 ++--
 Marlin/src/HAL/HAL_STM32F1/HAL.h            |  4 ++--
 Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h        |  4 ++--
 Marlin/src/HAL/HAL_TEENSY31_32/HAL.h        |  4 ++--
 Marlin/src/HAL/HAL_TEENSY35_36/HAL.h        |  4 ++--
 Marlin/src/HAL/shared/servo.cpp             |  4 ++--
 Marlin/src/feature/Max7219_Debug_LEDs.cpp   | 20 ++++++++++----------
 Marlin/src/libs/buzzer.cpp                  |  8 ++++----
 15 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Marlin/src/HAL/HAL_AVR/HAL.h b/Marlin/src/HAL/HAL_AVR/HAL.h
index ccbeec941ddd..025516981955 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.h
+++ b/Marlin/src/HAL/HAL_AVR/HAL.h
@@ -53,8 +53,8 @@
 //#define analogInputToDigitalPin(IO) IO
 
 #ifndef CRITICAL_SECTION_START
-  #define CRITICAL_SECTION_START  unsigned char _sreg = SREG; cli()
-  #define CRITICAL_SECTION_END    SREG = _sreg
+  #define CRITICAL_SECTION_START()  unsigned char _sreg = SREG; cli()
+  #define CRITICAL_SECTION_END()    SREG = _sreg
 #endif
 #define ISRS_ENABLED() TEST(SREG, SREG_I)
 #define ENABLE_ISRS()  sei()
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/HAL_DUE/HAL.h
index ed9b1f3894f4..97b94b5db234 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.h
+++ b/Marlin/src/HAL/HAL_DUE/HAL.h
@@ -119,8 +119,8 @@ typedef int8_t pin_t;
 //
 // Interrupts
 //
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_PRIMASK())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp b/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
index cf523cfe3b45..7964f2d1f680 100644
--- a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
+++ b/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
@@ -63,13 +63,13 @@ static pfnISR_Handler* get_relocated_table_addr() {
   memcpy(&ram_tab, romtab, sizeof(ram_tab));
 
   // Disable global interrupts
-  CRITICAL_SECTION_START;
+  CRITICAL_SECTION_START();
 
   // Set the vector table base address to the SRAM copy
   SCB->VTOR = (uint32_t)(&ram_tab);
 
   // Reenable interrupts
-  CRITICAL_SECTION_END;
+  CRITICAL_SECTION_END();
 
   // Return the address of the table
   return (pfnISR_Handler*)(&ram_tab);
@@ -80,7 +80,7 @@ pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
   pfnISR_Handler *isrtab = get_relocated_table_addr();
 
   // Disable global interrupts
-  CRITICAL_SECTION_START;
+  CRITICAL_SECTION_START();
 
   // Get the original handler
   pfnISR_Handler oldHandler = isrtab[irq + 16];
@@ -89,7 +89,7 @@ pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
   isrtab[irq + 16] = newHandler;
 
   // Reenable interrupts
-  CRITICAL_SECTION_END;
+  CRITICAL_SECTION_END();
 
   // Return the original one
   return oldHandler;
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.h b/Marlin/src/HAL/HAL_ESP32/HAL.h
index b59722d87760..a04343b69e5a 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.h
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.h
@@ -65,8 +65,8 @@ extern portMUX_TYPE spinlock;
   #define NUM_SERIAL 1
 #endif
 
-#define CRITICAL_SECTION_START portENTER_CRITICAL(&spinlock)
-#define CRITICAL_SECTION_END   portEXIT_CRITICAL(&spinlock)
+#define CRITICAL_SECTION_START() portENTER_CRITICAL(&spinlock)
+#define CRITICAL_SECTION_END()   portEXIT_CRITICAL(&spinlock)
 #define ISRS_ENABLED() (spinlock.owner == portMUX_FREE_VAL)
 #define ENABLE_ISRS()  if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock)
 #define DISABLE_ISRS() portENTER_CRITICAL(&spinlock)
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.h b/Marlin/src/HAL/HAL_LINUX/HAL.h
index fffe11111113..0475c953c356 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL.h
+++ b/Marlin/src/HAL/HAL_LINUX/HAL.h
@@ -72,8 +72,8 @@ extern HalSerial usb_serial;
 //
 // Interrupts
 //
-#define CRITICAL_SECTION_START
-#define CRITICAL_SECTION_END
+#define CRITICAL_SECTION_START()
+#define CRITICAL_SECTION_END()
 #define ISRS_ENABLED()
 #define ENABLE_ISRS()
 #define DISABLE_ISRS()
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/HAL_LPC1768/HAL.h
index 302cf9d376b0..c727877ff372 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.h
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL.h
@@ -119,8 +119,8 @@ extern "C" volatile uint32_t _millis;
 //
 // Interrupts
 //
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_PRIMASK())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/HAL_SAMD51/HAL.h
index 209514a70402..f2ee02a22fcc 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.h
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL.h
@@ -101,8 +101,8 @@ typedef int8_t pin_t;
 //
 // Interrupts
 //
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_PRIMASK())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/HAL_STM32/HAL.h
index a62c3f41309b..9fb40d612187 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32/HAL.h
@@ -127,8 +127,8 @@
   #define analogInputToDigitalPin(p) (p)
 #endif
 
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_PRIMASK())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/HAL_STM32F1/HAL.h
index b7e2921ffa52..c97abf4bb1a8 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.h
@@ -162,8 +162,8 @@ void HAL_idletask();
   #define digitalPinHasPWM(P) (PIN_MAP[P].timer_device != nullptr)
 #endif
 
-#define CRITICAL_SECTION_START  uint32_t primask = __get_primask(); (void)__iCliRetVal()
-#define CRITICAL_SECTION_END    if (!primask) (void)__iSeiRetVal()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_primask(); (void)__iCliRetVal()
+#define CRITICAL_SECTION_END()    if (!primask) (void)__iSeiRetVal()
 #define ISRS_ENABLED() (!__get_primask())
 #define ENABLE_ISRS()  ((void)__iSeiRetVal())
 #define DISABLE_ISRS() ((void)__iCliRetVal())
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
index d92aebeac0e5..b5d8ac29cf4f 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
@@ -127,8 +127,8 @@
   #define analogInputToDigitalPin(p) (p)
 #endif
 
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_PRIMASK())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
index 5a5038287cc1..15e9ab71bb34 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
@@ -70,8 +70,8 @@ typedef int8_t pin_t;
   #define analogInputToDigitalPin(p) ((p < 12u) ? (p) + 54u : -1)
 #endif
 
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_PRIMASK())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
index 3fbfeaea64f3..7e5be1081c01 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
@@ -73,8 +73,8 @@ typedef int8_t pin_t;
   #define analogInputToDigitalPin(p) ((p < 12u) ? (p) + 54u : -1)
 #endif
 
-#define CRITICAL_SECTION_START  uint32_t primask = __get_primask(); __disable_irq()
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_primask(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
 #define ISRS_ENABLED() (!__get_primask())
 #define ENABLE_ISRS()  __enable_irq()
 #define DISABLE_ISRS() __disable_irq()
diff --git a/Marlin/src/HAL/shared/servo.cpp b/Marlin/src/HAL/shared/servo.cpp
index 7c078d2f4180..d03b80b20097 100644
--- a/Marlin/src/HAL/shared/servo.cpp
+++ b/Marlin/src/HAL/shared/servo.cpp
@@ -129,9 +129,9 @@ void Servo::writeMicroseconds(int value) {
     value = constrain(value, SERVO_MIN(min), SERVO_MAX(max)) - (TRIM_DURATION);
     value = usToTicks(value);  // convert to ticks after compensating for interrupt overhead - 12 Aug 2009
 
-    CRITICAL_SECTION_START;
+    CRITICAL_SECTION_START();
     servo_info[channel].ticks = value;
-    CRITICAL_SECTION_END;
+    CRITICAL_SECTION_END();
   }
 }
 
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
index f56d98a5bca3..2b329db3b333 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
@@ -125,8 +125,8 @@ uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
   #define SIG_DELAY() DELAY_US(1)   // Approximate a 1µs delay on 32-bit ARM
   #undef CRITICAL_SECTION_START
   #undef CRITICAL_SECTION_END
-  #define CRITICAL_SECTION_START NOOP
-  #define CRITICAL_SECTION_END   NOOP
+  #define CRITICAL_SECTION_START() NOOP
+  #define CRITICAL_SECTION_END()   NOOP
 #else
   #define SIG_DELAY() DELAY_NS(188) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR)
 #endif
@@ -163,7 +163,7 @@ inline uint32_t flipped(const uint32_t bits, const uint8_t n_bytes) {
 }
 
 void Max7219::noop() {
-  CRITICAL_SECTION_START;
+  CRITICAL_SECTION_START();
   SIG_DELAY();
   WRITE(MAX7219_DIN_PIN, LOW);
   for (uint8_t i = 16; i--;) {
@@ -174,11 +174,11 @@ void Max7219::noop() {
     WRITE(MAX7219_CLK_PIN, HIGH);
     SIG_DELAY();
   }
-  CRITICAL_SECTION_END;
+  CRITICAL_SECTION_END();
 }
 
 void Max7219::putbyte(uint8_t data) {
-  CRITICAL_SECTION_START;
+  CRITICAL_SECTION_START();
   for (uint8_t i = 8; i--;) {
     SIG_DELAY();
     WRITE(MAX7219_CLK_PIN, LOW);       // tick
@@ -189,7 +189,7 @@ void Max7219::putbyte(uint8_t data) {
     SIG_DELAY();
     data <<= 1;
   }
-  CRITICAL_SECTION_END;
+  CRITICAL_SECTION_END();
 }
 
 void Max7219::pulse_load() {
@@ -202,12 +202,12 @@ void Max7219::pulse_load() {
 
 void Max7219::send(const uint8_t reg, const uint8_t data) {
   SIG_DELAY();
-  CRITICAL_SECTION_START;
+  CRITICAL_SECTION_START();
   SIG_DELAY();
   putbyte(reg);          // specify register
   SIG_DELAY();
   putbyte(data);         // put data
-  CRITICAL_SECTION_END;
+  CRITICAL_SECTION_END();
 }
 
 // Send out a single native row of bits to just one unit
@@ -574,14 +574,14 @@ void Max7219::idle_tasks() {
   #define MAX7219_USE_HEAD (defined(MAX7219_DEBUG_PLANNER_HEAD) || defined(MAX7219_DEBUG_PLANNER_QUEUE))
   #define MAX7219_USE_TAIL (defined(MAX7219_DEBUG_PLANNER_TAIL) || defined(MAX7219_DEBUG_PLANNER_QUEUE))
   #if MAX7219_USE_HEAD || MAX7219_USE_TAIL
-    CRITICAL_SECTION_START;
+    CRITICAL_SECTION_START();
     #if MAX7219_USE_HEAD
       const uint8_t head = planner.block_buffer_head;
     #endif
     #if MAX7219_USE_TAIL
       const uint8_t tail = planner.block_buffer_tail;
     #endif
-    CRITICAL_SECTION_END;
+    CRITICAL_SECTION_END();
   #endif
 
   #if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index 891d9fd17353..35631708c425 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -63,13 +63,13 @@ void Buzzer::tick() {
 
     if (state.tone.frequency > 0) {
       #if ENABLED(EXTENSIBLE_UI)
-        CRITICAL_SECTION_START;
+        CRITICAL_SECTION_START();
         ExtUI::onPlayTone(state.tone.frequency, state.tone.duration);
-        CRITICAL_SECTION_END;
+        CRITICAL_SECTION_END();
       #elif ENABLED(SPEAKER)
-        CRITICAL_SECTION_START;
+        CRITICAL_SECTION_START();
         ::tone(BEEPER_PIN, state.tone.frequency, state.tone.duration);
-        CRITICAL_SECTION_END;
+        CRITICAL_SECTION_END();
       #else
         on();
       #endif

From 0fd0554b5fbf6aecb5000ba6f37ab79a1c32f039 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 11 Feb 2020 10:07:24 -0600
Subject: [PATCH 178/565] Simplify old safe homing sanity check

---
 Marlin/src/inc/SanityCheck.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a94300d45e84..4581ca9b158c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1361,14 +1361,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Make sure Z_SAFE_HOMING point is reachable
  */
 #if ENABLED(Z_SAFE_HOMING)
-  #if HAS_BED_PROBE && (ENABLED(DELTA) || IS_SCARA)
-    static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, PROBE_X_MIN, PROBE_X_MAX), "Z_SAFE_HOMING_X_POINT is outside the probe region.");
-    static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, PROBE_Y_MIN, PROBE_Y_MAX), "Z_SAFE_HOMING_Y_POINT is outside the probe region.");
-  #else
-    static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
-    static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
-  #endif
-#endif // Z_SAFE_HOMING
+  static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_BED, X_MAX_BED), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
+  static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_BED, Y_MAX_BED), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
+#endif
 
 /**
  * Make sure DISABLE_[XYZ] compatible with selected homing options

From 4a733796bdd11e429f117e652c0edb74c33c9e49 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 11 Feb 2020 17:43:28 +0100
Subject: [PATCH 179/565] Prevent pin glitches on out commutation (#16835)

Better for switching from pulled input to output and also set real output (with no input enabled).
---
 Marlin/src/HAL/HAL_SAMD51/fastio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/HAL_SAMD51/fastio.h
index c91965e19e0b..e00fa77a7c1f 100644
--- a/Marlin/src/HAL/HAL_SAMD51/fastio.h
+++ b/Marlin/src/HAL/HAL_SAMD51/fastio.h
@@ -88,8 +88,8 @@
                                   const EPortType port = (EPortType)GET_SAMD_PORT(IO);              \
                                   const uint32_t pin = GET_SAMD_PIN(IO);                            \
                                                                                                     \
-                                  PORT->Group[port].PINCFG[pin].reg = (uint8_t)(PORT_PINCFG_INEN);  \
                                   PORT->Group[port].DIRSET.reg = MASK(pin);                         \
+                                  PORT->Group[port].PINCFG[pin].reg = 0;                            \
                                 }while(0)
 // Set pin as output (open drain)
 #define SET_OUTPUT_OD(IO)       do{                                                                   \

From 0306c1bb0c5a75a6e0d47ed1db31877ff9069177 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Feb 2020 00:03:54 +0000
Subject: [PATCH 180/565] [cron] Bump distribution date (2020-02-12)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1d263f0eeaee..9f2d898c5302 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-11"
+  #define STRING_DISTRIBUTION_DATE "2020-02-12"
 #endif
 
 /**

From a83ad2d9d41a91cba2ab9a1f9382bfd833e8bdbb Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Wed, 12 Feb 2020 09:30:20 +0700
Subject: [PATCH 181/565] Define MarlinSerial instances for DGUS (#16841)

---
 Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
index 382f30bff8c6..a486078db1bf 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
@@ -25,28 +25,28 @@
 #include "../../inc/MarlinConfigPre.h"
 #include "MarlinSerial.h"
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0)
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
   MarlinSerial MSerial(LPC_UART0);
   extern "C" void UART0_IRQHandler() {
     MSerial.IRQHandler();
   }
 #endif
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1)
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 1)
   MarlinSerial MSerial1((LPC_UART_TypeDef *) LPC_UART1);
   extern "C" void UART1_IRQHandler() {
     MSerial1.IRQHandler();
   }
 #endif
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2)
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 2)
   MarlinSerial MSerial2(LPC_UART2);
   extern "C" void UART2_IRQHandler() {
     MSerial2.IRQHandler();
   }
 #endif
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3)
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 3)
   MarlinSerial MSerial3(LPC_UART3);
   extern "C" void UART3_IRQHandler() {
     MSerial3.IRQHandler();

From 1d8d91afc66c10ebf007399b2c4e2dc57fef89d9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 12 Feb 2020 14:57:00 -0600
Subject: [PATCH 182/565] No limit needed on this raise

Remove an extraneous limit from #16811.
---
 Marlin/src/module/probe.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index f01599cdc30f..cf74d464fe2f 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -754,10 +754,8 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
   if (!deploy()) measured_z = run_z_probe() + offset.z;
   if (!isnan(measured_z)) {
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
-    if (big_raise || raise_after == PROBE_PT_RAISE) {
-      if (current_position.z < Z_PROBE_OFFSET_RANGE_MAX) // Only raise when in probing range (else error)
-        do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
-    }
+    if (big_raise || raise_after == PROBE_PT_RAISE)
+      do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
     else if (raise_after == PROBE_PT_STOW)
       if (stow()) measured_z = NAN;   // Error on stow?
 

From 62d7d49719d3726fff7039d7185f3215e1517db4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 13 Feb 2020 00:03:34 +0000
Subject: [PATCH 183/565] [cron] Bump distribution date (2020-02-13)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9f2d898c5302..8b95f831a5ac 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-12"
+  #define STRING_DISTRIBUTION_DATE "2020-02-13"
 #endif
 
 /**

From 68077149e202195310b404c44debfc245b5c2f37 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 14 Feb 2020 00:04:13 +0000
Subject: [PATCH 184/565] [cron] Bump distribution date (2020-02-14)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8b95f831a5ac..d1938116fd10 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-13"
+  #define STRING_DISTRIBUTION_DATE "2020-02-14"
 #endif
 
 /**

From 0e17d10bf325afed9ca3f133dd3d2e5cfb3a7724 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Fri, 14 Feb 2020 01:30:48 +0100
Subject: [PATCH 185/565] Fix G-code line parsing (#16840)

---
 Marlin/src/gcode/queue.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index c01a92ab10c3..dbef8d2332b6 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -363,8 +363,8 @@ inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD
 
 inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
   sis = PS_NORMAL;
-  if (!ind) { thermalManager.manage_heater(); return true; }
   buff[ind] = 0;
+  if (!ind) { thermalManager.manage_heater(); return true; }
   ind = 0;
   return false;
 }
@@ -377,7 +377,7 @@ inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind
 void GCodeQueue::get_serial_commands() {
   static char serial_line_buffer[NUM_SERIAL][MAX_CMD_SIZE];
 
-  static uint8_t serial_input_state[NUM_SERIAL] = { 0 };
+  static uint8_t serial_input_state[NUM_SERIAL] = { PS_NORMAL };
 
   #if ENABLED(BINARY_FILE_TRANSFER)
     if (card.flag.binary_mode) {

From 082117c4bb30d8f2e5b2edeccaa8d59ad6126940 Mon Sep 17 00:00:00 2001
From: Gaston Dombiak <gdombiak@gmail.com>
Date: Thu, 13 Feb 2020 16:43:47 -0800
Subject: [PATCH 186/565] Ping the job timer in M140 (#16849)

---
 Marlin/src/gcode/temperature/M140_M190.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Marlin/src/gcode/temperature/M140_M190.cpp b/Marlin/src/gcode/temperature/M140_M190.cpp
index 8e9778f7f03c..ad7608705a34 100644
--- a/Marlin/src/gcode/temperature/M140_M190.cpp
+++ b/Marlin/src/gcode/temperature/M140_M190.cpp
@@ -51,6 +51,15 @@
 void GcodeSuite::M140() {
   if (DEBUGGING(DRYRUN)) return;
   if (parser.seenval('S')) thermalManager.setTargetBed(parser.value_celsius());
+
+  #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
+    /**
+     * Stop the timer at the end of print. Both hotend and bed target
+     * temperatures need to be set below mintemp. Order of M140 and M104
+     * at the end of the print does not matter.
+     */
+    thermalManager.check_timer_autostart(false, true);
+  #endif
 }
 
 /**

From af84e362cc56404c07b176ee24f3eaad165c0b60 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Fri, 14 Feb 2020 07:59:32 +0700
Subject: [PATCH 187/565] Remove unused queue.stopped_N (#16850)

---
 Marlin/src/MarlinCore.cpp  | 1 -
 Marlin/src/gcode/queue.cpp | 2 +-
 Marlin/src/gcode/queue.h   | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index f439fb73a8ca..ecfdcc21b3da 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -798,7 +798,6 @@ void stop() {
   #endif
 
   if (IsRunning()) {
-    queue.stop();
     SERIAL_ERROR_MSG(MSG_ERR_STOPPED);
     LCD_MESSAGEPGM(MSG_STOPPED);
     safe_delay(350);       // allow enough time for messages to get out before stopping
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index dbef8d2332b6..4d0861c2bc9c 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -52,7 +52,7 @@ GCodeQueue queue;
  * sending commands to Marlin, and lines will be checked for sequentiality.
  * M110 N<int> sets the current line number.
  */
-long gcode_N, GCodeQueue::last_N, GCodeQueue::stopped_N = 0;
+long gcode_N, GCodeQueue::last_N;
 
 /**
  * GCode Command Queue
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 11d41303493e..10b0ec764380 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -35,9 +35,7 @@ class GCodeQueue {
    * commands to Marlin, and lines will be checked for sequentiality.
    * M110 N<int> sets the current line number.
    */
-  static long last_N, stopped_N;
-
-  static inline void stop() { stopped_N = last_N; }
+  static long last_N;
 
   /**
    * GCode Command Queue

From f3f692adf7c8ceffeb5af5ef562ec412db5cd0bd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 13 Feb 2020 19:20:37 -0600
Subject: [PATCH 188/565] Don't assert safe homing for delta/scara

---
 Marlin/src/inc/SanityCheck.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4581ca9b158c..1ae71e2ac745 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1227,7 +1227,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "Z_PROBE_LOW_POINT must be less than or equal to 0."
   #endif
 
-  #if HOMING_Z_WITH_PROBE && DISABLED(Z_SAFE_HOMING)
+  #if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
     #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue."
   #endif
 

From 49a66bc4cc74f115b1846056a8ac4ae40ad5473b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 13 Feb 2020 19:21:51 -0600
Subject: [PATCH 189/565] Fix ESP32 warning, specify supported version

---
 Marlin/src/HAL/HAL_ESP32/web.cpp | 2 ++
 platformio.ini                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_ESP32/web.cpp b/Marlin/src/HAL/HAL_ESP32/web.cpp
index 73f59f2adde9..b795efe3c55d 100644
--- a/Marlin/src/HAL/HAL_ESP32/web.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/web.cpp
@@ -26,6 +26,8 @@
 
 #if BOTH(WIFISUPPORT, WEBSUPPORT)
 
+#include "../../inc/MarlinConfig.h"
+
 #undef DISABLED  // esp32-hal-gpio.h
 #include <SPIFFS.h>
 #include "wifi.h"
diff --git a/platformio.ini b/platformio.ini
index db8f5dd6b7d7..5ea93ab8e0de 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -753,7 +753,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
 # Espressif ESP32
 #
 [env:esp32]
-platform      = espressif32
+platform      = espressif32@1.11.2
 board         = esp32dev
 build_flags   = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
 lib_deps      = ${common.lib_deps}

From a16f3baecc6cd5da2fe71faac49650b5ff766cd7 Mon Sep 17 00:00:00 2001
From: vivian-ng <vivian@maplerain.com>
Date: Fri, 14 Feb 2020 14:22:52 +0900
Subject: [PATCH 190/565] Add ESPAsyncTCP to lib_ignore (#16844)

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 5ea93ab8e0de..450fc32eb9d1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -762,7 +762,7 @@ lib_deps      = ${common.lib_deps}
   ESP3DLib=https://github.com/luc-github/ESP3DLib.git
   arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
   ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
-lib_ignore    = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED
+lib_ignore    = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
 upload_speed  = 115200
 #upload_port   = marlinesp.local

From ff0c931e470970a9bbbcefaa2f183fc6733ec2a9 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Fri, 14 Feb 2020 06:28:18 +0100
Subject: [PATCH 191/565] Add RAMPS 1.4.4 to AGCM4 (#16606)

---
 .github/workflows/test-builds.yml             |   2 +-
 Marlin/src/HAL/HAL_SAMD51/timers.h            |   2 +-
 Marlin/src/core/boards.h                      |   6 +-
 Marlin/src/pins/pins.h                        |   7 +
 Marlin/src/pins/samd/pins_RAMPS_144.h         | 611 ++++++++++++++++++
 .../share/tests/SAMD51_grandcentral_m4-tests  |   7 +
 6 files changed, 632 insertions(+), 3 deletions(-)
 create mode 100644 Marlin/src/pins/samd/pins_RAMPS_144.h

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 301165fcd0ba..59722e3ca5a3 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -32,6 +32,7 @@ jobs:
         - megaatmega2560
         - teensy31
         - teensy35
+        - SAMD51_grandcentral_m4
 
         # Extended AVR Environments
 
@@ -75,7 +76,6 @@ jobs:
         #- mks_robin_lite
         #- mks_robin_mini
         #- mks_robin_nano
-        #- SAMD51_grandcentral_m4
 
     steps:
 
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/HAL_SAMD51/timers.h
index 9bd2e03d6f66..7ebd1b1406ce 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.h
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.h
@@ -29,7 +29,7 @@
 typedef uint32_t hal_timer_t;
 #define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
 
-#define HAL_TIMER_RATE      SystemCoreClock  // frequency of timers peripherals
+#define HAL_TIMER_RATE      F_CPU   // frequency of timers peripherals
 
 #define STEP_TIMER_NUM      0  // index of timer to use for stepper (also +1 for 32bits counter)
 #define PULSE_TIMER_NUM     STEP_TIMER_NUM
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 904c25d86849..4ba9840d812f 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -295,7 +295,6 @@
 #define BOARD_GTM32_MINI_A30          4022  // STM32F103VET6 controller
 #define BOARD_GTM32_REV_B             4023  // STM32F103VET6 controller
 
-
 //
 // ARM Cortex-M4F
 //
@@ -340,6 +339,11 @@
 #define BOARD_MRR_ESPE                6002
 #define BOARD_E4D_BOX                 6003  // E4d@BOX
 
+//
+// SAMD51 ARM Cortex M4
+//
+#define BOARD_AGCM4_RAMPS_144         6100  // RAMPS 1.4.4
+
 //
 // Simulations
 //
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 941b21bbbf87..3ba15c1326b2 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -578,6 +578,13 @@
 #elif MB(E4D_BOX)
   #include "esp32/pins_E4D.h"                   // ESP32                                  env:esp32
 
+//
+// Adafruit Grand Central M4 (SAMD51 ARM Cortex-M4)
+//
+
+#elif MB(AGCM4_RAMPS_144)
+  #include "samd/pins_RAMPS_144.h"              // SAMD51                                 env:SAMD51_grandcentral_m4
+
 //
 // Linux Native Debug board
 //
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
new file mode 100644
index 000000000000..107ef9f57e95
--- /dev/null
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -0,0 +1,611 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * AGCM4 with RAMPS v1.4.4 pin assignments
+ */
+
+#ifndef ARDUINO_GRAND_CENTRAL_M4
+  #error "Oops! Select 'Adafruit Grand Central M4' in 'Tools > Board.'"
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "AGCM4 RAMPS 1.4.4"
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN         11
+#define SERVO1_PIN          6
+#define SERVO2_PIN          5
+#define SERVO3_PIN          4
+
+//
+// EEPROM
+//
+#define E2END 0x7FFF  // 32Kb (24lc256)
+#define I2C_EEPROM    // EEPROM on I2C-0
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN           3
+#define X_MAX_PIN           2
+#define Y_MIN_PIN          14
+#define Y_MAX_PIN          15
+#define Z_MIN_PIN          18
+#define Z_MAX_PIN          19
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  18
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN         67     // Mega/Due:54 - AGCM4:67
+#define X_DIR_PIN          68     // Mega/Due:55 - AGCM4:68
+#define X_ENABLE_PIN       38
+#ifndef X_CS_PIN
+  #define X_CS_PIN         47
+#endif
+
+#define Y_STEP_PIN         73     // Mega/Due:60 - AGCM4:73
+#define Y_DIR_PIN          74     // Mega/Due:61 - AGCM4:74
+#define Y_ENABLE_PIN       69     // Mega/Due:56 - AGCM4:69
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN         45
+#endif
+
+#define Z_STEP_PIN         46
+#define Z_DIR_PIN          48
+#define Z_ENABLE_PIN       54     // Mega/Due:62 - AGCM4:54
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN         32
+#endif
+
+#define Z2_STEP_PIN        36
+#define Z2_DIR_PIN         34
+#define Z2_ENABLE_PIN      30
+#ifndef Z2_CS_PIN
+  #define Z2_CS_PIN        22
+#endif
+
+#define E0_STEP_PIN        26
+#define E0_DIR_PIN         28
+#define E0_ENABLE_PIN      24
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN        43
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN         13
+#define TEMP_BED_PIN       14
+#define TEMP_CHAMBER_PIN   15
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN       10
+#define HEATER_BED_PIN      8
+#define FAN_PIN             9
+#define FAN1_PIN            7
+#define FAN2_PIN           12
+
+//
+// Misc. Functions
+//
+#define SDSS               53
+#define LED_PIN            13
+
+#ifndef FILWIDTH_PIN
+  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+#endif
+
+// RAMPS 1.4 DIO 4 on the servos connector
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN    4
+#endif
+
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN        39
+#endif
+
+#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
+  #if NUM_SERVOS <= 1 // Prefer the servo connector
+    #define CASE_LIGHT_PIN  6   // Hardware PWM
+  #endif
+#endif
+
+//
+// M3/M4/M5 - Spindle/Laser Control
+//
+#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
+  #if !NUM_SERVOS                      // Use servo connector if possible
+    #define SPINDLE_LASER_ENA_PIN  4   // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN  6   // Hardware PWM
+    #define SPINDLE_DIR_PIN        5
+  #else
+    #error "No auto-assignable Spindle/Laser pins available."
+  #endif
+#endif
+
+//
+// TMC software SPI
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI    58     // Mega/Due:66 - AGCM4:58
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO    44
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK     56     // Mega/Due:64 - AGCM4:56
+  #endif
+#endif
+
+#if HAS_TMC220x
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial1
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+
+  //
+  // Software serial
+  //
+
+  #ifndef X_SERIAL_TX_PIN
+    #define X_SERIAL_TX_PIN  47
+  #endif
+  #ifndef X_SERIAL_RX_PIN
+    #define X_SERIAL_RX_PIN  47
+  #endif
+  #ifndef X2_SERIAL_TX_PIN
+    #define X2_SERIAL_TX_PIN -1
+  #endif
+  #ifndef X2_SERIAL_RX_PIN
+    #define X2_SERIAL_RX_PIN -1
+  #endif
+
+  #ifndef Y_SERIAL_TX_PIN
+    #define Y_SERIAL_TX_PIN  45
+  #endif
+  #ifndef Y_SERIAL_RX_PIN
+    #define Y_SERIAL_RX_PIN  45
+  #endif
+  #ifndef Y2_SERIAL_TX_PIN
+    #define Y2_SERIAL_TX_PIN -1
+  #endif
+  #ifndef Y2_SERIAL_RX_PIN
+    #define Y2_SERIAL_RX_PIN -1
+  #endif
+
+  #ifndef Z_SERIAL_TX_PIN
+    #define Z_SERIAL_TX_PIN  32
+  #endif
+  #ifndef Z_SERIAL_RX_PIN
+    #define Z_SERIAL_RX_PIN  32
+  #endif
+  #ifndef Z2_SERIAL_TX_PIN
+    #define Z2_SERIAL_TX_PIN 22
+  #endif
+  #ifndef Z2_SERIAL_RX_PIN
+    #define Z2_SERIAL_RX_PIN 22
+  #endif
+
+  #ifndef E0_SERIAL_TX_PIN
+    #define E0_SERIAL_TX_PIN 43
+  #endif
+  #ifndef E0_SERIAL_RX_PIN
+    #define E0_SERIAL_RX_PIN 43
+  #endif
+  #ifndef E1_SERIAL_TX_PIN
+    #define E1_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E1_SERIAL_RX_PIN
+    #define E1_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E2_SERIAL_TX_PIN
+    #define E2_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E2_SERIAL_RX_PIN
+    #define E2_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E3_SERIAL_TX_PIN
+    #define E3_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E3_SERIAL_RX_PIN
+    #define E3_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E4_SERIAL_TX_PIN
+    #define E4_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E4_SERIAL_RX_PIN
+    #define E4_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E5_SERIAL_TX_PIN
+    #define E5_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E5_SERIAL_RX_PIN
+    #define E5_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_TX_PIN
+    #define E6_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E6_SERIAL_RX_PIN
+    #define E6_SERIAL_RX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_TX_PIN
+    #define E7_SERIAL_TX_PIN -1
+  #endif
+  #ifndef E7_SERIAL_RX_PIN
+    #define E7_SERIAL_RX_PIN -1
+  #endif
+#endif
+
+//////////////////////////
+// LCDs and Controllers //
+//////////////////////////
+
+#if HAS_SPI_LCD
+
+  //
+  // LCD Display output pins
+  //
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+    // TO TEST
+    // #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
+    // #define LCD_PINS_ENABLE     51   // SID (MOSI)
+    // #define LCD_PINS_D4         52   // SCK (CLK) clock
+
+  #elif BOTH(NEWPANEL, PANEL_ONE)
+
+    // TO TEST
+    // #define LCD_PINS_RS         40
+    // #define LCD_PINS_ENABLE     42
+    // #define LCD_PINS_D4         57     // Mega/Due:65 - AGCM4:57
+    // #define LCD_PINS_D5         58     // Mega/Due:66 - AGCM4:58
+    // #define LCD_PINS_D6         44
+    // #define LCD_PINS_D7         56     // Mega/Due:64 - AGCM4:56
+
+  #else
+
+    #if ENABLED(CR10_STOCKDISPLAY)
+
+      // TO TEST
+      // #define LCD_PINS_RS       27
+      // #define LCD_PINS_ENABLE   29
+      // #define LCD_PINS_D4       25
+
+      #if DISABLED(NEWPANEL)
+        // TO TEST
+        // #define BEEPER_PIN      37
+      #endif
+
+    #elif ENABLED(ZONESTAR_LCD)
+
+      // TO TEST
+      // #define LCD_PINS_RS       56     // Mega/Due:64 - AGCM4:56
+      // #define LCD_PINS_ENABLE   44
+      // #define LCD_PINS_D4       55     // Mega/Due:63 - AGCM4:55
+      // #define LCD_PINS_D5       40
+      // #define LCD_PINS_D6       42
+      // #define LCD_PINS_D7       57     // Mega/Due:65 - AGCM4:57
+
+    #else
+
+      #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
+        // TO TEST
+        // #define LCD_PINS_DC     25   // Set as output on init
+        // #define LCD_PINS_RS     27   // Pull low for 1s to init
+        // DOGM SPI LCD Support
+        // #define DOGLCD_CS       16
+        // #define DOGLCD_MOSI     17
+        // #define DOGLCD_SCK      23
+        // #define DOGLCD_A0       LCD_PINS_DC
+      #else
+        #define LCD_PINS_RS        16
+        #define LCD_PINS_ENABLE    17
+        #define LCD_PINS_D4        23
+        #define LCD_PINS_D5        25
+        #define LCD_PINS_D6        27
+      #endif
+
+      #define LCD_PINS_D7          29
+
+      #if DISABLED(NEWPANEL)
+        #define BEEPER_PIN         33
+      #endif
+
+    #endif
+
+    #if DISABLED(NEWPANEL)
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK          38
+      //#define SHIFT_LD           42
+      //#define SHIFT_OUT          40
+      //#define SHIFT_EN           17
+    #endif
+
+  #endif
+
+  //
+  // LCD Display input pins
+  //
+  #if ENABLED(NEWPANEL)
+
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+      #define BEEPER_PIN           37
+
+      #if ENABLED(CR10_STOCKDISPLAY)
+        // TO TEST
+        // #define BTN_EN1         17
+        // #define BTN_EN2         23
+      #else
+        #define BTN_EN1            31
+        #define BTN_EN2            33
+      #endif
+
+      #define BTN_ENC              35
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN      49
+      #endif
+      #define KILL_PIN             41
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        // TO TEST
+        // #define LCD_BACKLIGHT_PIN 39
+      #endif
+
+    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+      // TO TEST
+      // #define BTN_EN1           56     // Mega/Due:64 - AGCM4:56
+      // #define BTN_EN2           72     // Mega/Due:59 - AGCM4:72
+      // #define BTN_ENC           55
+      // #define SD_DETECT_PIN     42
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      // TO TEST
+      // #define BTN_EN1           47
+      // #define BTN_EN2           43
+      // #define BTN_ENC           32
+      // #define LCD_SDSS          SDSS
+      // #define KILL_PIN          41
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      // TO TEST
+      // #define BTN_EN1           40   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      // #define BTN_EN2           42
+      // #define BTN_ENC           -1
+
+      // #define LCD_SDSS SDSS
+      // #define SD_DETECT_PIN     49
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      // TO TEST
+      // #define DOGLCD_CS         45
+      // #define DOGLCD_A0         44
+      // #define LCD_SCREEN_ROT_180
+
+      // #define BEEPER_PIN        33
+      // #define STAT_LED_RED_PIN  32
+      // #define STAT_LED_BLUE_PIN 35
+
+      // #define BTN_EN1           22
+      // #define BTN_EN2            7
+      // #define BTN_ENC           39
+
+      // #define SD_DETECT_PIN     -1   // Pin 49 for display SD interface, 72 for easy adapter board
+      // #define KILL_PIN          31
+
+    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+
+      // TO TEST
+      // #define DOGLCD_CS         29
+      // #define DOGLCD_A0         27
+
+      // #define BEEPER_PIN        23
+      // #define LCD_BACKLIGHT_PIN 33
+
+      // #define BTN_EN1           35
+      // #define BTN_EN2           37
+      // #define BTN_ENC           31
+
+      // #define LCD_SDSS          SDSS
+      // #define SD_DETECT_PIN     49
+      // #define KILL_PIN          41
+
+    #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
+
+      // TO TEST
+      //#define BEEPER_PIN         37
+      //#define BTN_ENC            35
+      //#define SD_DETECT_PIN      49
+
+      //#ifndef KILL_PIN
+      //  #define KILL_PIN         41
+      //#endif
+
+      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
+
+        // TO TEST
+        // #define DOGLCD_A0       27
+        // #define DOGLCD_CS       25
+
+        // GLCD features
+        // Uncomment screen orientation
+        // #define LCD_SCREEN_ROT_90
+        // #define LCD_SCREEN_ROT_180
+        // #define LCD_SCREEN_ROT_270
+
+        // not connected to a pin
+        // #define LCD_BACKLIGHT_PIN 57    // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+        // #define BTN_EN1         31
+        // #define BTN_EN2         33
+
+      #elif ENABLED(FYSETC_MINI_12864)
+
+        // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+
+        // TO TEST
+        // #define DOGLCD_A0       16
+        // #define DOGLCD_CS       17
+
+        // #define BTN_EN1         33
+        // #define BTN_EN2         31
+
+        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
+                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+
+        // #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
+
+        #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+          #ifndef RGB_LED_R_PIN
+            // TO TEST
+            // #define RGB_LED_R_PIN 25
+          #endif
+          #ifndef RGB_LED_G_PIN
+            // TO TEST
+            // #define RGB_LED_G_PIN 27
+          #endif
+          #ifndef RGB_LED_B_PIN
+            // TO TEST
+            // #define RGB_LED_B_PIN 29
+          #endif
+        #elif ENABLED(FYSETC_MINI_12864_2_1)
+          // TO TEST
+          // #define NEOPIXEL_PIN    25
+        #endif
+
+      #endif
+
+    #elif ENABLED(MINIPANEL)
+
+      // TO TEST
+      // #define BEEPER_PIN        42
+      // not connected to a pin
+      // #define LCD_BACKLIGHT_PIN 57    // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+      // #define DOGLCD_A0         44
+      // #define DOGLCD_CS         58    // Mega/Due:66 - AGCM4:58
+
+      // GLCD features
+      // Uncomment screen orientation
+      // #define LCD_SCREEN_ROT_90
+      // #define LCD_SCREEN_ROT_180
+      // #define LCD_SCREEN_ROT_270
+
+      // #define BTN_EN1           40
+      // #define BTN_EN2           55    // Mega/Due:63 - AGCM4:55
+      // #define BTN_ENC           72    // Mega/Due:59 - AGCM4:72
+
+      // #define SD_DETECT_PIN     49
+      // #define KILL_PIN          56    // Mega/Due:64 - AGCM4:56
+
+    #elif ENABLED(ZONESTAR_LCD)
+
+      // TO TEST
+      // #define ADC_KEYPAD_PIN    12
+
+    #elif ENABLED(AZSMZ_12864)
+
+      // TO TEST
+
+    #else
+
+      // Beeper on AUX-4
+      // #define BEEPER_PIN        33
+
+      // Buttons are directly attached to AUX-2
+      #if ENABLED(REPRAPWORLD_KEYPAD)
+        // TO TEST
+        // #define SHIFT_OUT       40
+        // #define SHIFT_CLK       44
+        // #define SHIFT_LD        42
+        // #define BTN_EN1         56    // Mega/Due:64 - AGCM4:56
+        // #define BTN_EN2         72    // Mega/Due:59 - AGCM4:72
+        // #define BTN_ENC         55    // Mega/Due:63 - AGCM4:55
+      #elif ENABLED(PANEL_ONE)
+        // TO TEST
+        // #define BTN_EN1         72    // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
+        // #define BTN_EN2         55    // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
+        // #define BTN_ENC         49    // AUX3 PIN 7
+      #else
+        // TO TEST
+        // #define BTN_EN1         37
+        // #define BTN_EN2         35
+        // #define BTN_ENC         31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        // TO TEST
+        // #define SD_DETECT_PIN   49
+        // #define KILL_PIN        41
+      #endif
+
+    #endif
+  #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Support
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+  #undef SDSS
+  #define SDSS             83
+  #undef SD_DETECT_PIN
+  #define SD_DETECT_PIN    95
+#endif
diff --git a/buildroot/share/tests/SAMD51_grandcentral_m4-tests b/buildroot/share/tests/SAMD51_grandcentral_m4-tests
index 898a58560472..f7157b1ed8b1 100644
--- a/buildroot/share/tests/SAMD51_grandcentral_m4-tests
+++ b/buildroot/share/tests/SAMD51_grandcentral_m4-tests
@@ -6,5 +6,12 @@
 # exit on first failure
 set -e
 
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_AGCM4_RAMPS_144
+exec_test $1 $2 "Build Grand Central M4 Default Configuration"
+
 # clean up
 restore_configs

From 00ba053c90ebbe6d430a48912bc3e00c8a1041c8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 13 Feb 2020 23:39:27 -0600
Subject: [PATCH 192/565] Clean up host actions code (#16856)

---
 Marlin/src/feature/host_actions.cpp | 96 ++++++++++++++++-------------
 Marlin/src/feature/host_actions.h   | 10 +--
 Marlin/src/feature/pause.cpp        | 41 +++++-------
 Marlin/src/feature/pause.h          | 17 ++---
 Marlin/src/feature/runout.cpp       |  6 +-
 Marlin/src/gcode/host/M876.cpp      |  2 +
 6 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index 3633a7b75f5b..c9e87a62377b 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -84,70 +84,78 @@ void host_action(const char * const pstr, const bool eol) {
     if (eol) SERIAL_EOL();
   }
 
-  void host_action_prompt_plus(const char * const ptype, const char * const pstr, const bool eol=true) {
+  void host_action_prompt_plus(const char * const ptype, const char * const pstr, const char extra_char='\0') {
     host_action_prompt(ptype, false);
     SERIAL_CHAR(' ');
     serialprintPGM(pstr);
-    if (eol) SERIAL_EOL();
+    if (extra_char != '\0') SERIAL_CHAR(extra_char);
+    SERIAL_EOL();
+  }
+  void host_action_prompt_begin(const PromptReason reason, const char * const pstr, const char extra_char/*='\0'*/) {
+    host_action_prompt_end();
+    host_prompt_reason = reason;
+    host_action_prompt_plus(PSTR("begin"), pstr, extra_char);
   }
-  void host_action_prompt_begin(const char * const pstr, const bool eol/*=true*/) { host_action_prompt_plus(PSTR("begin"), pstr, eol); }
   void host_action_prompt_button(const char * const pstr) { host_action_prompt_plus(PSTR("button"), pstr); }
   void host_action_prompt_end() { host_action_prompt(PSTR("end")); }
   void host_action_prompt_show() { host_action_prompt(PSTR("show")); }
-  void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const pbtn/*=nullptr*/) {
-    host_prompt_reason = reason;
-    host_action_prompt_end();
-    host_action_prompt_begin(pstr);
-    if (pbtn) host_action_prompt_button(pbtn);
+  void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const btn1/*=nullptr*/, const char * const btn2/*=nullptr*/) {
+    host_action_prompt_begin(reason, pstr);
+    if (btn1) host_action_prompt_button(btn1);
+    if (btn2) host_action_prompt_button(btn2);
     host_action_prompt_show();
   }
 
-  inline void say_m876_response(const char * const pstr) {
-    SERIAL_ECHOPGM("M876 Responding PROMPT_");
-    serialprintPGM(pstr);
-    SERIAL_EOL();
+  void filament_load_host_prompt() {
+    const bool disable_to_continue = (false
+      #if HAS_FILAMENT_SENSOR
+        || runout.filament_ran_out
+      #endif
+    );
+    host_prompt_do(PROMPT_FILAMENT_RUNOUT, PSTR("Paused"), PSTR("PurgeMore"),
+      disable_to_continue ? PSTR("DisableRunout") : CONTINUE_STR
+    );
   }
 
+  //
+  // Handle responses from the host, such as:
+  //  - Filament runout responses: Purge More, Continue
+  //  - General "Continue" response
+  //  - Resume Print response
+  //  - Dismissal of info
+  //
   void host_response_handler(const uint8_t response) {
     #ifdef DEBUG_HOST_ACTIONS
-      SERIAL_ECHOLNPAIR("M876 Handle Reason: ", host_prompt_reason);
-      SERIAL_ECHOLNPAIR("M876 Handle Response: ", response);
+      static const char m876_prefix[] PROGMEM = "M876 Handle Re";
+      serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("ason: ", host_prompt_reason);
+      serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("sponse: ", response);
     #endif
     const char *msg = PSTR("UNKNOWN STATE");
     const PromptReason hpr = host_prompt_reason;
-    host_prompt_reason = PROMPT_NOT_DEFINED;
+    host_prompt_reason = PROMPT_NOT_DEFINED;  // Reset now ahead of logic
     switch (hpr) {
       case PROMPT_FILAMENT_RUNOUT:
         msg = PSTR("FILAMENT_RUNOUT");
-        if (response == 0) {
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
-          #endif
-          host_action_prompt_end();   // Close current prompt
-          host_action_prompt_begin(PSTR("Paused"));
-          host_action_prompt_button(PSTR("Purge More"));
-          if (false
+        switch (response) {
+
+          case 0: // "Purge More" button
+            #if HAS_LCD_MENU && ENABLED(ADVANCED_PAUSE_FEATURE)
+              pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;  // Simulate menu selection (menu exits, doesn't extrude more)
+            #endif
+            filament_load_host_prompt();                          // Initiate another host prompt. (NOTE: The loop in load_filament may also do this!)
+            break;
+
+          case 1: // "Continue" / "Disable Runout" button
+            #if HAS_LCD_MENU && ENABLED(ADVANCED_PAUSE_FEATURE)
+              pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;  // Simulate menu selection
+            #endif
             #if HAS_FILAMENT_SENSOR
-              || runout.filament_ran_out
+              if (runout.filament_ran_out) {                      // Disable a triggered sensor
+                runout.enabled = false;
+                runout.reset();
+              }
             #endif
-          )
-            host_action_prompt_button(PSTR("DisableRunout"));
-          else {
-            host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
-            host_action_prompt_button(CONTINUE_STR);
-          }
-          host_action_prompt_show();
-        }
-        else if (response == 1) {
-          #if HAS_FILAMENT_SENSOR
-            if (runout.filament_ran_out) {
-              runout.enabled = false;
-              runout.reset();
-            }
-          #endif
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
-          #endif
+            break;
         }
         break;
       case PROMPT_USER_CONTINUE:
@@ -168,7 +176,9 @@ void host_action(const char * const pstr, const bool eol) {
         break;
       default: break;
     }
-    say_m876_response(msg);
+    SERIAL_ECHOPGM("M876 Responding PROMPT_");
+    serialprintPGM(msg);
+    SERIAL_EOL();
   }
 
 #endif // HOST_PROMPT_SUPPORT
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 939f0be2de67..d90a21b1f1e4 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -61,13 +61,15 @@ void host_action(const char * const pstr, const bool eol=true);
 
   void host_response_handler(const uint8_t response);
   void host_action_notify(const char * const message);
-  void host_action_prompt_begin(const char * const pstr, const bool eol=true);
+  void host_action_prompt_begin(const PromptReason reason, const char * const pstr, const char extra_char='\0');
   void host_action_prompt_button(const char * const pstr);
   void host_action_prompt_end();
   void host_action_prompt_show();
-  void host_prompt_do(const PromptReason type, const char * const pstr, const char * const pbtn=nullptr);
-  inline void host_prompt_open(const PromptReason reason, const char * const pstr, const char * const pbtn=nullptr) {
-    if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, pbtn);
+  void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const btn1=nullptr, const char * const btn2=nullptr);
+  inline void host_prompt_open(const PromptReason reason, const char * const pstr, const char * const btn1=nullptr, const char * const btn2=nullptr) {
+    if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, btn1, btn2);
   }
 
+  void filament_load_host_prompt();
+
 #endif
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 0bf8fe4b9889..5a7cde204669 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -67,9 +67,10 @@
 
 static xyze_pos_t resume_position;
 
-PauseMode pause_mode = PAUSE_MODE_PAUSE_PRINT;
-
-PauseMenuResponse pause_menu_response;
+#if HAS_LCD_MENU
+  PauseMenuResponse pause_menu_response;
+  PauseMode pause_mode = PAUSE_MODE_PAUSE_PRINT;
+#endif
 
 fil_change_settings_t fc_settings[EXTRUDERS];
 
@@ -85,7 +86,11 @@ fil_change_settings_t fc_settings[EXTRUDERS];
 
 #if HAS_BUZZER
   static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {
-    if (pause_mode == PAUSE_MODE_PAUSE_PRINT) return;
+
+    #if HAS_LCD_MENU
+      if (pause_mode == PAUSE_MODE_PAUSE_PRINT) return;
+    #endif
+
     static millis_t next_buzz = 0;
     static int8_t runout_beep = 0;
 
@@ -186,11 +191,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
           + active_extruder
         #endif
       ;
-      host_prompt_reason = PROMPT_USER_CONTINUE;
-      host_action_prompt_end();
-      host_action_prompt_begin(PSTR("Load Filament T"), false);
-      SERIAL_CHAR(tool);
-      SERIAL_EOL();
+      host_action_prompt_begin(PROMPT_USER_CONTINUE, PSTR("Load Filament T"), tool);
       host_action_prompt_button(CONTINUE_STR);
       host_action_prompt_show();
     #endif
@@ -247,10 +248,10 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
 
     wait_for_user = true;
     #if ENABLED(HOST_PROMPT_SUPPORT)
-      host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purge Running..."), CONTINUE_STR);
+      host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::onUserConfirmRequired_P(PSTR("Filament Purge Running..."));
+      ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging..."));
     #endif
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
       do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
@@ -269,27 +270,13 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
         do_pause_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
       }
 
-      // Show "Purge More" / "Resume" menu and wait for reply
       #if ENABLED(HOST_PROMPT_SUPPORT)
-        host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
-        host_action_prompt_end();   // Close current prompt
-        host_action_prompt_begin(PSTR("Paused"));
-        host_action_prompt_button(PSTR("PurgeMore"));
-        if (false
-          #if HAS_FILAMENT_SENSOR
-            || runout.filament_ran_out
-          #endif
-        )
-          host_action_prompt_button(PSTR("DisableRunout"));
-        else {
-          host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
-          host_action_prompt_button(CONTINUE_STR);
-        }
-        host_action_prompt_show();
+        filament_load_host_prompt();  // Initiate another host prompt. (NOTE: host_response_handler may also do this!)
       #endif
 
       #if HAS_LCD_MENU
         if (show_lcd) {
+          // Show "Purge More" / "Resume" menu and wait for reply
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
           lcd_pause_show_message(PAUSE_MESSAGE_OPTION);
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index f88dd349c59e..5ac67a565c36 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -59,14 +59,15 @@ enum PauseMessage : char {
   PAUSE_MESSAGE_HEATING
 };
 
-enum PauseMenuResponse : char {
-  PAUSE_RESPONSE_WAIT_FOR,
-  PAUSE_RESPONSE_EXTRUDE_MORE,
-  PAUSE_RESPONSE_RESUME_PRINT
-};
-
-extern PauseMode pause_mode;
-extern PauseMenuResponse pause_menu_response;
+#if HAS_LCD_MENU
+  enum PauseMenuResponse : char {
+    PAUSE_RESPONSE_WAIT_FOR,
+    PAUSE_RESPONSE_EXTRUDE_MORE,
+    PAUSE_RESPONSE_RESUME_PRINT
+  };
+  extern PauseMenuResponse pause_menu_response;
+  extern PauseMode pause_mode;
+#endif
 
 extern fil_change_settings_t fc_settings[EXTRUDERS];
 
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 3acda2f7a254..3cf81303ddbe 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -92,11 +92,7 @@ void event_filament_runout() {
 
   //action:out_of_filament
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
-    host_action_prompt_end();
-    host_action_prompt_begin(PSTR("FilamentRunout T"), false);
-    SERIAL_CHAR(tool);
-    SERIAL_EOL();
+    host_action_prompt_begin(PROMPT_FILAMENT_RUNOUT, PSTR("FilamentRunout T"), tool);
     host_action_prompt_show();
   #endif
 
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 8e83185e0246..fe0ca1541abe 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -31,7 +31,9 @@
  * M876: Handle Prompt Response
  */
 void GcodeSuite::M876() {
+
   if (parser.seenval('S')) host_response_handler((uint8_t)parser.value_int());
+
 }
 
 #endif // HOST_PROMPT_SUPPORT && !EMERGENCY_PARSER

From 073e4443e8b8624078138a0c6f422cccc2959a86 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 14 Feb 2020 00:05:06 -0600
Subject: [PATCH 193/565] Optimize "Dismiss" string

---
 Marlin/src/MarlinCore.cpp           | 2 +-
 Marlin/src/feature/host_actions.cpp | 3 ++-
 Marlin/src/feature/host_actions.h   | 2 +-
 Marlin/src/feature/pause.cpp        | 4 ++--
 Marlin/src/gcode/sdcard/M24_M25.cpp | 2 +-
 Marlin/src/lcd/ultralcd.cpp         | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index ecfdcc21b3da..b1e895d97f81 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -345,7 +345,7 @@ void disable_all_steppers() {
 
   void event_probe_recover() {
     #if ENABLED(HOST_PROMPT_SUPPORT)
-      host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), PSTR("Dismiss"));
+      host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR);
     #endif
     #ifdef ACTION_ON_G29_RECOVER
       host_action(PSTR(ACTION_ON_G29_RECOVER));
diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index c9e87a62377b..2108f4e7f427 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -64,7 +64,8 @@ void host_action(const char * const pstr, const bool eol) {
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
 
-  const char CONTINUE_STR[] PROGMEM = "Continue";
+  const char CONTINUE_STR[] PROGMEM = "Continue",
+             DISMISS_STR[] PROGMEM = "Dismiss";
 
   #if HAS_RESUME_CONTINUE
     extern bool wait_for_user;
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index d90a21b1f1e4..3667b7f4308e 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -46,7 +46,7 @@ void host_action(const char * const pstr, const bool eol=true);
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
 
-  extern const char CONTINUE_STR[];
+  extern const char CONTINUE_STR[], DISMISS_STR[];
 
   enum PromptReason : uint8_t {
     PROMPT_NOT_DEFINED,
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 5a7cde204669..9fd279fe5d61 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -396,7 +396,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
   #endif
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_prompt_open(PROMPT_INFO, PSTR("Pause"), PSTR("Dismiss"));
+    host_prompt_open(PROMPT_INFO, PSTR("Pause"), DISMISS_STR);
   #endif
 
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
@@ -667,7 +667,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
   --did_pause_print;
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_prompt_open(PROMPT_INFO, PSTR("Resuming"), PSTR("Dismiss"));
+    host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR);
   #endif
 
   #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sdcard/M24_M25.cpp
index 02ba5acb3928..967b6dfdf37e 100644
--- a/Marlin/src/gcode/sdcard/M24_M25.cpp
+++ b/Marlin/src/gcode/sdcard/M24_M25.cpp
@@ -74,7 +74,7 @@ void GcodeSuite::M24() {
       host_action_resume();
     #endif
     #if ENABLED(HOST_PROMPT_SUPPORT)
-      host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), PSTR("Dismiss"));
+      host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), DISMISS_STR);
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 717a3f05d826..8ad02acfbaf7 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1504,7 +1504,7 @@ void MarlinUI::update() {
       host_action_cancel();
     #endif
     #if ENABLED(HOST_PROMPT_SUPPORT)
-      host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), PSTR("Dismiss"));
+      host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), DISMISS_STR);
     #endif
     print_job_timer.stop();
     set_status_P(GET_TEXT(MSG_PRINT_ABORTED));

From 0b984519c30f453fdb5b4efb8008a07c69688824 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 14 Feb 2020 05:14:37 -0600
Subject: [PATCH 194/565] Clean up stepper and babystep (#16857)

---
 Marlin/src/HAL/HAL_ESP32/i2s.cpp  |   4 +-
 Marlin/src/feature/babystep.cpp   |   8 --
 Marlin/src/feature/babystep.h     |  10 +-
 Marlin/src/module/planner.cpp     | 110 +++++++++++++++++--
 Marlin/src/module/planner.h       |  97 ++---------------
 Marlin/src/module/stepper.cpp     | 173 ++++++++++++++++--------------
 Marlin/src/module/stepper.h       |  75 +++++--------
 Marlin/src/module/temperature.cpp |   5 +-
 8 files changed, 242 insertions(+), 240 deletions(-)

diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/HAL_ESP32/i2s.cpp
index de5ef397ddb2..9f72fcbb0fdb 100644
--- a/Marlin/src/HAL/HAL_ESP32/i2s.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/i2s.cpp
@@ -153,8 +153,8 @@ void stepperTask(void* parameter) {
         remaining--;
       }
       else {
-        Stepper::stepper_pulse_phase_isr();
-        remaining = Stepper::stepper_block_phase_isr();
+        Stepper::pulse_phase_isr();
+        remaining = Stepper::block_phase_isr();
       }
     }
   }
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index c6e7628a154e..eedd8f6196c8 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -49,14 +49,6 @@ void Babystep::step_axis(const AxisEnum axis) {
   }
 }
 
-void Babystep::task() {
-  #if EITHER(BABYSTEP_XY, I2C_POSITION_ENCODERS)
-    LOOP_XYZ(axis) step_axis((AxisEnum)axis);
-  #else
-    step_axis(Z_AXIS);
-  #endif
-}
-
 void Babystep::add_mm(const AxisEnum axis, const float &mm) {
   add_steps(axis, mm * planner.settings.axis_steps_per_mm[axis]);
 }
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index 3322b4a24633..63ea0e3e24a0 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -55,7 +55,15 @@ class Babystep {
 
   static void add_steps(const AxisEnum axis, const int16_t distance);
   static void add_mm(const AxisEnum axis, const float &mm);
-  static void task();
+
+  //
+  // Called by the Temperature ISR to
+  // apply accumulated babysteps to the axes.
+  //
+  static inline void task() {
+    LOOP_L_N(axis, BS_TODO_AXIS(Z_AXIS)) step_axis((AxisEnum)axis);
+  }
+
 private:
   static void step_axis(const AxisEnum axis);
 };
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 72dfeed46ff3..b39ac993b40b 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -709,6 +709,59 @@ void Planner::init() {
 
 #define MINIMAL_STEP_RATE 120
 
+/**
+ * Get the current block for processing
+ * and mark the block as busy.
+ * Return nullptr if the buffer is empty
+ * or if there is a first-block delay.
+ *
+ * WARNING: Called from Stepper ISR context!
+ */
+block_t* Planner::get_current_block() {
+  // Get the number of moves in the planner queue so far
+  const uint8_t nr_moves = movesplanned();
+
+  // If there are any moves queued ...
+  if (nr_moves) {
+
+    // If there is still delay of delivery of blocks running, decrement it
+    if (delay_before_delivering) {
+      --delay_before_delivering;
+      // If the number of movements queued is less than 3, and there is still time
+      //  to wait, do not deliver anything
+      if (nr_moves < 3 && delay_before_delivering) return nullptr;
+      delay_before_delivering = 0;
+    }
+
+    // If we are here, there is no excuse to deliver the block
+    block_t * const block = &block_buffer[block_buffer_tail];
+
+    // No trapezoid calculated? Don't execute yet.
+    if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
+
+    #if HAS_SPI_LCD
+      block_buffer_runtime_us -= block->segment_time_us; // We can't be sure how long an active block will take, so don't count it.
+    #endif
+
+    // As this block is busy, advance the nonbusy block pointer
+    block_buffer_nonbusy = next_block_index(block_buffer_tail);
+
+    // Push block_buffer_planned pointer, if encountered.
+    if (block_buffer_tail == block_buffer_planned)
+      block_buffer_planned = block_buffer_nonbusy;
+
+    // Return the block
+    return block;
+  }
+
+  // The queue became empty
+  #if HAS_SPI_LCD
+    clear_block_buffer_runtime(); // paranoia. Buffer is empty now - so reset accumulated time to zero.
+  #endif
+
+  return nullptr;
+}
+
 /**
  * Calculate trapezoid parameters, multiplying the entry- and exit-speeds
  * by the provided factors.
@@ -1498,8 +1551,7 @@ void Planner::quick_stop() {
   // must be handled: The tail could change between the read and the assignment
   // so this must be enclosed in a critical section
 
-  const bool was_enabled = STEPPER_ISR_ENABLED();
-  if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+  const bool was_enabled = stepper.suspend();
 
   // Drop all queue entries
   block_buffer_nonbusy = block_buffer_planned = block_buffer_head = block_buffer_tail;
@@ -1517,7 +1569,7 @@ void Planner::quick_stop() {
   cleaning_buffer_counter = 1000;
 
   // Reenable Stepper ISR
-  if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+  if (was_enabled) stepper.wake_up();
 
   // And stop the stepper ISR
   stepper.quick_stop();
@@ -1548,13 +1600,12 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
     if (axis == CORE_AXIS_1 || axis == CORE_AXIS_2) {
 
       // Protect the access to the position.
-      const bool was_enabled = STEPPER_ISR_ENABLED();
-      if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+      const bool was_enabled = stepper.suspend();
 
       const int32_t p1 = stepper.position(CORE_AXIS_1),
                     p2 = stepper.position(CORE_AXIS_2);
 
-      if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+      if (was_enabled) stepper.wake_up();
 
       // ((a1+a2)+(a1-a2))/2 -> (a1+a2+a1-a2)/2 -> (a1+a1)/2 -> a1
       // ((a1+a2)-(a1-a2))/2 -> (a1+a2-a1+a2)/2 -> (a2+a2)/2 -> a2
@@ -2004,13 +2055,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   #if HAS_SPI_LCD
     // Protect the access to the position.
-    const bool was_enabled = STEPPER_ISR_ENABLED();
-    if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+    const bool was_enabled = stepper.suspend();
 
     block_buffer_runtime_us += segment_time_us;
     block->segment_time_us = segment_time_us;
 
-    if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+    if (was_enabled) stepper.wake_up();
   #endif
 
   block->nominal_speed_sqr = sq(block->millimeters * inverse_secs);   // (mm/sec)^2 Always > 0
@@ -2822,6 +2872,48 @@ void Planner::set_max_jerk(const AxisEnum axis, float targetValue) {
   #endif
 }
 
+#if HAS_SPI_LCD
+
+  uint16_t Planner::block_buffer_runtime() {
+    #ifdef __AVR__
+      // Protect the access to the variable. Only required for AVR, as
+      //  any 32bit CPU offers atomic access to 32bit variables
+      const bool was_enabled = stepper.suspend();
+    #endif
+
+    millis_t bbru = block_buffer_runtime_us;
+
+    #ifdef __AVR__
+      // Reenable Stepper ISR
+      if (was_enabled) stepper.wake_up();
+    #endif
+
+    // To translate µs to ms a division by 1000 would be required.
+    // We introduce 2.4% error here by dividing by 1024.
+    // Doesn't matter because block_buffer_runtime_us is already too small an estimation.
+    bbru >>= 10;
+    // limit to about a minute.
+    NOMORE(bbru, 0xFFFFul);
+    return bbru;
+  }
+
+  void Planner::clear_block_buffer_runtime() {
+    #ifdef __AVR__
+      // Protect the access to the variable. Only required for AVR, as
+      //  any 32bit CPU offers atomic access to 32bit variables
+      const bool was_enabled = stepper.suspend();
+    #endif
+
+    block_buffer_runtime_us = 0;
+
+    #ifdef __AVR__
+      // Reenable Stepper ISR
+      if (was_enabled) stepper.wake_up();
+    #endif
+  }
+
+#endif
+
 #if ENABLED(AUTOTEMP)
 
   void Planner::autotemp_M104_M109() {
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 37f0112cc81e..6942ec602876 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -763,60 +763,18 @@ class Planner {
     FORCE_INLINE static bool has_blocks_queued() { return (block_buffer_head != block_buffer_tail); }
 
     /**
-     * The current block. nullptr if the buffer is empty.
-     * This also marks the block as busy.
+     * Get the current block for processing
+     * and mark the block as busy.
+     * Return nullptr if the buffer is empty
+     * or if there is a first-block delay.
+     *
      * WARNING: Called from Stepper ISR context!
      */
-    static block_t* get_current_block() {
-
-      // Get the number of moves in the planner queue so far
-      const uint8_t nr_moves = movesplanned();
-
-      // If there are any moves queued ...
-      if (nr_moves) {
-
-        // If there is still delay of delivery of blocks running, decrement it
-        if (delay_before_delivering) {
-          --delay_before_delivering;
-          // If the number of movements queued is less than 3, and there is still time
-          //  to wait, do not deliver anything
-          if (nr_moves < 3 && delay_before_delivering) return nullptr;
-          delay_before_delivering = 0;
-        }
-
-        // If we are here, there is no excuse to deliver the block
-        block_t * const block = &block_buffer[block_buffer_tail];
-
-        // No trapezoid calculated? Don't execute yet.
-        if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
-
-        #if HAS_SPI_LCD
-          block_buffer_runtime_us -= block->segment_time_us; // We can't be sure how long an active block will take, so don't count it.
-        #endif
-
-        // As this block is busy, advance the nonbusy block pointer
-        block_buffer_nonbusy = next_block_index(block_buffer_tail);
-
-        // Push block_buffer_planned pointer, if encountered.
-        if (block_buffer_tail == block_buffer_planned)
-          block_buffer_planned = block_buffer_nonbusy;
-
-        // Return the block
-        return block;
-      }
-
-      // The queue became empty
-      #if HAS_SPI_LCD
-        clear_block_buffer_runtime(); // paranoia. Buffer is empty now - so reset accumulated time to zero.
-      #endif
-
-      return nullptr;
-    }
+    static block_t* get_current_block();
 
     /**
      * "Discard" the block and "release" the memory.
      * Called when the current block is no longer needed.
-     * NB: There MUST be a current block to call this function!!
      */
     FORCE_INLINE static void discard_current_block() {
       if (has_blocks_queued())
@@ -824,47 +782,8 @@ class Planner {
     }
 
     #if HAS_SPI_LCD
-
-      static uint16_t block_buffer_runtime() {
-        #ifdef __AVR__
-          // Protect the access to the variable. Only required for AVR, as
-          //  any 32bit CPU offers atomic access to 32bit variables
-          bool was_enabled = STEPPER_ISR_ENABLED();
-          if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
-        #endif
-
-        millis_t bbru = block_buffer_runtime_us;
-
-        #ifdef __AVR__
-          // Reenable Stepper ISR
-          if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
-        #endif
-
-        // To translate µs to ms a division by 1000 would be required.
-        // We introduce 2.4% error here by dividing by 1024.
-        // Doesn't matter because block_buffer_runtime_us is already too small an estimation.
-        bbru >>= 10;
-        // limit to about a minute.
-        NOMORE(bbru, 0xFFFFul);
-        return bbru;
-      }
-
-      static void clear_block_buffer_runtime() {
-        #ifdef __AVR__
-          // Protect the access to the variable. Only required for AVR, as
-          //  any 32bit CPU offers atomic access to 32bit variables
-          bool was_enabled = STEPPER_ISR_ENABLED();
-          if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
-        #endif
-
-        block_buffer_runtime_us = 0;
-
-        #ifdef __AVR__
-          // Reenable Stepper ISR
-          if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
-        #endif
-      }
-
+      static uint16_t block_buffer_runtime();
+      static void clear_block_buffer_runtime();
     #endif
 
     #if ENABLED(AUTOTEMP)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index bc08e3537747..6e0a318fcb2b 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -203,11 +203,8 @@ uint32_t Stepper::advance_divisor = 0,
   bool Stepper::bezier_2nd_half;    // =false If Bézier curve has been initialized or not
 #endif
 
-uint32_t Stepper::nextMainISR = 0;
-
 #if ENABLED(LIN_ADVANCE)
 
-  constexpr uint32_t LA_ADV_NEVER = 0xFFFFFFFF;
   uint32_t Stepper::nextAdvanceISR = LA_ADV_NEVER,
            Stepper::LA_isr_rate = LA_ADV_NEVER;
   uint16_t Stepper::LA_current_adv_steps = 0,
@@ -402,13 +399,13 @@ constexpr uint32_t NS_TO_PULSE_TIMER_TICKS(uint32_t NS) { return (NS + (NS_PER_P
 #define PULSE_HIGH_TICK_COUNT hal_timer_t(NS_TO_PULSE_TIMER_TICKS(_MIN_PULSE_HIGH_NS - _MIN(_MIN_PULSE_HIGH_NS, TIMER_SETUP_NS)))
 #define PULSE_LOW_TICK_COUNT hal_timer_t(NS_TO_PULSE_TIMER_TICKS(_MIN_PULSE_LOW_NS - _MIN(_MIN_PULSE_LOW_NS, TIMER_SETUP_NS)))
 
-#define USING_TIMED_PULSE() hal_timer_t end_tick_count = 0
-#define START_TIMED_PULSE(DIR) (end_tick_count = HAL_timer_get_count(PULSE_TIMER_NUM) + PULSE_##DIR##_TICK_COUNT)
-#define AWAIT_TIMED_PULSE() while (HAL_timer_get_count(PULSE_TIMER_NUM) < end_tick_count) { }
+#define USING_TIMED_PULSE() hal_timer_t start_pulse_count = 0
+#define START_TIMED_PULSE(DIR) (start_pulse_count = HAL_timer_get_count(PULSE_TIMER_NUM))
+#define AWAIT_TIMED_PULSE(DIR) while (PULSE_##DIR##_TICK_COUNT > HAL_timer_get_count(PULSE_TIMER_NUM) - start_pulse_count) { }
 #define START_HIGH_PULSE()  START_TIMED_PULSE(HIGH)
+#define AWAIT_HIGH_PULSE()  AWAIT_TIMED_PULSE(HIGH)
 #define START_LOW_PULSE()   START_TIMED_PULSE(LOW)
-#define AWAIT_HIGH_PULSE()  AWAIT_TIMED_PULSE()
-#define AWAIT_LOW_PULSE()   AWAIT_TIMED_PULSE()
+#define AWAIT_LOW_PULSE()   AWAIT_TIMED_PULSE(LOW)
 
 #if MINIMUM_STEPPER_PRE_DIR_DELAY > 0
   #define DIR_WAIT_BEFORE() DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY)
@@ -422,11 +419,6 @@ constexpr uint32_t NS_TO_PULSE_TIMER_TICKS(uint32_t NS) { return (NS + (NS_PER_P
   #define DIR_WAIT_AFTER()
 #endif
 
-void Stepper::wake_up() {
-  // TCNT1 = 0;
-  ENABLE_STEPPER_DRIVER_INTERRUPT();
-}
-
 /**
  * Set the stepper direction of each axis
  *
@@ -1334,6 +1326,9 @@ HAL_STEP_TIMER_ISR() {
 #endif
 
 void Stepper::isr() {
+
+  static uint32_t nextMainISR = 0;  // Interval until the next main Stepper Pulse phase (0 = Now)
+
   #ifndef __AVR__
     // Disable interrupts, to avoid ISR preemption while we reprogram the period
     // (AVR enters the ISR with global interrupts disabled, so no need to do it here)
@@ -1357,35 +1352,35 @@ void Stepper::isr() {
     // Enable ISRs to reduce USART processing latency
     ENABLE_ISRS();
 
-    // Run main stepping pulse phase ISR if we have to
-    if (!nextMainISR) Stepper::stepper_pulse_phase_isr();
+    if (!nextMainISR) pulse_phase_isr();                            // 0 = Do coordinated axes Stepper pulses
 
     #if ENABLED(LIN_ADVANCE)
-      // Run linear advance stepper ISR if we have to
-      if (!nextAdvanceISR) nextAdvanceISR = Stepper::advance_isr();
+      if (!nextAdvanceISR) nextAdvanceISR = advance_isr();          // 0 = Do Linear Advance E Stepper pulses
     #endif
 
     // ^== Time critical. NOTHING besides pulse generation should be above here!!!
 
-    // Run main stepping block processing ISR if we have to
-    if (!nextMainISR) nextMainISR = Stepper::stepper_block_phase_isr();
+    if (!nextMainISR) nextMainISR = block_phase_isr();  // Manage acc/deceleration, get next block
 
-    uint32_t interval =
+    // Get the interval to the next ISR call
+    const uint32_t interval = _MIN(
+      nextMainISR                                       // Time until the next Stepper ISR
       #if ENABLED(LIN_ADVANCE)
-        _MIN(nextAdvanceISR, nextMainISR)  // Nearest time interval
-      #else
-        nextMainISR                       // Remaining stepper ISR time
+        , nextAdvanceISR                                // Come back early for Linear Advance?
       #endif
-    ;
+      , uint32_t(HAL_TIMER_TYPE_MAX)                    // Come back in a very long time
+    );
 
-    // Limit the value to the maximum possible value of the timer
-    NOMORE(interval, uint32_t(HAL_TIMER_TYPE_MAX));
+    //
+    // Compute remaining time for each ISR phase
+    //     NEVER : The phase is idle
+    //      Zero : The phase will occur on the next ISR call
+    //  Non-zero : The phase will occur on a future ISR call
+    //
 
-    // Compute the time remaining for the main isr
     nextMainISR -= interval;
 
     #if ENABLED(LIN_ADVANCE)
-      // Compute the time remaining for the advance isr
       if (nextAdvanceISR != LA_ADV_NEVER) nextAdvanceISR -= interval;
     #endif
 
@@ -1471,7 +1466,7 @@ void Stepper::isr() {
  * call to this method that might cause variation in the timing. The aim
  * is to keep pulse timing as regular as possible.
  */
-void Stepper::stepper_pulse_phase_isr() {
+void Stepper::pulse_phase_isr() {
 
   // If we must abort the current block, do so!
   if (abort_current_block) {
@@ -1548,7 +1543,7 @@ void Stepper::stepper_pulse_phase_isr() {
           // Don't step E here - But remember the number of steps to perform
           motor_direction(E_AXIS) ? --LA_steps : ++LA_steps;
         #else
-          step_needed.e = delta_error.e >= 0;
+          step_needed.e = true;
         #endif
       }
     #elif HAS_E0_STEP
@@ -1604,20 +1599,14 @@ void Stepper::stepper_pulse_phase_isr() {
 
     #if DISABLED(LIN_ADVANCE)
       #if ENABLED(MIXING_EXTRUDER)
-
         if (delta_error.e >= 0) {
           delta_error.e -= advance_divisor;
           E_STEP_WRITE(mixer.get_stepper(), INVERT_E_STEP_PIN);
         }
-
-      #else // !MIXING_EXTRUDER
-
-        #if HAS_E0_STEP
-          PULSE_STOP(E);
-        #endif
-
-      #endif  // !MIXING_EXTRUDER
-    #endif // !LIN_ADVANCE
+      #elif HAS_E0_STEP
+        PULSE_STOP(E);
+      #endif
+    #endif
 
     #if ISR_MULTI_STEPS
       if (events_to_do) START_LOW_PULSE();
@@ -1630,10 +1619,10 @@ void Stepper::stepper_pulse_phase_isr() {
 // properly schedules blocks from the planner. This is executed after creating
 // the step pulses, so it is not time critical, as pulses are already done.
 
-uint32_t Stepper::stepper_block_phase_isr() {
+uint32_t Stepper::block_phase_isr() {
 
-  // If no queued movements, just wait 1ms for the next move
-  uint32_t interval = (STEPPER_TIMER_RATE) / 1000;
+  // If no queued movements, just wait 1ms for the next block
+  uint32_t interval = (STEPPER_TIMER_RATE) / 1000UL;
 
   // If there is a current block
   if (current_block) {
@@ -1667,16 +1656,14 @@ uint32_t Stepper::stepper_block_phase_isr() {
         // acc_step_rate is in steps/second
 
         // step_rate to timer interval and steps per stepper isr
-        interval = calc_timer_interval(acc_step_rate, oversampling_factor, &steps_per_isr);
+        interval = calc_timer_interval(acc_step_rate, &steps_per_isr);
         acceleration_time += interval;
 
         #if ENABLED(LIN_ADVANCE)
-          if (LA_use_advance_lead) {
-            // Fire ISR if final adv_rate is reached
-            if (LA_steps && LA_isr_rate != current_block->advance_speed) nextAdvanceISR = 0;
-          }
-          else if (LA_steps) nextAdvanceISR = 0;
-        #endif // LIN_ADVANCE
+          // Fire ISR if final adv_rate is reached
+          if (LA_steps && (!LA_use_advance_lead || LA_isr_rate != current_block->advance_speed))
+            initiateLA();
+        #endif
       }
       // Are we in Deceleration phase ?
       else if (step_events_completed > decelerate_after) {
@@ -1712,32 +1699,32 @@ uint32_t Stepper::stepper_block_phase_isr() {
         // step_rate is in steps/second
 
         // step_rate to timer interval and steps per stepper isr
-        interval = calc_timer_interval(step_rate, oversampling_factor, &steps_per_isr);
+        interval = calc_timer_interval(step_rate, &steps_per_isr);
         deceleration_time += interval;
 
         #if ENABLED(LIN_ADVANCE)
           if (LA_use_advance_lead) {
             // Wake up eISR on first deceleration loop and fire ISR if final adv_rate is reached
             if (step_events_completed <= decelerate_after + steps_per_isr || (LA_steps && LA_isr_rate != current_block->advance_speed)) {
-              nextAdvanceISR = 0;
+              initiateLA();
               LA_isr_rate = current_block->advance_speed;
             }
           }
-          else if (LA_steps) nextAdvanceISR = 0;
-        #endif // LIN_ADVANCE
+          else if (LA_steps) initiateLA();
+        #endif
       }
       // We must be in cruise phase otherwise
       else {
 
         #if ENABLED(LIN_ADVANCE)
           // If there are any esteps, fire the next advance_isr "now"
-          if (LA_steps && LA_isr_rate != current_block->advance_speed) nextAdvanceISR = 0;
+          if (LA_steps && LA_isr_rate != current_block->advance_speed) initiateLA();
         #endif
 
         // Calculate the ticks_nominal for this nominal speed, if not done yet
         if (ticks_nominal < 0) {
           // step_rate to timer interval and loops for the nominal speed
-          ticks_nominal = calc_timer_interval(current_block->nominal_rate, oversampling_factor, &steps_per_isr);
+          ticks_nominal = calc_timer_interval(current_block->nominal_rate, &steps_per_isr);
         }
 
         // The timer interval is just the nominal value for the nominal speed
@@ -1846,17 +1833,17 @@ uint32_t Stepper::stepper_block_phase_isr() {
       // No acceleration / deceleration time elapsed so far
       acceleration_time = deceleration_time = 0;
 
-      uint8_t oversampling = 0;                         // Assume we won't use it
+      uint8_t oversampling = 0;                           // Assume no axis smoothing (via oversampling)
 
       #if ENABLED(ADAPTIVE_STEP_SMOOTHING)
-        // At this point, we must decide if we can use Stepper movement axis smoothing.
+        // Decide if axis smoothing is possible
         uint32_t max_rate = current_block->nominal_rate;  // Get the maximum rate (maximum event speed)
-        while (max_rate < MIN_STEP_ISR_FREQUENCY) {
-          max_rate <<= 1;
-          if (max_rate >= MAX_STEP_ISR_FREQUENCY_1X) break;
-          ++oversampling;
+        while (max_rate < MIN_STEP_ISR_FREQUENCY) {         // As long as more ISRs are possible...
+          max_rate <<= 1;                                   // Try to double the rate
+          if (max_rate >= MAX_STEP_ISR_FREQUENCY_1X) break; // Don't exceed the estimated ISR limit
+          ++oversampling;                                   // Increase the oversampling (used for left-shift)
         }
-        oversampling_factor = oversampling;
+        oversampling_factor = oversampling;                 // For all timer interval calculations
       #endif
 
       // Based on the oversampling factor, do the calculations
@@ -1894,8 +1881,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
         if ((LA_use_advance_lead = current_block->use_advance_lead)) {
           LA_final_adv_steps = current_block->final_adv_steps;
           LA_max_adv_steps = current_block->max_adv_steps;
-          //Start the ISR
-          nextAdvanceISR = 0;
+          initiateLA(); // Start the ISR
           LA_isr_rate = current_block->advance_speed;
         }
         else LA_isr_rate = LA_ADV_NEVER;
@@ -1954,7 +1940,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
       #endif
 
       // Calculate the initial timer interval
-      interval = calc_timer_interval(current_block->initial_rate, oversampling_factor, &steps_per_isr);
+      interval = calc_timer_interval(current_block->initial_rate, &steps_per_isr);
     }
   }
 
@@ -2054,6 +2040,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
 
     return interval;
   }
+
 #endif // LIN_ADVANCE
 
 // Check if the given block is busy or not - Must not be called from ISR contexts
@@ -2093,7 +2080,7 @@ void Stepper::init() {
       digipot_motor = 255 * (motor_current[i] / 2.5);
       dac084s085::setValue(i, digipot_motor);
     }
-  #endif//MB(ALLIGATOR)
+  #endif
 
   // Init Microstepping Pins
   #if HAS_MICROSTEPS
@@ -2287,7 +2274,7 @@ void Stepper::init() {
 
   #if DISABLED(I2S_STEPPER_STREAM)
     HAL_timer_start(STEP_TIMER_NUM, 122); // Init Stepper ISR to 122 Hz for quick starting
-    ENABLE_STEPPER_DRIVER_INTERRUPT();
+    wake_up();
     sei();
   #endif
 
@@ -2341,19 +2328,43 @@ int32_t Stepper::position(const AxisEnum axis) {
   #ifdef __AVR__
     // Protect the access to the position. Only required for AVR, as
     //  any 32bit CPU offers atomic access to 32bit variables
-    const bool was_enabled = STEPPER_ISR_ENABLED();
-    if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+    const bool was_enabled = suspend();
   #endif
 
   const int32_t v = count_position[axis];
 
   #ifdef __AVR__
     // Reenable Stepper ISR
-    if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+    if (was_enabled) wake_up();
   #endif
   return v;
 }
 
+// Set the current position in steps
+void Stepper::set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) {
+  planner.synchronize();
+  const bool was_enabled = suspend();
+  _set_position(a, b, c, e);
+  if (was_enabled) wake_up();
+}
+
+void Stepper::set_axis_position(const AxisEnum a, const int32_t &v) {
+  planner.synchronize();
+
+  #ifdef __AVR__
+    // Protect the access to the position. Only required for AVR, as
+    //  any 32bit CPU offers atomic access to 32bit variables
+    const bool was_enabled = suspend();
+  #endif
+
+  count_position[a] = v;
+
+  #ifdef __AVR__
+    // Reenable Stepper ISR
+    if (was_enabled) wake_up();
+  #endif
+}
+
 // Signal endstops were triggered - This function can be called from
 // an ISR context  (Temperature, Stepper or limits ISR), so we must
 // be very careful here. If the interrupt being preempted was the
@@ -2362,8 +2373,7 @@ int32_t Stepper::position(const AxisEnum axis) {
 // is properly canceled
 void Stepper::endstop_triggered(const AxisEnum axis) {
 
-  const bool was_enabled = STEPPER_ISR_ENABLED();
-  if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+  const bool was_enabled = suspend();
   endstops_trigsteps[axis] = (
     #if IS_CORE
       (axis == CORE_AXIS_2
@@ -2378,22 +2388,21 @@ void Stepper::endstop_triggered(const AxisEnum axis) {
   // Discard the rest of the move if there is a current block
   quick_stop();
 
-  if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+  if (was_enabled) wake_up();
 }
 
 int32_t Stepper::triggered_position(const AxisEnum axis) {
   #ifdef __AVR__
     // Protect the access to the position. Only required for AVR, as
     //  any 32bit CPU offers atomic access to 32bit variables
-    const bool was_enabled = STEPPER_ISR_ENABLED();
-    if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+    const bool was_enabled = suspend();
   #endif
 
   const int32_t v = endstops_trigsteps[axis];
 
   #ifdef __AVR__
     // Reenable Stepper ISR
-    if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+    if (was_enabled) wake_up();
   #endif
 
   return v;
@@ -2403,14 +2412,13 @@ void Stepper::report_positions() {
 
   #ifdef __AVR__
     // Protect the access to the position.
-    const bool was_enabled = STEPPER_ISR_ENABLED();
-    if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
+    const bool was_enabled = suspend();
   #endif
 
   const xyz_long_t pos = count_position;
 
   #ifdef __AVR__
-    if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
+    if (was_enabled) wake_up();
   #endif
 
   #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
@@ -2571,16 +2579,21 @@ void Stepper::report_positions() {
           Z_STEP_WRITE(INVERT_Z_STEP_PIN);
 
           // Restore direction bits
+          DIR_WAIT_BEFORE();
+
           X_DIR_WRITE(old_dir.x);
           Y_DIR_WRITE(old_dir.y);
           Z_DIR_WRITE(old_dir.z);
 
+          DIR_WAIT_AFTER();
+
         #endif
 
       } break;
 
       default: break;
     }
+
     sei();
   }
 
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 6b8d0f362890..ed07bfd5df32 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -321,13 +321,13 @@ class Stepper {
       static bool bezier_2nd_half; // If Bézier curve has been initialized or not
     #endif
 
-    static uint32_t nextMainISR;   // time remaining for the next Step ISR
     #if ENABLED(LIN_ADVANCE)
+      static constexpr uint32_t LA_ADV_NEVER = 0xFFFFFFFF;
       static uint32_t nextAdvanceISR, LA_isr_rate;
       static uint16_t LA_current_adv_steps, LA_final_adv_steps, LA_max_adv_steps; // Copy from current executed block. Needed because current_block is set to NULL "too early".
       static int8_t LA_steps;
       static bool LA_use_advance_lead;
-    #endif // LIN_ADVANCE
+    #endif
 
     static int32_t ticks_nominal;
     #if DISABLED(S_CURVE_ACCELERATION)
@@ -351,28 +351,36 @@ class Stepper {
 
   public:
 
-    //
-    // Constructor / initializer
-    //
-    Stepper() {};
-
     // Initialize stepper hardware
     static void init();
 
-    // Interrupt Service Routines
+    // Interrupt Service Routine and phases
+
+    // The stepper subsystem goes to sleep when it runs out of things to execute.
+    // Call this to notify the subsystem that it is time to go to work.
+    static inline void wake_up() { ENABLE_STEPPER_DRIVER_INTERRUPT(); }
+
+    static inline bool is_awake() { return STEPPER_ISR_ENABLED(); }
+
+    static inline bool suspend() {
+      const bool awake = is_awake();
+      if (awake) DISABLE_STEPPER_DRIVER_INTERRUPT();
+      return awake;
+    }
 
     // The ISR scheduler
     static void isr();
 
-    // The stepper pulse phase ISR
-    static void stepper_pulse_phase_isr();
+    // The stepper pulse ISR phase
+    static void pulse_phase_isr();
 
-    // The stepper block processing phase ISR
-    static uint32_t stepper_block_phase_isr();
+    // The stepper block processing ISR phase
+    static uint32_t block_phase_isr();
 
     #if ENABLED(LIN_ADVANCE)
-      // The Linear advance stepper ISR
+      // The Linear advance ISR phase
       static uint32_t advance_isr();
+      FORCE_INLINE static void initiateLA() { nextAdvanceISR = 0; }
     #endif
 
     // Check if the given block is busy or not - Must not be called from ISR contexts
@@ -381,13 +389,14 @@ class Stepper {
     // Get the position of a stepper, in steps
     static int32_t position(const AxisEnum axis);
 
+    // Set the current position in steps
+    static void set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e);
+    static inline void set_position(const xyze_long_t &abce) { set_position(abce.a, abce.b, abce.c, abce.e); }
+    static void set_axis_position(const AxisEnum a, const int32_t &v);
+
     // Report the positions of the steppers, in steps
     static void report_positions();
 
-    // The stepper subsystem goes to sleep when it runs out of things to execute. Call this
-    // to notify the subsystem that it is time to go to work.
-    static void wake_up();
-
     // Quickly stop all steppers
     FORCE_INLINE static void quick_stop() { abort_current_block = true; }
 
@@ -453,34 +462,6 @@ class Stepper {
       static void refresh_motor_power();
     #endif
 
-    // Set the current position in steps
-    static inline void set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) {
-      planner.synchronize();
-      const bool was_enabled = STEPPER_ISR_ENABLED();
-      if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
-      _set_position(a, b, c, e);
-      if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
-    }
-    static inline void set_position(const xyze_long_t &abce) { set_position(abce.a, abce.b, abce.c, abce.e); }
-
-    static inline void set_axis_position(const AxisEnum a, const int32_t &v) {
-      planner.synchronize();
-
-      #ifdef __AVR__
-        // Protect the access to the position. Only required for AVR, as
-        //  any 32bit CPU offers atomic access to 32bit variables
-        const bool was_enabled = STEPPER_ISR_ENABLED();
-        if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT();
-      #endif
-
-      count_position[a] = v;
-
-      #ifdef __AVR__
-        // Reenable Stepper ISR
-        if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
-      #endif
-    }
-
     // Set direction bits for all steppers
     static void set_directions();
 
@@ -490,11 +471,11 @@ class Stepper {
     static void _set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e);
     FORCE_INLINE static void _set_position(const abce_long_t &spos) { _set_position(spos.a, spos.b, spos.c, spos.e); }
 
-    FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t scale, uint8_t* loops) {
+    FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t* loops) {
       uint32_t timer;
 
       // Scale the frequency, as requested by the caller
-      step_rate <<= scale;
+      step_rate <<= oversampling_factor;
 
       uint8_t multistep = 1;
       #if DISABLED(DISABLE_MULTI_STEPPING)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index f07f943213c2..cfb799001072 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -65,15 +65,12 @@
   #include "../libs/private_spi.h"
 #endif
 
-#if EITHER(BABYSTEPPING, PID_EXTRUSION_SCALING)
+#if ENABLED(PID_EXTRUSION_SCALING)
   #include "stepper.h"
 #endif
 
 #if ENABLED(BABYSTEPPING)
   #include "../feature/babystep.h"
-  #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
-    #include "../gcode/gcode.h"
-  #endif
 #endif
 
 #include "printcounter.h"

From 63dd0f249d3a82f8f253a1bd0f7c2edb7d4447e4 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Fri, 14 Feb 2020 21:18:57 +0800
Subject: [PATCH 195/565] Fysetc S6 pins / LCD updates (#16830)

---
 Marlin/Configuration_adv.h                         |  4 +++-
 .../extensible_ui/lib/ftdi_eve_touch_ui/compat.h   |  4 ++++
 .../lib/ftdi_eve_touch_ui/pin_mappings.h           |  9 +++++++++
 Marlin/src/pins/stm32/pins_FYSETC_S6.h             | 14 ++++++++++----
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2e0a5b5c50fc..cb2bdc08b4c5 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1333,9 +1333,11 @@
   //#define AO_EXP1_PINMAP    // AlephObjects CLCD UI EXP1 mapping
   //#define AO_EXP2_PINMAP    // AlephObjects CLCD UI EXP2 mapping
   //#define CR10_TFT_PINMAP   // Rudolph Riedel's CR10 pin mapping
+  //#define S6_TFT_PINMAP     // FYSETC S6 pin mapping
+
   //#define OTHER_PIN_LAYOUT  // Define pins manually below
   #if ENABLED(OTHER_PIN_LAYOUT)
-    // The pins for CS and MOD_RESET (PD) must be chosen.
+    // Pins for CS and MOD_RESET (PD) must be chosen
     #define CLCD_MOD_RESET  9
     #define CLCD_SPI_CS    10
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
index 90fd615a5d73..c3e8052a0e51 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
@@ -37,6 +37,10 @@
 #ifdef __MARLIN_FIRMWARE__
   // __MARLIN_FIRMWARE__ exists when compiled within Marlin.
   #include "pin_mappings.h"
+  #undef max
+  #define max(a,b) ((a)>(b)?(a):(b))
+  #undef min
+  #define min(a,b) ((a)<(b)?(a):(b))
 #else
   namespace UI {
     static inline uint32_t safe_millis() {return millis();};
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
index d474644b8c75..548c6c7439d4 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
@@ -27,6 +27,15 @@
  * without adding new pin definitions to the board.
  */
 
+#ifdef S6_TFT_PINMAP
+  #ifndef __MARLIN_FIRMWARE__
+    #error "This pin mapping requires Marlin."
+  #endif
+
+  #define CLCD_SPI_CS         PC7
+  #define CLCD_MOD_RESET      PC6
+#endif
+
 #ifdef CR10_TFT_PINMAP
   #ifndef __MARLIN_FIRMWARE__
     #error "This pin mapping requires Marlin."
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
index 4b85e6097cd9..16f176a376f7 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
@@ -48,6 +48,11 @@
   #define E2END 0xFFF // 4KB
 #endif
 
+//
+// Servos
+//
+#define SERVO0_PIN         PA3
+
 //
 // Limit Switches
 //
@@ -59,10 +64,11 @@
 #define Z_MAX_PIN          PA3
 
 //
-// Servos
-// share with Z_MAX_PIN
+// Filament Sensor
 //
-#define SERVO0_PIN         PA3
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN   PA1
+#endif
 
 //
 // Steppers
@@ -160,6 +166,7 @@
 //#define KILL_PIN           PC5
 
 #define SDSS               PA4
+#define SD_DETECT_PIN  	   PB10
 
 //
 // LCD / Controller
@@ -189,7 +196,6 @@
 
     #define BTN_EN1        PC6
     #define BTN_EN2        PC7
-    #define SD_DETECT_PIN  PB10
 
     #define LCD_SDSS       PA4
 

From 150237f7125c20aba6e81f93d04e48d166abe8a6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Feb 2020 00:03:59 +0000
Subject: [PATCH 196/565] [cron] Bump distribution date (2020-02-15)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d1938116fd10..41dd9ffb8ec8 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-14"
+  #define STRING_DISTRIBUTION_DATE "2020-02-15"
 #endif
 
 /**

From 1087e318e517571e166241222eff6ae7074bb49d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Feb 2020 01:45:24 -0600
Subject: [PATCH 197/565] Fix a BORG compile warning

---
 Marlin/src/pins/stm32/pins_THE_BORG.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32/pins_THE_BORG.h b/Marlin/src/pins/stm32/pins_THE_BORG.h
index 08da40029c5a..bfc9507c451e 100644
--- a/Marlin/src/pins/stm32/pins_THE_BORG.h
+++ b/Marlin/src/pins/stm32/pins_THE_BORG.h
@@ -30,7 +30,9 @@
 #define BOARD_INFO_NAME      "The-Borge"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
-#define E2END 0xFFF   // EEPROM end address
+#ifndef E2END
+  #define E2END 0xFFF   // EEPROM end address
+#endif
 
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000

From 71ec89a112b941818beed6ee54ac5cca444eff61 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Feb 2020 01:23:36 -0600
Subject: [PATCH 198/565] Fix mftest -b and -u. Add --help.

---
 buildroot/share/git/mftest | 46 ++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index 6db441478675..f647b8a2a6c8 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #
 #  mftest                             Select a test to apply and build
-#  mftest -b                          Build the auto-detected environment
-#  mftest -u                          Upload the auto-detected environment
+#  mftest -b [#]                      Build the auto-detected environment
+#  mftest -u [#]                      Upload the auto-detected environment
 #  mftest [name] [index] [-y]         Set config options and optionally build a test
 #
 
@@ -38,15 +38,27 @@ case $TESTENV in
     m256) TESTENV='megaatmega2560' ;;
     mega) TESTENV='megaatmega2560' ;;
      stm) TESTENV='STM32F103RE' ;;
-     f1)  TESTENV='STM32F103RE' ;;
-     f4)  TESTENV='STM32F4' ;;
-     f7)  TESTENV='STM32F7' ;;
-     s6)  TESTENV='FYSETC_S6' ;;
+      f1) TESTENV='STM32F103RE' ;;
+      f4) TESTENV='STM32F4' ;;
+      f7) TESTENV='STM32F7' ;;
+      s6) TESTENV='FYSETC_S6' ;;
   teensy) TESTENV='teensy31' ;;
      t31) TESTENV='teensy31' ;;
      t32) TESTENV='teensy31' ;;
      t35) TESTENV='teensy35' ;;
      t36) TESTENV='teensy35' ;;
+
+-h|--help)  echo -e "$(basename $0) : Marlin Firmware test, build, and upload\n"
+            echo "Usage: $(basename $0) ................. Select env and test to apply / run"
+            echo "       $(basename $0) [-y] env ........ Select a test for env to apply / run"
+            echo "       $(basename $0) [-y] env test ... Apply / run the specified env test"
+            echo "       $(basename $0) -b [variant] .... Auto-build the specified variant"
+            echo "       $(basename $0) -u [variant] .... Auto-build and upload the specified variant"
+            echo
+            echo "env shortcuts: tree due esp lin lpc|lpc8 lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36"
+            exit
+            ;;
+
           # Build with the last-built env
       -r) [[ -f "$STATE_FILE" ]] || { echo "No previous (-r) build state found." ; exit 1 ; }
           read TESTENV <"$STATE_FILE"
@@ -54,26 +66,26 @@ case $TESTENV in
           exit
           ;;
 
-   -[bu]) MB=$( grep "define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//' )
-          [[ -z $MB ]] && { echo "Error - Unable to read MOTHERBOARD setting." ; exit 1 ; }
-          BLINE=$( grep "define BOARD_$MB" Marlin/src/core/boards.h )
+   -[bu]) MB=$( grep -E "^\s*#define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//' )
+          [[ -z $MB ]] && { echo "Error - Can't read MOTHERBOARD setting." ; exit 1 ; }
+          BLINE=$( grep -E "define\s+BOARD_$MB\b" Marlin/src/core/boards.h )
           BNUM=$( $SED -E 's/^.+BOARD_[^ ]+ +([0-9]+).+$/\1/' <<<"$BLINE" )
           BDESC=$( $SED -E 's/^.+\/\/ *(.+)$/\1/' <<<"$BLINE" )
-          [[ -z $BNUM ]] && { echo "Error - Unable to $MB in boards list." ; exit 1 ; }
-          readarray -t ENVS <<< $( grep -A1 "MB($MB)" Marlin/src/pins/pins.h | $SED -n '2 p' | grep -oE 'env:[^ ]+' | $SED -E 's/env://' )
-          [[ -z $ENVS ]] && { echo "Error - Unable to find target(s) for $MB ($BNUM)." ; exit 1 ; }
+          [[ -z $BNUM ]] && { echo "Error - Can't find $MB in boards list." ; exit 1 ; }
+          readarray -t ENVS <<< $( grep -EA1 "MB\(.*\b$MB\b.*\)" Marlin/src/pins/pins.h | $SED -n '2 p' | grep -oE 'env:[^ ]+' | $SED -E 's/env://' )
+          [[ -z $ENVS ]] && { echo "Error - Can't find target(s) for $MB ($BNUM)." ; exit 1 ; }
           ECOUNT=${#ENVS[*]}
 
           if [[ $ECOUNT == 1 ]]; then
             TARGET=$ENVS
           else
-            #
-            # List env names and numbers. Get selection.
-            #
             if [[ $CHOICE == 0 ]]; then
+              #
+              # List env names and numbers. Get selection.
+              #
               echo "Available targets for \"$BDESC\" | $MB ($BNUM):"
 
-              IND=0 ; for ENV in "${ENVS[@]}"; do echo " $IND) $ENV" ; done
+              IND=0 ; for ENV in "${ENVS[@]}"; do let IND++ ; echo " $IND) $ENV" ; done
 
               if [[ $ECOUNT > 1 ]]; then
                 for (( ; ; ))
@@ -87,7 +99,7 @@ case $TESTENV in
               fi
             else
               echo "Detected \"$BDESC\" | $MB ($BNUM)."
-              [[ $CHOICE > $ECOUNT ]] && { echo "Environment selection is out of range." ; exit 1 ; }
+              [[ $CHOICE > $ECOUNT ]] && { echo "Environment selection out of range." ; exit 1 ; }
             fi
             TARGET="${ENVS[$CHOICE-1]}"
             echo "Selected $TARGET"

From efdaf940a557e38a0446421309c862c8d7fccd3e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Feb 2020 02:35:36 -0600
Subject: [PATCH 199/565] Fix byte-to-percent display

Fixes #16866
---
 Marlin/src/lcd/menu/menu.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 4020385a1508..de531e5a324e 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -234,10 +234,10 @@ template<typename NAME>
 class TMenuEditItem : MenuEditItemBase {
   private:
     typedef typename NAME::type_t type_t;
-    static inline float unscale(const float value)    { return value * (1.0f / NAME::scale);  }
-    static inline float scale(const float value)      { return value * NAME::scale;           }
-    static void load(void *ptr, const int32_t value)  { *((type_t*)ptr) = unscale(value);     }
+    static inline float scale(const float value)      { return NAME::scale(value);            }
+    static inline float unscale(const float value)    { return NAME::unscale(value);          }
     static const char* to_string(const int32_t value) { return NAME::strfunc(unscale(value)); }
+    static void load(void *ptr, const int32_t value)  { *((type_t*)ptr) = unscale(value);     }
   public:
     FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, type_t * const data, ...) {
       MenuEditItemBase::draw(sel, row, pstr, NAME::strfunc(*(data)));
@@ -266,16 +266,17 @@ class TMenuEditItem : MenuEditItemBase {
 // Provide a set of Edit Item Types which encompass a primitive
 // type, a string function, and a scale factor for edit and display.
 // These items call the Edit Item draw method passing the prepared string.
-#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, STRFUNC, SCALE) \
-  struct MenuEditItemInfo_##NAME { \
-    typedef TYPE type_t; \
-    static constexpr float scale = SCALE; \
+#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, STRFUNC, SCALE, V...)                      \
+  struct MenuEditItemInfo_##NAME {                                                        \
+    typedef TYPE type_t;                                                                  \
+    static inline float scale(const float value)   { return value * (SCALE) + (V+0); }    \
+    static inline float unscale(const float value) { return value / (SCALE) + (V+0); }    \
     static inline const char* strfunc(const float value) { return STRFUNC((TYPE)value); } \
-  }; \
+  };                                                                                      \
   typedef TMenuEditItem<MenuEditItemInfo_##NAME> MenuItem_##NAME
 
 //                         TYPE      NAME         STRFUNC       SCALE
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  percent,     ui8tostr4pct, 100.0/255);   // 100%       right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  percent,     ui8tostr4pct, 100.0/255, 0.5);  // 100%   right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int3,        i16tostr3,       1     );   // 123, -12   right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int4,        i16tostr4sign,   1     );   // 1234, -123 right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(int8_t,   int8,        i8tostr3,        1     );   // 123, -12   right-justified

From 5584da388c4a425207dd8460bf66538b29954bc2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Feb 2020 02:44:34 -0600
Subject: [PATCH 200/565] Conceal float rounding errors on display

Fix #16866
---
 Marlin/src/lcd/menu/menu.h | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index de531e5a324e..5299fefde2b7 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -266,35 +266,35 @@ class TMenuEditItem : MenuEditItemBase {
 // Provide a set of Edit Item Types which encompass a primitive
 // type, a string function, and a scale factor for edit and display.
 // These items call the Edit Item draw method passing the prepared string.
-#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, STRFUNC, SCALE, V...)                      \
-  struct MenuEditItemInfo_##NAME {                                                        \
-    typedef TYPE type_t;                                                                  \
-    static inline float scale(const float value)   { return value * (SCALE) + (V+0); }    \
-    static inline float unscale(const float value) { return value / (SCALE) + (V+0); }    \
-    static inline const char* strfunc(const float value) { return STRFUNC((TYPE)value); } \
-  };                                                                                      \
+#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, FIX, STRFUNC, SCALE, V...) \
+  struct MenuEditItemInfo_##NAME { \
+    typedef TYPE type_t; \
+    static inline float scale(const float value)   { return value * (SCALE) + (V+0); } \
+    static inline float unscale(const float value) { return value / (SCALE) + (V+0); } \
+    static inline const char* strfunc(const float value) { return STRFUNC((TYPE)(FIX ? FIXFLOAT(value) : value)); } \
+  }; \
   typedef TMenuEditItem<MenuEditItemInfo_##NAME> MenuItem_##NAME
 
 //                         TYPE      NAME         STRFUNC       SCALE
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  percent,     ui8tostr4pct, 100.0/255, 0.5);  // 100%   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int3,        i16tostr3,       1     );   // 123, -12   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int4,        i16tostr4sign,   1     );   // 1234, -123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int8_t,   int8,        i8tostr3,        1     );   // 123, -12   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  uint8,       ui8tostr3,       1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_3,    ui16tostr3,      1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_4,    ui16tostr4,      0.1   );   // 1234       right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_5,    ui16tostr5,      0.01  );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float3,      ftostr3,         1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52,     ftostr42_52,   100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float43,     ftostr43sign, 1000     );   // 1.234
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5,      ftostr5rj,       1     );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5_25,   ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51,     ftostr51rj,     10     );   // 1234.5     right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float41sign, ftostr41sign,   10     );   // +123.4
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51sign, ftostr51sign,   10     );   // +1234.5
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52sign, ftostr52sign,  100     );   // +123.45
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5_25,    ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
+DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  percent,     0, ui8tostr4pct, 100.0/255, 0.5);  // 100%   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int3,        0, i16tostr3,       1     );   // 123, -12   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int4,        0, i16tostr4sign,   1     );   // 1234, -123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int8_t,   int8,        0, i8tostr3,        1     );   // 123, -12   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  uint8,       0, ui8tostr3,       1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_3,    0, ui16tostr3,      1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_4,    0, ui16tostr4,      0.1   );   // 1234       right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_5,    0, ui16tostr5,      0.01  );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float3,      1, ftostr3,         1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52,     1, ftostr42_52,   100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float43,     1, ftostr43sign, 1000     );   // 1.234
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5,      1, ftostr5rj,       1     );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5_25,   1, ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51,     1, ftostr51rj,     10     );   // 1234.5     right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float41sign, 1, ftostr41sign,   10     );   // +123.4
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51sign, 1, ftostr51sign,   10     );   // +1234.5
+DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52sign, 1, ftostr52sign,  100     );   // +123.45
+DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5,       0, ftostr5rj,       0.01f );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5_25,    0, ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
 
 class MenuItem_bool : public MenuEditItemBase {
   public:

From 52a126808917f480e0ee1f8bcdf8fb6eeaacc4ba Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 16 Feb 2020 00:04:09 +0000
Subject: [PATCH 201/565] [cron] Bump distribution date (2020-02-16)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 41dd9ffb8ec8..96a47155fad9 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-15"
+  #define STRING_DISTRIBUTION_DATE "2020-02-16"
 #endif
 
 /**

From 64b96f390867700834641b01bbb37a40867a7bef Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:10:46 -0600
Subject: [PATCH 202/565] Double ADC read frequency (#16864)

---
 Marlin/src/module/temperature.cpp | 232 ++++++++++++++++++------------
 platformio.ini                    |   2 -
 2 files changed, 143 insertions(+), 91 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index cfb799001072..a422912742c9 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2798,23 +2798,133 @@ void Temperature::tick() {
   if ((do_buttons ^= true)) ui.update_buttons();
 
   /**
-   * One sensor is sampled on every other call of the ISR.
-   * Each sensor is read 16 (OVERSAMPLENR) times, taking the average.
+   * On each call to the ISR one sensor is Sampled and
+   * the next sensor is Prepared.
    *
-   * On each Prepare pass, ADC is started for a sensor pin.
-   * On the next pass, the ADC value is read and accumulated.
+   * Sensors are read 16 (OVERSAMPLENR) times and the
+   * final reading takes the average.
    *
-   * This gives each ADC 0.9765ms to charge up.
+   * Extra do-nothing passes may exist when there are
+   * only a few sensors. This is set by MIN_ADC_ISR_LOOPS.
+   *
+   * The timing of this ISR gives ADCs 0.9765ms to charge up.
    */
-  #define ACCUMULATE_ADC(obj) do{ \
-    if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; \
-    else obj.sample(HAL_READ_ADC()); \
+  #define ACCUMULATE_ADC(obj) do{           \
+    if (HAL_ADC_READY())                    \
+      obj.sample(HAL_READ_ADC());           \
+    else                                    \
+      next_sensor_state = adc_sensor_state; \
   }while(0)
 
-  ADCSensorState next_sensor_state = adc_sensor_state < SensorsReady ? (ADCSensorState)(int(adc_sensor_state) + 1) : StartSampling;
+  #define NEXT_ENUM(A) (typeof(A))(int(A) + 1)
+  #define NEXT_ADC_STATE(N) ((N) >= SensorsReady ? StartSampling : NEXT_ENUM(N))
+
+  // Assume the machine will go on to the next state
+  ADCSensorState next_sensor_state = NEXT_ADC_STATE(adc_sensor_state);
+
+  switch (adc_sensor_state) {
+
+    default: break;
+
+    #if HAS_TEMP_ADC_0
+      case MeasureTemp_0:       ACCUMULATE_ADC(temp_hotend[0]); break;
+    #endif
+    #if HAS_HEATED_BED
+      case MeasureTemp_BED:     ACCUMULATE_ADC(temp_bed); break;
+    #endif
+    #if HAS_TEMP_CHAMBER
+      case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
+    #endif
+    #if HAS_TEMP_PROBE
+      case MeasureTemp_PROBE:   ACCUMULATE_ADC(temp_probe); break;
+    #endif
+    #if HAS_TEMP_ADC_1
+      case MeasureTemp_1:       ACCUMULATE_ADC(temp_hotend[1]); break;
+    #endif
+    #if HAS_TEMP_ADC_2
+      case MeasureTemp_2:       ACCUMULATE_ADC(temp_hotend[2]); break;
+    #endif
+    #if HAS_TEMP_ADC_3
+      case MeasureTemp_3:       ACCUMULATE_ADC(temp_hotend[3]); break;
+    #endif
+    #if HAS_TEMP_ADC_4
+      case MeasureTemp_4:       ACCUMULATE_ADC(temp_hotend[4]); break;
+    #endif
+    #if HAS_TEMP_ADC_5
+      case MeasureTemp_5:       ACCUMULATE_ADC(temp_hotend[5]); break;
+    #endif
+    #if HAS_TEMP_ADC_6
+      case MeasureTemp_6:       ACCUMULATE_ADC(temp_hotend[6]); break;
+    #endif
+    #if HAS_TEMP_ADC_7
+      case MeasureTemp_7:       ACCUMULATE_ADC(temp_hotend[7]); break;
+    #endif
+
+    #if ENABLED(FILAMENT_WIDTH_SENSOR)
+      case Measure_FILWIDTH:
+        if (HAL_ADC_READY())
+          filwidth.accumulate(HAL_READ_ADC());
+        else
+          next_sensor_state = adc_sensor_state; // redo this state
+      break;
+    #endif
+
+    #if HAS_JOY_ADC_X
+      case MeasureJoy_X:        ACCUMULATE_ADC(joystick.x); break;
+    #endif
+    #if HAS_JOY_ADC_Y
+      case MeasureJoy_Y:        ACCUMULATE_ADC(joystick.y); break;
+    #endif
+    #if HAS_JOY_ADC_Z
+      case MeasureJoy_Z:        ACCUMULATE_ADC(joystick.z); break;
+    #endif
+
+    #if HAS_ADC_BUTTONS
+      #ifndef ADC_BUTTON_DEBOUNCE_DELAY
+        #define ADC_BUTTON_DEBOUNCE_DELAY 16
+      #endif
+      case Measure_ADC_KEY: {
+        if (HAL_ADC_READY()) {
+          if (ADCKey_count < ADC_BUTTON_DEBOUNCE_DELAY) {
+            raw_ADCKey_value = HAL_READ_ADC();
+            if (raw_ADCKey_value <= (HAL_ADC_RANGE) * 900UL / 1024UL) {
+              NOMORE(current_ADCKey_raw, raw_ADCKey_value);
+              ADCKey_count++;
+            }
+            else { // ADC Key release
+              if (ADCKey_count > 0) {
+                if (ADCKey_pressed) {
+                  ADCKey_count = 0;
+                  current_ADCKey_raw = HAL_ADC_RANGE;
+                }
+                else
+                  ADCKey_count++;
+              }
+              else
+                ADCKey_pressed = false;
+            }
+            if (ADCKey_count == ADC_BUTTON_DEBOUNCE_DELAY) ADCKey_pressed = true;
+          }
+        }
+        else
+          next_sensor_state = adc_sensor_state; // redo this state
+
+      } break;
+
+    #endif // HAS_ADC_BUTTONS
+
+  } // switch(adc_sensor_state)
+
+  // Go to the next state (may be unchanged)
+  adc_sensor_state = next_sensor_state;
+
+  // Assume that the state advances
+  next_sensor_state = NEXT_ADC_STATE(adc_sensor_state);
 
   switch (adc_sensor_state) {
 
+    default: break;
+
     case SensorsReady: {
       // All sensors have been read. Stay in this state for a few
       // ISRs to save on calls to temp update/checking code below.
@@ -2824,128 +2934,72 @@ void Temperature::tick() {
         if (delay_count == 0) delay_count = extra_loops;  // Init this delay
         if (--delay_count)                                // While delaying...
           next_sensor_state = SensorsReady;               // retain this state (else, next state will be 0)
-        break;
+        break;                                            // No fallthru
       }
       else {
-        adc_sensor_state = StartSampling;                 // Fall-through to start sampling
-        next_sensor_state = (ADCSensorState)(int(StartSampling) + 1);
+        adc_sensor_state = StartSampling;                 // Fall through to count up oversamples
+        next_sensor_state = NEXT_ENUM(StartSampling);     // and possibly send the final readings.
       }
     }
+    // fallthru
 
     case StartSampling:                                   // Start of sampling loops. Do updates/checks.
-      if (++temp_count >= OVERSAMPLENR) {                 // 10 * 16 * 1/(16000000/64/256)  = 164ms.
+      if (++temp_count >= OVERSAMPLENR) {                 // 10 * 16 * 1 / (16000000 / 64 / 256) = 164ms.
         temp_count = 0;
         readings_ready();
       }
-      break;
+      adc_sensor_state = NEXT_ENUM(StartSampling);        // Do one Prepare phase before exiting
+      next_sensor_state = NEXT_ENUM(adc_sensor_state);    // Also update the next state
+      // fallthru
 
     #if HAS_TEMP_ADC_0
-      case PrepareTemp_0: HAL_START_ADC(TEMP_0_PIN); break;
-      case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
+      case PrepareTemp_0:       HAL_START_ADC(TEMP_0_PIN); break;
     #endif
-
     #if HAS_HEATED_BED
-      case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
-      case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
+      case PrepareTemp_BED:     HAL_START_ADC(TEMP_BED_PIN); break;
     #endif
-
     #if HAS_TEMP_CHAMBER
       case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
-      case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
     #endif
-
     #if HAS_TEMP_PROBE
-      case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
-      case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
+      case PrepareTemp_PROBE:   HAL_START_ADC(TEMP_PROBE_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_1
-      case PrepareTemp_1: HAL_START_ADC(TEMP_1_PIN); break;
-      case MeasureTemp_1: ACCUMULATE_ADC(temp_hotend[1]); break;
+      case PrepareTemp_1:       HAL_START_ADC(TEMP_1_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_2
-      case PrepareTemp_2: HAL_START_ADC(TEMP_2_PIN); break;
-      case MeasureTemp_2: ACCUMULATE_ADC(temp_hotend[2]); break;
+      case PrepareTemp_2:       HAL_START_ADC(TEMP_2_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_3
-      case PrepareTemp_3: HAL_START_ADC(TEMP_3_PIN); break;
-      case MeasureTemp_3: ACCUMULATE_ADC(temp_hotend[3]); break;
+      case PrepareTemp_3:       HAL_START_ADC(TEMP_3_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_4
-      case PrepareTemp_4: HAL_START_ADC(TEMP_4_PIN); break;
-      case MeasureTemp_4: ACCUMULATE_ADC(temp_hotend[4]); break;
+      case PrepareTemp_4:       HAL_START_ADC(TEMP_4_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_5
-      case PrepareTemp_5: HAL_START_ADC(TEMP_5_PIN); break;
-      case MeasureTemp_5: ACCUMULATE_ADC(temp_hotend[5]); break;
+      case PrepareTemp_5:       HAL_START_ADC(TEMP_5_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_6
-      case PrepareTemp_6: HAL_START_ADC(TEMP_6_PIN); break;
-      case MeasureTemp_6: ACCUMULATE_ADC(temp_hotend[6]); break;
+      case PrepareTemp_6:       HAL_START_ADC(TEMP_6_PIN); break;
     #endif
-
     #if HAS_TEMP_ADC_7
-      case PrepareTemp_7: HAL_START_ADC(TEMP_7_PIN); break;
-      case MeasureTemp_7: ACCUMULATE_ADC(temp_hotend[7]); break;
+      case PrepareTemp_7:       HAL_START_ADC(TEMP_7_PIN); break;
     #endif
-
     #if ENABLED(FILAMENT_WIDTH_SENSOR)
-      case Prepare_FILWIDTH: HAL_START_ADC(FILWIDTH_PIN); break;
-      case Measure_FILWIDTH:
-        if (!HAL_ADC_READY())
-          next_sensor_state = adc_sensor_state; // redo this state
-        else
-          filwidth.accumulate(HAL_READ_ADC());
-      break;
+      case Prepare_FILWIDTH:    HAL_START_ADC(FILWIDTH_PIN); break;
     #endif
-
     #if HAS_JOY_ADC_X
-      case PrepareJoy_X: HAL_START_ADC(JOY_X_PIN); break;
-      case MeasureJoy_X: ACCUMULATE_ADC(joystick.x); break;
+      case PrepareJoy_X:        HAL_START_ADC(JOY_X_PIN); break;
     #endif
-
     #if HAS_JOY_ADC_Y
-      case PrepareJoy_Y: HAL_START_ADC(JOY_Y_PIN); break;
-      case MeasureJoy_Y: ACCUMULATE_ADC(joystick.y); break;
+      case PrepareJoy_Y:        HAL_START_ADC(JOY_Y_PIN); break;
     #endif
-
     #if HAS_JOY_ADC_Z
-      case PrepareJoy_Z: HAL_START_ADC(JOY_Z_PIN); break;
-      case MeasureJoy_Z: ACCUMULATE_ADC(joystick.z); break;
+      case PrepareJoy_Z:        HAL_START_ADC(JOY_Z_PIN); break;
     #endif
-
     #if HAS_ADC_BUTTONS
-      #ifndef ADC_BUTTON_DEBOUNCE_DELAY
-        #define ADC_BUTTON_DEBOUNCE_DELAY 16
-      #endif
-      case Prepare_ADC_KEY: HAL_START_ADC(ADC_KEYPAD_PIN); break;
-      case Measure_ADC_KEY:
-        if (!HAL_ADC_READY())
-          next_sensor_state = adc_sensor_state; // redo this state
-        else if (ADCKey_count < ADC_BUTTON_DEBOUNCE_DELAY) {
-          raw_ADCKey_value = HAL_READ_ADC();
-          if (raw_ADCKey_value <= 900UL * HAL_ADC_RANGE / 1024UL) {
-            NOMORE(current_ADCKey_raw, raw_ADCKey_value);
-            ADCKey_count++;
-          }
-          else { //ADC Key release
-            if (ADCKey_count > 0) ADCKey_count++; else ADCKey_pressed = false;
-            if (ADCKey_pressed) {
-              ADCKey_count = 0;
-              current_ADCKey_raw = HAL_ADC_RANGE;
-            }
-          }
-        }
-        if (ADCKey_count == ADC_BUTTON_DEBOUNCE_DELAY) ADCKey_pressed = true;
-        break;
-    #endif // HAS_ADC_BUTTONS
-
-    case StartupDelay: break;
+      case Prepare_ADC_KEY:     HAL_START_ADC(ADC_KEYPAD_PIN); break;
+    #endif
 
   } // switch(adc_sensor_state)
 
diff --git a/platformio.ini b/platformio.ini
index 450fc32eb9d1..06946b774760 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -138,7 +138,6 @@ board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
-build_flags   = ${common.build_flags}
 lib_ignore    = TMCStepper
 upload_speed  = 57600
 
@@ -151,7 +150,6 @@ board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
-build_flags   = ${common.build_flags}
 lib_ignore    = TMCStepper
 upload_speed  = 115200
 

From 64a81f887a3b9fd471484dba784e11bdba88ffbb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:42:28 -0600
Subject: [PATCH 203/565] EXPERIMENTAL integrated BABYSTEPPING (#16829)

---
 Marlin/Configuration_adv.h        |  1 +
 Marlin/src/feature/babystep.cpp   |  4 +++
 Marlin/src/feature/babystep.h     | 14 +++++++++-
 Marlin/src/module/stepper.cpp     | 45 ++++++++++++++++++++++++++++---
 Marlin/src/module/stepper.h       | 16 +++++++++++
 Marlin/src/module/temperature.cpp |  4 +--
 6 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index cb2bdc08b4c5..ca4f86a834e8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1447,6 +1447,7 @@
  */
 //#define BABYSTEPPING
 #if ENABLED(BABYSTEPPING)
+  //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR
   //#define BABYSTEP_WITHOUT_HOMING
   //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index eedd8f6196c8..be2d1b0d2e2e 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -117,6 +117,10 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
     gcode.reset_stepper_timeout();
   #endif
+
+  #if ENABLED(INTEGRATED_BABYSTEPPING)
+    if (has_steps()) stepper.initiateBabystepping();
+  #endif
 }
 
 #endif // BABYSTEPPING
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index 63ea0e3e24a0..7f017afb55cc 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -23,6 +23,14 @@
 
 #include "../inc/MarlinConfigPre.h"
 
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+  #define BABYSTEPS_PER_SEC 1000UL
+  #define BABYSTEP_TICKS ((STEPPER_TIMER_RATE) / (BABYSTEPS_PER_SEC))
+#else
+  #define BABYSTEPS_PER_SEC 976UL
+  #define BABYSTEP_TICKS ((TEMP_TIMER_RATE) / (BABYSTEPS_PER_SEC))
+#endif
+
 #if IS_CORE || EITHER(BABYSTEP_XY, I2C_POSITION_ENCODERS)
   #define BS_TODO_AXIS(A) A
 #else
@@ -56,8 +64,12 @@ class Babystep {
   static void add_steps(const AxisEnum axis, const int16_t distance);
   static void add_mm(const AxisEnum axis, const float &mm);
 
+  static inline bool has_steps() {
+    return steps[BS_TODO_AXIS(X_AXIS)] || steps[BS_TODO_AXIS(Y_AXIS)] || steps[BS_TODO_AXIS(Z_AXIS)];
+  }
+
   //
-  // Called by the Temperature ISR to
+  // Called by the Temperature or Stepper ISR to
   // apply accumulated babysteps to the axes.
   //
   static inline void task() {
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 6e0a318fcb2b..e898d974ed0f 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -217,6 +217,10 @@ uint32_t Stepper::advance_divisor = 0,
 
 #endif // LIN_ADVANCE
 
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+  uint32_t Stepper::nextBabystepISR = BABYSTEP_NEVER;
+#endif
+
 int32_t Stepper::ticks_nominal = -1;
 #if DISABLED(S_CURVE_ACCELERATION)
   uint32_t Stepper::acc_step_rate; // needed for deceleration start point
@@ -1358,16 +1362,32 @@ void Stepper::isr() {
       if (!nextAdvanceISR) nextAdvanceISR = advance_isr();          // 0 = Do Linear Advance E Stepper pulses
     #endif
 
+    #if ENABLED(INTEGRATED_BABYSTEPPING)
+      const bool do_babystep = (nextBabystepISR == 0);              // 0 = Do Babystepping (XY)Z pulses
+      if (do_babystep) nextBabystepISR = babystepping_isr();
+    #endif
+
     // ^== Time critical. NOTHING besides pulse generation should be above here!!!
 
     if (!nextMainISR) nextMainISR = block_phase_isr();  // Manage acc/deceleration, get next block
 
+    #if ENABLED(INTEGRATED_BABYSTEPPING)
+      if (do_babystep)                                  // Avoid ANY stepping too soon after baby-stepping
+        NOLESS(nextMainISR, (BABYSTEP_TICKS) / 8)       // FULL STOP for 125µs after a baby-step
+
+      if (nextBabystepISR != BABYSTEP_NEVER)            // Avoid baby-stepping too close to axis Stepping
+        NOLESS(nextBabystepISR, nextMainISR / 2)        // TODO: Only look at axes enabled for baby-stepping
+    #endif
+
     // Get the interval to the next ISR call
     const uint32_t interval = _MIN(
-      nextMainISR                                       // Time until the next Stepper ISR
+      nextMainISR                                       // Time until the next Pulse / Block phase
       #if ENABLED(LIN_ADVANCE)
         , nextAdvanceISR                                // Come back early for Linear Advance?
       #endif
+      #if ENABLED(INTEGRATED_BABYSTEPPING)
+        , nextBabystepISR                               // Come back early for Babystepping?
+      #endif
       , uint32_t(HAL_TIMER_TYPE_MAX)                    // Come back in a very long time
     );
 
@@ -1384,6 +1404,10 @@ void Stepper::isr() {
       if (nextAdvanceISR != LA_ADV_NEVER) nextAdvanceISR -= interval;
     #endif
 
+    #if ENABLED(INTEGRATED_BABYSTEPPING)
+      if (nextBabystepISR != BABYSTEP_NEVER) nextBabystepISR -= interval;
+    #endif
+
     /**
      * This needs to avoid a race-condition caused by interleaving
      * of interrupts required by both the LA and Stepper algorithms.
@@ -2043,6 +2067,16 @@ uint32_t Stepper::block_phase_isr() {
 
 #endif // LIN_ADVANCE
 
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+
+  // Timer interrupt for baby-stepping
+  uint32_t Stepper::babystepping_isr() {
+    babystep.task();
+    return babystep.has_steps() ? BABYSTEP_TICKS : BABYSTEP_NEVER;
+  }
+
+#endif
+
 // Check if the given block is busy or not - Must not be called from ISR contexts
 // The current_block could change in the middle of the read by an Stepper ISR, so
 // we must explicitly prevent that!
@@ -2511,7 +2545,10 @@ void Stepper::report_positions() {
   // MUST ONLY BE CALLED BY AN ISR,
   // No other ISR should ever interrupt this!
   void Stepper::babystep(const AxisEnum axis, const bool direction) {
-    cli();
+
+    #if DISABLED(INTEGRATED_BABYSTEPPING)
+      cli();
+    #endif
 
     switch (axis) {
 
@@ -2594,7 +2631,9 @@ void Stepper::report_positions() {
       default: break;
     }
 
-    sei();
+    #if DISABLED(INTEGRATED_BABYSTEPPING)
+      sei();
+    #endif
   }
 
 #endif // BABYSTEPPING
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index ed07bfd5df32..9f1b9321bb35 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -329,6 +329,11 @@ class Stepper {
       static bool LA_use_advance_lead;
     #endif
 
+    #if ENABLED(INTEGRATED_BABYSTEPPING)
+      static constexpr uint32_t BABYSTEP_NEVER = 0xFFFFFFFF;
+      static uint32_t nextBabystepISR;
+    #endif
+
     static int32_t ticks_nominal;
     #if DISABLED(S_CURVE_ACCELERATION)
       static uint32_t acc_step_rate; // needed for deceleration start point
@@ -383,6 +388,17 @@ class Stepper {
       FORCE_INLINE static void initiateLA() { nextAdvanceISR = 0; }
     #endif
 
+    #if ENABLED(INTEGRATED_BABYSTEPPING)
+      // The Babystepping ISR phase
+      static uint32_t babystepping_isr();
+      FORCE_INLINE static void initiateBabystepping() {
+        if (nextBabystepISR == BABYSTEP_NEVER) {
+          nextBabystepISR = 0;
+          wake_up();
+        }
+      }
+    #endif
+
     // Check if the given block is busy or not - Must not be called from ISR contexts
     static bool is_block_busy(const block_t* const block);
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index a422912742c9..5bed31b1a1f3 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -69,7 +69,7 @@
   #include "stepper.h"
 #endif
 
-#if ENABLED(BABYSTEPPING)
+#if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
   #include "../feature/babystep.h"
 #endif
 
@@ -3010,7 +3010,7 @@ void Temperature::tick() {
   // Additional ~1KHz Tasks
   //
 
-  #if ENABLED(BABYSTEPPING)
+  #if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
     babystep.task();
   #endif
 

From 72fae2faa5c95f63f50daf49be67657ddc3ad069 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Feb 2020 18:51:23 -0600
Subject: [PATCH 204/565] Require TMCStepper 0.6.2

---
 Marlin/src/module/stepper/trinamic.cpp     |  8 +++---
 buildroot/share/tests/megaatmega2560-tests | 30 +++++++++++-----------
 platformio.ini                             |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 1103e12f63ed..506383aa3577 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -44,13 +44,13 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 //   AI = Axis Enum Index
 // SWHW = SW/SH UART selection
 #if ENABLED(TMC_USE_SW_SPI)
-  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, ST##_RSENSE, TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS)
+  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS)
 #else
-  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, ST##_RSENSE, ST##_CHAIN_POS)
+  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), ST##_CHAIN_POS)
 #endif
 
-#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, ST##_RSENSE, ST##_SLAVE_ADDRESS)
-#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, ST##_RSENSE, ST##_SLAVE_ADDRESS, ST##_SERIAL_RX_PIN > -1)
+#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, float(ST##_RSENSE), ST##_SLAVE_ADDRESS)
+#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, float(ST##_RSENSE), ST##_SLAVE_ADDRESS, ST##_SERIAL_RX_PIN > -1)
 
 #define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
 #define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests
index 9509806d1a1a..a49536529f9e 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/megaatmega2560-tests
@@ -339,21 +339,6 @@ exec_test $1 $2 "RAMPS 1.3 | DELTA | FLSUN AC Config"
 #use_example_configs makibox
 #exec_test $1 $2 "Stuff"
 
-#
-# SCARA with Mixed TMC
-#
-use_example_configs SCARA/Morgan
-opt_set LCD_LANGUAGE es
-opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
-           MKS_12864OLED EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
-           STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
-opt_set X_MAX_ENDSTOP_INVERTING false
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set Z_DRIVER_TYPE TMC2130_STANDALONE
-opt_set E0_DRIVER_TYPE TMC2660
-exec_test $1 $2 "RAMPS | SCARA | Mixed TMC | EEPROM"
-
 #
 # Test mixed TMC config
 #
@@ -371,6 +356,21 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
            USE_ZMIN_PLUG SENSORLESS_HOMING TMC_DEBUG M114_DETAIL
 exec_test $1 $2 "RAMPS | Mixed TMC | Sensorless | RRDFGSC | Games"
 
+#
+# SCARA with Mixed TMC
+#
+use_example_configs SCARA/Morgan
+opt_set LCD_LANGUAGE es
+opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
+           MKS_12864OLED EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
+           STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
+opt_set X_MAX_ENDSTOP_INVERTING false
+opt_set X_DRIVER_TYPE TMC2209
+opt_set Y_DRIVER_TYPE TMC2130
+opt_set Z_DRIVER_TYPE TMC2130_STANDALONE
+opt_set E0_DRIVER_TYPE TMC2660
+exec_test $1 $2 "RAMPS | SCARA | Mixed TMC | EEPROM"
+
 #
 # tvrrug Config need to check board type for sanguino atmega644p
 #
diff --git a/platformio.ini b/platformio.ini
index 06946b774760..fc8c0dc1af81 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,7 +26,7 @@ extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
 build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
 lib_deps =
   LiquidCrystal
-  TMCStepper@>=0.6.1,<1.0.0
+  TMCStepper@>=0.6.2,<1.0.0
   Adafruit NeoPixel
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
   Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip

From ddce1c6ef23f86bde9389a309838ead6e0d0f36b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Feb 2020 18:28:04 -0600
Subject: [PATCH 205/565] Show '*' for zero 'stst' flag

---
 Marlin/src/feature/tmc_util.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 11a81559df9e..be26b804b593 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -723,13 +723,13 @@
     SERIAL_CHAR('\t');
     switch (i) {
       case TMC_DRV_CODES:     st.printLabel();  break;
-      case TMC_STST:          if (st.stst())         SERIAL_CHAR('*'); break;
-      case TMC_OLB:           if (st.olb())          SERIAL_CHAR('*'); break;
-      case TMC_OLA:           if (st.ola())          SERIAL_CHAR('*'); break;
-      case TMC_S2GB:          if (st.s2gb())         SERIAL_CHAR('*'); break;
-      case TMC_S2GA:          if (st.s2ga())         SERIAL_CHAR('*'); break;
-      case TMC_DRV_OTPW:      if (st.otpw())         SERIAL_CHAR('*'); break;
-      case TMC_OT:            if (st.ot())           SERIAL_CHAR('*'); break;
+      case TMC_STST:          if (!st.stst())   SERIAL_CHAR('*'); break;
+      case TMC_OLB:           if (st.olb())     SERIAL_CHAR('*'); break;
+      case TMC_OLA:           if (st.ola())     SERIAL_CHAR('*'); break;
+      case TMC_S2GB:          if (st.s2gb())    SERIAL_CHAR('*'); break;
+      case TMC_S2GA:          if (st.s2ga())    SERIAL_CHAR('*'); break;
+      case TMC_DRV_OTPW:      if (st.otpw())    SERIAL_CHAR('*'); break;
+      case TMC_OT:            if (st.ot())      SERIAL_CHAR('*'); break;
       case TMC_DRV_STATUS_HEX: {
         const uint32_t drv_status = st.DRV_STATUS();
         SERIAL_CHAR('\t');

From 4360142bd10d4750cb4e2502b43bd22be6b424f3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Feb 2020 22:37:16 -0600
Subject: [PATCH 206/565] Defer updated ADC

---
 Marlin/src/module/temperature.cpp | 232 ++++++++++++------------------
 1 file changed, 89 insertions(+), 143 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 5bed31b1a1f3..de64c28c8563 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2798,133 +2798,23 @@ void Temperature::tick() {
   if ((do_buttons ^= true)) ui.update_buttons();
 
   /**
-   * On each call to the ISR one sensor is Sampled and
-   * the next sensor is Prepared.
+   * One sensor is sampled on every other call of the ISR.
+   * Each sensor is read 16 (OVERSAMPLENR) times, taking the average.
    *
-   * Sensors are read 16 (OVERSAMPLENR) times and the
-   * final reading takes the average.
+   * On each Prepare pass, ADC is started for a sensor pin.
+   * On the next pass, the ADC value is read and accumulated.
    *
-   * Extra do-nothing passes may exist when there are
-   * only a few sensors. This is set by MIN_ADC_ISR_LOOPS.
-   *
-   * The timing of this ISR gives ADCs 0.9765ms to charge up.
+   * This gives each ADC 0.9765ms to charge up.
    */
-  #define ACCUMULATE_ADC(obj) do{           \
-    if (HAL_ADC_READY())                    \
-      obj.sample(HAL_READ_ADC());           \
-    else                                    \
-      next_sensor_state = adc_sensor_state; \
+  #define ACCUMULATE_ADC(obj) do{ \
+    if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; \
+    else obj.sample(HAL_READ_ADC()); \
   }while(0)
 
-  #define NEXT_ENUM(A) (typeof(A))(int(A) + 1)
-  #define NEXT_ADC_STATE(N) ((N) >= SensorsReady ? StartSampling : NEXT_ENUM(N))
-
-  // Assume the machine will go on to the next state
-  ADCSensorState next_sensor_state = NEXT_ADC_STATE(adc_sensor_state);
-
-  switch (adc_sensor_state) {
-
-    default: break;
-
-    #if HAS_TEMP_ADC_0
-      case MeasureTemp_0:       ACCUMULATE_ADC(temp_hotend[0]); break;
-    #endif
-    #if HAS_HEATED_BED
-      case MeasureTemp_BED:     ACCUMULATE_ADC(temp_bed); break;
-    #endif
-    #if HAS_TEMP_CHAMBER
-      case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
-    #endif
-    #if HAS_TEMP_PROBE
-      case MeasureTemp_PROBE:   ACCUMULATE_ADC(temp_probe); break;
-    #endif
-    #if HAS_TEMP_ADC_1
-      case MeasureTemp_1:       ACCUMULATE_ADC(temp_hotend[1]); break;
-    #endif
-    #if HAS_TEMP_ADC_2
-      case MeasureTemp_2:       ACCUMULATE_ADC(temp_hotend[2]); break;
-    #endif
-    #if HAS_TEMP_ADC_3
-      case MeasureTemp_3:       ACCUMULATE_ADC(temp_hotend[3]); break;
-    #endif
-    #if HAS_TEMP_ADC_4
-      case MeasureTemp_4:       ACCUMULATE_ADC(temp_hotend[4]); break;
-    #endif
-    #if HAS_TEMP_ADC_5
-      case MeasureTemp_5:       ACCUMULATE_ADC(temp_hotend[5]); break;
-    #endif
-    #if HAS_TEMP_ADC_6
-      case MeasureTemp_6:       ACCUMULATE_ADC(temp_hotend[6]); break;
-    #endif
-    #if HAS_TEMP_ADC_7
-      case MeasureTemp_7:       ACCUMULATE_ADC(temp_hotend[7]); break;
-    #endif
-
-    #if ENABLED(FILAMENT_WIDTH_SENSOR)
-      case Measure_FILWIDTH:
-        if (HAL_ADC_READY())
-          filwidth.accumulate(HAL_READ_ADC());
-        else
-          next_sensor_state = adc_sensor_state; // redo this state
-      break;
-    #endif
-
-    #if HAS_JOY_ADC_X
-      case MeasureJoy_X:        ACCUMULATE_ADC(joystick.x); break;
-    #endif
-    #if HAS_JOY_ADC_Y
-      case MeasureJoy_Y:        ACCUMULATE_ADC(joystick.y); break;
-    #endif
-    #if HAS_JOY_ADC_Z
-      case MeasureJoy_Z:        ACCUMULATE_ADC(joystick.z); break;
-    #endif
-
-    #if HAS_ADC_BUTTONS
-      #ifndef ADC_BUTTON_DEBOUNCE_DELAY
-        #define ADC_BUTTON_DEBOUNCE_DELAY 16
-      #endif
-      case Measure_ADC_KEY: {
-        if (HAL_ADC_READY()) {
-          if (ADCKey_count < ADC_BUTTON_DEBOUNCE_DELAY) {
-            raw_ADCKey_value = HAL_READ_ADC();
-            if (raw_ADCKey_value <= (HAL_ADC_RANGE) * 900UL / 1024UL) {
-              NOMORE(current_ADCKey_raw, raw_ADCKey_value);
-              ADCKey_count++;
-            }
-            else { // ADC Key release
-              if (ADCKey_count > 0) {
-                if (ADCKey_pressed) {
-                  ADCKey_count = 0;
-                  current_ADCKey_raw = HAL_ADC_RANGE;
-                }
-                else
-                  ADCKey_count++;
-              }
-              else
-                ADCKey_pressed = false;
-            }
-            if (ADCKey_count == ADC_BUTTON_DEBOUNCE_DELAY) ADCKey_pressed = true;
-          }
-        }
-        else
-          next_sensor_state = adc_sensor_state; // redo this state
-
-      } break;
-
-    #endif // HAS_ADC_BUTTONS
-
-  } // switch(adc_sensor_state)
-
-  // Go to the next state (may be unchanged)
-  adc_sensor_state = next_sensor_state;
-
-  // Assume that the state advances
-  next_sensor_state = NEXT_ADC_STATE(adc_sensor_state);
+  ADCSensorState next_sensor_state = adc_sensor_state < SensorsReady ? (ADCSensorState)(int(adc_sensor_state) + 1) : StartSampling;
 
   switch (adc_sensor_state) {
 
-    default: break;
-
     case SensorsReady: {
       // All sensors have been read. Stay in this state for a few
       // ISRs to save on calls to temp update/checking code below.
@@ -2934,72 +2824,128 @@ void Temperature::tick() {
         if (delay_count == 0) delay_count = extra_loops;  // Init this delay
         if (--delay_count)                                // While delaying...
           next_sensor_state = SensorsReady;               // retain this state (else, next state will be 0)
-        break;                                            // No fallthru
+        break;
       }
       else {
-        adc_sensor_state = StartSampling;                 // Fall through to count up oversamples
-        next_sensor_state = NEXT_ENUM(StartSampling);     // and possibly send the final readings.
+        adc_sensor_state = StartSampling;                 // Fall-through to start sampling
+        next_sensor_state = (ADCSensorState)(int(StartSampling) + 1);
       }
     }
-    // fallthru
 
     case StartSampling:                                   // Start of sampling loops. Do updates/checks.
-      if (++temp_count >= OVERSAMPLENR) {                 // 10 * 16 * 1 / (16000000 / 64 / 256) = 164ms.
+      if (++temp_count >= OVERSAMPLENR) {                 // 10 * 16 * 1/(16000000/64/256)  = 164ms.
         temp_count = 0;
         readings_ready();
       }
-      adc_sensor_state = NEXT_ENUM(StartSampling);        // Do one Prepare phase before exiting
-      next_sensor_state = NEXT_ENUM(adc_sensor_state);    // Also update the next state
-      // fallthru
+      break;
 
     #if HAS_TEMP_ADC_0
-      case PrepareTemp_0:       HAL_START_ADC(TEMP_0_PIN); break;
+      case PrepareTemp_0: HAL_START_ADC(TEMP_0_PIN); break;
+      case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
     #endif
+
     #if HAS_HEATED_BED
-      case PrepareTemp_BED:     HAL_START_ADC(TEMP_BED_PIN); break;
+      case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
+      case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
     #endif
+
     #if HAS_TEMP_CHAMBER
       case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
+      case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
     #endif
+
     #if HAS_TEMP_PROBE
-      case PrepareTemp_PROBE:   HAL_START_ADC(TEMP_PROBE_PIN); break;
+      case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
+      case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
     #endif
+
     #if HAS_TEMP_ADC_1
-      case PrepareTemp_1:       HAL_START_ADC(TEMP_1_PIN); break;
+      case PrepareTemp_1: HAL_START_ADC(TEMP_1_PIN); break;
+      case MeasureTemp_1: ACCUMULATE_ADC(temp_hotend[1]); break;
     #endif
+
     #if HAS_TEMP_ADC_2
-      case PrepareTemp_2:       HAL_START_ADC(TEMP_2_PIN); break;
+      case PrepareTemp_2: HAL_START_ADC(TEMP_2_PIN); break;
+      case MeasureTemp_2: ACCUMULATE_ADC(temp_hotend[2]); break;
     #endif
+
     #if HAS_TEMP_ADC_3
-      case PrepareTemp_3:       HAL_START_ADC(TEMP_3_PIN); break;
+      case PrepareTemp_3: HAL_START_ADC(TEMP_3_PIN); break;
+      case MeasureTemp_3: ACCUMULATE_ADC(temp_hotend[3]); break;
     #endif
+
     #if HAS_TEMP_ADC_4
-      case PrepareTemp_4:       HAL_START_ADC(TEMP_4_PIN); break;
+      case PrepareTemp_4: HAL_START_ADC(TEMP_4_PIN); break;
+      case MeasureTemp_4: ACCUMULATE_ADC(temp_hotend[4]); break;
     #endif
+
     #if HAS_TEMP_ADC_5
-      case PrepareTemp_5:       HAL_START_ADC(TEMP_5_PIN); break;
+      case PrepareTemp_5: HAL_START_ADC(TEMP_5_PIN); break;
+      case MeasureTemp_5: ACCUMULATE_ADC(temp_hotend[5]); break;
     #endif
+
     #if HAS_TEMP_ADC_6
-      case PrepareTemp_6:       HAL_START_ADC(TEMP_6_PIN); break;
+      case PrepareTemp_6: HAL_START_ADC(TEMP_6_PIN); break;
+      case MeasureTemp_6: ACCUMULATE_ADC(temp_hotend[6]); break;
     #endif
+
     #if HAS_TEMP_ADC_7
-      case PrepareTemp_7:       HAL_START_ADC(TEMP_7_PIN); break;
+      case PrepareTemp_7: HAL_START_ADC(TEMP_7_PIN); break;
+      case MeasureTemp_7: ACCUMULATE_ADC(temp_hotend[7]); break;
     #endif
+
     #if ENABLED(FILAMENT_WIDTH_SENSOR)
-      case Prepare_FILWIDTH:    HAL_START_ADC(FILWIDTH_PIN); break;
+      case Prepare_FILWIDTH: HAL_START_ADC(FILWIDTH_PIN); break;
+      case Measure_FILWIDTH:
+        if (!HAL_ADC_READY())
+          next_sensor_state = adc_sensor_state; // redo this state
+        else
+          filwidth.accumulate(HAL_READ_ADC());
+      break;
     #endif
+
     #if HAS_JOY_ADC_X
-      case PrepareJoy_X:        HAL_START_ADC(JOY_X_PIN); break;
+      case PrepareJoy_X: HAL_START_ADC(JOY_X_PIN); break;
+      case MeasureJoy_X: ACCUMULATE_ADC(joystick.x); break;
     #endif
+
     #if HAS_JOY_ADC_Y
-      case PrepareJoy_Y:        HAL_START_ADC(JOY_Y_PIN); break;
+      case PrepareJoy_Y: HAL_START_ADC(JOY_Y_PIN); break;
+      case MeasureJoy_Y: ACCUMULATE_ADC(joystick.y); break;
     #endif
+
     #if HAS_JOY_ADC_Z
-      case PrepareJoy_Z:        HAL_START_ADC(JOY_Z_PIN); break;
+      case PrepareJoy_Z: HAL_START_ADC(JOY_Z_PIN); break;
+      case MeasureJoy_Z: ACCUMULATE_ADC(joystick.z); break;
     #endif
+
     #if HAS_ADC_BUTTONS
-      case Prepare_ADC_KEY:     HAL_START_ADC(ADC_KEYPAD_PIN); break;
-    #endif
+      #ifndef ADC_BUTTON_DEBOUNCE_DELAY
+        #define ADC_BUTTON_DEBOUNCE_DELAY 16
+      #endif
+      case Prepare_ADC_KEY: HAL_START_ADC(ADC_KEYPAD_PIN); break;
+      case Measure_ADC_KEY:
+        if (!HAL_ADC_READY())
+          next_sensor_state = adc_sensor_state; // redo this state
+        else if (ADCKey_count < ADC_BUTTON_DEBOUNCE_DELAY) {
+          raw_ADCKey_value = HAL_READ_ADC();
+          if (raw_ADCKey_value <= 900UL * HAL_ADC_RANGE / 1024UL) {
+            NOMORE(current_ADCKey_raw, raw_ADCKey_value);
+            ADCKey_count++;
+          }
+          else { //ADC Key release
+            if (ADCKey_count > 0) ADCKey_count++; else ADCKey_pressed = false;
+            if (ADCKey_pressed) {
+              ADCKey_count = 0;
+              current_ADCKey_raw = HAL_ADC_RANGE;
+            }
+          }
+        }
+        if (ADCKey_count == ADC_BUTTON_DEBOUNCE_DELAY) ADCKey_pressed = true;
+        break;
+    #endif // HAS_ADC_BUTTONS
+
+    case StartupDelay: break;
 
   } // switch(adc_sensor_state)
 

From 199a1ba0e566cc91d5082bbafdef81c6f0800c36 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 16 Feb 2020 05:45:52 +0100
Subject: [PATCH 207/565] Move SAMD51 Temperature timer to RTC (#16868)

---
 Marlin/src/HAL/HAL_SAMD51/timers.cpp | 106 +++++++++++++++++----------
 Marlin/src/HAL/HAL_SAMD51/timers.h   |  38 +++++++---
 2 files changed, 97 insertions(+), 47 deletions(-)

diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.cpp b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
index 95784c760414..99839cd48a10 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
@@ -37,15 +37,16 @@
 // Private Variables
 // --------------------------------------------------------------------------
 
-const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS] = {
-  { TC0, TC0_IRQn, TC_PRIORITY(0) },
-  { TC1, TC1_IRQn, TC_PRIORITY(1) },
-  { TC2, TC2_IRQn, TC_PRIORITY(2) },  // Reserved by framework tone function
-  { TC3, TC3_IRQn, TC_PRIORITY(3) },  // Reserved by servo library
-  { TC4, TC4_IRQn, TC_PRIORITY(4) },
-  { TC5, TC5_IRQn, TC_PRIORITY(5) },
-  { TC6, TC6_IRQn, TC_PRIORITY(6) },
-  { TC7, TC7_IRQn, TC_PRIORITY(7) }
+const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS+1] = {
+  { {.pTc=TC0},  TC0_IRQn, TC_PRIORITY(0) },  // 0 - stepper
+  { {.pTc=TC1},  TC1_IRQn, TC_PRIORITY(1) },  // 1 - stepper (needed by 32 bit timers)
+  { {.pTc=TC2},  TC2_IRQn, TC_PRIORITY(2) },  // 2 - tone (framework)
+  { {.pTc=TC3},  TC3_IRQn, TC_PRIORITY(3) },  // 3 - servo
+  { {.pTc=TC4},  TC4_IRQn, TC_PRIORITY(4) },
+  { {.pTc=TC5},  TC5_IRQn, TC_PRIORITY(5) },
+  { {.pTc=TC6},  TC6_IRQn, TC_PRIORITY(6) },
+  { {.pTc=TC7},  TC7_IRQn, TC_PRIORITY(7) },
+  { {.pRtc=RTC}, RTC_IRQn, TC_PRIORITY(8) }   // 8 - temperature
 };
 
 // --------------------------------------------------------------------------
@@ -66,49 +67,80 @@ FORCE_INLINE void Disable_Irq(IRQn_Type irq) {
 // --------------------------------------------------------------------------
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
-  Tc * const tc = TimerConfig[timer_num].pTimer;
   IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
 
   // Disable interrupt, just in case it was already enabled
   Disable_Irq(irq);
 
-  // Disable timer interrupt
-  tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
+  if (timer_num == RTC_TIMER_NUM) {
+    Rtc * const rtc = TimerConfig[timer_num].pRtc;
 
-  // TCn clock setup
-  const uint8_t clockID = GCLK_CLKCTRL_IDs[TCC_INST_NUM + timer_num];
-  GCLK->PCHCTRL[clockID].bit.CHEN = false;
-  SYNC(GCLK->PCHCTRL[clockID].bit.CHEN);
-  GCLK->PCHCTRL[clockID].reg = GCLK_PCHCTRL_GEN_GCLK0 | GCLK_PCHCTRL_CHEN;   // 120MHz startup code programmed
-  SYNC(!GCLK->PCHCTRL[clockID].bit.CHEN);
+    // Disable timer interrupt
+    rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
 
-  // Stop timer, just in case, to be able to reconfigure it
-  tc->COUNT32.CTRLA.bit.ENABLE = false;
-  SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
+    // RTC clock setup
+    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC32K;  // External 32.768KHz oscillator
 
-  // Reset timer
-  tc->COUNT32.CTRLA.bit.SWRST = true;
-  SYNC(tc->COUNT32.SYNCBUSY.bit.SWRST);
+    // Stop timer, just in case, to be able to reconfigure it
+    rtc->MODE0.CTRLA.bit.ENABLE = false;
+    SYNC(rtc->MODE0.SYNCBUSY.bit.ENABLE);
 
-  NVIC_SetPriority(irq, TimerConfig[timer_num].priority);
+    // Mode, reset counter on match
+    rtc->MODE0.CTRLA.reg = RTC_MODE0_CTRLA_MODE_COUNT32 | RTC_MODE0_CTRLA_MATCHCLR;
+
+    // Set compare value
+    rtc->MODE0.COMP[0].reg = (32768 + frequency / 2) / frequency;
+    SYNC(rtc->MODE0.SYNCBUSY.bit.COMP0);
+
+    // Enable interrupt on compare
+    rtc->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0;    // reset pending interrupt
+    rtc->MODE0.INTENSET.reg = RTC_MODE0_INTENSET_CMP0;  // enable compare 0 interrupt
+
+    // And start timer
+    rtc->MODE0.CTRLA.bit.ENABLE = true;
+    SYNC(rtc->MODE0.SYNCBUSY.bit.ENABLE);
+  }
+  else {
+    Tc * const tc = TimerConfig[timer_num].pTc;
+
+    // Disable timer interrupt
+    tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
 
-  // Wave mode, reset counter on overflow on 0 (I use count down to prevent double buffer use)
-  tc->COUNT32.WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
-  tc->COUNT32.CTRLA.reg = TC_CTRLA_MODE_COUNT32 | TC_CTRLA_PRESCALER_DIV1;
-  tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_DIR;
-  SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB);
+    // TCn clock setup
+    const uint8_t clockID = GCLK_CLKCTRL_IDs[TCC_INST_NUM + timer_num];   // TC clock are preceeded by TCC ones
+    GCLK->PCHCTRL[clockID].bit.CHEN = false;
+    SYNC(GCLK->PCHCTRL[clockID].bit.CHEN);
+    GCLK->PCHCTRL[clockID].reg = GCLK_PCHCTRL_GEN_GCLK0 | GCLK_PCHCTRL_CHEN;   // 120MHz startup code programmed
+    SYNC(!GCLK->PCHCTRL[clockID].bit.CHEN);
 
-  // Set compare value
-  tc->COUNT32.COUNT.reg = tc->COUNT32.CC[0].reg = (HAL_TIMER_RATE) / frequency;
+    // Stop timer, just in case, to be able to reconfigure it
+    tc->COUNT32.CTRLA.bit.ENABLE = false;
+    SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
 
-  // And start timer
-  tc->COUNT32.CTRLA.bit.ENABLE = true;
-  SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
+    // Reset timer
+    tc->COUNT32.CTRLA.bit.SWRST = true;
+    SYNC(tc->COUNT32.SYNCBUSY.bit.SWRST);
 
-  // Enable interrupt on RC compare
-  tc->COUNT32.INTENSET.reg = TC_INTENCLR_OVF; // enable overflow interrupt
+    // Wave mode, reset counter on overflow on 0 (I use count down to prevent double buffer use)
+    tc->COUNT32.WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
+    tc->COUNT32.CTRLA.reg = TC_CTRLA_MODE_COUNT32 | TC_CTRLA_PRESCALER_DIV1;
+    tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_DIR;
+    SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB);
+
+    // Set compare value
+    tc->COUNT32.COUNT.reg = tc->COUNT32.CC[0].reg = (HAL_TIMER_RATE) / frequency;
+
+    // Enable interrupt on compare
+    tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;   // reset pending interrupt
+    tc->COUNT32.INTENSET.reg = TC_INTENSET_OVF; // enable overflow interrupt
+
+    // And start timer
+    tc->COUNT32.CTRLA.bit.ENABLE = true;
+    SYNC(tc->COUNT32.SYNCBUSY.bit.ENABLE);
+  }
 
   // Finally, enable IRQ
+  NVIC_SetPriority(irq, TimerConfig[timer_num].priority);
   NVIC_EnableIRQ(irq);
 }
 
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/HAL_SAMD51/timers.h
index 7ebd1b1406ce..073239c4311e 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.h
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.h
@@ -25,6 +25,7 @@
 // --------------------------------------------------------------------------
 // Defines
 // --------------------------------------------------------------------------
+#define RTC_TIMER_NUM       8   // This is not a TC but a RTC
 
 typedef uint32_t hal_timer_t;
 #define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
@@ -33,12 +34,12 @@ typedef uint32_t hal_timer_t;
 
 #define STEP_TIMER_NUM      0  // index of timer to use for stepper (also +1 for 32bits counter)
 #define PULSE_TIMER_NUM     STEP_TIMER_NUM
-#define TEMP_TIMER_NUM      4  // index of timer to use for temperature (also +1 for 32bits counter)
+#define TEMP_TIMER_NUM      RTC_TIMER_NUM  // index of timer to use for temperature
 
 #define TEMP_TIMER_FREQUENCY   1000 // temperature interrupt frequency
 
 #define STEPPER_TIMER_RATE          HAL_TIMER_RATE   // frequency of stepper timer (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)
-#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs
+#define STEPPER_TIMER_TICKS_PER_US  (STEPPER_TIMER_RATE / 1000000) // stepper timer ticks per µs
 #define STEPPER_TIMER_PRESCALE      (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
 
 #define PULSE_TIMER_RATE          STEPPER_TIMER_RATE
@@ -62,14 +63,21 @@ typedef uint32_t hal_timer_t;
 #if STEP_TIMER_NUM != PULSE_TIMER_NUM
   #define HAL_PULSE_TIMER_ISR()  TC_HANDLER(PULSE_TIMER_NUM)
 #endif
-#define HAL_TEMP_TIMER_ISR()  TC_HANDLER(TEMP_TIMER_NUM)
+#if TEMP_TIMER_NUM == RTC_TIMER_NUM
+  #define HAL_TEMP_TIMER_ISR()  void RTC_Handler()
+#else
+  #define HAL_TEMP_TIMER_ISR()  TC_HANDLER(TEMP_TIMER_NUM)
+#endif
 
 // --------------------------------------------------------------------------
 // Types
 // --------------------------------------------------------------------------
 
 typedef struct {
-  Tc          *pTimer;
+  union {
+    Tc  *pTc;
+    Rtc *pRtc;
+  };
   IRQn_Type   IRQ_Id;
   uint8_t     priority;
 } tTimerConfig;
@@ -87,17 +95,20 @@ extern const tTimerConfig TimerConfig[];
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
 
 FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare) {
-  Tc * const tc = TimerConfig[timer_num].pTimer;
+  // Should never be called with timer RTC_TIMER_NUM
+  Tc * const tc = TimerConfig[timer_num].pTc;
   tc->COUNT32.CC[0].reg = HAL_TIMER_TYPE_MAX - compare;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
-  Tc * const tc = TimerConfig[timer_num].pTimer;
+  // Should never be called with timer RTC_TIMER_NUM
+  Tc * const tc = TimerConfig[timer_num].pTc;
   return (hal_timer_t)(HAL_TIMER_TYPE_MAX - tc->COUNT32.CC[0].reg);
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
-  Tc * const tc = TimerConfig[timer_num].pTimer;
+  // Should never be called with timer RTC_TIMER_NUM
+  Tc * const tc = TimerConfig[timer_num].pTc;
   tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_CMD_READSYNC;
   SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB || tc->COUNT32.SYNCBUSY.bit.COUNT);
   return HAL_TIMER_TYPE_MAX - tc->COUNT32.COUNT.reg;
@@ -108,9 +119,16 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
-  Tc * const tc = TimerConfig[timer_num].pTimer;
-  // Clear interrupt flag
-  tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
+  if (timer_num == RTC_TIMER_NUM) {
+    Rtc * const rtc = TimerConfig[timer_num].pRtc;
+    // Clear interrupt flag
+    rtc->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0;
+  }
+  else {
+    Tc * const tc = TimerConfig[timer_num].pTc;
+    // Clear interrupt flag
+    tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
+  }
 }
 
 #define HAL_timer_isr_epilogue(timer_num)

From 42208bc031aae9761d512183c554763df41a34cb Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 16 Feb 2020 08:10:20 +0100
Subject: [PATCH 208/565] Fix unknown command on empty lines (#16867)

---
 Marlin/src/gcode/queue.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 4d0861c2bc9c..eca6d5cb1dd3 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -415,7 +415,7 @@ void GCodeQueue::get_serial_commands() {
 
       if (serial_char == '\n' || serial_char == '\r') {
 
-        process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]);
+        if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i])) continue;
 
         char* command = serial_line_buffer[i];
 
@@ -550,7 +550,7 @@ void GCodeQueue::get_serial_commands() {
         else if (n < 0)
           SERIAL_ERROR_MSG(MSG_SD_ERR_READ);
 
-        process_line_done(sd_input_state, command_buffer[index_w], sd_count);
+        if (process_line_done(sd_input_state, command_buffer[index_w], sd_count)) continue;
 
         _commit_command(false);
 

From 4d400910b4058c236615737a36c96ce523fcbd2a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 16 Feb 2020 15:29:56 -0600
Subject: [PATCH 209/565] Fix mftest -b -u line match

---
 buildroot/share/git/mftest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index f647b8a2a6c8..0b2d9ef78f55 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -72,7 +72,7 @@ case $TESTENV in
           BNUM=$( $SED -E 's/^.+BOARD_[^ ]+ +([0-9]+).+$/\1/' <<<"$BLINE" )
           BDESC=$( $SED -E 's/^.+\/\/ *(.+)$/\1/' <<<"$BLINE" )
           [[ -z $BNUM ]] && { echo "Error - Can't find $MB in boards list." ; exit 1 ; }
-          readarray -t ENVS <<< $( grep -EA1 "MB\(.*\b$MB\b.*\)" Marlin/src/pins/pins.h | $SED -n '2 p' | grep -oE 'env:[^ ]+' | $SED -E 's/env://' )
+          readarray -t ENVS <<< $( grep -EA1 "MB\(.*\b$MB\b.*\)" Marlin/src/pins/pins.h | grep -E '#include.+//.+env:.+' | grep -oE 'env:[^ ]+' | $SED -E 's/env://' )
           [[ -z $ENVS ]] && { echo "Error - Can't find target(s) for $MB ($BNUM)." ; exit 1 ; }
           ECOUNT=${#ENVS[*]}
 

From 8bc3e63871a54439e7782f7133d7091b0b8152d6 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 16 Feb 2020 23:39:17 +0100
Subject: [PATCH 210/565] Update French language (#16877)

---
 Marlin/src/lcd/language/language_fr.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 0b7f84031318..e047a2193456 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -384,7 +384,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h"); // One character only
   PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // One character only
 
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("En chauffe...");
+  PROGMEM Language_Str MSG_HEATING                         = _UxGT("en chauffe...");
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Refroidissement");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Lit en chauffe...");
   PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Refroid. du lit...");
@@ -416,6 +416,9 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrudeurs");
   PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Bauds");
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocole");
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Protection inactive");
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Protection active");
+
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Lumière caisson");
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Luminosité");
 
@@ -437,7 +440,7 @@ namespace Language_fr {
 
   PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temp Min");
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Max");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Alimentation");
+  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Alim.");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Puiss. moteur ");
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");

From 4c6f695bea0bf5e3262f74be97aea00aa4c9fc03 Mon Sep 17 00:00:00 2001
From: vivian-ng <vivian@maplerain.com>
Date: Mon, 17 Feb 2020 07:44:36 +0900
Subject: [PATCH 211/565] Put ESP32 I2S stepper task and Marlin on the same
 core (#16874)

---
 Marlin/src/HAL/HAL_ESP32/i2s.cpp | 2 +-
 Marlin/src/core/boards.h         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/HAL_ESP32/i2s.cpp
index 9f72fcbb0fdb..d80c3c24e16f 100644
--- a/Marlin/src/HAL/HAL_ESP32/i2s.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/i2s.cpp
@@ -308,7 +308,7 @@ int i2s_init() {
   esp_intr_enable(i2s_isr_handle);
 
   // Create the task that will feed the buffer
-  xTaskCreate(stepperTask, "StepperTask", 10000, nullptr, 1, nullptr);
+  xTaskCreatePinnedToCore(stepperTask, "StepperTask", 10000, nullptr, 1, nullptr, CONFIG_ARDUINO_RUNNING_CORE); // run I2S stepper task on same core as rest of Marlin
 
   // Route the i2s pins to the appropriate GPIO
   gpio_matrix_out_check(I2S_DATA, I2S0O_DATA_OUT23_IDX, 0, 0);
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 4ba9840d812f..f4db7b0c57a7 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -335,8 +335,8 @@
 // Espressif ESP32 WiFi
 //
 #define BOARD_ESPRESSIF_ESP32         6000  // Generic ESP32
-#define BOARD_MRR_ESPA                6001
-#define BOARD_MRR_ESPE                6002
+#define BOARD_MRR_ESPA                6001  // MRR ESPA board based on ESP32 (native pins only)
+#define BOARD_MRR_ESPE                6002  // MRR ESPE board based on ESP32 (with I2S stepper stream)
 #define BOARD_E4D_BOX                 6003  // E4d@BOX
 
 //

From 99a50743727e2076c19d8f9469090c3ddd6f9a93 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 16 Feb 2020 17:46:41 -0600
Subject: [PATCH 212/565] Fix babystep include, typos in stepper.cpp

Fix #16881
---
 Marlin/src/feature/babystep.cpp |  2 +-
 Marlin/src/module/stepper.cpp   | 10 +++++++---
 Marlin/src/module/stepper.h     |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index be2d1b0d2e2e..fd4491bc6f8a 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -44,7 +44,7 @@ int16_t Babystep::accum;
 void Babystep::step_axis(const AxisEnum axis) {
   const int16_t curTodo = steps[BS_TODO_AXIS(axis)]; // get rid of volatile for performance
   if (curTodo) {
-    stepper.babystep((AxisEnum)axis, curTodo > 0);
+    stepper.do_babystep((AxisEnum)axis, curTodo > 0);
     if (curTodo > 0) steps[BS_TODO_AXIS(axis)]--; else steps[BS_TODO_AXIS(axis)]++;
   }
 }
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index e898d974ed0f..0a79855bcfd5 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -101,6 +101,10 @@ Stepper stepper; // Singleton
 #include "../MarlinCore.h"
 #include "../HAL/shared/Delay.h"
 
+#if ENABLED(INTEGRATED_BABYSTEPPING)
+  #include "../feature/babystep.h"
+#endif
+
 #if MB(ALLIGATOR)
   #include "../feature/dac/dac_dac084s085.h"
 #endif
@@ -1373,10 +1377,10 @@ void Stepper::isr() {
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
       if (do_babystep)                                  // Avoid ANY stepping too soon after baby-stepping
-        NOLESS(nextMainISR, (BABYSTEP_TICKS) / 8)       // FULL STOP for 125µs after a baby-step
+        NOLESS(nextMainISR, (BABYSTEP_TICKS) / 8);      // FULL STOP for 125µs after a baby-step
 
       if (nextBabystepISR != BABYSTEP_NEVER)            // Avoid baby-stepping too close to axis Stepping
-        NOLESS(nextBabystepISR, nextMainISR / 2)        // TODO: Only look at axes enabled for baby-stepping
+        NOLESS(nextBabystepISR, nextMainISR / 2);       // TODO: Only look at axes enabled for baby-stepping
     #endif
 
     // Get the interval to the next ISR call
@@ -2544,7 +2548,7 @@ void Stepper::report_positions() {
 
   // MUST ONLY BE CALLED BY AN ISR,
   // No other ISR should ever interrupt this!
-  void Stepper::babystep(const AxisEnum axis, const bool direction) {
+  void Stepper::do_babystep(const AxisEnum axis, const bool direction) {
 
     #if DISABLED(INTEGRATED_BABYSTEPPING)
       cli();
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 9f1b9321bb35..6671b946dfcf 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -471,7 +471,7 @@ class Stepper {
     #endif
 
     #if ENABLED(BABYSTEPPING)
-      static void babystep(const AxisEnum axis, const bool direction); // perform a short step with a single stepper motor, outside of any convention
+      static void do_babystep(const AxisEnum axis, const bool direction); // perform a short step with a single stepper motor, outside of any convention
     #endif
 
     #if HAS_MOTOR_CURRENT_PWM

From 75e3aa12c5e963345c533d8f191aba207bb4d2c1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Feb 2020 00:03:58 +0000
Subject: [PATCH 213/565] [cron] Bump distribution date (2020-02-17)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 96a47155fad9..9e1d819547e3 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-16"
+  #define STRING_DISTRIBUTION_DATE "2020-02-17"
 #endif
 
 /**

From 05f51e9355870e10c4173ba71268a4457f2e1739 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 18 Feb 2020 00:03:31 +0000
Subject: [PATCH 214/565] [cron] Bump distribution date (2020-02-18)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9e1d819547e3..1ecbdb73eb2c 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-17"
+  #define STRING_DISTRIBUTION_DATE "2020-02-18"
 #endif
 
 /**

From 4c179ba3f73d91f58aece7b047946dac0db217ce Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 19 Feb 2020 00:03:54 +0000
Subject: [PATCH 215/565] [cron] Bump distribution date (2020-02-19)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1ecbdb73eb2c..70101bf4e5e8 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-18"
+  #define STRING_DISTRIBUTION_DATE "2020-02-19"
 #endif
 
 /**

From 178735b9585753104e3bbd244bcee46e271f6d2e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 20 Feb 2020 00:03:52 +0000
Subject: [PATCH 216/565] [cron] Bump distribution date (2020-02-20)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 70101bf4e5e8..1a01e503f54f 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-19"
+  #define STRING_DISTRIBUTION_DATE "2020-02-20"
 #endif
 
 /**

From 1c52d76668cafb28a1838825107e38362cd31c6c Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Thu, 20 Feb 2020 15:22:08 +0700
Subject: [PATCH 217/565] Serial redirect for Move Command when stopping
 (#16906)

---
 Marlin/src/gcode/queue.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index eca6d5cb1dd3..21d6d773eea2 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -469,6 +469,7 @@ void GCodeQueue::get_serial_commands() {
               #if ENABLED(BEZIER_CURVE_SUPPORT)
                 case 5:
               #endif
+                PORT_REDIRECT(i);                      // Reply to the serial port that sent the command
                 SERIAL_ECHOLNPGM(MSG_ERR_STOPPED);
                 LCD_MESSAGEPGM(MSG_STOPPED);
                 break;

From 140e4ac507c4ff4040e5e6e0840be63b55800e97 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 21 Feb 2020 00:03:41 +0000
Subject: [PATCH 218/565] [cron] Bump distribution date (2020-02-21)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1a01e503f54f..9968c4d7c379 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-20"
+  #define STRING_DISTRIBUTION_DATE "2020-02-21"
 #endif
 
 /**

From 2b788e9aa6ac60ad9386d90ac0a7b05fb152bd90 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:07:07 -0600
Subject: [PATCH 219/565] Single envs for specific boards

---
 Marlin/src/pins/pins.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3ba15c1326b2..3b6b474bcf2e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -105,15 +105,15 @@
 #elif MB(BAM_DICE_DUE)
   #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_BASE)
-  #include "ramps/pins_MKS_BASE_10.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_14)
   #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_15)
-  #include "ramps/pins_MKS_BASE_15.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_16)
-  #include "ramps/pins_MKS_BASE_16.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_BASE_HEROIC)
-  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:megaatmega2560
 #elif MB(MKS_GEN_13)
   #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
 #elif MB(MKS_GEN_L)

From a1f026f57ad7dbf4c50b135cf1dc0f9eacc06025 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:09:37 -0600
Subject: [PATCH 220/565] Inline manage_inactivity, tweak autoreport_paused

---
 Marlin/src/MarlinCore.cpp               |  8 ++------
 Marlin/src/MarlinCore.h                 |  6 ------
 Marlin/src/core/utility.cpp             | 12 ++++++++++++
 Marlin/src/core/utility.h               | 13 +++++--------
 Marlin/src/feature/bedlevel/ubl/ubl.cpp | 10 ++++------
 Marlin/src/gcode/gcode.cpp              |  8 ++++++--
 Marlin/src/gcode/gcode.h                | 12 ++++++++++++
 7 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index b1e895d97f81..19fe1c06249e 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -204,10 +204,6 @@ bool wait_for_heatup = true;
   bool wait_for_user; // = false;
 #endif
 
-#if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
-  bool suspend_auto_report; // = false
-#endif
-
 // Inactivity shutdown
 millis_t max_inactive_time, // = 0
          stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
@@ -432,7 +428,7 @@ void startOrResumeJob() {
  *  - Pulse FET_SAFETY_PIN if it exists
  */
 
-void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
+inline void manage_inactivity(const bool ignore_stepper_queue=false) {
 
   #if HAS_FILAMENT_SENSOR
     runout.run();
@@ -697,7 +693,7 @@ void idle(
   #endif
 
   #if HAS_AUTO_REPORTING
-    if (!suspend_auto_report) {
+    if (!gcode.autoreport_paused) {
       #if ENABLED(AUTO_REPORT_TEMPERATURES)
         thermalManager.auto_report_temperatures();
       #endif
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index fb5746225954..5a8157bde1f6 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -44,8 +44,6 @@ void idle(
   #endif
 );
 
-void manage_inactivity(const bool ignore_stepper_queue=false);
-
 #if ENABLED(EXPERIMENTAL_I2CBUS)
   #include "feature/twibus.h"
   extern TWIBus i2c;
@@ -84,10 +82,6 @@ extern bool wait_for_heatup;
   extern bool wait_for_user;
 #endif
 
-#if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
-  extern bool suspend_auto_report;
-#endif
-
 // Inactivity shutdown timer
 extern millis_t max_inactive_time, stepper_inactive_time;
 
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 768bc5e9d083..64783d070f0a 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -35,6 +35,18 @@ void safe_delay(millis_t ms) {
   thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
 }
 
+// A delay to provide brittle hosts time to receive bytes
+#if ENABLED(SERIAL_OVERRUN_PROTECTION)
+
+  #include "../gcode/gcode.h" // for set_autoreport_paused
+
+  void serial_delay(const millis_t ms) {
+    const bool was = gcode.set_autoreport_paused(true);
+    safe_delay(ms);
+    gcode.set_autoreport_paused(was);
+  }
+#endif
+
 #if ENABLED(DEBUG_LEVELING_FEATURE)
 
   #include "../module/probe.h"
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index d0a5274ce240..e34f9dd58a0e 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -27,14 +27,11 @@
 // Delay that ensures heaters and watchdog are kept alive
 void safe_delay(millis_t ms);
 
-// A delay to provide brittle hosts time to receive bytes
-inline void serial_delay(const millis_t ms) {
-  #if ENABLED(SERIAL_OVERRUN_PROTECTION)
-    safe_delay(ms);
-  #else
-    UNUSED(ms);
-  #endif
-}
+#if ENABLED(SERIAL_OVERRUN_PROTECTION)
+  void serial_delay(const millis_t ms);
+#else
+  inline void serial_delay(const millis_t) {}
+#endif
 
 #if GRID_MAX_POINTS_X && GRID_MAX_POINTS_Y
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 6583e679cf6c..72fe9d97423c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -28,6 +28,8 @@
 
   unified_bed_leveling ubl;
 
+  #include "../../../MarlinCore.h"
+
   #include "../../../module/configuration_store.h"
   #include "../../../module/planner.h"
   #include "../../../module/motion.h"
@@ -151,9 +153,7 @@
    *   4: Compact Human-Readable
    */
   void unified_bed_leveling::display_map(const int map_type) {
-    #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
-      suspend_auto_report = true;
-    #endif
+    const bool was = gcode.set_autoreport_paused(true);
 
     constexpr uint8_t eachsp = 1 + 6 + 1,                           // [-3.567]
                       twixt = eachsp * (GRID_MAX_POINTS_X) - 9 * 2; // Leading 4sp, Coordinates 9sp each
@@ -229,9 +229,7 @@
       SERIAL_EOL();
     }
 
-    #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
-      suspend_auto_report = false;
-    #endif
+    set_gcode.set_autoreport_paused(was);
   }
 
   bool unified_bed_leveling::sanity_check() {
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 06ab3af52afe..4c9832dbadec 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -53,7 +53,7 @@ GcodeSuite gcode;
   #include "../feature/cancel_object.h"
 #endif
 
-#include "../MarlinCore.h" // for idle() and suspend_auto_report
+#include "../MarlinCore.h" // for idle()
 
 millis_t GcodeSuite::previous_move_ms;
 
@@ -66,6 +66,10 @@ uint8_t GcodeSuite::axis_relative = (
   | (ar_init.e ? _BV(REL_E) : 0)
 );
 
+#if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
+  bool GcodeSuite::autoreport_paused; // = false
+#endif
+
 #if ENABLED(HOST_KEEPALIVE_FEATURE)
   GcodeSuite::MarlinBusyState GcodeSuite::busy_state = NOT_BUSY;
   uint8_t GcodeSuite::host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL;
@@ -942,7 +946,7 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
   void GcodeSuite::host_keepalive() {
     const millis_t ms = millis();
     static millis_t next_busy_signal_ms = 0;
-    if (!suspend_auto_report && host_keepalive_interval && busy_state != NOT_BUSY) {
+    if (!autoreport_paused && host_keepalive_interval && busy_state != NOT_BUSY) {
       if (PENDING(ms, next_busy_signal_ms)) return;
       switch (busy_state) {
         case IN_HANDLER:
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 7670a8163950..c44c17081131 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -351,6 +351,18 @@ class GcodeSuite {
     process_subcommands_now_P(G28_STR);
   }
 
+  #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
+    static bool autoreport_paused;
+    static inline bool set_autoreport_paused(const bool p) {
+      const bool was = autoreport_paused;
+      autoreport_paused = p;
+      return was;
+    }
+  #else
+    static constexpr bool autoreport_paused = false;
+    static inline bool set_autoreport_paused(const bool) { return false; }
+  #endif
+
   #if ENABLED(HOST_KEEPALIVE_FEATURE)
     /**
      * States for managing Marlin and host communication

From b8b225c8b5f7792990169563707f8afcb2cc6db9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:09:59 -0600
Subject: [PATCH 221/565] Function for CONFIG_ECHO_HEADING

---
 Marlin/src/module/configuration_store.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index a0294433288c..0ae39233449a 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2766,9 +2766,18 @@ void MarlinSettings::reset() {
 
 #if DISABLED(DISABLE_M503)
 
+  static void config_heading(const bool repl, PGM_P const pstr, const bool eol=true) {
+    if (!repl) {
+      CONFIG_ECHO_START();
+      SERIAL_ECHOPGM("; ");
+      serialprintPGM(pstr);
+      if (eol) SERIAL_EOL();
+    }
+  }
+
   #define CONFIG_ECHO_START()       do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
   #define CONFIG_ECHO_MSG(STR)      do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); }while(0)
-  #define CONFIG_ECHO_HEADING(STR)  do{ if (!forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); } }while(0)
+  #define CONFIG_ECHO_HEADING(STR, V...) config_heading(forReplay, PSTR(STR), V)
 
   #if HAS_TRINAMIC
     inline void say_M906(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M906"); }

From 19991e269b07f77e2ef4134da406bb1a6afe9d25 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:15:08 -0600
Subject: [PATCH 222/565] Show end prompt with Print Event LEDs

---
 Marlin/src/gcode/queue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 21d6d773eea2..000747b489ad 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -537,7 +537,7 @@ void GCodeQueue::get_serial_commands() {
             #if ENABLED(PRINTER_EVENT_LEDS)
               printerEventLEDs.onPrintCompleted();
               #if HAS_RESUME_CONTINUE
-                enqueue_now_P(PSTR("M0 Q S"
+                enqueue_now_P(PSTR("M0 S"
                   #if HAS_LCD_MENU
                     "1800"
                   #else

From 4ef627d79f08ea6c9ae25b8e8963262f557b5b9c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:17:05 -0600
Subject: [PATCH 223/565] Add a note on EEPROM todo

---
 Marlin/src/HAL/shared/eeprom_i2c.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/HAL/shared/eeprom_i2c.cpp b/Marlin/src/HAL/shared/eeprom_i2c.cpp
index fac77ac7db46..3eb72194acf2 100644
--- a/Marlin/src/HAL/shared/eeprom_i2c.cpp
+++ b/Marlin/src/HAL/shared/eeprom_i2c.cpp
@@ -23,6 +23,9 @@
 /**
  * Description: functions for I2C connected external EEPROM.
  * Not platform dependent.
+ *
+ * TODO: Some platform Arduino libraries define these functions
+ *       so Marlin needs to add a glue layer to prevent the conflict.
  */
 
 #include "../../inc/MarlinConfig.h"

From 22b974691eee6f27d5f790dc2dccda6935b87a08 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:22:27 -0600
Subject: [PATCH 224/565] Tweak process_line_done for speed

---
 Marlin/src/gcode/queue.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 000747b489ad..397b5a39234e 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -254,7 +254,7 @@ void GCodeQueue::ok_to_send() {
         SERIAL_ECHO(*p++);
     }
     SERIAL_ECHOPAIR_P(SP_P_STR, int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
-    SERIAL_ECHOPAIR(" B", BUFSIZE - length);
+    SERIAL_ECHOPAIR(" B", int(BUFSIZE - length));
   #endif
   SERIAL_EOL();
 }
@@ -364,9 +364,9 @@ inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD
 inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
   sis = PS_NORMAL;
   buff[ind] = 0;
-  if (!ind) { thermalManager.manage_heater(); return true; }
-  ind = 0;
-  return false;
+  if (ind) { ind = 0; return false; }
+  thermalManager.manage_heater();
+  return true;
 }
 
 /**
@@ -415,11 +415,13 @@ void GCodeQueue::get_serial_commands() {
 
       if (serial_char == '\n' || serial_char == '\r') {
 
-        if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i])) continue;
+        // Reset our state, continue if the line was empty
+        if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]))
+          continue;
 
         char* command = serial_line_buffer[i];
 
-        while (*command == ' ') command++;                // Skip leading spaces
+        while (*command == ' ') command++;                   // Skip leading spaces
         char *npos = (*command == 'N') ? command : nullptr;  // Require the N parameter to start the line
 
         if (npos) {
@@ -551,7 +553,9 @@ void GCodeQueue::get_serial_commands() {
         else if (n < 0)
           SERIAL_ERROR_MSG(MSG_SD_ERR_READ);
 
-        if (process_line_done(sd_input_state, command_buffer[index_w], sd_count)) continue;
+        // Terminate the buffer, reset the input state, continue for empty line
+        if (process_line_done(sd_input_state, command_buffer[index_w], sd_count))
+          continue;
 
         _commit_command(false);
 

From 6320f9795ca91e8c467339afeaa5d3d354500543 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 20 Feb 2020 20:56:13 -0600
Subject: [PATCH 225/565] More EEPROM cleanup

---
 Marlin/src/module/configuration_store.cpp | 41 +++++++++++------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 0ae39233449a..bcdb0e4a81e5 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2768,7 +2768,7 @@ void MarlinSettings::reset() {
 
   static void config_heading(const bool repl, PGM_P const pstr, const bool eol=true) {
     if (!repl) {
-      CONFIG_ECHO_START();
+      SERIAL_ECHO_START();
       SERIAL_ECHOPGM("; ");
       serialprintPGM(pstr);
       if (eol) SERIAL_EOL();
@@ -2777,7 +2777,7 @@ void MarlinSettings::reset() {
 
   #define CONFIG_ECHO_START()       do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
   #define CONFIG_ECHO_MSG(STR)      do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); }while(0)
-  #define CONFIG_ECHO_HEADING(STR, V...) config_heading(forReplay, PSTR(STR), V)
+  #define CONFIG_ECHO_HEADING(STR)  config_heading(forReplay, PSTR(STR))
 
   #if HAS_TRINAMIC
     inline void say_M906(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M906"); }
@@ -2861,8 +2861,7 @@ void MarlinSettings::reset() {
        * Volumetric extrusion M200
        */
       if (!forReplay) {
-        CONFIG_ECHO_START();
-        SERIAL_ECHOPGM("Filament settings:");
+        config_heading(forReplay, PSTR("Filament settings:"), false);
         if (parser.volumetric_enabled)
           SERIAL_EOL();
         else
@@ -2936,20 +2935,18 @@ void MarlinSettings::reset() {
       , SP_T_STR, LINEAR_UNIT(planner.settings.travel_acceleration)
     );
 
-    if (!forReplay) {
-      CONFIG_ECHO_START();
-      SERIAL_ECHOPGM("Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>");
+    CONFIG_ECHO_HEADING(
+      "Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
       #if DISABLED(CLASSIC_JERK)
-        SERIAL_ECHOPGM(" J<junc_dev>");
+        " J<junc_dev>"
       #endif
       #if HAS_CLASSIC_JERK
-        SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
+        " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>"
         #if HAS_CLASSIC_E_JERK
-          SERIAL_ECHOPGM(" E<max_e_jerk>");
+          " E<max_e_jerk>"
         #endif
       #endif
-      SERIAL_EOL();
-    }
+    );
     CONFIG_ECHO_START();
     SERIAL_ECHOLNPAIR_P(
         PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
@@ -3007,10 +3004,11 @@ void MarlinSettings::reset() {
 
       #elif ENABLED(AUTO_BED_LEVELING_UBL)
 
+        config_heading(forReplay, PSTR(""), false);
         if (!forReplay) {
-          CONFIG_ECHO_START();
           ubl.echo_name();
-          SERIAL_ECHOLNPGM(":");
+          SERIAL_CHAR(':');
+          SERIAL_EOL();
         }
 
       #elif HAS_ABL_OR_UBL
@@ -3046,8 +3044,12 @@ void MarlinSettings::reset() {
         if (!forReplay) {
           SERIAL_EOL();
           ubl.report_state();
-          SERIAL_ECHOLNPAIR("\nActive Mesh Slot: ", ubl.storage_slot);
-          SERIAL_ECHOLNPAIR("EEPROM can hold ", calc_num_meshes(), " meshes.\n");
+          SERIAL_EOL();
+          config_heading(false, PSTR("Active Mesh Slot: "), false);
+          SERIAL_ECHOLN(ubl.storage_slot);
+          config_heading(false, PSTR("EEPROM can hold "), false);
+          SERIAL_ECHO(calc_num_meshes());
+          SERIAL_ECHOLNPGM(" meshes.\n");
         }
 
        //ubl.report_current_mesh();   // This is too verbose for large meshes. A better (more terse)
@@ -3257,11 +3259,8 @@ void MarlinSettings::reset() {
      * Probe Offset
      */
     #if HAS_BED_PROBE
-      if (!forReplay) {
-        CONFIG_ECHO_START();
-        SERIAL_ECHOPGM("Z-Probe Offset");
-        say_units(true);
-      }
+      config_heading(forReplay, PSTR("Z-Probe Offset"), false);
+      if (!forReplay) say_units(true);
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
         #if HAS_PROBE_XY_OFFSET

From 68de12acbfc803243445ead3e530c6a9a90beee0 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 21 Feb 2020 14:36:59 +0100
Subject: [PATCH 226/565] Followup to autoreport patch (#16914)

See a1f026f57a
---
 Marlin/src/feature/bedlevel/ubl/ubl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 72fe9d97423c..f1a67061335e 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -29,6 +29,7 @@
   unified_bed_leveling ubl;
 
   #include "../../../MarlinCore.h"
+  #include "../../../gcode/gcode.h"
 
   #include "../../../module/configuration_store.h"
   #include "../../../module/planner.h"
@@ -229,7 +230,7 @@
       SERIAL_EOL();
     }
 
-    set_gcode.set_autoreport_paused(was);
+    gcode.set_autoreport_paused(was);
   }
 
   bool unified_bed_leveling::sanity_check() {

From f30897500d37b59fbf975cfc772c4359fe8b2566 Mon Sep 17 00:00:00 2001
From: Karl Andersson <karl@iaccess.se>
Date: Fri, 21 Feb 2020 14:40:55 +0100
Subject: [PATCH 227/565] Disable spreadcycle in tmc_enable_stallguard<2209>
 (#16890)

---
 Marlin/src/feature/tmc_util.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index be26b804b593..9f905021ea6e 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1096,8 +1096,11 @@
   }
 
   bool tmc_enable_stallguard(TMC2209Stepper &st) {
+    const bool stealthchop_was_enabled = !st.en_spreadCycle();
+    
     st.TCOOLTHRS(0xFFFFF);
-    return !st.en_spreadCycle();
+    st.en_spreadCycle(false);
+    return stealthchop_was_enabled;
   }
   void tmc_disable_stallguard(TMC2209Stepper &st, const bool restore_stealth) {
     st.en_spreadCycle(!restore_stealth);

From e1d367e05afad0485f58d4417ff7cd717bf41c80 Mon Sep 17 00:00:00 2001
From: Jamie <vector76@users.noreply.github.com>
Date: Fri, 21 Feb 2020 07:42:13 -0600
Subject: [PATCH 228/565] Fix EEPROM errors with EXTRUDERS == 0 (#16898)

---
 Marlin/src/module/configuration_store.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index bcdb0e4a81e5..efd9dadede11 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -323,7 +323,7 @@ typedef struct SettingsDataStruct {
   //
   // LIN_ADVANCE
   //
-  float planner_extruder_advance_K[EXTRUDERS];          // M900 K  planner.extruder_advance_K
+  float planner_extruder_advance_K[_MAX(EXTRUDERS, 1)]; // M900 K  planner.extruder_advance_K
 
   //
   // HAS_MOTOR_CURRENT_PWM

From 9f53bbd7912d7fc407ce7c4236ba4f59891aecc5 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 22 Feb 2020 03:27:32 +1300
Subject: [PATCH 229/565] Add PICA shields support (#16891)

---
 Marlin/src/core/boards.h            |   2 +
 Marlin/src/pins/mega/pins_PICA.h    | 143 ++++++++++++++++++++++++++++
 Marlin/src/pins/mega/pins_PICAOLD.h |  28 ++++++
 Marlin/src/pins/pins.h              |   4 +
 4 files changed, 177 insertions(+)
 create mode 100644 Marlin/src/pins/mega/pins_PICA.h
 create mode 100644 Marlin/src/pins/mega/pins_PICAOLD.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index f4db7b0c57a7..09b0eada1a17 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -141,6 +141,8 @@
 #define BOARD_EINSTART_S              1319  // Einstart retrofit
 #define BOARD_WANHAO_ONEPLUS          1320  // Wanhao 0ne+ i3 Mini
 #define BOARD_LEAPFROG_XEED2015       1321  // Leapfrog Xeed 2015
+#define BOARD_PICA_REVB               1322  // PICA Shield (original version)
+#define BOARD_PICA                    1323  // PICA Shield (rev C or later)
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
new file mode 100644
index 000000000000..7771d5887f24
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -0,0 +1,143 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Arduino Mega with PICA pin assignments
+ *
+ * PICA is Power, Interface, and Control Adapter and is open source hardware.
+ * See https://github.com/mjrice/PICA for schematics etc.
+ *
+ * Applies to PICA, PICA_REVB
+ */
+
+#ifndef BOARD_NAME
+  #define BOARD_NAME "PICA"
+#endif
+
+/*
+// Note that these are the "pins" that correspond to the analog inputs on the arduino mega.
+// These are not the same as the physical pin numbers
+  AD0 = 54;   AD1 = 55;   AD2 = 56;   AD3 = 57;   
+  AD4 = 58;   AD5 = 59;   AD6 = 60;   AD7 = 61;   
+  AD8 = 62;   AD9 = 63;   AD10 = 64;  AD11 = 65;
+  AD12 = 66;  AD13 = 67;  AD14 = 68;  AD15 = 69;
+*/
+
+#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
+  #error "Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
+#endif
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN          14
+#define X_MAX_PIN          15
+#define Y_MIN_PIN          16
+#define Y_MAX_PIN          17
+#define Z_MIN_PIN          23
+#define Z_MAX_PIN          22
+
+//
+// Steppers
+//
+#define X_STEP_PIN         55
+#define X_DIR_PIN          54
+#define X_ENABLE_PIN       60     
+
+#define Y_STEP_PIN         57
+#define Y_DIR_PIN          56
+#define Y_ENABLE_PIN       61
+
+#define Z_STEP_PIN         59
+#define Z_DIR_PIN          58
+#define Z_ENABLE_PIN       62
+
+#define E0_STEP_PIN        67 
+#define E0_DIR_PIN         24
+#define E0_ENABLE_PIN      26
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN          9   // Analog Input
+#define TEMP_1_PIN         10
+#define TEMP_BED_PIN       10
+#define TEMP_2_PIN         11
+#define TEMP_3_PIN         12
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN     10   // E0
+#endif
+#ifndef HEATER_1_PIN
+  #define HEATER_1_PIN      2   // E1
+#endif
+#define HEATER_BED_PIN      8   // HEAT-BED
+
+#ifndef FAN_PIN
+  #define FAN_PIN           9
+#endif
+#ifndef FAN_2_PIN
+  #define FAN_2_PIN         7
+#endif
+
+#define SDPOWER_PIN        -1
+#define LED_PIN            -1 
+#define PS_ON_PIN          -1
+#define KILL_PIN           -1
+      
+#define SSR_PIN             6
+
+// SPI for Max6675 or Max31855 Thermocouple
+#if DISABLED(SDSUPPORT)
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+#else
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+#endif
+
+//
+// SD Support
+//
+#define SD_DETECT_PIN      49 
+#define SDSS               53
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN         29
+
+#if HAS_SPI_LCD
+  #define LCD_PINS_RS      33
+  #define LCD_PINS_ENABLE  30
+  #define LCD_PINS_D4      35
+  #define LCD_PINS_D5      32
+  #define LCD_PINS_D6      37
+  #define LCD_PINS_D7      36
+
+  #define BTN_EN1          47
+  #define BTN_EN2          48
+  #define BTN_ENC          31
+
+  #define LCD_SDSS         53
+#endif
diff --git a/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin/src/pins/mega/pins_PICAOLD.h
new file mode 100644
index 000000000000..88fa1ada29c0
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_PICAOLD.h
@@ -0,0 +1,28 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#define HEATER_0_PIN        9   // E0
+#define HEATER_1_PIN       10   // E1
+#define FAN_PIN            11
+#define FAN2_PIN           12
+
+#include "pins_PICA.h"
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3b6b474bcf2e..ce03a3468d31 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -252,6 +252,10 @@
   #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:megaatmega2560
 #elif MB(LEAPFROG_XEED2015)
   #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:megaatmega2560
+#elif MB(PICA)
+  #include "mega/pins_PICA.h"                   // ATmega2560                             env:megaatmega2560
+#elif MB(PICA_REVB)
+  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:megaatmega2560
 
 //
 // ATmega1281, ATmega2561

From 5d16497bed7022da90606aa3ad6c97e0683d8d09 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 21 Feb 2020 08:32:45 -0600
Subject: [PATCH 230/565] Tweak pins spacing, comments

---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h       | 18 +++++++++---------
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h    |  4 ++--
 Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h |  4 ++--
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h     |  4 ++--
 Marlin/src/pins/ramps/pins_RAMPS.h             |  4 ++--
 Marlin/src/pins/ramps/pins_RAMPS_OLD.h         |  4 ++--
 Marlin/src/pins/ramps/pins_TT_OSCAR.h          |  4 ++--
 Marlin/src/pins/sam/pins_RAMPS_DUO.h           |  4 ++--
 Marlin/src/pins/sam/pins_RAMPS_SMART.h         |  4 ++--
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 72f2a450a7b4..d206547ab8ba 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -127,15 +127,15 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN            0   // Analog Input
-#define TEMP_1_PIN            1   // Analog Input
-#define TEMP_BED_PIN          2   // Analog Input
+#define TEMP_0_PIN          0   // Analog Input
+#define TEMP_1_PIN          1   // Analog Input
+#define TEMP_BED_PIN        2   // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN     66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN     66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -159,16 +159,16 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN  -1
+  #define MOSFET_D_PIN     -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN   8
+  #define RAMPS_D8_PIN      8
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN   9
+  #define RAMPS_D9_PIN      9
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN 10
+  #define RAMPS_D10_PIN    10
 #endif
 
 #define HEATER_0_PIN     RAMPS_D10_PIN
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index d98f3eed1648..3dcd7e57bc08 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -115,9 +115,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index b73acf84acdc..1c911cd125df 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -112,9 +112,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index 72e57b4f1839..bdcb28dac211 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -112,9 +112,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index a427ef14c904..82c19dd1535f 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -169,9 +169,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
index 36dd6c5690f3..aa45370e6a07 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
@@ -78,9 +78,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 5649b95f34f3..3b2d3c8b8d92 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -184,9 +184,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 //#if DISABLED(SDSUPPORT)
-//  #define MAX6675_SS       66   // Don't use 53 if there is even the remote possibility of using Display/SD card
+//  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
 //#else
-//  #define MAX6675_SS       66   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+//  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
 //#endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
index e0a8d5cd943a..d25ef9e059ff 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_DUO.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
@@ -67,9 +67,9 @@
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   69   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   69   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   69   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   69   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index f3ae437c1f4b..455d40a99969 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -90,9 +90,9 @@
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   67   // Don't use 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN   67   // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   67   // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN   67   // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //

From cfd49740eb91e63a0319a80ba89c6d0915058327 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 22 Feb 2020 00:03:47 +0000
Subject: [PATCH 231/565] [cron] Bump distribution date (2020-02-22)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9968c4d7c379..5fb6a7ec4a48 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-21"
+  #define STRING_DISTRIBUTION_DATE "2020-02-22"
 #endif
 
 /**

From 1ab6f910b630905711203491b6edae39bf8328c1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 21 Feb 2020 07:24:58 -0600
Subject: [PATCH 232/565] Use moves_free in ok_to_send

---
 Marlin/src/gcode/queue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 397b5a39234e..12c370363006 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -253,7 +253,7 @@ void GCodeQueue::ok_to_send() {
       while (NUMERIC_SIGNED(*p))
         SERIAL_ECHO(*p++);
     }
-    SERIAL_ECHOPAIR_P(SP_P_STR, int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
+    SERIAL_ECHOPAIR_P(SP_P_STR, int(planner.moves_free()));
     SERIAL_ECHOPAIR(" B", int(BUFSIZE - length));
   #endif
   SERIAL_EOL();

From ac3e27c0260dd1983a5704ba7efa343362456350 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Feb 2020 02:52:21 -0600
Subject: [PATCH 233/565] Hotfix for Babystepping

---
 Marlin/src/feature/babystep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index 7f017afb55cc..192817bc7b03 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -73,7 +73,7 @@ class Babystep {
   // apply accumulated babysteps to the axes.
   //
   static inline void task() {
-    LOOP_L_N(axis, BS_TODO_AXIS(Z_AXIS)) step_axis((AxisEnum)axis);
+    LOOP_LE_N(axis, BS_TODO_AXIS(Z_AXIS)) step_axis((AxisEnum)axis);
   }
 
 private:

From 484e1a624c178f1bb0996892d2c606f6cfebefbe Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Feb 2020 02:52:59 -0600
Subject: [PATCH 234/565] CoreXY Babystepping hotfix

---
 Marlin/src/module/stepper.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 0a79855bcfd5..5ccfca2e008b 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2526,12 +2526,12 @@ void Stepper::report_positions() {
 
   #elif IS_CORE
 
-    #define BABYSTEP_CORE(A, B, INV, DIR) do{                   \
+    #define BABYSTEP_CORE(A, B, INV, DIR, ALT) do{              \
       const xy_byte_t old_dir = { _READ_DIR(A), _READ_DIR(B) }; \
       _ENABLE_AXIS(A); _ENABLE_AXIS(B);                         \
       DIR_WAIT_BEFORE();                                        \
       _APPLY_DIR(A, _INVERT_DIR(A)^DIR^INV);                    \
-      _APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^(CORESIGN(1)<0));    \
+      _APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^ALT);                \
       DIR_WAIT_AFTER();                                         \
       _SAVE_START();                                            \
       _APPLY_STEP(A, !_INVERT_STEP_PIN(A), true);               \
@@ -2560,21 +2560,21 @@ void Stepper::report_positions() {
 
         case X_AXIS:
           #if CORE_IS_XY
-            BABYSTEP_CORE(X, Y, false, direction);
+            BABYSTEP_CORE(X, Y, 0, direction, 0);
           #elif CORE_IS_XZ
-            BABYSTEP_CORE(X, Z, false, direction);
+            BABYSTEP_CORE(X, Z, 0, direction, 0);
           #else
-            BABYSTEP_AXIS(X, false, direction);
+            BABYSTEP_AXIS(X, 0, direction, 0);
           #endif
           break;
 
         case Y_AXIS:
           #if CORE_IS_XY
-            BABYSTEP_CORE(X, Y, false, direction);
+            BABYSTEP_CORE(X, Y, 0, direction, (CORESIGN(1)<0));
           #elif CORE_IS_YZ
-            BABYSTEP_CORE(Y, Z, false, direction);
+            BABYSTEP_CORE(Y, Z, 0, direction, (CORESIGN(1)<0));
           #else
-            BABYSTEP_AXIS(Y, false, direction);
+            BABYSTEP_AXIS(Y, 0, direction, (CORESIGN(1)<0));
           #endif
           break;
 
@@ -2583,11 +2583,11 @@ void Stepper::report_positions() {
       case Z_AXIS: {
 
         #if CORE_IS_XZ
-          BABYSTEP_CORE(X, Z, BABYSTEP_INVERT_Z, direction);
+          BABYSTEP_CORE(X, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
         #elif CORE_IS_YZ
-          BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction);
+          BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
         #elif DISABLED(DELTA)
-          BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction);
+          BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
 
         #else // DELTA
 

From eeec4c27e7ba4d3692ee0fc27486370628d47278 Mon Sep 17 00:00:00 2001
From: vivian-ng <vivian@maplerain.com>
Date: Sat, 22 Feb 2020 19:00:10 +0900
Subject: [PATCH 235/565] [ESP32] Allow user to define pins for hardware
 Serial1 and Serial2 (#16918)

---
 Marlin/src/HAL/HAL_ESP32/HAL.cpp      | 22 ++++++++++++++++++++++
 Marlin/src/pins/esp32/pins_MRR_ESPA.h |  7 +++++++
 Marlin/src/pins/esp32/pins_MRR_ESPE.h | 12 +++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
index dc6d84e96fa7..d9afa13ab8d2 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
@@ -27,6 +27,7 @@
 #include <rom/rtc.h>
 #include <driver/adc.h>
 #include <esp_adc_cal.h>
+#include <HardwareSerial.h>
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -105,6 +106,27 @@ void HAL_init_board() {
     #endif
     server.begin();
   #endif
+
+  // ESP32 uses a GPIO matrix that allows pins to be assigned to hardware serial ports.
+  // The following code initializes hardware Serial1 and Serial2 to use user-defined pins
+  // if they have been defined.
+  #if defined(HARDWARE_SERIAL1_RX) && defined(HARDWARE_SERIAL1_TX)
+    HardwareSerial Serial1(1);
+    #ifdef TMC_BAUD_RATE  // use TMC_BAUD_RATE for Serial1 if defined
+      Serial1.begin(TMC_BAUD_RATE, SERIAL_8N1, HARDWARE_SERIAL1_RX, HARDWARE_SERIAL1_TX);
+    #else  // use default BAUDRATE if TMC_BAUD_RATE not defined
+      Serial1.begin(BAUDRATE, SERIAL_8N1, HARDWARE_SERIAL1_RX, HARDWARE_SERIAL1_TX);
+    #endif
+  #endif
+  #if defined(HARDWARE_SERIAL2_RX) && defined(HARDWARE_SERIAL2_TX)
+    HardwareSerial Serial2(2);
+    #ifdef TMC_BAUD_RATE  // use TMC_BAUD_RATE for Serial1 if defined
+      Serial2.begin(TMC_BAUD_RATE, SERIAL_8N1, HARDWARE_SERIAL2_RX, HARDWARE_SERIAL2_TX);
+    #else  // use default BAUDRATE if TMC_BAUD_RATE not defined
+      Serial2.begin(BAUDRATE, SERIAL_8N1, HARDWARE_SERIAL2_RX, HARDWARE_SERIAL2_TX);
+    #endif
+  #endif
+
 }
 
 void HAL_idletask() {
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index a984ddbe1a9f..a93f0f05c4aa 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -101,3 +101,10 @@
 #define SDSS                5
 #define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
 
+// Hardware serial pins
+// Add the following to Configuration.h or Configuration_adv.h to assign
+// specific pins to hardware Serial1.
+// Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
+// MRR ESPA does not have enough spare pins for such reassignment.
+//#define HARDWARE_SERIAL1_RX 21
+//#define HARDWARE_SERIAL1_TX 22
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index cffdfa465de2..0096027158e9 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -139,7 +139,7 @@
     #define BEEPER_PIN      151
 
     //#define LCD_PINS_D5     150
-    //#define LCD_PINS_D6     151
+    //#define LCD_PINS_D6     152
     //#define LCD_PINS_D7     153
 
   #else
@@ -153,3 +153,13 @@
   #define BTN_ENC            14
 
 #endif // HAS_GRAPHICAL_LCD
+
+// Hardware serial pins
+// Add the following to Configuration.h or Configuration_adv.h to assign
+// specific pins to hardware Serial1 and Serial2.
+// Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
+// MRR ESPA does not have enough spare pins for such reassignment.
+//#define HARDWARE_SERIAL1_RX 21
+//#define HARDWARE_SERIAL1_TX 22
+//#define HARDWARE_SERIAL2_RX  2
+//#define HARDWARE_SERIAL2_TX  4

From 34c92bbc173bdf91cf56902ff0a2e06adb9fbd6e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 23 Feb 2020 00:03:55 +0000
Subject: [PATCH 236/565] [cron] Bump distribution date (2020-02-23)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5fb6a7ec4a48..18e6215b57ea 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-22"
+  #define STRING_DISTRIBUTION_DATE "2020-02-23"
 #endif
 
 /**

From 20df64814e962d6f0aa4fc179f8e7c5ddca0c4c1 Mon Sep 17 00:00:00 2001
From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 22 Feb 2020 16:33:34 -0800
Subject: [PATCH 237/565] Finish Custom User Menu sanity-check (#16917)

---
 Marlin/src/inc/SanityCheck.h | 80 ++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1ae71e2ac745..88cd49f57e2b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2474,6 +2474,86 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     constexpr char _chr5 = USER_GCODE_5[strlen(USER_GCODE_5) - 1];
     static_assert(_chr5 != '\n' && _chr5 != '\r', "USER_GCODE_5 cannot have a newline at the end. Please remove it.");
   #endif
+  #ifdef USER_GCODE_6
+    constexpr char _chr6 = USER_GCODE_6[strlen(USER_GCODE_6) - 1];
+    static_assert(_chr6 != '\n' && _chr6 != '\r', "USER_GCODE_6 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_7
+    constexpr char _chr7 = USER_GCODE_7[strlen(USER_GCODE_7) - 1];
+    static_assert(_chr7 != '\n' && _chr7 != '\r', "USER_GCODE_7 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_8
+    constexpr char _chr8 = USER_GCODE_8[strlen(USER_GCODE_8) - 1];
+    static_assert(_chr8 != '\n' && _chr8 != '\r', "USER_GCODE_8 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_9
+    constexpr char _chr9 = USER_GCODE_9[strlen(USER_GCODE_9) - 1];
+    static_assert(_chr9 != '\n' && _chr9 != '\r', "USER_GCODE_9 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_10
+    constexpr char _chr10 = USER_GCODE_10[strlen(USER_GCODE_10) - 1];
+    static_assert(_chr10 != '\n' && _chr10 != '\r', "USER_GCODE_10 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_11
+    constexpr char _chr11 = USER_GCODE_11[strlen(USER_GCODE_11) - 1];
+    static_assert(_chr11 != '\n' && _chr11 != '\r', "USER_GCODE_11 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_12
+    constexpr char _chr12 = USER_GCODE_12[strlen(USER_GCODE_12) - 1];
+    static_assert(_chr12 != '\n' && _chr12 != '\r', "USER_GCODE_12 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_13
+    constexpr char _chr13 = USER_GCODE_13[strlen(USER_GCODE_13) - 1];
+    static_assert(_chr13 != '\n' && _chr13 != '\r', "USER_GCODE_13 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_14
+    constexpr char _chr14 = USER_GCODE_14[strlen(USER_GCODE_14) - 1];
+    static_assert(_chr14 != '\n' && _chr14 != '\r', "USER_GCODE_14 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_15
+    constexpr char _chr15 = USER_GCODE_15[strlen(USER_GCODE_15) - 1];
+    static_assert(_chr15 != '\n' && _chr15 != '\r', "USER_GCODE_15 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_16
+    constexpr char _chr16 = USER_GCODE_16[strlen(USER_GCODE_16) - 1];
+    static_assert(_chr16 != '\n' && _chr16 != '\r', "USER_GCODE_16 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_17
+    constexpr char _chr17 = USER_GCODE_17[strlen(USER_GCODE_17) - 1];
+    static_assert(_chr17 != '\n' && _chr17 != '\r', "USER_GCODE_17 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_18
+    constexpr char _chr18 = USER_GCODE_18[strlen(USER_GCODE_18) - 1];
+    static_assert(_chr18 != '\n' && _chr18 != '\r', "USER_GCODE_18 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_19
+    constexpr char _chr19 = USER_GCODE_19[strlen(USER_GCODE_19) - 1];
+    static_assert(_chr19 != '\n' && _chr19 != '\r', "USER_GCODE_19 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_20
+    constexpr char _chr20 = USER_GCODE_20[strlen(USER_GCODE_20) - 1];
+    static_assert(_chr20 != '\n' && _chr20 != '\r', "USER_GCODE_20 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_21
+    constexpr char _chr21 = USER_GCODE_21[strlen(USER_GCODE_21) - 1];
+    static_assert(_chr21 != '\n' && _chr21 != '\r', "USER_GCODE_21 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_22
+    constexpr char _chr22 = USER_GCODE_22[strlen(USER_GCODE_22) - 1];
+    static_assert(_chr22 != '\n' && _chr22 != '\r', "USER_GCODE_22 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_23
+    constexpr char _chr23 = USER_GCODE_23[strlen(USER_GCODE_23) - 1];
+    static_assert(_chr23 != '\n' && _chr23 != '\r', "USER_GCODE_23 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_24
+    constexpr char _chr24 = USER_GCODE_24[strlen(USER_GCODE_24) - 1];
+    static_assert(_chr24 != '\n' && _chr24 != '\r', "USER_GCODE_24 cannot have a newline at the end. Please remove it.");
+  #endif
+  #ifdef USER_GCODE_25
+    constexpr char _chr25 = USER_GCODE_25[strlen(USER_GCODE_25) - 1];
+    static_assert(_chr25 != '\n' && _chr25 != '\r', "USER_GCODE_25 cannot have a newline at the end. Please remove it.");
+  #endif
 #endif
 
 #if ENABLED(BACKLASH_COMPENSATION)

From b9b29bf4c075996f50ed2f8680fbed3862239010 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Feb 2020 07:04:06 -0600
Subject: [PATCH 238/565] Followup to babystep hotfix

---
 Marlin/src/module/stepper.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 5ccfca2e008b..d21d1fe3591c 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2564,7 +2564,7 @@ void Stepper::report_positions() {
           #elif CORE_IS_XZ
             BABYSTEP_CORE(X, Z, 0, direction, 0);
           #else
-            BABYSTEP_AXIS(X, 0, direction, 0);
+            BABYSTEP_AXIS(X, 0, direction);
           #endif
           break;
 
@@ -2574,7 +2574,7 @@ void Stepper::report_positions() {
           #elif CORE_IS_YZ
             BABYSTEP_CORE(Y, Z, 0, direction, (CORESIGN(1)<0));
           #else
-            BABYSTEP_AXIS(Y, 0, direction, (CORESIGN(1)<0));
+            BABYSTEP_AXIS(Y, 0, direction);
           #endif
           break;
 
@@ -2587,7 +2587,7 @@ void Stepper::report_positions() {
         #elif CORE_IS_YZ
           BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
         #elif DISABLED(DELTA)
-          BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
+          BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction);
 
         #else // DELTA
 

From 7bf3581b024c2942d80d03d7e7abeccca612587f Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 23 Feb 2020 13:37:39 +1300
Subject: [PATCH 239/565] Fix M0/M1 broken wait loop (#16921)

---
 Marlin/src/gcode/lcd/M0_M1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 9ed7b2af42fc..bf6a3d23d514 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -102,7 +102,7 @@ void GcodeSuite::M0_M1() {
   #endif
 
   if (ms > 0) ms += millis();  // wait until this time for a click
-  while (wait_for_user && (ms > 0 || PENDING(millis(), ms))) idle();
+  while (wait_for_user || (ms > 0 && PENDING(millis(), ms))) idle();
 
   #if HAS_LEDS_OFF_FLAG
     printerEventLEDs.onResumeAfterWait();

From 2471a8bb91697ba05fa8cea4a15c1ed836e47a3c Mon Sep 17 00:00:00 2001
From: ZMiguel Alves <zmiguel@users.noreply.github.com>
Date: Sun, 23 Feb 2020 00:45:10 +0000
Subject: [PATCH 240/565] Define ANET_FULL_GRAPHICS_LCD pins for SKR 1.4
 (#16928)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 2bb57c09fd4e..b90ac07a7de6 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -232,9 +232,19 @@
  *              EXP2                                              EXP1
  */
 #if HAS_SPI_LCD
-  #define BTN_ENC          P0_28   // (58) open-drain
+  #if ENABLED(ANET_FULL_GRAPHICS_LCD)
 
-  #if ENABLED(CR10_STOCKDISPLAY)
+    #define LCD_PINS_RS    P1_23
+
+    #define BTN_EN1        P1_20
+    #define BTN_EN2        P1_22
+    #define BTN_ENC        P1_18
+
+    #define LCD_PINS_ENABLE P1_21
+    #define LCD_PINS_D4    P1_19
+
+  #elif ENABLED(CR10_STOCKDISPLAY)
+    #define BTN_ENC        P0_28   // (58) open-drain
     #define LCD_PINS_RS    P1_22
 
     #define BTN_EN1        P1_18
@@ -244,6 +254,7 @@
     #define LCD_PINS_D4    P1_21
 
   #else
+    #define BTN_ENC        P0_28   // (58) open-drain
     #define LCD_PINS_RS    P1_19
 
     #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4

From 1d431fe8d27b3b5c16333793c71408fe0156308b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Feb 2020 19:26:52 -0600
Subject: [PATCH 241/565] Suppress "packed member" warning

---
 Marlin/src/sd/SdBaseFile.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index 22c0cd2f75b0..cdb1072cbef7 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -20,6 +20,12 @@
  *
  */
 
+#if __GNUC__ > 8
+  // The NXP platform updated GCC from 7.2.1 to 9.2.1
+  // and this new warning apparently can be ignored.
+  #pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#endif
+
 /**
  * Arduino SdFat Library
  * Copyright (c) 2009 by William Greiman

From 29ec868c4bc19058f02039c2a90e21fed816c257 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Feb 2020 20:45:59 -0600
Subject: [PATCH 242/565] Commit last SD line before fileHasFinished

---
 Marlin/src/gcode/queue.cpp   | 40 ++++++++++++++++--------------------
 Marlin/src/sd/cardreader.cpp |  2 +-
 Marlin/src/sd/cardreader.h   |  2 +-
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 12c370363006..c3c155e4c3eb 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -526,42 +526,38 @@ void GCodeQueue::get_serial_commands() {
     while (length < BUFSIZE && !card_eof) {
       const int16_t n = card.get();
       card_eof = card.eof();
+      if (n < 0) { SERIAL_ERROR_MSG(MSG_SD_ERR_READ); continue; }
       const char sd_char = (char)n;
-      if (card_eof || n < 0 || sd_char == '\n' || sd_char == '\r') {
+      if (sd_char == '\n' || sd_char == '\r' || card_eof) {
+
+        // Reset stream state, terminate the buffer, and commit a non-empty command
+        if (!process_line_done(sd_input_state, command_buffer[index_w], sd_count)) {
+          _commit_command(false);                     // The file was not terminated with a newline
+          #if ENABLED(POWER_LOSS_RECOVERY)
+            recovery.cmd_sdpos = card.getIndex();     // Prime for the next _commit_command
+          #endif
+        }
+
         if (card_eof) {
 
-          card.printingHasFinished();
+          card.fileHasFinished();                     // Handle end of file reached
 
-          if (IS_SD_PRINTING())
-            sd_count = 0; // If a sub-file was printing, continue from call point
-          else {
-            SERIAL_ECHOLNPGM(MSG_FILE_PRINTED);
+          if (!IS_SD_PRINTING()) {                    // Was it the main job file?
+            SERIAL_ECHOLNPGM(MSG_FILE_PRINTED);       // Tell the host the file is printed.
             #if ENABLED(PRINTER_EVENT_LEDS)
-              printerEventLEDs.onPrintCompleted();
+              printerEventLEDs.onPrintCompleted();    // Change LED color for Print Completed
               #if HAS_RESUME_CONTINUE
-                enqueue_now_P(PSTR("M0 S"
+                enqueue_now_P(PSTR("M0 S"             // Display "Click to Continue..."
                   #if HAS_LCD_MENU
-                    "1800"
+                    "1800"                            // ...for 30 minutes with LCD
                   #else
-                    "60"
+                    "60"                              // ...for 1 minute with no LCD
                   #endif
                 ));
               #endif
             #endif
           }
         }
-        else if (n < 0)
-          SERIAL_ERROR_MSG(MSG_SD_ERR_READ);
-
-        // Terminate the buffer, reset the input state, continue for empty line
-        if (process_line_done(sd_input_state, command_buffer[index_w], sd_count))
-          continue;
-
-        _commit_command(false);
-
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          recovery.cmd_sdpos = card.getIndex(); // Prime for the next _commit_command
-        #endif
       }
       else
         process_stream_char(sd_char, sd_input_state, command_buffer[index_w], sd_count);
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 0b3a91f40e2f..3cc888fd9635 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -1063,7 +1063,7 @@ uint16_t CardReader::get_num_Files() {
 //
 // Return from procedure or close out the Print Job
 //
-void CardReader::printingHasFinished() {
+void CardReader::fileHasFinished() {
   planner.synchronize();
   file.close();
   if (file_subcall_ctr > 0) { // Resume calling file after closing procedure
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 54d541c38aeb..8e09f444796a 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -106,7 +106,7 @@ class CardReader {
 
   // Print job
   static void openAndPrintFile(const char *name);   // (working directory)
-  static void printingHasFinished();
+  static void fileHasFinished();
   static void getAbsFilename(char *dst);
   static void startFileprint();
   static void printFilename();

From b2328d089a1c3c375de729c0af623c638d631078 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Feb 2020 21:36:12 -0600
Subject: [PATCH 243/565] Allow LCD_PIXEL_WIDTH/HEIGHT override

---
 Marlin/src/gcode/queue.cpp                             | 2 +-
 Marlin/src/inc/Conditionals_LCD.h                      | 9 +++++++++
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.h              | 3 ++-
 Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp      | 2 --
 Marlin/src/lcd/dogm/ultralcd_DOGM.h                    | 7 -------
 Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp | 2 +-
 Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h   | 9 +++------
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index c3c155e4c3eb..5edd2d926bd6 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -532,7 +532,7 @@ void GCodeQueue::get_serial_commands() {
 
         // Reset stream state, terminate the buffer, and commit a non-empty command
         if (!process_line_done(sd_input_state, command_buffer[index_w], sd_count)) {
-          _commit_command(false);                     // The file was not terminated with a newline
+          _commit_command(false);                     // Can handle last line missing a newline terminator
           #if ENABLED(POWER_LOSS_RECOVERY)
             recovery.cmd_sdpos = card.getIndex();     // Prime for the next _commit_command
           #endif
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 67130d21e45f..5cbdafd6e0da 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -361,6 +361,15 @@
 #define HAS_ADC_BUTTONS      ENABLED(ADC_KEYPAD)
 #define HAS_DGUS_LCD         ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
 
+#if HAS_GRAPHICAL_LCD
+  #ifndef LCD_PIXEL_WIDTH
+    #define LCD_PIXEL_WIDTH 128
+  #endif
+  #ifndef LCD_PIXEL_HEIGHT
+    #define LCD_PIXEL_HEIGHT 64
+  #endif
+#endif
+
 /**
  * Extruders have some combination of stepper motors and hotends
  * so we separate these concepts into the defines:
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index e1478ff98ede..25224934c50c 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -25,7 +25,7 @@
 
 #include <U8glib.h>
 
-#ifndef U8G_HAL_LINKS
+#ifndef U8G_HAL_LINKS   // Defined by LPC1768/9 environments in platform.ini
 
   #ifdef __SAM3X8E__
 
@@ -75,6 +75,7 @@
     #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_arduino_st7920_hw_spi_fn
   #endif
 
+  // This can't be invoked from the current platformio.ini
   #ifdef TARGET_LPC1768
     uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
   #endif
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
index 34712e070651..b6449bd4ae90 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
@@ -59,8 +59,6 @@
 
 #include "HAL_LCD_com_defines.h"
 
-#define LCD_PIXEL_WIDTH  128
-#define LCD_PIXEL_HEIGHT  64
 #define PAGE_HEIGHT        8
 
 /* init sequence from https://github.com/adafruit/ST7565-LCD/blob/master/ST7565/ST7565.cpp */
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
index 27443d9e7180..536b8f0bf9f7 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
@@ -196,13 +196,6 @@
   #endif
 #endif
 
-#ifndef LCD_PIXEL_WIDTH
-  #define LCD_PIXEL_WIDTH 128
-#endif
-#ifndef LCD_PIXEL_HEIGHT
-  #define LCD_PIXEL_HEIGHT 64
-#endif
-
 // LCD_FULL_PIXEL_WIDTH =
 // LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X
 #if ENABLED(FSMC_GRAPHICAL_TFT)
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
index 41b0c571f03c..4e38e554a2da 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -154,4 +154,4 @@ u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_rrd_st7920_128x64_fn, &u8
 #endif
 
 #endif // U8GLIB_ST7920
-#endif // __AVR__ && !U8G_HAL_LINKS
+#endif // !U8G_HAL_LINKS && (__AVR__ || ARDUINO_ARCH_STM32 || ARDUINO_ARCH_ESP32)
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
index 6bcf3a94cf5c..c6e0b9944bb3 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
@@ -31,12 +31,9 @@
 #define ST7920_DAT_PIN  LCD_PINS_ENABLE
 #define ST7920_CS_PIN   LCD_PINS_RS
 
-//#define PAGE_HEIGHT 8   //128 byte framebuffer
-#define PAGE_HEIGHT 16  //256 byte framebuffer
-//#define PAGE_HEIGHT 32  //512 byte framebuffer
-
-#define LCD_PIXEL_WIDTH 128
-#define LCD_PIXEL_HEIGHT 64
+//#define PAGE_HEIGHT 8   // 128 byte framebuffer
+#define PAGE_HEIGHT 16    // 256 byte framebuffer
+//#define PAGE_HEIGHT 32  // 512 byte framebuffer
 
 #include <U8glib.h>
 

From 0ba18848af83d66aa14ca8f5d387ab9f630d450e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Feb 2020 16:22:38 -0600
Subject: [PATCH 244/565] Allow USE_GCODE_SUBCODES for debugging

---
 Marlin/src/gcode/geometry/G92.cpp  |  2 +-
 Marlin/src/gcode/parser.cpp        | 22 +++++++++++-----------
 Marlin/src/gcode/parser.h          |  4 ++--
 Marlin/src/inc/Conditionals_post.h |  4 +++-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index dd87349976ef..0ed10beb54c2 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -35,7 +35,7 @@ void GcodeSuite::G92() {
 
   bool sync_E = false, sync_XYZ = false;
 
-  #if USE_GCODE_SUBCODES
+  #if ENABLED(USE_GCODE_SUBCODES)
     const uint8_t subcode_G92 = parser.subcode;
   #else
     constexpr uint8_t subcode_G92 = 0;
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 8218ee53d887..a49b8b216e17 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -51,13 +51,13 @@ char *GCodeParser::command_ptr,
 char GCodeParser::command_letter;
 int GCodeParser::codenum;
 
-#if USE_GCODE_SUBCODES
+#if ENABLED(USE_GCODE_SUBCODES)
   uint8_t GCodeParser::subcode;
 #endif
 
 #if ENABLED(GCODE_MOTION_MODES)
   int16_t GCodeParser::motion_mode_codenum = -1;
-  #if USE_GCODE_SUBCODES
+  #if ENABLED(USE_GCODE_SUBCODES)
     uint8_t GCodeParser::motion_mode_subcode;
   #endif
 #endif
@@ -83,7 +83,7 @@ void GCodeParser::reset() {
   string_arg = nullptr;                 // No whole line argument
   command_letter = '?';                 // No command letter
   codenum = 0;                          // No command code
-  #if USE_GCODE_SUBCODES
+  #if ENABLED(USE_GCODE_SUBCODES)
     subcode = 0;                        // No command sub-code
   #endif
   #if ENABLED(FASTER_GCODE_PARSER)
@@ -187,12 +187,12 @@ void GCodeParser::parse(char *p) {
       do { codenum *= 10, codenum += *p++ - '0'; } while (NUMERIC(*p));
 
       // Allow for decimal point in command
-      #if USE_GCODE_SUBCODES
-      if (*p == '.') {
-        p++;
-        while (NUMERIC(*p))
-        subcode *= 10, subcode += *p++ - '0';
-      }
+      #if ENABLED(USE_GCODE_SUBCODES)
+        if (*p == '.') {
+          p++;
+          while (NUMERIC(*p))
+          subcode *= 10, subcode += *p++ - '0';
+        }
       #endif
 
       // Skip all spaces to get to the first argument, or nul
@@ -206,7 +206,7 @@ void GCodeParser::parse(char *p) {
                              )
         ) {
           motion_mode_codenum = codenum;
-          #if USE_GCODE_SUBCODES
+          #if ENABLED(USE_GCODE_SUBCODES)
             motion_mode_subcode = subcode;
           #endif
         }
@@ -225,7 +225,7 @@ void GCodeParser::parse(char *p) {
         if (motion_mode_codenum < 0) return;
         command_letter = 'G';
         codenum = motion_mode_codenum;
-        #if USE_GCODE_SUBCODES
+        #if ENABLED(USE_GCODE_SUBCODES)
           subcode = motion_mode_subcode;
         #endif
         p--; // Back up one character to use the current parameter
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 08f8613c1718..70eb85e31e8e 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -85,13 +85,13 @@ class GCodeParser {
               *string_arg,                // string of command line
               command_letter;             // G, M, or T
   static int codenum;                     // 123
-  #if USE_GCODE_SUBCODES
+  #if ENABLED(USE_GCODE_SUBCODES)
     static uint8_t subcode;               // .1
   #endif
 
   #if ENABLED(GCODE_MOTION_MODES)
     static int16_t motion_mode_codenum;
-    #if USE_GCODE_SUBCODES
+    #if ENABLED(USE_GCODE_SUBCODES)
       static uint8_t motion_mode_subcode;
     #endif
     FORCE_INLINE static void cancel_motion_mode() { motion_mode_codenum = -1; }
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 624de26a0ba5..6785ea01e81c 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2110,7 +2110,9 @@
 #endif
 
 // Add commands that need sub-codes to this list
-#define USE_GCODE_SUBCODES ANY(G38_PROBE_TARGET, CNC_COORDINATE_SYSTEMS, POWER_LOSS_RECOVERY)
+#if ANY(G38_PROBE_TARGET, CNC_COORDINATE_SYSTEMS, POWER_LOSS_RECOVERY)
+  #define USE_GCODE_SUBCODES
+#endif
 
 // Parking Extruder
 #if ENABLED(PARKING_EXTRUDER)

From 529d57bddf63ea4598b4c5a3f4ff42f188c995c8 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 23 Feb 2020 14:47:30 +0100
Subject: [PATCH 245/565] Sync Italian language (#16935)

---
 Marlin/src/lcd/language/language_it.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index addd02c7a78f..af1f76208003 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -38,6 +38,7 @@ namespace Language_it {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Italian");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" pronto.");
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
   PROGMEM Language_Str MSG_YES                             = _UxGT("SI");
   PROGMEM Language_Str MSG_NO                              = _UxGT("NO");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Indietro");
@@ -255,6 +256,16 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Off");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autotune");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
+  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
+  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
+  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
+  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
+  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
+  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
+  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
+  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
+  PROGMEM Language_Str MSG_PID_F                           = _UxGT("PID-F");
+  PROGMEM Language_Str MSG_PID_F_E                         = _UxGT("PID-F *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Seleziona");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seleziona *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");

From 2bcc2ec7d1125428beb6898a527d1cc49c26ac78 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 23 Feb 2020 05:48:56 -0800
Subject: [PATCH 246/565] Reduce default TMC baudrate to 57600 with Software
 Serial (#16930)

---
 Marlin/src/module/stepper/trinamic.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 506383aa3577..0b14aaf64779 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -117,7 +117,16 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 #endif
 
 #ifndef TMC_BAUD_RATE
-  #define TMC_BAUD_RATE 115200
+  #if HAS_TMC_SW_SERIAL
+    // Reduce baud rate for boards not already overriding TMC_BAUD_RATE for software serial.
+    // Testing has shown that 115200 is not 100% reliable on AVR platforms, occasionally
+    // failing to read status properly. 32-bit platforms typically define an even lower
+    // TMC_BAUD_RATE, due to differences in how SoftwareSerial libraries work on different
+    // platforms.
+    #define TMC_BAUD_RATE 57600
+  #else
+    #define TMC_BAUD_RATE 115200
+  #endif
 #endif
 
 #if HAS_DRIVER(TMC2130)

From 9717b3044f41d47dab2b426823e2de0d466dcf59 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:03:56 +0000
Subject: [PATCH 247/565] [cron] Bump distribution date (2020-02-24)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 18e6215b57ea..64f557ab026c 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-23"
+  #define STRING_DISTRIBUTION_DATE "2020-02-24"
 #endif
 
 /**

From ebd2bcc177640ad0a272426675bc1322272e7bc2 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 23 Feb 2020 11:55:24 -0800
Subject: [PATCH 248/565] Fix AXIS_HAS_SW_SERIAL

---
 Marlin/src/core/drivers.h          |  2 +-
 Marlin/src/inc/Conditionals_post.h | 53 ++++++++++++++++++++++++++++++
 buildroot/share/tests/esp32-tests  | 15 +++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index ad2c755bae34..f1410f1d47c3 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -131,7 +131,7 @@
 #define AXIS_HAS_UART(A) (    AXIS_DRIVER_TYPE(A,TMC2208) \
                            || AXIS_DRIVER_TYPE(A,TMC2209) )
 
-#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
+#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !HAS_##A##_HARDWARE_SERIAL))
 
 #define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
                                    || AXIS_DRIVER_TYPE(A,TMC2160) \
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6785ea01e81c..55058a4d1107 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1444,6 +1444,59 @@
 #define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
 #define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
 
+// Cannot use a macro with a defined() statement inside REPEAT macros.
+// [AXIS]_HARDWARE_SERIAL definitions are typically strings which cannot be
+// tested directly, as they will evaluate to 0.
+#ifdef X_HARDWARE_SERIAL
+  #define HAS_X_HARDWARE_SERIAL 1
+#endif
+#ifdef X2_HARDWARE_SERIAL
+  #define HAS_X2_HARDWARE_SERIAL 1
+#endif
+#ifdef Y_HARDWARE_SERIAL
+  #define HAS_Y_HARDWARE_SERIAL 1
+#endif
+#ifdef Y2_HARDWARE_SERIAL
+  #define HAS_Y2_HARDWARE_SERIAL 1
+#endif
+#ifdef Z_HARDWARE_SERIAL
+  #define HAS_Z_HARDWARE_SERIAL 1
+#endif
+#ifdef Z2_HARDWARE_SERIAL
+  #define HAS_Z2_HARDWARE_SERIAL 1
+#endif
+#ifdef Z3_HARDWARE_SERIAL
+  #define HAS_Z3_HARDWARE_SERIAL 1
+#endif
+#ifdef Z4_HARDWARE_SERIAL
+  #define HAS_Z4_HARDWARE_SERIAL 1
+#endif
+#ifdef E0_HARDWARE_SERIAL
+  #define HAS_E0_HARDWARE_SERIAL 1
+#endif
+#ifdef E1_HARDWARE_SERIAL
+  #define HAS_E1_HARDWARE_SERIAL 1
+#endif
+#ifdef E2_HARDWARE_SERIAL
+  #define HAS_E2_HARDWARE_SERIAL 1
+#endif
+#ifdef E3_HARDWARE_SERIAL
+  #define HAS_E3_HARDWARE_SERIAL 1
+#endif
+#ifdef E4_HARDWARE_SERIAL
+  #define HAS_E4_HARDWARE_SERIAL 1
+#endif
+#ifdef E5_HARDWARE_SERIAL
+  #define HAS_E5_HARDWARE_SERIAL 1
+#endif
+#ifdef E6_HARDWARE_SERIAL
+  #define HAS_E6_HARDWARE_SERIAL 1
+#endif
+#ifdef E7_HARDWARE_SERIAL
+  #define HAS_E7_HARDWARE_SERIAL 1
+#endif
+
+
 //
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
 //
diff --git a/buildroot/share/tests/esp32-tests b/buildroot/share/tests/esp32-tests
index 47f5d8176144..18abab8b065f 100755
--- a/buildroot/share/tests/esp32-tests
+++ b/buildroot/share/tests/esp32-tests
@@ -18,5 +18,20 @@ opt_set TX_BUFFER_SIZE 64
 opt_add WEBSUPPORT
 exec_test $1 $2 "ESP32 with WIFISUPPORT and WEBSUPPORT"
 
+#
+# Build with TMC drivers using hardware serial
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
+opt_set X_DRIVER_TYPE TMC2209
+opt_set Y_DRIVER_TYPE TMC2208
+opt_set Z_DRIVER_TYPE TMC2209
+opt_set E0_DRIVER_TYPE TMC2209
+opt_set X_HARDWARE_SERIAL Serial1
+opt_set Y_HARDWARE_SERIAL Serial1
+opt_set Z_HARDWARE_SERIAL Serial1
+opt_set E0_HARDWARE_SERIAL Serial1
+exec_test $1 $2 "ESP32 with TMC Hardware Serial"
+
 # cleanup
 restore_configs

From 9a51f29efad894eb96bc86d6bb9b274700d0a816 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 23 Feb 2020 23:55:05 -0600
Subject: [PATCH 249/565] Simplified E_AXIS_HAS macro

---
 Marlin/src/core/drivers.h          |  4 +--
 Marlin/src/inc/Conditionals_post.h | 53 ------------------------------
 2 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index f1410f1d47c3..306329d6fe98 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -131,7 +131,7 @@
 #define AXIS_HAS_UART(A) (    AXIS_DRIVER_TYPE(A,TMC2208) \
                            || AXIS_DRIVER_TYPE(A,TMC2209) )
 
-#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !HAS_##A##_HARDWARE_SERIAL))
+#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
 
 #define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
                                    || AXIS_DRIVER_TYPE(A,TMC2160) \
@@ -158,7 +158,7 @@
                                    || AXIS_DRIVER_TYPE(A,TMC5160) )
 
 #define _OR_EAH(N,T)    || AXIS_HAS_##T(E##N)
-#define E_AXIS_HAS(T)   (0 RREPEAT2(E_STEPPERS, _OR_EAH, T))
+#define E_AXIS_HAS(T)   (0 _OR_EAH(0,T) _OR_EAH(1,T) _OR_EAH(2,T) _OR_EAH(3,T) _OR_EAH(4,T) _OR_EAH(5,T) _OR_EAH(6,T) _OR_EAH(7,T))
 
 #define ANY_AXIS_HAS(T) (    AXIS_HAS_##T(X)  || AXIS_HAS_##T(X2) \
                           || AXIS_HAS_##T(Y)  || AXIS_HAS_##T(Y2) \
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 55058a4d1107..6785ea01e81c 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1444,59 +1444,6 @@
 #define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
 #define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
 
-// Cannot use a macro with a defined() statement inside REPEAT macros.
-// [AXIS]_HARDWARE_SERIAL definitions are typically strings which cannot be
-// tested directly, as they will evaluate to 0.
-#ifdef X_HARDWARE_SERIAL
-  #define HAS_X_HARDWARE_SERIAL 1
-#endif
-#ifdef X2_HARDWARE_SERIAL
-  #define HAS_X2_HARDWARE_SERIAL 1
-#endif
-#ifdef Y_HARDWARE_SERIAL
-  #define HAS_Y_HARDWARE_SERIAL 1
-#endif
-#ifdef Y2_HARDWARE_SERIAL
-  #define HAS_Y2_HARDWARE_SERIAL 1
-#endif
-#ifdef Z_HARDWARE_SERIAL
-  #define HAS_Z_HARDWARE_SERIAL 1
-#endif
-#ifdef Z2_HARDWARE_SERIAL
-  #define HAS_Z2_HARDWARE_SERIAL 1
-#endif
-#ifdef Z3_HARDWARE_SERIAL
-  #define HAS_Z3_HARDWARE_SERIAL 1
-#endif
-#ifdef Z4_HARDWARE_SERIAL
-  #define HAS_Z4_HARDWARE_SERIAL 1
-#endif
-#ifdef E0_HARDWARE_SERIAL
-  #define HAS_E0_HARDWARE_SERIAL 1
-#endif
-#ifdef E1_HARDWARE_SERIAL
-  #define HAS_E1_HARDWARE_SERIAL 1
-#endif
-#ifdef E2_HARDWARE_SERIAL
-  #define HAS_E2_HARDWARE_SERIAL 1
-#endif
-#ifdef E3_HARDWARE_SERIAL
-  #define HAS_E3_HARDWARE_SERIAL 1
-#endif
-#ifdef E4_HARDWARE_SERIAL
-  #define HAS_E4_HARDWARE_SERIAL 1
-#endif
-#ifdef E5_HARDWARE_SERIAL
-  #define HAS_E5_HARDWARE_SERIAL 1
-#endif
-#ifdef E6_HARDWARE_SERIAL
-  #define HAS_E6_HARDWARE_SERIAL 1
-#endif
-#ifdef E7_HARDWARE_SERIAL
-  #define HAS_E7_HARDWARE_SERIAL 1
-#endif
-
-
 //
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
 //

From 8ba5ef8cae5f7323688749e699606dcc14182c3e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 24 Feb 2020 05:33:16 -0600
Subject: [PATCH 250/565] "Init. Media" => "Attach Media"

---
 Marlin/src/lcd/language/language_an.h      | 2 +-
 Marlin/src/lcd/language/language_bg.h      | 2 +-
 Marlin/src/lcd/language/language_ca.h      | 2 +-
 Marlin/src/lcd/language/language_cz.h      | 2 +-
 Marlin/src/lcd/language/language_de.h      | 2 +-
 Marlin/src/lcd/language/language_el.h      | 2 +-
 Marlin/src/lcd/language/language_el_gr.h   | 2 +-
 Marlin/src/lcd/language/language_en.h      | 2 +-
 Marlin/src/lcd/language/language_es.h      | 2 +-
 Marlin/src/lcd/language/language_eu.h      | 2 +-
 Marlin/src/lcd/language/language_fr.h      | 2 +-
 Marlin/src/lcd/language/language_gl.h      | 2 +-
 Marlin/src/lcd/language/language_hr.h      | 2 +-
 Marlin/src/lcd/language/language_it.h      | 2 +-
 Marlin/src/lcd/language/language_jp_kana.h | 2 +-
 Marlin/src/lcd/language/language_nl.h      | 2 +-
 Marlin/src/lcd/language/language_pl.h      | 2 +-
 Marlin/src/lcd/language/language_pt.h      | 2 +-
 Marlin/src/lcd/language/language_pt_br.h   | 2 +-
 Marlin/src/lcd/language/language_ru.h      | 2 +-
 Marlin/src/lcd/language/language_sk.h      | 2 +-
 Marlin/src/lcd/language/language_tr.h      | 2 +-
 Marlin/src/lcd/language/language_uk.h      | 2 +-
 Marlin/src/lcd/language/language_vi.h      | 2 +-
 Marlin/src/lcd/language/language_zh_CN.h   | 2 +-
 Marlin/src/lcd/language/language_zh_TW.h   | 2 +-
 Marlin/src/lcd/menu/menu_main.cpp          | 4 ++--
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 4c9b2deab4d7..9498d558e7ff 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -151,7 +151,7 @@ namespace Language_an {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Retraccion auto.");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Cambear filamento");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Cambear filamento *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Encetan. tarcheta");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Encetan. tarcheta");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Cambiar tarcheta");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z fuera");
   PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset BLTouch");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 094aca8caff5..18096b626966 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -136,7 +136,7 @@ namespace Language_bg {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Автоoткат");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Смяна нишка");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Смяна нишка *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Иниц. SD-Карта");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Иниц. SD-Карта");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Смяна SD-Карта");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z-сондата е извадена");
   PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z Отстояние");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 8d29cd95651b..950a73d7f135 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -146,7 +146,7 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto retraccio");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Canvia filament");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Canvia filament *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Inicialitza SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Inicialitza SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Canvia SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z fora");
   PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reinicia BLTouch");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index b185a5e18cb6..9b983dd94d69 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -369,7 +369,7 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Vysunout filament *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Vysunout vše");
 
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Načíst médium");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Načíst médium");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Vyměnit médium");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Vysunout médium");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z mimo podl");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 8215cd4a05c3..cacef7b4d013 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -343,7 +343,7 @@ namespace Language_de {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Filament entladen");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Filament entladen *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Alles entladen");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Medium initial.");  // Manually initialize the SD-card via user interface
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Medium initial.");  // Manually initialize the SD-card via user interface
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Medium getauscht"); // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Medium freigeben"); // if Marlin gets confused - M22
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z-Sonde außerhalb");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index c40cdb4ec106..2690e0b7f17f 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -162,7 +162,7 @@ namespace Language_el {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Αυτόματη ανάσυρση");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Αλλαγή νήματος");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Αλλαγή νήματος *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Προετοιμασία κάρτας SD");  //SHORTEN
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Προετοιμασία κάρτας SD");  //SHORTEN
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Αλλαγή κάρτας SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Διερεύνηση Z εκτός Επ.Εκτύπωσης"); //SHORTEN
   PROGMEM Language_Str MSG_YX_UNHOMED                      = _UxGT("Επαναφορά Χ/Υ πριν από Ζ"); //SHORTEN
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 982e4bba7813..859a8fa4fde2 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -164,7 +164,7 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Αυτόματη ανάσυρση");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Αλλαγή νήματος");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Αλλαγή νήματος *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Προετοιμασία κάρτας SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Προετοιμασία κάρτας SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Αλλαγή κάρτας SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Διερεύνηση Z εκτός κλίνης");
   PROGMEM Language_Str MSG_YX_UNHOMED                      = _UxGT("Επαναφορά Χ/Υ πριν από Ζ");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 4f4e32bd088a..4cbb2cc0818a 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -370,7 +370,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Unload Filament");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Unload Filament *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Unload All");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Init. Media");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Attach Media");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change Media");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release Media");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 22ab93e78e88..fdab16a18661 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -337,7 +337,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Descargar filamento");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Descargar fil. *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Descargar todo");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Iniciar SD/USB");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Iniciar SD/USB");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Cambiar SD/USB");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Lanzar SD/USB");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z fuera cama");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index ab9b61f13a86..210752e25555 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -221,7 +221,7 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Harizpia deskargatu");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Harizpia deskargatu *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Erabat deskargatu");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Hasieratu SD-a");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Hasieratu SD-a");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Aldatu txartela");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z zunda kanpora");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Okertze faktorea");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index e047a2193456..ec057399a449 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -340,7 +340,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Retrait filament");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Retrait filament *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Retirer tout");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Charger le média");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Charger le média");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Actualiser média");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Retirer le média");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonde Z hors lit");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 77d015bef641..1c78d4455731 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -143,7 +143,7 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Retraccion auto.");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Cambiar filamen.");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Cambiar filamen. *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Iniciando SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Iniciando SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Cambiar SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda-Z sen cama");
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Comprobar BLTouch");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 184bf20694f5..e1caeb8efa6a 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -112,7 +112,7 @@ namespace Language_hr {
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ZAUSTAVLJEN. ");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Promijeni filament");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Promijeni filament *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Init. SD karticu");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Init. SD karticu");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Promijeni SD karticu");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Grijanje neuspješno");
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("Grijanje...");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index af1f76208003..008f7735dc12 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -368,7 +368,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Rimuovi filamento");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Rimuovi filamento *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Rimuovi tutto");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Inizializ. media");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Inizializ. media");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Cambia media");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Rilascia media");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z probe fuori piatto");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index d5a5ec33c36d..ddff7f547354 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -166,7 +166,7 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("ホショウソクド mm/s");            // "UnRet  V"
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("ジドウヒキコミ");                 // "AutoRetr."
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("フィラメントコウカン");              // "Change filament"
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("メディアサイヨミコミ");             // "Init. SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("メディアサイヨミコミ");             // "Init. SD card"
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("メディアコウカン");               // "Change SD card"
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Zプローブ ベッドガイ");            // "Z probe out. bed"
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch ジコシンダン");          // "BLTouch Self-Test"
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 7c017c2c9672..f657919bb28a 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -149,7 +149,7 @@ namespace Language_nl {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("AutoRetr.");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Verv. Filament");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Verv. Filament *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Init. SD kaart");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Init. SD kaart");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Verv. SD Kaart");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z probe uit. bed");
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Zelf-Test");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index ec7295455fc0..8a8fe43ee595 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -350,7 +350,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Wyładuj Filament");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Wyładuj Filament *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Wyładuj wszystkie");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Inicjal. karty SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Inicjal. karty SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Zmiana karty SD");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Zwolnienie karty");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z za stołem");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 5f2eb046656e..8a1e863b7806 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -139,7 +139,7 @@ namespace Language_pt {
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT(" AutoRetr.");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Trocar filamento");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Trocar filamento *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Inici. cartão SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Inici. cartão SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Trocar cartão SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sensor fora/base");
   PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Desvio Z");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 0c63f63cb2dd..ab8e313b3e11 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -293,7 +293,7 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Carregar Filamento *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Descarreg. Filamento *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Descarregar Todos");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Iniciar SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Iniciar SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Trocar SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda fora da mesa");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Fator de Cisalho");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index efab82fe9b7c..0cb25e057894 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -328,7 +328,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Загрузка филамента *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Выгрузка филамента *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Выгрузить всё");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Активировать SD");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Активировать SD");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Сменить SD карту");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Деактивировать SD");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z-датчик вне стола");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index fdd1ab8384bd..d652bb098dbf 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -360,7 +360,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Vysunúť filament");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Vysunúť filament *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Vysunúť všetko");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Načítať SD kartu");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Načítať SD kartu");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Vymeniť SD kartu");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Odpojiť SD kartu");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z mimo podl.");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 5ddc72df17da..b5ed642676b7 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -309,7 +309,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Filaman Çıkart");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Filaman Çıkart *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Tümünü Çıkart");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("SD Kart Başlatılıyor");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("SD Kart Başlatılıyor");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("SD Kart Değiştir");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Prob Açık. Tabla");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Çarpıklık Faktörü");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 5119b8bc3ece..bfc6e16dc190 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -157,7 +157,7 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ЗУПИНЕНО. ");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Зміна волокна");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Зміна волокна *");
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Старт SD картки");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Старт SD картки");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Заміна SD карти");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z дет. не в межах");
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Само-Тест");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 3dbf922b951f..76ce55284ffc 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -309,7 +309,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Dỡ dây nhựa");                          // unload filament
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Dỡ dây nhựa *");                        // unload filament
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Dỡ tất cả");                            // Unload All
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("Khởi tạo phương tiện");                 // Init. media
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Khởi tạo phương tiện");                 // Init. media
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Thay phương tiện");                     // Change midea
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Phát hành phương tiện");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Đầu Dò Z qua bàn");                     // Z Probe past bed
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 3595aabe83a3..8e760f73b31a 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -274,7 +274,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("卸载丝料");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("卸载丝料 *");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("卸载全部");     // "Unload All"
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("初始化存储卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("初始化存储卡");     //"Init. SD card"
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更换存储卡");     //"Change SD card"
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探针在热床之外");     //"Z probe out. bed" Z probe is not within the physical limits
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("偏斜因数");     // "Skew Factor"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index f3cc322a922d..77a6c04d9ae7 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -274,7 +274,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("卸載絲料");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("卸載絲料 *");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("卸載全部");     // "Unload All"
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("初始化記憶卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("初始化記憶卡");     //"Init. SD card"
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更換記憶卡");     //"Change SD card"
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探針在熱床之外");     //"Z probe out. bed" Z probe is not within the physical limits
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("偏斜因數");     // "Skew Factor"
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 5a56770a177b..d98670922c9d 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -134,7 +134,7 @@ void menu_main() {
         #if PIN_EXISTS(SD_DETECT)
           ACTION_ITEM(MSG_NO_MEDIA, nullptr);
         #else
-          GCODES_ITEM(MSG_INIT_MEDIA, M21_STR);
+          GCODES_ITEM(MSG_ATTACH_MEDIA, M21_STR);
           ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
         #endif
       }
@@ -228,7 +228,7 @@ void menu_main() {
       #if PIN_EXISTS(SD_DETECT)
         ACTION_ITEM(MSG_NO_MEDIA, nullptr);
       #else
-        GCODES_ITEM(MSG_INIT_MEDIA, M21_STR);
+        GCODES_ITEM(MSG_ATTACH_MEDIA, M21_STR);
         ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
       #endif
     }

From 5e197df89af624d556b75c4881aacd1ab57e861d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 24 Feb 2020 05:29:13 -0600
Subject: [PATCH 251/565] Fix Babystepping loop (again)

---
 Marlin/src/feature/babystep.cpp         |  8 +++----
 Marlin/src/feature/babystep.h           | 12 ++++++-----
 Marlin/src/feature/tmc_util.cpp         |  2 +-
 Marlin/src/gcode/motion/M290.cpp        |  2 +-
 Marlin/src/lcd/extensible_ui/ui_api.cpp | 16 +++++++-------
 Marlin/src/lcd/extensible_ui/ui_api.h   |  2 +-
 Marlin/src/module/stepper.cpp           | 28 +++++++++++++++++--------
 Marlin/src/pins/mega/pins_PICA.h        | 14 ++++++-------
 8 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index fd4491bc6f8a..25552a701cb5 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -35,17 +35,17 @@
 
 Babystep babystep;
 
-volatile int16_t Babystep::steps[BS_TODO_AXIS(Z_AXIS) + 1];
+volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1];
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
   int16_t Babystep::axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];
 #endif
 int16_t Babystep::accum;
 
 void Babystep::step_axis(const AxisEnum axis) {
-  const int16_t curTodo = steps[BS_TODO_AXIS(axis)]; // get rid of volatile for performance
+  const int16_t curTodo = steps[BS_AXIS_IND(axis)]; // get rid of volatile for performance
   if (curTodo) {
     stepper.do_babystep((AxisEnum)axis, curTodo > 0);
-    if (curTodo > 0) steps[BS_TODO_AXIS(axis)]--; else steps[BS_TODO_AXIS(axis)]++;
+    if (curTodo > 0) steps[BS_AXIS_IND(axis)]--; else steps[BS_AXIS_IND(axis)]++;
   }
 }
 
@@ -112,7 +112,7 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
     #else
       BSA_ENABLE(Z_AXIS);
     #endif
-    steps[BS_TODO_AXIS(axis)] += distance;
+    steps[BS_AXIS_IND(axis)] += distance;
   #endif
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
     gcode.reset_stepper_timeout();
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index 192817bc7b03..8ce48e397deb 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -32,9 +32,11 @@
 #endif
 
 #if IS_CORE || EITHER(BABYSTEP_XY, I2C_POSITION_ENCODERS)
-  #define BS_TODO_AXIS(A) A
+  #define BS_AXIS_IND(A) A
+  #define BS_AXIS(I) AxisEnum(I)
 #else
-  #define BS_TODO_AXIS(A) 0
+  #define BS_AXIS_IND(A) 0
+  #define BS_AXIS(I) Z_AXIS
 #endif
 
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
@@ -47,7 +49,7 @@
 
 class Babystep {
 public:
-  static volatile int16_t steps[BS_TODO_AXIS(Z_AXIS) + 1];
+  static volatile int16_t steps[BS_AXIS_IND(Z_AXIS) + 1];
   static int16_t accum;                                     // Total babysteps in current edit
 
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
@@ -65,7 +67,7 @@ class Babystep {
   static void add_mm(const AxisEnum axis, const float &mm);
 
   static inline bool has_steps() {
-    return steps[BS_TODO_AXIS(X_AXIS)] || steps[BS_TODO_AXIS(Y_AXIS)] || steps[BS_TODO_AXIS(Z_AXIS)];
+    return steps[BS_AXIS_IND(X_AXIS)] || steps[BS_AXIS_IND(Y_AXIS)] || steps[BS_AXIS_IND(Z_AXIS)];
   }
 
   //
@@ -73,7 +75,7 @@ class Babystep {
   // apply accumulated babysteps to the axes.
   //
   static inline void task() {
-    LOOP_LE_N(axis, BS_TODO_AXIS(Z_AXIS)) step_axis((AxisEnum)axis);
+    LOOP_LE_N(i, BS_AXIS_IND(Z_AXIS)) step_axis(BS_AXIS(i));
   }
 
 private:
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 9f905021ea6e..a2723fd3935b 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1097,7 +1097,7 @@
 
   bool tmc_enable_stallguard(TMC2209Stepper &st) {
     const bool stealthchop_was_enabled = !st.en_spreadCycle();
-    
+
     st.TCOOLTHRS(0xFFFFF);
     st.en_spreadCycle(false);
     return stealthchop_was_enabled;
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 9422307cda1d..d6535af82f7a 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -131,7 +131,7 @@ void GcodeSuite::M290() {
         #else
           PSTR("Babystep Z")
         #endif
-        , babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]
+        , babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
       );
     }
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 31d195c95de4..7ef7614b8df8 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -785,7 +785,7 @@ namespace ExtUI {
     #if HAS_BED_PROBE
       return probe.offset.z;
     #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
-      return (planner.steps_to_mm[Z_AXIS] * babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]);
+      return (planner.steps_to_mm[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]);
     #else
       return 0.0;
     #endif
@@ -898,11 +898,11 @@ namespace ExtUI {
     float getPIDValues_Kp(const extruder_t tool) {
       return PID_PARAM(Kp, tool);
     }
-    
+
     float getPIDValues_Ki(const extruder_t tool) {
       return unscalePID_i(PID_PARAM(Ki, tool));
     }
-    
+
     float getPIDValues_Kd(const extruder_t tool) {
       return unscalePID_d(PID_PARAM(Kd, tool));
     }
@@ -918,27 +918,27 @@ namespace ExtUI {
       thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
     }
   #endif
-  
+
   #if ENABLED(PIDTEMPBED)
     float getBedPIDValues_Kp() {
       return thermalManager.temp_bed.pid.Kp;
     }
-    
+
     float getBedPIDValues_Ki() {
       return unscalePID_i(thermalManager.temp_bed.pid.Ki);
     }
-    
+
     float getBedPIDValues_Kd() {
       return unscalePID_d(thermalManager.temp_bed.pid.Kd);
     }
-    
+
     void setBedPIDValues(const float p, const float i, const float d) {
       thermalManager.temp_bed.pid.Kp = p;
       thermalManager.temp_bed.pid.Ki = scalePID_i(i);
       thermalManager.temp_bed.pid.Kd = scalePID_d(d);
       thermalManager.updatePID();
     }
-    
+
     void startBedPIDTune(const float temp) {
       thermalManager.PID_autotune(temp, H_BED, 4, true);
     }
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h
index d99cfcedb4f6..10df2bc72d99 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extensible_ui/ui_api.h
@@ -256,7 +256,7 @@ namespace ExtUI {
     void setPIDValues(const float, const float, const float, extruder_t);
     void startPIDTune(const float, extruder_t);
   #endif
-  
+
   #if ENABLED(PIDTEMPBED)
     float getBedPIDValues_Kp();
     float getBedPIDValues_Ki();
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index d21d1fe3591c..66fc39228dd3 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -81,6 +81,8 @@
 
 Stepper stepper; // Singleton
 
+#define BABYSTEPPING_EXTRA_DIR_WAIT
+
 #if HAS_MOTOR_CURRENT_PWM
   bool Stepper::initialized; // = false
 #endif
@@ -1367,8 +1369,8 @@ void Stepper::isr() {
     #endif
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
-      const bool do_babystep = (nextBabystepISR == 0);              // 0 = Do Babystepping (XY)Z pulses
-      if (do_babystep) nextBabystepISR = babystepping_isr();
+      const bool is_babystep = (nextBabystepISR == 0);              // 0 = Do Babystepping (XY)Z pulses
+      if (is_babystep) nextBabystepISR = babystepping_isr();
     #endif
 
     // ^== Time critical. NOTHING besides pulse generation should be above here!!!
@@ -1376,7 +1378,7 @@ void Stepper::isr() {
     if (!nextMainISR) nextMainISR = block_phase_isr();  // Manage acc/deceleration, get next block
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
-      if (do_babystep)                                  // Avoid ANY stepping too soon after baby-stepping
+      if (is_babystep)                                  // Avoid ANY stepping too soon after baby-stepping
         NOLESS(nextMainISR, (BABYSTEP_TICKS) / 8);      // FULL STOP for 125µs after a baby-step
 
       if (nextBabystepISR != BABYSTEP_NEVER)            // Avoid baby-stepping too close to axis Stepping
@@ -2507,6 +2509,14 @@ void Stepper::report_positions() {
     #endif
   #endif
 
+  #if ENABLED(BABYSTEPPING_EXTRA_DIR_WAIT)
+    #define EXTRA_DIR_WAIT_BEFORE DIR_WAIT_BEFORE
+    #define EXTRA_DIR_WAIT_AFTER  DIR_WAIT_AFTER
+  #else
+    #define EXTRA_DIR_WAIT_BEFORE()
+    #define EXTRA_DIR_WAIT_AFTER()
+  #endif
+
   #if DISABLED(DELTA)
 
     #define BABYSTEP_AXIS(AXIS, INV, DIR) do{           \
@@ -2519,9 +2529,9 @@ void Stepper::report_positions() {
       _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), true); \
       _PULSE_WAIT();                                    \
       _APPLY_STEP(AXIS, _INVERT_STEP_PIN(AXIS), true);  \
-      DIR_WAIT_BEFORE();                                \
+      EXTRA_DIR_WAIT_BEFORE();                          \
       _APPLY_DIR(AXIS, old_dir);                        \
-      DIR_WAIT_AFTER();                                 \
+      EXTRA_DIR_WAIT_AFTER();                           \
     }while(0)
 
   #elif IS_CORE
@@ -2539,9 +2549,9 @@ void Stepper::report_positions() {
       _PULSE_WAIT();                                            \
       _APPLY_STEP(A, _INVERT_STEP_PIN(A), true);                \
       _APPLY_STEP(B, _INVERT_STEP_PIN(B), true);                \
-      DIR_WAIT_BEFORE();                                        \
+      EXTRA_DIR_WAIT_BEFORE();                                  \
       _APPLY_DIR(A, old_dir.a); _APPLY_DIR(B, old_dir.b);       \
-      DIR_WAIT_AFTER();                                         \
+      EXTRA_DIR_WAIT_AFTER();                                   \
     }while(0)
 
   #endif
@@ -2620,13 +2630,13 @@ void Stepper::report_positions() {
           Z_STEP_WRITE(INVERT_Z_STEP_PIN);
 
           // Restore direction bits
-          DIR_WAIT_BEFORE();
+          EXTRA_DIR_WAIT_BEFORE();
 
           X_DIR_WRITE(old_dir.x);
           Y_DIR_WRITE(old_dir.y);
           Z_DIR_WRITE(old_dir.z);
 
-          DIR_WAIT_AFTER();
+          EXTRA_DIR_WAIT_AFTER();
 
         #endif
 
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 7771d5887f24..4c618bda4e33 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -36,8 +36,8 @@
 /*
 // Note that these are the "pins" that correspond to the analog inputs on the arduino mega.
 // These are not the same as the physical pin numbers
-  AD0 = 54;   AD1 = 55;   AD2 = 56;   AD3 = 57;   
-  AD4 = 58;   AD5 = 59;   AD6 = 60;   AD7 = 61;   
+  AD0 = 54;   AD1 = 55;   AD2 = 56;   AD3 = 57;
+  AD4 = 58;   AD5 = 59;   AD6 = 60;   AD7 = 61;
   AD8 = 62;   AD9 = 63;   AD10 = 64;  AD11 = 65;
   AD12 = 66;  AD13 = 67;  AD14 = 68;  AD15 = 69;
 */
@@ -61,7 +61,7 @@
 //
 #define X_STEP_PIN         55
 #define X_DIR_PIN          54
-#define X_ENABLE_PIN       60     
+#define X_ENABLE_PIN       60
 
 #define Y_STEP_PIN         57
 #define Y_DIR_PIN          56
@@ -71,7 +71,7 @@
 #define Z_DIR_PIN          58
 #define Z_ENABLE_PIN       62
 
-#define E0_STEP_PIN        67 
+#define E0_STEP_PIN        67
 #define E0_DIR_PIN         24
 #define E0_ENABLE_PIN      26
 
@@ -103,10 +103,10 @@
 #endif
 
 #define SDPOWER_PIN        -1
-#define LED_PIN            -1 
+#define LED_PIN            -1
 #define PS_ON_PIN          -1
 #define KILL_PIN           -1
-      
+
 #define SSR_PIN             6
 
 // SPI for Max6675 or Max31855 Thermocouple
@@ -119,7 +119,7 @@
 //
 // SD Support
 //
-#define SD_DETECT_PIN      49 
+#define SD_DETECT_PIN      49
 #define SDSS               53
 
 //

From a254354e687a781d5cb27094374cc5c436cf98ee Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 24 Feb 2020 06:11:31 -0600
Subject: [PATCH 252/565] BS_TOTAL_AXIS => BS_TOTAL_IND

---
 Marlin/src/feature/babystep.cpp   | 4 ++--
 Marlin/src/feature/babystep.h     | 8 ++++----
 Marlin/src/lcd/menu/menu_tune.cpp | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index 25552a701cb5..bf9e9a78b551 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -37,7 +37,7 @@ Babystep babystep;
 
 volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1];
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
-  int16_t Babystep::axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];
+  int16_t Babystep::axis_total[BS_TOTAL_IND(Z_AXIS) + 1];
 #endif
 int16_t Babystep::accum;
 
@@ -66,7 +66,7 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
 
   accum += distance; // Count up babysteps for the UI
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
-    axis_total[BS_TOTAL_AXIS(axis)] += distance;
+    axis_total[BS_TOTAL_IND(axis)] += distance;
   #endif
 
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index 8ce48e397deb..287664502cdb 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -41,9 +41,9 @@
 
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
   #if ENABLED(BABYSTEP_XY)
-    #define BS_TOTAL_AXIS(A) A
+    #define BS_TOTAL_IND(A) A
   #else
-    #define BS_TOTAL_AXIS(A) 0
+    #define BS_TOTAL_IND(A) 0
   #endif
 #endif
 
@@ -53,13 +53,13 @@ class Babystep {
   static int16_t accum;                                     // Total babysteps in current edit
 
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
-    static int16_t axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];   // Total babysteps since G28
+    static int16_t axis_total[BS_TOTAL_IND(Z_AXIS) + 1];   // Total babysteps since G28
     static inline void reset_total(const AxisEnum axis) {
       if (true
         #if ENABLED(BABYSTEP_XY)
           && axis == Z_AXIS
         #endif
-      ) axis_total[BS_TOTAL_AXIS(axis)] = 0;
+      ) axis_total[BS_TOTAL_IND(axis)] = 0;
     }
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 549e41c9c63c..9221d7700541 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -81,7 +81,7 @@
           #endif
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
           lcd_put_wchar(':');
-          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_AXIS(axis)]));
+          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
       #endif
     }

From 92278a45ed355e13c177ac552bbdb3060c99c2f4 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Mon, 24 Feb 2020 09:40:12 -0700
Subject: [PATCH 253/565] Allow Z_SAFE_HOMING_POINT outside bed (#16945)

---
 Marlin/src/inc/SanityCheck.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 88cd49f57e2b..f340e758abef 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1361,8 +1361,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Make sure Z_SAFE_HOMING point is reachable
  */
 #if ENABLED(Z_SAFE_HOMING)
-  static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_BED, X_MAX_BED), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
-  static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_BED, Y_MAX_BED), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
+  static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
+  static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
 #endif
 
 /**

From 955ce393df06de8d4a73e6e712b77ff40a2ef496 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Mon, 24 Feb 2020 09:42:12 -0700
Subject: [PATCH 254/565] Restore tabs in Makefile (#16944)

---
 Marlin/Makefile | 56 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Marlin/Makefile b/Marlin/Makefile
index df44b6f718e3..fcd763881eef 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -789,11 +789,11 @@ sym: $(BUILD_DIR)/$(TARGET).sym
 # Do not try to reset an Arduino if it's not one
 upload: $(BUILD_DIR)/$(TARGET).hex
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
-  stty hup < $(UPLOAD_PORT); true
+	stty hup < $(UPLOAD_PORT); true
 endif
-  $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
-  stty -hup < $(UPLOAD_PORT); true
+	stty -hup < $(UPLOAD_PORT); true
 endif
 
 # Display size of file.
@@ -801,10 +801,10 @@ HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
 ELFSIZE = $(SIZE)  $(SIZE_FLAGS) $(BUILD_DIR)/$(TARGET).elf; \
           $(SIZE)  $(BUILD_DIR)/$(TARGET).elf
 sizebefore:
-  $P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
+	$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
 
 sizeafter: build
-  $P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
+	$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
 
 
 # Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
@@ -816,71 +816,71 @@ COFFCONVERT=$(OBJCOPY) --debugging \
 
 
 coff: $(BUILD_DIR)/$(TARGET).elf
-  $(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
+	$(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
 
 
 extcoff: $(TARGET).elf
-  $(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
+	$(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
 
 
 .SUFFIXES: .elf .hex .eep .lss .sym .bin
 .PRECIOUS: .o
 
 .elf.hex:
-  $(Pecho) "  COPY  $@"
-  $P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+	$(Pecho) "  COPY  $@"
+	$P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
 
 .elf.bin:
-  $(Pecho) "  COPY  $@"
-  $P $(OBJCOPY) -O binary -R .eeprom $< $@
+	$(Pecho) "  COPY  $@"
+	$P $(OBJCOPY) -O binary -R .eeprom $< $@
 
 .elf.eep:
-  -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
     --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
 
 # Create extended listing file from ELF output file.
 .elf.lss:
-  $(OBJDUMP) -h -S $< > $@
+	$(OBJDUMP) -h -S $< > $@
 
 # Create a symbol table from ELF output file.
 .elf.sym:
-  $(NM) -n $< > $@
+	$(NM) -n $< > $@
 
 # Link: create ELF output file from library.
 
 $(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
-  $(Pecho) "  CXX   $@"
-  $P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
+	$(Pecho) "  CXX   $@"
+	$P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
 
 # Object files that were found in "src" will be stored in $(BUILD_DIR)
 # in directories that mirror the structure of "src"
 
 $(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
-  $(Pecho) "  CC    $<"
-  $P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
+	$(Pecho) "  CC    $<"
+	$P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
 
 $(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
-  $(Pecho) "  CXX   $<"
-  $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
+	$(Pecho) "  CXX   $<"
+	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
 
 # Object files for Arduino libs will be created in $(BUILD_DIR)/arduino
 
 $(BUILD_DIR)/arduino/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
-  $(Pecho) "  CC    $<"
-  $P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
+	$(Pecho) "  CC    $<"
+	$P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
 
 $(BUILD_DIR)/arduino/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
-  $(Pecho) "  CXX   $<"
-  $P $(CXX) -MMD -c $(ALL_CXXFLAGS)  $(LIBWARN) $< -o $@
+	$(Pecho) "  CXX   $<"
+	$P $(CXX) -MMD -c $(ALL_CXXFLAGS)  $(LIBWARN) $< -o $@
 
 $(BUILD_DIR)/arduino/%.o: %.S $(MAKEFILE)
-  $(Pecho) "  CXX   $<"
-  $P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
+	$(Pecho) "  CXX   $<"
+	$P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
 
 # Target: clean project.
 clean:
-  $(Pecho) "  RMDIR $(BUILD_DIR)/"
-  $P rm -rf $(BUILD_DIR)
+	$(Pecho) "  RMDIR $(BUILD_DIR)/"
+	$P rm -rf $(BUILD_DIR)
 
 
 .PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter

From 9040394e8e1eb67e995bee59b340309448329c2e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 24 Feb 2020 10:58:54 -0600
Subject: [PATCH 255/565] Fix card_eof error

---
 Marlin/src/gcode/queue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 5edd2d926bd6..edcb025bb3e1 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -526,7 +526,7 @@ void GCodeQueue::get_serial_commands() {
     while (length < BUFSIZE && !card_eof) {
       const int16_t n = card.get();
       card_eof = card.eof();
-      if (n < 0) { SERIAL_ERROR_MSG(MSG_SD_ERR_READ); continue; }
+      if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(MSG_SD_ERR_READ); continue; }
       const char sd_char = (char)n;
       if (sd_char == '\n' || sd_char == '\r' || card_eof) {
 

From ca305b03b7ef30e622de365b00f577aade5eeb26 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 25 Feb 2020 00:04:00 +0000
Subject: [PATCH 256/565] [cron] Bump distribution date (2020-02-25)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 64f557ab026c..7152c1ea4d06 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-24"
+  #define STRING_DISTRIBUTION_DATE "2020-02-25"
 #endif
 
 /**

From 3a6f776c4b7fb456f79eba4ad16e7ce76ea05d84 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 25 Feb 2020 00:51:10 -0500
Subject: [PATCH 257/565] Update POWER_LOSS_PIN comment (#16957)

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ca4f86a834e8..db36728fa367 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1044,7 +1044,7 @@
   #if ENABLED(POWER_LOSS_RECOVERY)
     //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
     //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
     //#define POWER_LOSS_PULL           // Set pullup / pulldown as appropriate
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume

From d13b1532306173b29c8bbe8f68e2d67c10ec7c36 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 25 Feb 2020 10:05:58 +0100
Subject: [PATCH 258/565] Update Italian language (#16947)

---
 Marlin/src/lcd/language/language_it.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 008f7735dc12..2af8e0ae30c6 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -368,7 +368,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Rimuovi filamento");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Rimuovi filamento *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Rimuovi tutto");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Inizializ. media");
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Collega media");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Cambia media");
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Rilascia media");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z probe fuori piatto");

From 3e685777a8789e6704d982881b2d94a9f42d4a3a Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 25 Feb 2020 04:07:36 -0500
Subject: [PATCH 259/565] Fix LCD cutter/bed icons overlapping (#16956)

---
 Marlin/Configuration_adv.h              | 1 +
 Marlin/src/lcd/dogm/dogm_Statusscreen.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index db36728fa367..b93ab3651263 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1260,6 +1260,7 @@
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
   #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
+  //#define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
   //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 32a22b9f459c..11d4d7093c20 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -1729,8 +1729,8 @@
 
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
 #define DO_DRAW_HOTENDS (HOTENDS > 0)
-#define DO_DRAW_CUTTER (HAS_CUTTER)
 #define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
+#define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
 #define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
 #define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))
 

From 6bfae5de6f1e3cc56ba03547d90fffa264463784 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 25 Feb 2020 04:17:08 -0500
Subject: [PATCH 260/565] Fix SKR 1.4 Turbo SD_DETECT_PIN (#16955)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index b90ac07a7de6..316049d6b127 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -150,11 +150,6 @@
 #define TEMP_1_PIN         P0_23_A0   // A2 (T2) - (69) - TEMP_1_PIN
 #define TEMP_BED_PIN       P0_25_A2   // A0 (T0) - (67) - TEMP_BED_PIN
 
-//
-// Include common SKR pins
-//
-#include "pins_BTT_SKR_common.h"
-
 //
 // Software SPI pins for TMC2130 stepper drivers
 //
@@ -264,7 +259,10 @@
     #define LCD_PINS_D4    P1_20
 
     #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN  P1_31   // (49) (NOT 5V tolerant)
+
+    #if SD_CONNECTION_IS(LCD)
+      #define SD_DETECT_PIN P1_31  // (49) (NOT 5V tolerant)
+    #endif
 
     #if ENABLED(FYSETC_MINI_12864)
       #define DOGLCD_CS    P1_18
@@ -329,3 +327,8 @@
  *   P0_27  (57) (Open collector)
  *   P0_28  (58) (Open collector)
  */
+
+//
+// Include common SKR pins
+//
+#include "pins_BTT_SKR_common.h"

From 454cbcce51cd6e18d550bfd5e4799e39cbbc216c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 25 Feb 2020 12:20:40 -0600
Subject: [PATCH 261/565] Fix the wait loop in M0 / M1

---
 Marlin/src/gcode/lcd/M0_M1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index bf6a3d23d514..2f110c5c5580 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -102,7 +102,7 @@ void GcodeSuite::M0_M1() {
   #endif
 
   if (ms > 0) ms += millis();  // wait until this time for a click
-  while (wait_for_user || (ms > 0 && PENDING(millis(), ms))) idle();
+  while (wait_for_user && (ms == 0 || PENDING(millis(), ms))) idle();
 
   #if HAS_LEDS_OFF_FLAG
     printerEventLEDs.onResumeAfterWait();

From 91cff02596a54d8024b6a4ab10880a04deafe58b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 26 Feb 2020 00:03:52 +0000
Subject: [PATCH 262/565] [cron] Bump distribution date (2020-02-26)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7152c1ea4d06..43df5cb7c317 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-25"
+  #define STRING_DISTRIBUTION_DATE "2020-02-26"
 #endif
 
 /**

From 5071fe82ab221627ef10cf4125896e3d2585993a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 25 Feb 2020 22:18:14 -0600
Subject: [PATCH 263/565] Ensure proper SD print completion (#16967)

---
 Marlin/src/MarlinCore.cpp      | 80 ++++++++++++++++++++++++++++++----
 Marlin/src/gcode/queue.cpp     | 43 ++++++------------
 Marlin/src/gcode/queue.h       |  6 +++
 Marlin/src/lcd/menu/menu.cpp   |  2 +-
 Marlin/src/module/endstops.cpp |  2 +-
 Marlin/src/sd/cardreader.cpp   | 36 +++++----------
 Marlin/src/sd/cardreader.h     |  5 ++-
 7 files changed, 106 insertions(+), 68 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 19fe1c06249e..839b64e091eb 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -390,8 +390,8 @@ void startOrResumeJob() {
 
 #if ENABLED(SDSUPPORT)
 
-  void abortSDPrinting() {
-    card.stopSDPrint(
+  inline void abortSDPrinting() {
+    card.endFilePrint(
       #if SD_RESORT
         true
       #endif
@@ -412,10 +412,68 @@ void startOrResumeJob() {
     #endif
   }
 
-#endif
+  #if ENABLED(PRINTER_EVENT_LEDS)
+    #include "feature/leds/printer_event_leds.h"
+  #endif
+
+  inline void finishSDPrinting() {
+    bool did_state = true;
+    switch (card.sdprinting_done_state) {
+
+      #if ENABLED(PRINTER_EVENT_LEDS)
+        case 1:
+          printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
+          break;
+      #endif
+
+      #if HAS_RESUME_CONTINUE                   // Display "Click to Continue..."
+        case 2:
+          did_state = queue.enqueue_P(PSTR("M0 S"
+            #if HAS_LCD_MENU
+              "1800"                            // ...for 30 minutes with LCD
+            #else
+              "60"                              // ...for 1 minute with no LCD
+            #endif
+          ));
+          break;
+      #endif
+
+      case 3: print_job_timer.stop(); break;
+
+      case 4:
+        did_state = print_job_timer.duration() < 60 || queue.enqueue_P(PSTR("M31"));
+        break;
+
+      case 5:
+        #if ENABLED(POWER_LOSS_RECOVERY)
+          recovery.purge();
+        #endif
+
+        #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+          planner.finish_and_disable();
+        #endif
+
+        #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+          ui.set_progress_done();
+        #endif
+
+        #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
+          ui.reselect_last_file();
+        #endif
+
+        SERIAL_ECHOLNPGM(MSG_FILE_PRINTED);
+
+      default:
+        did_state = false;
+        card.sdprinting_done_state = 0;
+    }
+    if (did_state) ++card.sdprinting_done_state;
+  }
+
+#endif // SDSUPPORT
 
 /**
- * Manage several activities:
+ * Minimal management of Marlin's core activities:
  *  - Check for Filament Runout
  *  - Keep the command buffer full
  *  - Check for maximum inactive time between commands
@@ -1122,10 +1180,15 @@ void setup() {
 /**
  * The main Marlin program loop
  *
- *  - Save or log commands to SD
- *  - Process available commands (if not saving)
- *  - Call endstop manager
- *  - Call inactivity manager
+ *  - Call idle() to handle all tasks between G-code commands
+ *      Note that no G-codes from the queue can be executed during idle()
+ *      but many G-codes can be called directly anytime like macros.
+ *  - Check whether SD card auto-start is needed now.
+ *  - Check whether SD print finishing is needed now.
+ *  - Run one G-code command from the immediate or main command queue
+ *    and open up one space. Commands in the main queue may come from sd
+ *    card, host, or by direct injection. The queue will continue to fill
+ *    as long as idle() or manage_inactivity() are being called.
  */
 void loop() {
   do {
@@ -1135,6 +1198,7 @@ void loop() {
     #if ENABLED(SDSUPPORT)
       card.checkautostart();
       if (card.flag.abort_sd_printing) abortSDPrinting();
+      if (card.sdprinting_done_state) finishSDPrinting();
     #endif
 
     queue.advance();
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index edcb025bb3e1..ec1d3ebd35fd 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -512,9 +512,10 @@ void GCodeQueue::get_serial_commands() {
 #if ENABLED(SDSUPPORT)
 
   /**
-   * Get commands from the SD Card until the command buffer is full
-   * or until the end of the file is reached. The special character '#'
-   * can also interrupt buffering.
+   * Get lines from the SD Card until the command buffer is full
+   * or until the end of the file is reached. Because this method
+   * always receives complete command-lines, they can go directly
+   * into the main command queue.
    */
   inline void GCodeQueue::get_sdcard_commands() {
     static uint8_t sd_input_state = PS_NORMAL;
@@ -527,37 +528,21 @@ void GCodeQueue::get_serial_commands() {
       const int16_t n = card.get();
       card_eof = card.eof();
       if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(MSG_SD_ERR_READ); continue; }
+
       const char sd_char = (char)n;
-      if (sd_char == '\n' || sd_char == '\r' || card_eof) {
+      const bool is_eol = sd_char == '\n' || sd_char == '\r';
+      if (is_eol || card_eof) {
 
         // Reset stream state, terminate the buffer, and commit a non-empty command
+        if (!is_eol && sd_count) ++sd_count;          // End of file with no newline
         if (!process_line_done(sd_input_state, command_buffer[index_w], sd_count)) {
-          _commit_command(false);                     // Can handle last line missing a newline terminator
+          _commit_command(false);
           #if ENABLED(POWER_LOSS_RECOVERY)
-            recovery.cmd_sdpos = card.getIndex();     // Prime for the next _commit_command
+            recovery.cmd_sdpos = card.getIndex();     // Prime for the NEXT _commit_command
           #endif
         }
 
-        if (card_eof) {
-
-          card.fileHasFinished();                     // Handle end of file reached
-
-          if (!IS_SD_PRINTING()) {                    // Was it the main job file?
-            SERIAL_ECHOLNPGM(MSG_FILE_PRINTED);       // Tell the host the file is printed.
-            #if ENABLED(PRINTER_EVENT_LEDS)
-              printerEventLEDs.onPrintCompleted();    // Change LED color for Print Completed
-              #if HAS_RESUME_CONTINUE
-                enqueue_now_P(PSTR("M0 S"             // Display "Click to Continue..."
-                  #if HAS_LCD_MENU
-                    "1800"                            // ...for 30 minutes with LCD
-                  #else
-                    "60"                              // ...for 1 minute with no LCD
-                  #endif
-                ));
-              #endif
-            #endif
-          }
-        }
+        if (card_eof) card.fileHasFinished();         // Handle end of file reached
       }
       else
         process_stream_char(sd_char, sd_input_state, command_buffer[index_w], sd_count);
@@ -633,9 +618,7 @@ void GCodeQueue::advance() {
   #endif // SDSUPPORT
 
   // The queue may be reset by a command handler or by code invoked by idle() within a handler
-  if (length) {
-    --length;
-    if (++index_r >= BUFSIZE) index_r = 0;
-  }
+  --length;
+  if (++index_r >= BUFSIZE) index_r = 0;
 
 }
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 10b0ec764380..1ce64590c367 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -117,6 +117,12 @@ class GCodeQueue {
    */
   static void flush_and_request_resend();
 
+  /**
+   * Attempt to enqueue a single G-code command
+   * and return 'true' if successful.
+   */
+  FORCE_INLINE static bool enqueue_P(const char* cmd) { return _enqueue(cmd); }
+
 private:
 
   static uint8_t index_w;  // Ring buffer write position
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index f787e492e86e..f1bcb970d413 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -324,9 +324,9 @@ void MarlinUI::_synchronize() {
   if (should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, sync_message);
   if (no_reentry) return;
   // Make this the current handler till all moves are done
-  no_reentry = true;
   const screenFunc_t old_screen = currentScreen;
   goto_screen(_synchronize);
+  no_reentry = true;
   planner.synchronize(); // idle() is called until moves complete
   no_reentry = false;
   goto_screen(old_screen);
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 1491d881d526..d291f972d3e5 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -403,7 +403,7 @@ void Endstops::event_handler() {
 
     #if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)
       if (planner.abort_on_endstop_hit) {
-        card.stopSDPrint();
+        card.endFilePrint();
         quickstop_stepper();
         thermalManager.disable_all_heaters();
         print_job_timer.stop();
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 3cc888fd9635..426d540c7e25 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -28,7 +28,7 @@
 
 #include "../MarlinCore.h"
 #include "../lcd/ultralcd.h"
-#include "../module/planner.h"
+#include "../module/planner.h"        // for synchronize
 #include "../module/printcounter.h"
 #include "../core/language.h"
 #include "../gcode/queue.h"
@@ -49,6 +49,7 @@
 // public:
 
 card_flags_t CardReader::flag;
+uint8_t CardReader::sdprinting_done_state;
 char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENAME_LENGTH];
 int8_t CardReader::autostart_index;
 
@@ -379,7 +380,7 @@ void CardReader::mount() {
 }
 
 void CardReader::release() {
-  stopSDPrint();
+  endFilePrint();
   flag.mounted = false;
 }
 
@@ -401,7 +402,7 @@ void CardReader::startFileprint() {
   }
 }
 
-void CardReader::stopSDPrint(
+void CardReader::endFilePrint(
   #if SD_RESORT
     const bool re_sort/*=false*/
   #endif
@@ -501,7 +502,7 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
       break;
   }
 
-  stopSDPrint();
+  endFilePrint();
 
   SdFile *curDir;
   const char * const fname = diveToFile(true, curDir, path);
@@ -529,7 +530,7 @@ void CardReader::openFileWrite(char * const path) {
   announceOpen(2, path);
   file_subcall_ctr = 0;
 
-  stopSDPrint();
+  endFilePrint();
 
   SdFile *curDir;
   const char * const fname = diveToFile(false, curDir, path);
@@ -554,7 +555,7 @@ void CardReader::openFileWrite(char * const path) {
 void CardReader::removeFile(const char * const name) {
   if (!isMounted()) return;
 
-  //stopSDPrint();
+  //endFilePrint();
 
   SdFile *curDir;
   const char * const fname = diveToFile(false, curDir, name);
@@ -937,7 +938,7 @@ void CardReader::cdroot() {
           bool didSwap = false;
           uint8_t o1 = sort_order[0];
           #if DISABLED(SDSORT_USES_RAM)
-            selectFileByIndex(o1);                // Pre-fetch the first entry and save it
+            selectFileByIndex(o1);              // Pre-fetch the first entry and save it
             strcpy(name1, longest_filename());  // so the loop only needs one fetch
             #if HAS_FOLDER_SORTING
               bool dir1 = flag.filenameIsDir;
@@ -1073,30 +1074,13 @@ void CardReader::fileHasFinished() {
     startFileprint();
   }
   else {
-    stopSDPrint();
-
-    #if ENABLED(POWER_LOSS_RECOVERY)
-      recovery.purge();
-    #endif
-
-    #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
-      planner.finish_and_disable();
-    #endif
-
-    print_job_timer.stop();
-    queue.enqueue_now_P(print_job_timer.duration() > 60 ? PSTR("M31") : PSTR("M117"));
+    endFilePrint();
 
     #if ENABLED(SDCARD_SORT_ALPHA)
       presort();
     #endif
 
-    #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-      ui.set_progress_done();
-    #endif
-
-    #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
-      ui.reselect_last_file();
-    #endif
+    sdprinting_done_state = 1;
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 8e09f444796a..be700401eed4 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -49,6 +49,7 @@ typedef struct {
 
 class CardReader {
 public:
+  static uint8_t sdprinting_done_state;
   static card_flags_t flag;                         // Flags (above)
   static char filename[FILENAME_LENGTH],            // DOS 8.3 filename of the selected item
               longFilename[LONG_FILENAME_LENGTH];   // Long name of the selected item
@@ -108,9 +109,9 @@ class CardReader {
   static void openAndPrintFile(const char *name);   // (working directory)
   static void fileHasFinished();
   static void getAbsFilename(char *dst);
-  static void startFileprint();
   static void printFilename();
-  static void stopSDPrint(
+  static void startFileprint();
+  static void endFilePrint(
     #if SD_RESORT
       const bool re_sort=false
     #endif

From 5b438fb20d8b96860d307253fb0f3a728bcbf223 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 25 Feb 2020 22:30:16 -0600
Subject: [PATCH 264/565] HAS_SDCARD_CONNECTION is more obsolete

---
 Marlin/Configuration_adv.h                    | 22 +++++++++----------
 Marlin/src/inc/Conditionals_LCD.h             |  2 --
 Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h |  4 ++++
 Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h  |  6 ++++-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b93ab3651263..c9e226cef443 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1172,18 +1172,16 @@
   // Add an optimized binary file transfer mode, initiated with 'M28 B1'
   //#define BINARY_FILE_TRANSFER
 
-  #if HAS_SDCARD_CONNECTION
-    /**
-     * Set this option to one of the following (or the board's defaults apply):
-     *
-     *           LCD - Use the SD drive in the external LCD controller.
-     *       ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
-     *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
-     *
-     * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
-     */
-    //#define SDCARD_CONNECTION LCD
-  #endif
+  /**
+   * Set this option to one of the following (or the board's defaults apply):
+   *
+   *           LCD - Use the SD drive in the external LCD controller.
+   *       ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
+   *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
+   *
+   * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
+   */
+  //#define SDCARD_CONNECTION LCD
 
 #endif // SDSUPPORT
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 5cbdafd6e0da..7373e65d6702 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -571,8 +571,6 @@
 
 #define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
 
-#define HAS_SDCARD_CONNECTION EITHER(TARGET_LPC1768, ADAFRUIT_GRAND_CENTRAL_M4)
-
 #define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
 
 #ifndef SPI_SPEED
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
index b523874cb95c..8222bbe14392 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
@@ -182,6 +182,10 @@
 // Misc. Functions
 //
 
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION LCD
+#endif
+
 //
 // Onboard SD card
 //   NOT compatible with LCD
diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
index e65367971abe..2b6e6f6c335b 100644
--- a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
@@ -236,7 +236,11 @@
 #define SDIO_CK_PIN       28   // PC12  SDIO_CK
 #define SDIO_CMD_PIN      29   // PD2   SDIO_CMD
 
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION ONBOARD
+#endif
+
+#if SDCARD_CONNECTION == ONBOARD
   #define SDIO_SUPPORT     // Use SDIO for onboard SD
 
   #ifndef SDIO_SUPPORT

From ba4f49f4a269642a1743618c3b2e44ccf6fb89f1 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 25 Feb 2020 23:56:52 -0500
Subject: [PATCH 265/565] Fix GTR10 overlapping defines (#16976)

---
 platformio.ini | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index fc8c0dc1af81..405efd8624ee 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -687,12 +687,6 @@ extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_varian
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407IG\"
   -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
-  -DHAVE_HWSERIAL3
-  -DHAVE_HWSERIAL6
-  -DPIN_SERIAL3_RX=PD_9
-  -DPIN_SERIAL3_TX=PD_8
-  -DPIN_SERIAL6_RX=PC_7
-  -DPIN_SERIAL6_TX=PC_6
 
   -IMarlin/src/HAL/HAL_STM32
 lib_deps          =

From 4250a9890818372f13da6baab1dd09170191dbb1 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 26 Feb 2020 01:12:14 -0500
Subject: [PATCH 266/565] Toolchange improvements (#16979)

---
 Marlin/src/module/tool_change.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 28baa4047db3..cf104e7b5ac1 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -45,8 +45,8 @@
   #endif
 #endif
 
-#if ENABLED(MAGNETIC_PARKING_EXTRUDER) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
-  #include "../gcode/gcode.h" // for dwell()
+#if ENABLED(MAGNETIC_PARKING_EXTRUDER) || defined(EVENT_GCODE_AFTER_TOOLCHANGE) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
+  #include "../gcode/gcode.h"
 #endif
 
 #if ANY(SWITCHING_EXTRUDER, SWITCHING_NOZZLE, SWITCHING_TOOLHEAD)
@@ -861,7 +861,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       }
     #endif // TOOLCHANGE_FILAMENT_SWAP
 
-    #if HAS_LEVELING
+    #if HAS_LEVELING && DISABLED(SINGLENOZZLE)
       // Set current position to the physical position
       TEMPORARY_BED_LEVELING_STATE(false);
     #endif
@@ -1068,7 +1068,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     #endif
 
     #ifdef EVENT_GCODE_AFTER_TOOLCHANGE
-      gcode.process_subcommands_now_P(EVENT_GCODE_AFTER_TOOLCHANGE);
+      if (!no_move)
+        gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE));
     #endif
 
     SERIAL_ECHO_START();

From 6b9a17be16448459cdbf3447598094fae455e39a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 02:02:20 -0600
Subject: [PATCH 267/565] Language: "failsafe" => "Defaults"

---
 .../ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp    | 4 ++--
 .../lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp | 2 +-
 Marlin/src/lcd/language/language_an.h                       | 2 +-
 Marlin/src/lcd/language/language_bg.h                       | 2 +-
 Marlin/src/lcd/language/language_ca.h                       | 2 +-
 Marlin/src/lcd/language/language_cz.h                       | 2 +-
 Marlin/src/lcd/language/language_da.h                       | 2 +-
 Marlin/src/lcd/language/language_de.h                       | 2 +-
 Marlin/src/lcd/language/language_el.h                       | 2 +-
 Marlin/src/lcd/language/language_el_gr.h                    | 2 +-
 Marlin/src/lcd/language/language_en.h                       | 2 +-
 Marlin/src/lcd/language/language_es.h                       | 2 +-
 Marlin/src/lcd/language/language_eu.h                       | 2 +-
 Marlin/src/lcd/language/language_fi.h                       | 2 +-
 Marlin/src/lcd/language/language_fr.h                       | 2 +-
 Marlin/src/lcd/language/language_gl.h                       | 2 +-
 Marlin/src/lcd/language/language_hr.h                       | 2 +-
 Marlin/src/lcd/language/language_it.h                       | 2 +-
 Marlin/src/lcd/language/language_jp_kana.h                  | 2 +-
 Marlin/src/lcd/language/language_ko_KR.h                    | 2 +-
 Marlin/src/lcd/language/language_nl.h                       | 2 +-
 Marlin/src/lcd/language/language_pl.h                       | 2 +-
 Marlin/src/lcd/language/language_pt.h                       | 2 +-
 Marlin/src/lcd/language/language_pt_br.h                    | 2 +-
 Marlin/src/lcd/language/language_ru.h                       | 2 +-
 Marlin/src/lcd/language/language_sk.h                       | 2 +-
 Marlin/src/lcd/language/language_test.h                     | 6 +++---
 Marlin/src/lcd/language/language_tr.h                       | 2 +-
 Marlin/src/lcd/language/language_uk.h                       | 2 +-
 Marlin/src/lcd/language/language_vi.h                       | 4 ++--
 Marlin/src/lcd/language/language_zh_CN.h                    | 2 +-
 Marlin/src/lcd/language/language_zh_TW.h                    | 2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp                  | 2 +-
 33 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index b2fc2790a0c2..103dcc036481 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -84,7 +84,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(12).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
       .tag(15).button( BTN_POS(2,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
       .tag(9) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(10).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_FAILSAFE))
+      .tag(10).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
       .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
       .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
       #if DISABLED(CLASSIC_JERK)
@@ -154,7 +154,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(11).button( BTN_POS(1,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
       .tag(15).button( BTN_POS(3,5),  BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
       .tag(9) .button( BTN_POS(1,5),  BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(10).button( BTN_POS(1,6),  BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_FAILSAFE))
+      .tag(10).button( BTN_POS(1,6),  BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
       .colors(action_btn)
       .tag(1) .button( BTN_POS(3,6),  BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index c2cbf70ae293..0c53dca61b4e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -86,7 +86,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       )
       .tag(12) .button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
       .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_FAILSAFE))
+      .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
       .colors(action_btn)
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
     #undef GRID_COLS
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 9498d558e7ff..8e7798d72ddb 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -125,7 +125,7 @@ namespace Language_an {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contraste");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Alzar memoria");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Cargar memoria");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Restaurar memoria");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Restaurar memoria");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Tornar a cargar");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Informacion");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Preparar");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 18096b626966..1987c207660d 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -110,7 +110,7 @@ namespace Language_bg {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD контраст");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Запази в EPROM");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Зареди от EPROM");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Фабрични настройки");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Фабрични настройки");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Обнови");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Преглед");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Действия");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 950a73d7f135..ef5334f878e2 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -120,7 +120,7 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contrast de LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Desa memoria");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Carrega memoria");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Restaura valors");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Restaura valors");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Actualitza");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Pantalla Info.");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Prepara");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 9b983dd94d69..77e25b73329b 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -310,7 +310,7 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Kontrast LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Uložit nastavení");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Načíst nastavení");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Obnovit výchozí");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Obnovit výchozí");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inic. EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Aktualizace z SD");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset tiskárny");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 09802adff761..23d931c17419 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -105,7 +105,7 @@ namespace Language_da {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD kontrast");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Gem i EEPROM");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Hent fra EEPROM");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Gendan failsafe");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Gendan Defaults");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Genopfrisk");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info skærm");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Forbered");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index cacef7b4d013..ed2f779dd84a 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -290,7 +290,7 @@ namespace Language_de {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD-Kontrast");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Konfig. speichern");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Konfig. laden");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Standardwerte laden");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Standardwerte laden");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Werkseinstellungen");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("FW Update vom Medium");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Drucker neustarten");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 2690e0b7f17f..6cb177d10806 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -136,7 +136,7 @@ namespace Language_el {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Κοντράστ LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Αποθήκευση");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Φόρτωση");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Επαναφορά ασφαλούς αντιγράφου"); //SHORTEN
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Επαναφορά ασφαλούς αντιγράφου"); //SHORTEN
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Ανανέωση");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Οθόνη πληροφόρησης");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Προετοιμασία");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 859a8fa4fde2..5213dc7db92e 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -138,7 +138,7 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Κοντράστ LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Αποθήκευση");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Φόρτωση");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Ανανέωση");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Οθόνη πληροφόρησης");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Προετοιμασία");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 4cbb2cc0818a..6f1adbbf8413 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -312,7 +312,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD Contrast");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Store Settings");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Load Settings");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Restore failsafe");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Restore Defaults");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initialize EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Update");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index fdab16a18661..12d487b35b76 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -284,7 +284,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contraste LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Guardar EEPROM");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Cargar EEPROM");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Rest. fábrica");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Rest. fábrica");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inicializar EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Actualizar SD/USB");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetear Impresora");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 210752e25555..a6a0a52518c9 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -187,7 +187,7 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD kontrastea");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Gorde memoria");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Kargatu memoria");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Larri. berriz.");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Larri. berriz.");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROM-a hasieratu");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Berriz kargatu");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Pantaila info");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 2517a008fd10..79124c000770 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -97,7 +97,7 @@ namespace Language_fi {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD kontrasti");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Tallenna muistiin");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Lataa muistista");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Palauta oletus");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Palauta oletus");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Päivitä");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Seuraa");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Valmistele");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ec057399a449..ffa12f39fe6d 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -282,7 +282,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contraste LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Enregistrer config.");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Charger config.");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Restaurer défauts");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Restaurer défauts");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initialiser EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("MaJ Firmware SD");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("RaZ imprimante");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 1c78d4455731..6a8f166ff19c 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -117,7 +117,7 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Constraste LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Gardar en memo.");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Cargar de memo.");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Cargar de firm.");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Cargar de firm.");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Volver a cargar");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Monitorizacion");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Preparar");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index e1caeb8efa6a..740d7e562599 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -98,7 +98,7 @@ namespace Language_hr {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Kontrast LCD-a");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Pohrani u memoriju");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Učitaj memoriju");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Učitaj failsafe");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Učitaj Defaults");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Osvježi");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info screen");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Pripremi");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 2af8e0ae30c6..ae4dd813ea5f 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -310,7 +310,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contrasto LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Salva impostazioni");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Carica impostazioni");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Ripristina imp.");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Ripristina imp.");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inizializza EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Aggiorna media");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetta stampante");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index ddff7f547354..809ee83de8b3 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -141,7 +141,7 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCDコントラスト");               // "LCD contrast"
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("EEPROMヘホゾン");               // "Store memory"
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("EEPROMカラヨミコミ");               // "Load memory"
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("セッテイリセット");               // "Restore failsafe"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("セッテイリセット");               // "Restore Defaults"
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("リフレッシュ");                  // "Refresh"
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("ジョウホウガメン");               // "Info screen"
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("ジュンビセッテイ");               // "Prepare"
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index f94a182fd764..4d8142e38bae 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -84,7 +84,7 @@ namespace Language_ko_KR {
   PROGMEM Language_Str MSG_MOTION                          = _UxGT("동작");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("설정 저장하기");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("설정 읽어오기");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("설정 되돌리기");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("설정 되돌리기");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROM 초기화");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("새로고침");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("처음으로");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index f657919bb28a..d5d46ecfe6aa 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -123,7 +123,7 @@ namespace Language_nl {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD contrast");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Geheugen opslaan");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Geheugen laden");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Noodstop reset");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Noodstop reset");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Ververs");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info scherm");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Voorbereiden");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 8a8fe43ee595..113c58629f10 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -298,7 +298,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Kontrast LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Zapisz w pamięci");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Wczytaj z pamięci");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Ustaw. fabryczne");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Ustaw. fabryczne");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initializuj EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Uaktualnij kartę");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetuj drukarkę");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 8a1e863b7806..69c8be603fdc 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -113,7 +113,7 @@ namespace Language_pt {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contraste");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Guardar na memoria");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Carregar da memoria");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Rest. de emergen.");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Rest. de emergen.");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT(" Recarregar");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Monitorizar");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Preparar");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index ab8e313b3e11..9ce6a7042b46 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -252,7 +252,7 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Contraste");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Salvar Configuração");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Ler Configuração");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Restauro seguro");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Restauro seguro");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Iniciar EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Atualiz. SD");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetar Impressora");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 0cb25e057894..82c91c65029c 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -276,7 +276,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Контраст LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Сохранить настройки");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Загрузить настройки");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Вернуть настройки");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Вернуть настройки");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Изначальный EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Обновление прошивки");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Сброс принтера");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index d652bb098dbf..7e6fe72ed9e6 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -302,7 +302,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Kontrast LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Uložiť nastavenie");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Načítať nastavenie");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Obnoviť nastavenie");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Obnoviť nastavenie");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inicializ. EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Aktualizovať z SD");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reštart. tlačiar.");
diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h
index 1aa5cb4a095c..465d3743f3aa 100644
--- a/Marlin/src/lcd/language/language_test.h
+++ b/Marlin/src/lcd/language/language_test.h
@@ -149,7 +149,7 @@ namespace Language_test {
     PROGMEM Language_Str MSG_MOTION                          = STRG_OKTAL_4;
     PROGMEM Language_Str MSG_FILAMENT                        = STRG_OKTAL_5;
     PROGMEM Language_Str MSG_CONTRAST                        = STRG_OKTAL_6;
-    PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = STRG_OKTAL_7;
+    PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = STRG_OKTAL_7;
 
     PROGMEM Language_Str MSG_NOZZLE                          = STRG_OKTAL_8;
     PROGMEM Language_Str MSG_NOZZLE_N                        = STRG_OKTAL_8 " ~";
@@ -186,7 +186,7 @@ namespace Language_test {
     PROGMEM Language_Str MSG_MOTION                          = STRG_OKTAL_4;
     PROGMEM Language_Str MSG_FILAMENT                        = STRG_OKTAL_5;
     PROGMEM Language_Str MSG_CONTRAST                        = STRG_OKTAL_6;
-    PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = STRG_OKTAL_7;
+    PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = STRG_OKTAL_7;
 
     PROGMEM Language_Str MSG_NOZZLE                          = STRG_OKTAL_8;
     PROGMEM Language_Str MSG_NOZZLE_N                        = STRG_OKTAL_8 " ~";
@@ -222,7 +222,7 @@ namespace Language_test {
     PROGMEM Language_Str MSG_MOTION                          = STRG_OKTAL_4;
     PROGMEM Language_Str MSG_FILAMENT                        = STRG_OKTAL_5;
     PROGMEM Language_Str MSG_CONTRAST                        = STRG_OKTAL_6;
-    PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = STRG_OKTAL_7;
+    PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = STRG_OKTAL_7;
 
     PROGMEM Language_Str MSG_NOZZLE                          = STRG_OKTAL_8;
     PROGMEM Language_Str MSG_NOZZLE_N                        = STRG_OKTAL_8 " ~";
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index b5ed642676b7..57d2911af93d 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -266,7 +266,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD Kontrast");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Hafızaya Al");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Hafızadan Yükle");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Fabrika Ayarları");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Fabrika Ayarları");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROM'u başlat");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("SD Güncellemesi");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Yazıcıyı Resetle");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index bfc6e16dc190..0d473bf0af64 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -139,7 +139,7 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("контраст LCD");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Зберегти в ПЗП");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Зчитати з ПЗП");
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Відновити базові");
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Відновити базові");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Поновити");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Інформація");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Підготувати");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 76ce55284ffc..330db4b6906c 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -266,7 +266,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Độ tương phản LCD");                    // LCD contrast
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Lưu các thiết lập");                    // Store settings
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Tải các cài đặt");                      // Load settings
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("Khôi phục phòng hư");                   // Restore failsafe
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Khôi phục phòng hư");                   // Restore Defaults
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Khởi Tạo EEPROM");                      // Initialize EEPROM
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Cập Nhật phương tiện");                 // Update media
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Bặt Lại Máy In");
@@ -309,7 +309,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Dỡ dây nhựa");                          // unload filament
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Dỡ dây nhựa *");                        // unload filament
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Dỡ tất cả");                            // Unload All
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Khởi tạo phương tiện");                 // Init. media
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Khởi tạo phương tiện");                 // Attach media
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Thay phương tiện");                     // Change midea
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Phát hành phương tiện");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Đầu Dò Z qua bàn");                     // Z Probe past bed
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 8e760f73b31a..742375c7d177 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -240,7 +240,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD对比度");     //"LCD contrast"
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存设置");     //"Store memory"
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("装载设置");     //"Load memory"
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("恢复安全值");     //"Restore failsafe"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢复安全值");     //"Restore Defaults"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化设置");     // "Initialize EEPROM"
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("刷新");     //"Refresh"
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("信息屏");     //"Info screen"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 77a6c04d9ae7..d0871f0e4604 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -240,7 +240,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD對比度");     //"LCD contrast"
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存設置");     //"Store memory"
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("載入設置");     //"Load memory"
-  PROGMEM Language_Str MSG_RESTORE_FAILSAFE                = _UxGT("恢復安全值");     //"Restore failsafe"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     //"Restore Defaults"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化設置");     // "Initialize EEPROM"
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("刷新");     //"Refresh"
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("資訊界面");     //"Info screen"
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index eeae0e70270a..d2285e083560 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -394,7 +394,7 @@ void menu_configuration() {
   #endif
 
   if (!busy)
-    ACTION_ITEM(MSG_RESTORE_FAILSAFE, []{
+    ACTION_ITEM(MSG_RESTORE_DEFAULTS, []{
       settings.reset();
       #if HAS_BUZZER
         ui.completion_feedback();

From e78f607ef33044eecde744e77beea87532817c47 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 03:02:03 -0600
Subject: [PATCH 268/565] Use a STR_ prefix for non-translated strings

---
 .../HAL/HAL_AVR/persistent_store_eeprom.cpp   |   2 +-
 Marlin/src/HAL/HAL_AVR/watchdog.cpp           |   2 +-
 .../HAL/HAL_DUE/persistent_store_eeprom.cpp   |   2 +-
 .../HAL_SAMD51/persistent_store_eeprom.cpp    |   2 +-
 .../HAL/HAL_STM32/persistent_store_impl.cpp   |   2 +-
 .../HAL_STM32F1/persistent_store_eeprom.cpp   |   2 +-
 .../persistent_store_eeprom.cpp               |   2 +-
 .../HAL_TEENSY31_32/persistent_store_impl.cpp |   2 +-
 .../persistent_store_eeprom.cpp               |   2 +-
 Marlin/src/MarlinCore.cpp                     |  28 +-
 Marlin/src/core/language.h                    | 408 +++++++++---------
 Marlin/src/core/serial.cpp                    |   2 +-
 Marlin/src/feature/bltouch.cpp                |   4 +-
 Marlin/src/feature/pause.cpp                  |   4 +-
 Marlin/src/feature/prusa_MMU2/mmu2.cpp        |   2 +-
 Marlin/src/feature/solenoid.cpp               |   2 +-
 Marlin/src/gcode/bedlevel/G42.cpp             |   2 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |   4 +-
 Marlin/src/gcode/bedlevel/abl/M421.cpp        |   4 +-
 Marlin/src/gcode/bedlevel/mbl/M421.cpp        |   4 +-
 Marlin/src/gcode/bedlevel/ubl/M421.cpp        |   4 +-
 Marlin/src/gcode/calibrate/G28.cpp            |   6 +-
 Marlin/src/gcode/calibrate/M852.cpp           |   2 +-
 Marlin/src/gcode/config/M218.cpp              |   2 +-
 Marlin/src/gcode/config/M301.cpp              |   2 +-
 Marlin/src/gcode/control/M111.cpp             |  16 +-
 Marlin/src/gcode/control/M211.cpp             |   6 +-
 Marlin/src/gcode/control/M605.cpp             |   2 +-
 Marlin/src/gcode/control/M80_M81.cpp          |   2 +-
 Marlin/src/gcode/feature/pause/G60.cpp        |   4 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |   4 +-
 Marlin/src/gcode/gcode.cpp                    |  12 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |   2 +-
 Marlin/src/gcode/host/M115.cpp                |   2 +-
 Marlin/src/gcode/lcd/M145.cpp                 |   2 +-
 Marlin/src/gcode/motion/G0_G1.cpp             |   2 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |   4 +-
 Marlin/src/gcode/motion/G4.cpp                |   2 +-
 Marlin/src/gcode/motion/G5.cpp                |   2 +-
 Marlin/src/gcode/motion/M290.cpp              |   6 +-
 Marlin/src/gcode/parser.cpp                   |   2 +-
 Marlin/src/gcode/probe/M851.cpp               |   4 +-
 Marlin/src/gcode/queue.cpp                    |  22 +-
 Marlin/src/gcode/sdcard/M20.cpp               |   4 +-
 Marlin/src/gcode/temperature/M105.cpp         |   2 +-
 Marlin/src/gcode/temperature/M303.cpp         |   2 +-
 .../lib/ftdi_eve_touch_ui/marlin_events.cpp   |   8 +-
 .../screens/advanced_settings_menu.cpp        |   4 +-
 .../screens/bio_advanced_settings.cpp         |   2 +-
 .../screens/endstop_state_screen.cpp          |  28 +-
 .../screens/nozzle_offsets_screen.cpp         |   2 +-
 .../screens/nudge_nozzle_screen.cpp           |   2 +-
 Marlin/src/lcd/extui_dgus_lcd.cpp             |   8 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |   6 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |   2 +-
 Marlin/src/lcd/menu/menu_tmc.cpp              |  48 +--
 Marlin/src/module/endstops.cpp                |  12 +-
 Marlin/src/module/motion.cpp                  |   6 +-
 Marlin/src/module/planner.cpp                 |   4 +-
 Marlin/src/module/printcounter.cpp            |   8 +-
 Marlin/src/module/probe.cpp                   |   4 +-
 Marlin/src/module/stepper.cpp                 |   4 +-
 Marlin/src/module/temperature.cpp             |  75 ++--
 Marlin/src/module/tool_change.cpp             |   6 +-
 Marlin/src/sd/cardreader.cpp                  |  38 +-
 65 files changed, 438 insertions(+), 431 deletions(-)

diff --git a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
index db63b088f37d..1ae37f892aa6 100644
--- a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
@@ -39,7 +39,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     if (v != eeprom_read_byte(p)) {
       eeprom_write_byte(p, v);
       if (eeprom_read_byte(p) != v) {
-        SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
         return true;
       }
     }
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.cpp b/Marlin/src/HAL/HAL_AVR/watchdog.cpp
index c746346192d4..e35a70f2ccbc 100644
--- a/Marlin/src/HAL/HAL_AVR/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_AVR/watchdog.cpp
@@ -62,7 +62,7 @@ void watchdog_init() {
 #if ENABLED(WATCHDOG_RESET_MANUAL)
   ISR(WDT_vect) {
     sei();  // With the interrupt driven serial we need to allow interrupts.
-    SERIAL_ERROR_MSG(MSG_WATCHDOG_FIRED);
+    SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
     minkill();  // interrupt-safe final kill and infinite loop
   }
 #endif
diff --git a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
index 801719dcd109..9fdcca7850f1 100644
--- a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
@@ -54,7 +54,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
       eeprom_write_byte(p, v);
       delay(2);
       if (eeprom_read_byte(p) != v) {
-        SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
         return true;
       }
     }
diff --git a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
index 7e7c25378e83..c450599d7b16 100644
--- a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
@@ -72,7 +72,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
         eeprom_write_byte(p, v);
         delay(2);
         if (eeprom_read_byte(p) != v) {
-          SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+          SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
           return true;
         }
       }
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
index 2a71c4594876..b4e58a795e28 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
@@ -48,7 +48,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
       if (v != eeprom_read_byte(p)) {
         eeprom_write_byte(p, v);
         if (eeprom_read_byte(p) != v) {
-          SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+          SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
           return true;
         }
       }
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
index 19fcc39521ca..f2a1cb031a0b 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
@@ -49,7 +49,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     if (v != eeprom_read_byte(p)) {
       eeprom_write_byte(p, v);
       if (eeprom_read_byte(p) != v) {
-        SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
         return true;
       }
     }
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
index 8ffb689551c6..2ffbc609ecf5 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
@@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     if (v != eeprom_read_byte(p)) {
       eeprom_write_byte(p, v);
       if (eeprom_read_byte(p) != v) {
-        SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
         return true;
       }
     }
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
index 9781dc62e641..6a179cd962ea 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
@@ -36,7 +36,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     if (v != eeprom_read_byte(p)) {
       eeprom_write_byte(p, v);
       if (eeprom_read_byte(p) != v) {
-        SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
         return true;
       }
     }
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
index 963f372f547a..32b215ee6e12 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
@@ -42,7 +42,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     if (v != eeprom_read_byte(p)) {
       eeprom_write_byte(p, v);
       if (eeprom_read_byte(p) != v) {
-        SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
         return true;
       }
     }
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 839b64e091eb..a07948e0c951 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -278,7 +278,7 @@ bool pin_is_protected(const pin_t pin) {
 }
 
 void protected_pin_err() {
-  SERIAL_ERROR_MSG(MSG_ERR_PROTECTED_PIN);
+  SERIAL_ERROR_MSG(STR_ERR_PROTECTED_PIN);
 }
 
 void quickstop_stepper() {
@@ -461,7 +461,7 @@ void startOrResumeJob() {
           ui.reselect_last_file();
         #endif
 
-        SERIAL_ECHOLNPGM(MSG_FILE_PRINTED);
+        SERIAL_ECHOLNPGM(STR_FILE_PRINTED);
 
       default:
         did_state = false;
@@ -498,7 +498,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
 
   if (max_inactive_time && ELAPSED(ms, gcode.previous_move_ms + max_inactive_time)) {
     SERIAL_ERROR_START();
-    SERIAL_ECHOLNPAIR(MSG_KILL_INACTIVE_TIME, parser.command_ptr);
+    SERIAL_ECHOLNPAIR(STR_KILL_INACTIVE_TIME, parser.command_ptr);
     kill();
   }
 
@@ -563,7 +563,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
     // KILL the machine
     // ----------------------------------------------------------------
     if (killCount >= KILL_DELAY) {
-      SERIAL_ERROR_MSG(MSG_KILL_BUTTON);
+      SERIAL_ERROR_MSG(STR_KILL_BUTTON);
       kill();
     }
   #endif
@@ -781,7 +781,7 @@ void idle(
 void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr*/, const bool steppers_off/*=false*/) {
   thermalManager.disable_all_heaters();
 
-  SERIAL_ERROR_MSG(MSG_ERR_KILLED);
+  SERIAL_ERROR_MSG(STR_ERR_KILLED);
 
   #if HAS_DISPLAY
     ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
@@ -852,7 +852,7 @@ void stop() {
   #endif
 
   if (IsRunning()) {
-    SERIAL_ERROR_MSG(MSG_ERR_STOPPED);
+    SERIAL_ERROR_MSG(STR_ERR_STOPPED);
     LCD_MESSAGEPGM(MSG_STOPPED);
     safe_delay(350);       // allow enough time for messages to get out before stopping
     Running = false;
@@ -958,11 +958,11 @@ void setup() {
 
   // Check startup - does nothing if bootloader sets MCUSR to 0
   byte mcu = HAL_get_reset_source();
-  if (mcu &  1) SERIAL_ECHOLNPGM(MSG_POWERUP);
-  if (mcu &  2) SERIAL_ECHOLNPGM(MSG_EXTERNAL_RESET);
-  if (mcu &  4) SERIAL_ECHOLNPGM(MSG_BROWNOUT_RESET);
-  if (mcu &  8) SERIAL_ECHOLNPGM(MSG_WATCHDOG_RESET);
-  if (mcu & 32) SERIAL_ECHOLNPGM(MSG_SOFTWARE_RESET);
+  if (mcu &  1) SERIAL_ECHOLNPGM(STR_POWERUP);
+  if (mcu &  2) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
+  if (mcu &  4) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
+  if (mcu &  8) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
+  if (mcu & 32) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
   HAL_clear_reset_source();
 
   serialprintPGM(GET_TEXT(MSG_MARLIN));
@@ -972,15 +972,15 @@ void setup() {
 
   #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)
     SERIAL_ECHO_MSG(
-      MSG_CONFIGURATION_VER
+      STR_CONFIGURATION_VER
       STRING_DISTRIBUTION_DATE
-      MSG_AUTHOR STRING_CONFIG_H_AUTHOR
+      STR_AUTHOR STRING_CONFIG_H_AUTHOR
     );
     SERIAL_ECHO_MSG("Compiled: " __DATE__);
   #endif
 
   SERIAL_ECHO_START();
-  SERIAL_ECHOLNPAIR(MSG_FREE_MEMORY, freeMemory(), MSG_PLANNER_BUFFER_BYTES, (int)sizeof(block_t) * (BLOCK_BUFFER_SIZE));
+  SERIAL_ECHOLNPAIR(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, (int)sizeof(block_t) * (BLOCK_BUFFER_SIZE));
 
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 47245fa89030..f58ace77091b 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -97,6 +97,210 @@
 //  #define STRING_SPLASH_LINE3 WEBSITE_URL
 //#endif
 
+//
+// Common Serial Console Messages
+// Don't change these strings because serial hosts look for them.
+//
+
+#define STR_ENQUEUEING                      "enqueueing \""
+#define STR_POWERUP                         "PowerUp"
+#define STR_EXTERNAL_RESET                  " External Reset"
+#define STR_BROWNOUT_RESET                  " Brown out Reset"
+#define STR_WATCHDOG_RESET                  " Watchdog Reset"
+#define STR_SOFTWARE_RESET                  " Software Reset"
+#define STR_AUTHOR                          " | Author: "
+#define STR_CONFIGURATION_VER               " Last Updated: "
+#define STR_FREE_MEMORY                     " Free Memory: "
+#define STR_PLANNER_BUFFER_BYTES            "  PlannerBufferBytes: "
+#define STR_OK                              "ok"
+#define STR_WAIT                            "wait"
+#define STR_STATS                           "Stats: "
+#define STR_FILE_SAVED                      "Done saving file."
+#define STR_ERR_LINE_NO                     "Line Number is not Last Line Number+1, Last Line: "
+#define STR_ERR_CHECKSUM_MISMATCH           "checksum mismatch, Last Line: "
+#define STR_ERR_NO_CHECKSUM                 "No Checksum with line number, Last Line: "
+#define STR_FILE_PRINTED                    "Done printing file"
+#define STR_BEGIN_FILE_LIST                 "Begin file list"
+#define STR_END_FILE_LIST                   "End file list"
+#define STR_INVALID_EXTRUDER                "Invalid extruder"
+#define STR_INVALID_E_STEPPER               "Invalid E stepper"
+#define STR_E_STEPPER_NOT_SPECIFIED         "E stepper not specified"
+#define STR_INVALID_SOLENOID                "Invalid solenoid"
+#define STR_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
+#define STR_COUNT_X                         " Count X:"
+#define STR_COUNT_A                         " Count A:"
+#define STR_WATCHDOG_FIRED                  "Watchdog timeout. Reset required."
+#define STR_ERR_KILLED                      "Printer halted. kill() called!"
+#define STR_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
+#define STR_BUSY_PROCESSING                 "busy: processing"
+#define STR_BUSY_PAUSED_FOR_USER            "busy: paused for user"
+#define STR_BUSY_PAUSED_FOR_INPUT           "busy: paused for input"
+#define STR_Z_MOVE_COMP                     "Z_move_comp"
+#define STR_RESEND                          "Resend: "
+#define STR_UNKNOWN_COMMAND                 "Unknown command: \""
+#define STR_ACTIVE_EXTRUDER                 "Active Extruder: "
+#define STR_X_MIN                           "x_min"
+#define STR_X_MAX                           "x_max"
+#define STR_X2_MIN                          "x2_min"
+#define STR_X2_MAX                          "x2_max"
+#define STR_Y_MIN                           "y_min"
+#define STR_Y_MAX                           "y_max"
+#define STR_Y2_MIN                          "y2_min"
+#define STR_Y2_MAX                          "y2_max"
+#define STR_Z_MIN                           "z_min"
+#define STR_Z_MAX                           "z_max"
+#define STR_Z2_MIN                          "z2_min"
+#define STR_Z2_MAX                          "z2_max"
+#define STR_Z3_MIN                          "z3_min"
+#define STR_Z3_MAX                          "z3_max"
+#define STR_Z4_MIN                          "z4_min"
+#define STR_Z4_MAX                          "z4_max"
+#define STR_Z_PROBE                         "z_probe"
+#define STR_FILAMENT_RUNOUT_SENSOR          "filament"
+#define STR_PROBE_OFFSET                    "Probe Offset"
+#define STR_SKEW_MIN                        "min_skew_factor: "
+#define STR_SKEW_MAX                        "max_skew_factor: "
+#define STR_ERR_MATERIAL_INDEX              "M145 S<index> out of range (0-1)"
+#define STR_ERR_M421_PARAMETERS             "M421 incorrect parameter usage"
+#define STR_ERR_BAD_PLANE_MODE              "G5 requires XY plane mode"
+#define STR_ERR_MESH_XY                     "Mesh point cannot be resolved"
+#define STR_ERR_ARC_ARGS                    "G2/G3 bad parameters"
+#define STR_ERR_PROTECTED_PIN               "Protected Pin"
+#define STR_ERR_M420_FAILED                 "Failed to enable Bed Leveling"
+#define STR_ERR_M428_TOO_FAR                "Too far from reference point"
+#define STR_ERR_M303_DISABLED               "PIDTEMP disabled"
+#define STR_M119_REPORT                     "Reporting endstop status"
+#define STR_ON                              "ON"
+#define STR_OFF                             "OFF"
+#define STR_ENDSTOP_HIT                     "TRIGGERED"
+#define STR_ENDSTOP_OPEN                    "open"
+#define STR_HOTEND_OFFSET                   "Hotend offsets:"
+#define STR_DUPLICATION_MODE                "Duplication mode: "
+#define STR_SOFT_ENDSTOPS                   "Soft endstops: "
+#define STR_SOFT_MIN                        "  Min: "
+#define STR_SOFT_MAX                        "  Max: "
+
+#define STR_SAVED_POS                       "Position saved"
+#define STR_RESTORING_POS                   "Restoring position"
+#define STR_INVALID_POS_SLOT                "Invalid slot. Total: "
+
+#define STR_SD_CANT_OPEN_SUBDIR             "Cannot open subdir "
+#define STR_SD_INIT_FAIL                    "SD init fail"
+#define STR_SD_VOL_INIT_FAIL                "volume.init failed"
+#define STR_SD_OPENROOT_FAIL                "openRoot failed"
+#define STR_SD_CARD_OK                      "SD card ok"
+#define STR_SD_WORKDIR_FAIL                 "workDir open failed"
+#define STR_SD_OPEN_FILE_FAIL               "open failed, File: "
+#define STR_SD_FILE_OPENED                  "File opened: "
+#define STR_SD_SIZE                         " Size: "
+#define STR_SD_FILE_SELECTED                "File selected"
+#define STR_SD_WRITE_TO_FILE                "Writing to file: "
+#define STR_SD_PRINTING_BYTE                "SD printing byte "
+#define STR_SD_NOT_PRINTING                 "Not SD printing"
+#define STR_SD_ERR_WRITE_TO_FILE            "error writing to file"
+#define STR_SD_ERR_READ                     "SD read error"
+#define STR_SD_CANT_ENTER_SUBDIR            "Cannot enter subdir: "
+
+#define STR_ENDSTOPS_HIT                    "endstops hit: "
+#define STR_ERR_COLD_EXTRUDE_STOP           " cold extrusion prevented"
+#define STR_ERR_LONG_EXTRUDE_STOP           " too long extrusion prevented"
+#define STR_ERR_HOTEND_TOO_COLD             "Hotend too cold"
+#define STR_ERR_Z_HOMING_SER                "Home XY first"
+#define STR_ERR_EEPROM_WRITE                "Error writing to EEPROM!"
+
+#define STR_FILAMENT_CHANGE_HEAT_LCD        "Press button to heat nozzle"
+#define STR_FILAMENT_CHANGE_INSERT_LCD      "Insert filament and press button"
+#define STR_FILAMENT_CHANGE_WAIT_LCD        "Press button to resume"
+#define STR_FILAMENT_CHANGE_HEAT_M108       "Send M108 to heat nozzle"
+#define STR_FILAMENT_CHANGE_INSERT_M108     "Insert filament and send M108"
+#define STR_FILAMENT_CHANGE_WAIT_M108       "Send M108 to resume"
+
+#define STR_STOP_BLTOUCH                    "!! STOP called because of BLTouch error - restart with M999"
+#define STR_STOP_UNHOMED                    "!! STOP called because of unhomed error - restart with M999"
+#define STR_KILL_INACTIVE_TIME              "!! KILL caused by too much inactive time - current command: "
+#define STR_KILL_BUTTON                     "!! KILL caused by KILL button/pin"
+
+// temperature.cpp strings
+#define STR_PID_AUTOTUNE_PREFIX             "PID Autotune"
+#define STR_PID_AUTOTUNE_START              STR_PID_AUTOTUNE_PREFIX " start"
+#define STR_PID_AUTOTUNE_FAILED             STR_PID_AUTOTUNE_PREFIX " failed!"
+#define STR_PID_BAD_EXTRUDER_NUM            STR_PID_AUTOTUNE_FAILED " Bad extruder number"
+#define STR_PID_TEMP_TOO_HIGH               STR_PID_AUTOTUNE_FAILED " Temperature too high"
+#define STR_PID_TIMEOUT                     STR_PID_AUTOTUNE_FAILED " timeout"
+#define STR_BIAS                            " bias: "
+#define STR_D_COLON                         " d: "
+#define STR_T_MIN                           " min: "
+#define STR_T_MAX                           " max: "
+#define STR_KU                              " Ku: "
+#define STR_TU                              " Tu: "
+#define STR_CLASSIC_PID                     " Classic PID "
+#define STR_KP                              " Kp: "
+#define STR_KI                              " Ki: "
+#define STR_KD                              " Kd: "
+#define STR_PID_AUTOTUNE_FINISHED           STR_PID_AUTOTUNE_PREFIX " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
+#define STR_PID_DEBUG                       " PID_DEBUG "
+#define STR_PID_DEBUG_INPUT                 ": Input "
+#define STR_PID_DEBUG_OUTPUT                " Output "
+#define STR_PID_DEBUG_PTERM                 " pTerm "
+#define STR_PID_DEBUG_ITERM                 " iTerm "
+#define STR_PID_DEBUG_DTERM                 " dTerm "
+#define STR_PID_DEBUG_CTERM                 " cTerm "
+#define STR_INVALID_EXTRUDER_NUM            " - Invalid extruder number !"
+
+#define STR_HEATER_BED                      "bed"
+#define STR_HEATER_CHAMBER                  "chamber"
+
+#define STR_STOPPED_HEATER                  ", system stopped! Heater_ID: "
+#define STR_REDUNDANCY                      "Heater switched off. Temperature difference between temp sensors is too high !"
+#define STR_T_HEATING_FAILED                "Heating failed"
+#define STR_T_THERMAL_RUNAWAY               "Thermal Runaway"
+#define STR_T_MAXTEMP                       "MAXTEMP triggered"
+#define STR_T_MINTEMP                       "MINTEMP triggered"
+#define STR_ERR_PROBING_FAILED              "Probing Failed"
+#define STR_ZPROBE_OUT_SER                  "Z Probe Past Bed"
+
+// Debug
+#define STR_DEBUG_PREFIX                    "DEBUG:"
+#define STR_DEBUG_OFF                       "off"
+#define STR_DEBUG_ECHO                      "ECHO"
+#define STR_DEBUG_INFO                      "INFO"
+#define STR_DEBUG_ERRORS                    "ERRORS"
+#define STR_DEBUG_DRYRUN                    "DRYRUN"
+#define STR_DEBUG_COMMUNICATION             "COMMUNICATION"
+#define STR_DEBUG_LEVELING                  "LEVELING"
+
+// LCD Menu Messages
+
+#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/langdata_##M.h)
+#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
+
+#define LANGUAGE_INCL_(M) STRINGIFY_(../lcd/language/language_##M.h)
+#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
+
+#define STR_X "X"
+#define STR_Y "Y"
+#define STR_Z "Z"
+#define STR_E "E"
+#if IS_KINEMATIC
+  #define STR_A "A"
+  #define STR_B "B"
+  #define STR_C "C"
+#else
+  #define STR_A "X"
+  #define STR_B "Y"
+  #define STR_C "Z"
+#endif
+#define STR_X2 "X2"
+#define STR_Y2 "Y2"
+#define STR_Z2 "Z2"
+#define STR_Z3 "Z3"
+#define STR_Z4 "Z4"
+
+#define LCD_STR_A STR_A
+#define LCD_STR_B STR_B
+#define LCD_STR_C STR_C
+#define LCD_STR_E STR_E
+
 #if HAS_CHARACTER_LCD
 
   // Custom characters defined in the first 8 characters of the LCD
@@ -135,210 +339,6 @@
 
 #endif
 
-// Common Serial Console Messages (do not translate those!)
-
-#define MSG_ENQUEUEING                      "enqueueing \""
-#define MSG_POWERUP                         "PowerUp"
-#define MSG_EXTERNAL_RESET                  " External Reset"
-#define MSG_BROWNOUT_RESET                  " Brown out Reset"
-#define MSG_WATCHDOG_RESET                  " Watchdog Reset"
-#define MSG_SOFTWARE_RESET                  " Software Reset"
-#define MSG_AUTHOR                          " | Author: "
-#define MSG_CONFIGURATION_VER               " Last Updated: "
-#define MSG_FREE_MEMORY                     " Free Memory: "
-#define MSG_PLANNER_BUFFER_BYTES            "  PlannerBufferBytes: "
-#define MSG_OK                              "ok"
-#define MSG_WAIT                            "wait"
-#define MSG_STATS                           "Stats: "
-#define MSG_FILE_SAVED                      "Done saving file."
-#define MSG_ERR_LINE_NO                     "Line Number is not Last Line Number+1, Last Line: "
-#define MSG_ERR_CHECKSUM_MISMATCH           "checksum mismatch, Last Line: "
-#define MSG_ERR_NO_CHECKSUM                 "No Checksum with line number, Last Line: "
-#define MSG_FILE_PRINTED                    "Done printing file"
-#define MSG_BEGIN_FILE_LIST                 "Begin file list"
-#define MSG_END_FILE_LIST                   "End file list"
-#define MSG_INVALID_EXTRUDER                "Invalid extruder"
-#define MSG_INVALID_E_STEPPER               "Invalid E stepper"
-#define MSG_E_STEPPER_NOT_SPECIFIED         "E stepper not specified"
-#define MSG_INVALID_SOLENOID                "Invalid solenoid"
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
-#define MSG_COUNT_X                         " Count X:"
-#define MSG_COUNT_A                         " Count A:"
-#define MSG_WATCHDOG_FIRED                  "Watchdog timeout. Reset required."
-#define MSG_ERR_KILLED                      "Printer halted. kill() called!"
-#define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-#define MSG_BUSY_PROCESSING                 "busy: processing"
-#define MSG_BUSY_PAUSED_FOR_USER            "busy: paused for user"
-#define MSG_BUSY_PAUSED_FOR_INPUT           "busy: paused for input"
-#define MSG_Z_MOVE_COMP                     "Z_move_comp"
-#define MSG_RESEND                          "Resend: "
-#define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
-#define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "
-#define MSG_X_MIN                           "x_min"
-#define MSG_X_MAX                           "x_max"
-#define MSG_X2_MIN                          "x2_min"
-#define MSG_X2_MAX                          "x2_max"
-#define MSG_Y_MIN                           "y_min"
-#define MSG_Y_MAX                           "y_max"
-#define MSG_Y2_MIN                          "y2_min"
-#define MSG_Y2_MAX                          "y2_max"
-#define MSG_Z_MIN                           "z_min"
-#define MSG_Z_MAX                           "z_max"
-#define MSG_Z2_MIN                          "z2_min"
-#define MSG_Z2_MAX                          "z2_max"
-#define MSG_Z3_MIN                          "z3_min"
-#define MSG_Z3_MAX                          "z3_max"
-#define MSG_Z4_MIN                          "z4_min"
-#define MSG_Z4_MAX                          "z4_max"
-#define MSG_Z_PROBE                         "z_probe"
-#define MSG_FILAMENT_RUNOUT_SENSOR          "filament"
-#define MSG_PROBE_OFFSET                    "Probe Offset"
-#define MSG_SKEW_MIN                        "min_skew_factor: "
-#define MSG_SKEW_MAX                        "max_skew_factor: "
-#define MSG_ERR_MATERIAL_INDEX              "M145 S<index> out of range (0-1)"
-#define MSG_ERR_M421_PARAMETERS             "M421 incorrect parameter usage"
-#define MSG_ERR_BAD_PLANE_MODE              "G5 requires XY plane mode"
-#define MSG_ERR_MESH_XY                     "Mesh point cannot be resolved"
-#define MSG_ERR_ARC_ARGS                    "G2/G3 bad parameters"
-#define MSG_ERR_PROTECTED_PIN               "Protected Pin"
-#define MSG_ERR_M420_FAILED                 "Failed to enable Bed Leveling"
-#define MSG_ERR_M428_TOO_FAR                "Too far from reference point"
-#define MSG_ERR_M303_DISABLED               "PIDTEMP disabled"
-#define MSG_M119_REPORT                     "Reporting endstop status"
-#define MSG_ON                              "ON"
-#define MSG_OFF                             "OFF"
-#define MSG_ENDSTOP_HIT                     "TRIGGERED"
-#define MSG_ENDSTOP_OPEN                    "open"
-#define MSG_HOTEND_OFFSET                   "Hotend offsets:"
-#define MSG_DUPLICATION_MODE                "Duplication mode: "
-#define MSG_SOFT_ENDSTOPS                   "Soft endstops: "
-#define MSG_SOFT_MIN                        "  Min: "
-#define MSG_SOFT_MAX                        "  Max: "
-
-#define MSG_SAVED_POS                       "Position saved"
-#define MSG_RESTORING_POS                   "Restoring position"
-#define MSG_INVALID_POS_SLOT                "Invalid slot. Total: "
-
-#define MSG_SD_CANT_OPEN_SUBDIR             "Cannot open subdir "
-#define MSG_SD_INIT_FAIL                    "SD init fail"
-#define MSG_SD_VOL_INIT_FAIL                "volume.init failed"
-#define MSG_SD_OPENROOT_FAIL                "openRoot failed"
-#define MSG_SD_CARD_OK                      "SD card ok"
-#define MSG_SD_WORKDIR_FAIL                 "workDir open failed"
-#define MSG_SD_OPEN_FILE_FAIL               "open failed, File: "
-#define MSG_SD_FILE_OPENED                  "File opened: "
-#define MSG_SD_SIZE                         " Size: "
-#define MSG_SD_FILE_SELECTED                "File selected"
-#define MSG_SD_WRITE_TO_FILE                "Writing to file: "
-#define MSG_SD_PRINTING_BYTE                "SD printing byte "
-#define MSG_SD_NOT_PRINTING                 "Not SD printing"
-#define MSG_SD_ERR_WRITE_TO_FILE            "error writing to file"
-#define MSG_SD_ERR_READ                     "SD read error"
-#define MSG_SD_CANT_ENTER_SUBDIR            "Cannot enter subdir: "
-
-#define MSG_STEPPER_TOO_HIGH                "Steprate too high: "
-#define MSG_ENDSTOPS_HIT                    "endstops hit: "
-#define MSG_ERR_COLD_EXTRUDE_STOP           " cold extrusion prevented"
-#define MSG_ERR_LONG_EXTRUDE_STOP           " too long extrusion prevented"
-#define MSG_ERR_HOTEND_TOO_COLD             "Hotend too cold"
-#define MSG_ERR_Z_HOMING_SER                "Home XY first"
-#define MSG_ERR_EEPROM_WRITE                "Error writing to EEPROM!"
-
-#define MSG_FILAMENT_CHANGE_HEAT_LCD        "Press button to heat nozzle"
-#define MSG_FILAMENT_CHANGE_INSERT_LCD      "Insert filament and press button"
-#define MSG_FILAMENT_CHANGE_WAIT_LCD        "Press button to resume"
-#define MSG_FILAMENT_CHANGE_HEAT_M108       "Send M108 to heat nozzle"
-#define MSG_FILAMENT_CHANGE_INSERT_M108     "Insert filament and send M108"
-#define MSG_FILAMENT_CHANGE_WAIT_M108       "Send M108 to resume"
-
-#define MSG_STOP_BLTOUCH                    "!! STOP called because of BLTouch error - restart with M999"
-#define MSG_STOP_UNHOMED                    "!! STOP called because of unhomed error - restart with M999"
-#define MSG_KILL_INACTIVE_TIME              "!! KILL caused by too much inactive time - current command: "
-#define MSG_KILL_BUTTON                     "!! KILL caused by KILL button/pin"
-
-// temperature.cpp strings
-#define MSG_PID_AUTOTUNE_PREFIX             "PID Autotune"
-#define MSG_PID_AUTOTUNE_START              MSG_PID_AUTOTUNE_PREFIX " start"
-#define MSG_PID_AUTOTUNE_FAILED             MSG_PID_AUTOTUNE_PREFIX " failed!"
-#define MSG_PID_BAD_EXTRUDER_NUM            MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
-#define MSG_PID_TEMP_TOO_HIGH               MSG_PID_AUTOTUNE_FAILED " Temperature too high"
-#define MSG_PID_TIMEOUT                     MSG_PID_AUTOTUNE_FAILED " timeout"
-#define MSG_BIAS                            " bias: "
-#define MSG_D                               " d: "
-#define MSG_T_MIN                           " min: "
-#define MSG_T_MAX                           " max: "
-#define MSG_KU                              " Ku: "
-#define MSG_TU                              " Tu: "
-#define MSG_CLASSIC_PID                     " Classic PID "
-#define MSG_KP                              " Kp: "
-#define MSG_KI                              " Ki: "
-#define MSG_KD                              " Kd: "
-#define MSG_AT                              " @:"
-#define MSG_PID_AUTOTUNE_FINISHED           MSG_PID_AUTOTUNE_PREFIX " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
-#define MSG_PID_DEBUG                       " PID_DEBUG "
-#define MSG_PID_DEBUG_INPUT                 ": Input "
-#define MSG_PID_DEBUG_OUTPUT                " Output "
-#define MSG_PID_DEBUG_PTERM                 " pTerm "
-#define MSG_PID_DEBUG_ITERM                 " iTerm "
-#define MSG_PID_DEBUG_DTERM                 " dTerm "
-#define MSG_PID_DEBUG_CTERM                 " cTerm "
-#define MSG_INVALID_EXTRUDER_NUM            " - Invalid extruder number !"
-
-#define MSG_HEATER_BED                      "bed"
-#define MSG_HEATER_CHAMBER                  "chamber"
-
-#define MSG_STOPPED_HEATER                  ", system stopped! Heater_ID: "
-#define MSG_REDUNDANCY                      "Heater switched off. Temperature difference between temp sensors is too high !"
-#define MSG_T_HEATING_FAILED                "Heating failed"
-#define MSG_T_THERMAL_RUNAWAY               "Thermal Runaway"
-#define MSG_T_MAXTEMP                       "MAXTEMP triggered"
-#define MSG_T_MINTEMP                       "MINTEMP triggered"
-#define MSG_ERR_PROBING_FAILED              "Probing Failed"
-#define MSG_ZPROBE_OUT_SER                  "Z Probe Past Bed"
-
-// Debug
-#define MSG_DEBUG_PREFIX                    "DEBUG:"
-#define MSG_DEBUG_OFF                       "off"
-#define MSG_DEBUG_ECHO                      "ECHO"
-#define MSG_DEBUG_INFO                      "INFO"
-#define MSG_DEBUG_ERRORS                    "ERRORS"
-#define MSG_DEBUG_DRYRUN                    "DRYRUN"
-#define MSG_DEBUG_COMMUNICATION             "COMMUNICATION"
-#define MSG_DEBUG_LEVELING                  "LEVELING"
-
-// LCD Menu Messages
-
-#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/langdata_##M.h)
-#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
-
-#define LANGUAGE_INCL_(M) STRINGIFY_(../lcd/language/language_##M.h)
-#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
-
-// Never translate these strings
-#define MSG_X "X"
-#define MSG_Y "Y"
-#define MSG_Z "Z"
-#define MSG_E "E"
-#if IS_KINEMATIC
-  #define MSG_A "A"
-  #define MSG_B "B"
-  #define MSG_C "C"
-#else
-  #define MSG_A "X"
-  #define MSG_B "Y"
-  #define MSG_C "Z"
-#endif
-#define MSG_X2 "X2"
-#define MSG_Y2 "Y2"
-#define MSG_Z2 "Z2"
-#define MSG_Z3 "Z3"
-#define MSG_Z4 "Z4"
-
-#define LCD_STR_A MSG_A
-#define LCD_STR_B MSG_B
-#define LCD_STR_C MSG_C
-#define LCD_STR_E MSG_E
-
 /**
  * Tool indexes for LCD display only
  *
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 41c400ea62b2..304aa09a8ae4 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -54,7 +54,7 @@ void serial_ternary(const bool onoff, PGM_P const pre, PGM_P const on, PGM_P con
   serialprintPGM(onoff ? on : off);
   if (post) serialprintPGM(post);
 }
-void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(MSG_ON) : PSTR(MSG_OFF)); }
+void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(STR_ON) : PSTR(STR_OFF)); }
 void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EOL(); }
 void serialprint_truefalse(const bool tf) { serialprintPGM(tf ? PSTR("true") : PSTR("false")); }
 
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index e5ccb42bf492..77d85c4195f4 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -124,7 +124,7 @@ bool BLTouch::deploy_proc() {
       // The deploy might have failed or the probe is actually triggered (nozzle too low?) again
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
 
-      SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
+      SERIAL_ERROR_MSG(STR_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
       stop();                              // but it's not too bad, no need to kill, allow restart
 
       return true;                         // Tell our caller we goofed in case he cares to know
@@ -169,7 +169,7 @@ bool BLTouch::stow_proc() {
 
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
 
-      SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
+      SERIAL_ERROR_MSG(STR_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
       stop();                              // but it's not too bad, no need to kill, allow restart
 
       return true;                         // Tell our caller we goofed in case he cares to know
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 9fd279fe5d61..cfda05612ba5 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -120,7 +120,7 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) {
-      SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
+      SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
       return false;
     }
   #endif
@@ -400,7 +400,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
   #endif
 
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
-    SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
+    SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
 
     #if HAS_LCD_MENU
       if (show_lcd) { // Show status screen
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/prusa_MMU2/mmu2.cpp
index 2833735f3e2f..d71edbac35f4 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp
+++ b/Marlin/src/feature/prusa_MMU2/mmu2.cpp
@@ -462,7 +462,7 @@ void MMU2::tool_change(uint8_t index) {
     ENABLE_AXIS_E0();
 
     SERIAL_ECHO_START();
-    SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(extruder));
+    SERIAL_ECHOLNPAIR(STR_ACTIVE_EXTRUDER, int(extruder));
 
     ui.reset_status();
   }
diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index a6717b749c0e..d53118fdd441 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -67,7 +67,7 @@ static void set_solenoid(const uint8_t num, const bool active) {
         break;
     #endif
     default:
-      SERIAL_ECHO_MSG(MSG_INVALID_SOLENOID);
+      SERIAL_ECHO_MSG(STR_INVALID_SOLENOID);
       break;
   }
 }
diff --git a/Marlin/src/gcode/bedlevel/G42.cpp b/Marlin/src/gcode/bedlevel/G42.cpp
index ed6d66f002f9..139bd1bb6628 100644
--- a/Marlin/src/gcode/bedlevel/G42.cpp
+++ b/Marlin/src/gcode/bedlevel/G42.cpp
@@ -41,7 +41,7 @@ void GcodeSuite::G42() {
     const int8_t iy = hasJ ? parser.value_int() : 0;
 
     if ((hasI && !WITHIN(ix, 0, GRID_MAX_POINTS_X - 1)) || (hasJ && !WITHIN(iy, 0, GRID_MAX_POINTS_Y - 1))) {
-      SERIAL_ECHOLNPGM(MSG_ERR_MESH_XY);
+      SERIAL_ECHOLNPGM(STR_ERR_MESH_XY);
       return;
     }
 
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 1d78afaca3e1..b84c60a6ae87 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -235,7 +235,7 @@ void GcodeSuite::M420() {
 
   // Error if leveling failed to enable or reenable
   if (to_enable && !planner.leveling_active)
-    SERIAL_ERROR_MSG(MSG_ERR_M420_FAILED);
+    SERIAL_ERROR_MSG(STR_ERR_M420_FAILED);
 
   SERIAL_ECHO_START();
   SERIAL_ECHOPGM("Bed Leveling ");
@@ -247,7 +247,7 @@ void GcodeSuite::M420() {
     if (planner.z_fade_height > 0.0)
       SERIAL_ECHOLN(planner.z_fade_height);
     else
-      SERIAL_ECHOLNPGM(MSG_OFF);
+      SERIAL_ECHOLNPGM(STR_OFF);
   #endif
 
   // Report change in position
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index bec7514409d7..85ff70757514 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -50,9 +50,9 @@ void GcodeSuite::M421() {
              hasQ = !hasZ && parser.seen('Q');
 
   if (!hasI || !hasJ || !(hasZ || hasQ))
-    SERIAL_ERROR_MSG(MSG_ERR_M421_PARAMETERS);
+    SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
   else if (!WITHIN(ix, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(iy, 0, GRID_MAX_POINTS_Y - 1))
-    SERIAL_ERROR_MSG(MSG_ERR_MESH_XY);
+    SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
   else {
     z_values[ix][iy] = parser.value_linear_units() + (hasQ ? z_values[ix][iy] : 0);
     #if ENABLED(ABL_BILINEAR_SUBDIVISION)
diff --git a/Marlin/src/gcode/bedlevel/mbl/M421.cpp b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
index f0fbf3021044..3997e5ad591c 100644
--- a/Marlin/src/gcode/bedlevel/mbl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
@@ -49,9 +49,9 @@ void GcodeSuite::M421() {
   const bool hasZ = parser.seen('Z'), hasQ = !hasZ && parser.seen('Q');
 
   if (int(hasI && hasJ) + int(hasX && hasY) != 1 || !(hasZ || hasQ))
-    SERIAL_ERROR_MSG(MSG_ERR_M421_PARAMETERS);
+    SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
   else if (ix < 0 || iy < 0)
-    SERIAL_ERROR_MSG(MSG_ERR_MESH_XY);
+    SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
   else
     mbl.set_z(ix, iy, parser.value_linear_units() + (hasQ ? mbl.z_values[ix][iy] : 0));
 }
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index 393eae03b278..ca4af1e0c026 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -57,9 +57,9 @@ void GcodeSuite::M421() {
   if (hasC) ij = ubl.find_closest_mesh_point_of_type(REAL, current_position);
 
   if (int(hasC) + int(hasI && hasJ) != 1 || !(hasZ || hasQ || hasN))
-    SERIAL_ERROR_MSG(MSG_ERR_M421_PARAMETERS);
+    SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
   else if (!WITHIN(ij.x, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(ij.y, 0, GRID_MAX_POINTS_Y - 1))
-    SERIAL_ERROR_MSG(MSG_ERR_MESH_XY);
+    SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
   else {
     float &zval = ubl.z_values[ij.x][ij.y];
     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index b76d4da96632..bee8182401c5 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -118,7 +118,7 @@
     // Disallow Z homing if X or Y are unknown
     if (!TEST(axis_known_position, X_AXIS) || !TEST(axis_known_position, Y_AXIS)) {
       LCD_MESSAGEPGM(MSG_ERR_Z_HOMING);
-      SERIAL_ECHO_MSG(MSG_ERR_Z_HOMING_SER);
+      SERIAL_ECHO_MSG(STR_ERR_Z_HOMING_SER);
       return;
     }
 
@@ -154,7 +154,7 @@
     }
     else {
       LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
-      SERIAL_ECHO_MSG(MSG_ZPROBE_OUT_SER);
+      SERIAL_ECHO_MSG(STR_ZPROBE_OUT_SER);
     }
 
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< home_z_safely");
@@ -529,7 +529,7 @@ void GcodeSuite::G28(const bool always_home_all) {
       #define _HOME_SYNC doZ        // Only for Z-axis
     #endif
     if (_HOME_SYNC)
-      SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
+      SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
   #endif
 
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G28");
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index f9fa84a3b3be..865b03def394 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -82,7 +82,7 @@ void GcodeSuite::M852() {
   #endif
 
   if (badval)
-    SERIAL_ECHOLNPGM(MSG_SKEW_MIN " " STRINGIFY(SKEW_FACTOR_MIN) " " MSG_SKEW_MAX " " STRINGIFY(SKEW_FACTOR_MAX));
+    SERIAL_ECHOLNPGM(STR_SKEW_MIN " " STRINGIFY(SKEW_FACTOR_MIN) " " STR_SKEW_MAX " " STRINGIFY(SKEW_FACTOR_MAX));
 
   // When skew is changed the current position changes
   if (setval) {
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index 644a67eeaf6f..5c7d5eac719c 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -50,7 +50,7 @@ void GcodeSuite::M218() {
 
   if (!parser.seen("XYZ")) {
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM(MSG_HOTEND_OFFSET);
+    SERIAL_ECHOPGM(STR_HOTEND_OFFSET);
     HOTEND_LOOP() {
       SERIAL_CHAR(' ');
       SERIAL_ECHO(hotend_offset[e].x);
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 31584d61e0d3..54d32c865074 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -82,7 +82,7 @@ void GcodeSuite::M301() {
     SERIAL_EOL();
   }
   else
-    SERIAL_ERROR_MSG(MSG_INVALID_EXTRUDER);
+    SERIAL_ERROR_MSG(STR_INVALID_EXTRUDER);
 }
 
 #endif // PIDTEMP
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index fd7ca09c6cdf..bb1a77836be1 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -28,13 +28,13 @@
 void GcodeSuite::M111() {
   if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
 
-  static const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
-                    str_debug_2[] PROGMEM = MSG_DEBUG_INFO,
-                    str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
-                    str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
-                    str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION
+  static const char str_debug_1[] PROGMEM = STR_DEBUG_ECHO,
+                    str_debug_2[] PROGMEM = STR_DEBUG_INFO,
+                    str_debug_4[] PROGMEM = STR_DEBUG_ERRORS,
+                    str_debug_8[] PROGMEM = STR_DEBUG_DRYRUN,
+                    str_debug_16[] PROGMEM = STR_DEBUG_COMMUNICATION
                     #if ENABLED(DEBUG_LEVELING_FEATURE)
-                      , str_debug_lvl[] PROGMEM = MSG_DEBUG_LEVELING
+                      , str_debug_lvl[] PROGMEM = STR_DEBUG_LEVELING
                     #endif
                     ;
 
@@ -46,7 +46,7 @@ void GcodeSuite::M111() {
   };
 
   SERIAL_ECHO_START();
-  SERIAL_ECHOPGM(MSG_DEBUG_PREFIX);
+  SERIAL_ECHOPGM(STR_DEBUG_PREFIX);
   if (marlin_debug_flags) {
     uint8_t comma = 0;
     for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
@@ -57,7 +57,7 @@ void GcodeSuite::M111() {
     }
   }
   else {
-    SERIAL_ECHOPGM(MSG_DEBUG_OFF);
+    SERIAL_ECHOPGM(STR_DEBUG_OFF);
     #if !defined(__AVR__) || !defined(USBCON)
       #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
         SERIAL_ECHOPAIR("\nBuffer Overruns: ", MYSERIAL0.buffer_overruns());
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index 782084b711e2..3b0a928b8f13 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -36,11 +36,11 @@ void GcodeSuite::M211() {
   const xyz_pos_t l_soft_min = soft_endstop.min.asLogical(),
                   l_soft_max = soft_endstop.max.asLogical();
   SERIAL_ECHO_START();
-  SERIAL_ECHOPGM(MSG_SOFT_ENDSTOPS);
+  SERIAL_ECHOPGM(STR_SOFT_ENDSTOPS);
   if (parser.seen('S')) soft_endstops_enabled = parser.value_bool();
   serialprint_onoff(soft_endstops_enabled);
-  print_xyz(l_soft_min, PSTR(MSG_SOFT_MIN), PSTR(" "));
-  print_xyz(l_soft_max, PSTR(MSG_SOFT_MAX));
+  print_xyz(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
+  print_xyz(l_soft_max, PSTR(STR_SOFT_MAX));
 }
 
 #endif
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index e45dedf27b65..99bab4ddc960 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -167,7 +167,7 @@
       extruder_duplication_enabled = ena && (duplication_e_mask >= 3);
     }
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM(MSG_DUPLICATION_MODE);
+    SERIAL_ECHOPGM(STR_DUPLICATION_MODE);
     serialprint_onoff(extruder_duplication_enabled);
     if (ena) {
       SERIAL_ECHOPGM(" ( ");
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 76808e9c9d44..f9c40a20a9ce 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -110,6 +110,6 @@ void GcodeSuite::M81() {
   #endif
 
   #if HAS_LCD_MENU
-    LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " MSG_OFF "."));
+    LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " STR_OFF "."));
   #endif
 }
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 8d2e168afd8b..45a8734ca3b3 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -40,7 +40,7 @@ void GcodeSuite::G60() {
   const uint8_t slot = parser.byteval('S');
 
   if (slot >= SAVED_POSITIONS) {
-    SERIAL_ERROR_MSG(MSG_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
+    SERIAL_ERROR_MSG(STR_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
     return;
   }
 
@@ -49,7 +49,7 @@ void GcodeSuite::G60() {
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
     const xyze_pos_t &pos = stored_position[slot];
-    DEBUG_ECHOPAIR_F(MSG_SAVED_POS " S", slot);
+    DEBUG_ECHOPAIR_F(STR_SAVED_POS " S", slot);
     DEBUG_ECHOPAIR_F(" : X", pos.x);
     DEBUG_ECHOPAIR_F_P(SP_Y_STR, pos.y);
     DEBUG_ECHOLNPAIR_F_P(SP_Z_STR, pos.z);
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index ed2cfca4fa20..e6e5180192e6 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -42,7 +42,7 @@ void GcodeSuite::G61(void) {
 
   #if SAVED_POSITIONS < 256
     if (slot >= SAVED_POSITIONS) {
-      SERIAL_ERROR_MSG(MSG_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
+      SERIAL_ERROR_MSG(STR_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
       return;
     }
   #endif
@@ -54,7 +54,7 @@ void GcodeSuite::G61(void) {
   const float fr = parser.linearval('F');
   if (fr > 0.0) feedrate_mm_s = MMM_TO_MMS(fr);
 
-  SERIAL_ECHOPAIR(MSG_RESTORING_POS " S", int(slot));
+  SERIAL_ECHOPAIR(STR_RESTORING_POS " S", int(slot));
   LOOP_XYZ(i) {
     destination[i] = parser.seen(axis_codes[i])
       ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 4c9832dbadec..0d2b656dd6e7 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -94,7 +94,7 @@ int8_t GcodeSuite::get_target_extruder_from_command() {
     if (e < EXTRUDERS) return e;
     SERIAL_ECHO_START();
     SERIAL_CHAR('M'); SERIAL_ECHO(parser.codenum);
-    SERIAL_ECHOLNPAIR(" " MSG_INVALID_EXTRUDER " ", int(e));
+    SERIAL_ECHOLNPAIR(" " STR_INVALID_EXTRUDER " ", int(e));
     return -1;
   }
   return active_extruder;
@@ -111,9 +111,9 @@ int8_t GcodeSuite::get_target_e_stepper_from_command() {
   SERIAL_ECHO_START();
   SERIAL_CHAR('M'); SERIAL_ECHO(parser.codenum);
   if (e == -1)
-    SERIAL_ECHOLNPGM(" " MSG_E_STEPPER_NOT_SPECIFIED);
+    SERIAL_ECHOLNPGM(" " STR_E_STEPPER_NOT_SPECIFIED);
   else
-    SERIAL_ECHOLNPAIR(" " MSG_INVALID_E_STEPPER " ", int(e));
+    SERIAL_ECHOLNPAIR(" " STR_INVALID_E_STEPPER " ", int(e));
   return -1;
 }
 
@@ -951,13 +951,13 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
       switch (busy_state) {
         case IN_HANDLER:
         case IN_PROCESS:
-          SERIAL_ECHO_MSG(MSG_BUSY_PROCESSING);
+          SERIAL_ECHO_MSG(STR_BUSY_PROCESSING);
           break;
         case PAUSED_FOR_USER:
-          SERIAL_ECHO_MSG(MSG_BUSY_PAUSED_FOR_USER);
+          SERIAL_ECHO_MSG(STR_BUSY_PAUSED_FOR_USER);
           break;
         case PAUSED_FOR_INPUT:
-          SERIAL_ECHO_MSG(MSG_BUSY_PAUSED_FOR_INPUT);
+          SERIAL_ECHO_MSG(STR_BUSY_PAUSED_FOR_INPUT);
           break;
         default:
           break;
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 8f0908595fcf..e4cac5174bf7 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::M428() {
     if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
       diff[i] = -current_position[i];
     if (!WITHIN(diff[i], -20, 20)) {
-      SERIAL_ERROR_MSG(MSG_ERR_M428_TOO_FAR);
+      SERIAL_ERROR_MSG(STR_ERR_M428_TOO_FAR);
       LCD_ALERTMESSAGEPGM_P(PSTR("Err: Too far!"));
       BUZZ(200, 40);
       return;
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index bce0c891842e..4d2c5d5d6996 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -39,7 +39,7 @@
  */
 void GcodeSuite::M115() {
 
-  SERIAL_ECHOLNPGM(MSG_M115_REPORT);
+  SERIAL_ECHOLNPGM(STR_M115_REPORT);
 
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
 
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index 3ba1c3fe7086..31167275338b 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -38,7 +38,7 @@
 void GcodeSuite::M145() {
   const uint8_t material = (uint8_t)parser.intval('S');
   if (material >= COUNT(ui.preheat_hotend_temp))
-    SERIAL_ERROR_MSG(MSG_ERR_MATERIAL_INDEX);
+    SERIAL_ERROR_MSG(STR_ERR_MATERIAL_INDEX);
   else {
     int v;
     if (parser.seenval('H')) {
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 73329e7fc9eb..8f0dfc71b2f6 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -118,7 +118,7 @@ void GcodeSuite::G0_G1(
       #endif
       if (_MOVE_SYNC) {
         planner.synchronize();
-        SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
+        SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
       }
     #endif
   }
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 70043f5386de..b11b1136b6e1 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -327,7 +327,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
         // P indicates number of circles to do
         int8_t circles_to_do = parser.byteval('P');
         if (!WITHIN(circles_to_do, 0, 100))
-          SERIAL_ERROR_MSG(MSG_ERR_ARC_ARGS);
+          SERIAL_ERROR_MSG(STR_ERR_ARC_ARGS);
 
         while (circles_to_do--)
           plan_arc(current_position, arc_offset, clockwise);
@@ -338,7 +338,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
       reset_stepper_timeout();
     }
     else
-      SERIAL_ERROR_MSG(MSG_ERR_ARC_ARGS);
+      SERIAL_ERROR_MSG(STR_ERR_ARC_ARGS);
   }
 }
 
diff --git a/Marlin/src/gcode/motion/G4.cpp b/Marlin/src/gcode/motion/G4.cpp
index 2310c2c72752..d157face9002 100644
--- a/Marlin/src/gcode/motion/G4.cpp
+++ b/Marlin/src/gcode/motion/G4.cpp
@@ -35,7 +35,7 @@ void GcodeSuite::G4() {
 
   planner.synchronize();
   #if ENABLED(NANODLP_Z_SYNC)
-    SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
+    SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
   #endif
 
   if (!ui.has_status()) LCD_MESSAGEPGM(MSG_DWELL);
diff --git a/Marlin/src/gcode/motion/G5.cpp b/Marlin/src/gcode/motion/G5.cpp
index f34be757829f..5d289e11d815 100644
--- a/Marlin/src/gcode/motion/G5.cpp
+++ b/Marlin/src/gcode/motion/G5.cpp
@@ -45,7 +45,7 @@ void GcodeSuite::G5() {
 
     #if ENABLED(CNC_WORKSPACE_PLANES)
       if (workspace_plane != PLANE_XY) {
-        SERIAL_ERROR_MSG(MSG_ERR_BAD_PLANE_MODE);
+        SERIAL_ERROR_MSG(STR_ERR_BAD_PLANE_MODE);
         return;
       }
     #endif
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index d6535af82f7a..4f6489d3b912 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -48,13 +48,13 @@
     ) {
       probe.offset.z += offs;
       SERIAL_ECHO_START();
-      SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", probe.offset.z);
+      SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET STR_Z ": ", probe.offset.z);
     }
     else {
       #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
         hotend_offset[active_extruder].z -= offs;
         SERIAL_ECHO_START();
-        SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", hotend_offset[active_extruder].z);
+        SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET STR_Z ": ", hotend_offset[active_extruder].z);
       #endif
     }
   }
@@ -98,7 +98,7 @@ void GcodeSuite::M290() {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-      SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET " " MSG_Z, probe.offset.z);
+      SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
     #endif
 
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index a49b8b216e17..5a473403a3a3 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -365,7 +365,7 @@ void GCodeParser::parse(char *p) {
 #endif // CNC_COORDINATE_SYSTEMS
 
 void GCodeParser::unknown_command_warning() {
-  SERIAL_ECHO_MSG(MSG_UNKNOWN_COMMAND, command_ptr, "\"");
+  SERIAL_ECHO_MSG(STR_UNKNOWN_COMMAND, command_ptr, "\"");
 }
 
 #if ENABLED(DEBUG_GCODE_PARSER)
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index 242ea170a72b..c2e746cf0b5c 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -39,9 +39,9 @@ void GcodeSuite::M851() {
   if (!parser.seen("XYZ")) {
     SERIAL_ECHOLNPAIR_P(
       #if HAS_PROBE_XY_OFFSET
-        PSTR(MSG_PROBE_OFFSET " X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR
+        PSTR(STR_PROBE_OFFSET " X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR
       #else
-        PSTR(MSG_PROBE_OFFSET " X0 Y0 Z")
+        PSTR(STR_PROBE_OFFSET " X0 Y0 Z")
       #endif
       , probe.offset.z
     );
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index ec1d3ebd35fd..7d17ca602b6f 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -163,7 +163,7 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
   if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
 
   if (_enqueue(cmd)) {
-    SERIAL_ECHO_MSG(MSG_ENQUEUEING, cmd, "\"");
+    SERIAL_ECHO_MSG(STR_ENQUEUEING, cmd, "\"");
     return true;
   }
   return false;
@@ -244,7 +244,7 @@ void GCodeQueue::ok_to_send() {
     PORT_REDIRECT(pn);                    // Reply to the serial port that sent the command
   #endif
   if (!send_ok[index_r]) return;
-  SERIAL_ECHOPGM(MSG_OK);
+  SERIAL_ECHOPGM(STR_OK);
   #if ENABLED(ADVANCED_OK)
     char* p = command_buffer[index_r];
     if (*p == 'N') {
@@ -270,7 +270,7 @@ void GCodeQueue::flush_and_request_resend() {
     PORT_REDIRECT(pn);                    // Reply to the serial port that sent the command
   #endif
   SERIAL_FLUSH();
-  SERIAL_ECHOPGM(MSG_RESEND);
+  SERIAL_ECHOPGM(STR_RESEND);
   SERIAL_ECHOLN(last_N + 1);
   ok_to_send();
 }
@@ -397,7 +397,7 @@ void GCodeQueue::get_serial_commands() {
     static millis_t last_command_time = 0;
     const millis_t ms = millis();
     if (length == 0 && !serial_data_available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) {
-      SERIAL_ECHOLNPGM(MSG_WAIT);
+      SERIAL_ECHOLNPGM(STR_WAIT);
       last_command_time = ms;
     }
   #endif
@@ -436,24 +436,24 @@ void GCodeQueue::get_serial_commands() {
           gcode_N = strtol(npos + 1, nullptr, 10);
 
           if (gcode_N != last_N + 1 && !M110)
-            return gcode_line_error(PSTR(MSG_ERR_LINE_NO), i);
+            return gcode_line_error(PSTR(STR_ERR_LINE_NO), i);
 
           char *apos = strrchr(command, '*');
           if (apos) {
             uint8_t checksum = 0, count = uint8_t(apos - command);
             while (count) checksum ^= command[--count];
             if (strtol(apos + 1, nullptr, 10) != checksum)
-              return gcode_line_error(PSTR(MSG_ERR_CHECKSUM_MISMATCH), i);
+              return gcode_line_error(PSTR(STR_ERR_CHECKSUM_MISMATCH), i);
           }
           else
-            return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
+            return gcode_line_error(PSTR(STR_ERR_NO_CHECKSUM), i);
 
           last_N = gcode_N;
         }
         #if ENABLED(SDSUPPORT)
           // Pronterface "M29" and "M29 " has no line number
           else if (card.flag.saving && !is_M29(command))
-            return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
+            return gcode_line_error(PSTR(STR_ERR_NO_CHECKSUM), i);
         #endif
 
         //
@@ -472,7 +472,7 @@ void GCodeQueue::get_serial_commands() {
                 case 5:
               #endif
                 PORT_REDIRECT(i);                      // Reply to the serial port that sent the command
-                SERIAL_ECHOLNPGM(MSG_ERR_STOPPED);
+                SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
                 LCD_MESSAGEPGM(MSG_STOPPED);
                 break;
             }
@@ -527,7 +527,7 @@ void GCodeQueue::get_serial_commands() {
     while (length < BUFSIZE && !card_eof) {
       const int16_t n = card.get();
       card_eof = card.eof();
-      if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(MSG_SD_ERR_READ); continue; }
+      if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
 
       const char sd_char = (char)n;
       const bool is_eol = sd_char == '\n' || sd_char == '\r';
@@ -585,7 +585,7 @@ void GCodeQueue::advance() {
       if (is_M29(command)) {
         // M29 closes the file
         card.closefile();
-        SERIAL_ECHOLNPGM(MSG_FILE_SAVED);
+        SERIAL_ECHOLNPGM(STR_FILE_SAVED);
 
         #if !defined(__AVR__) || !defined(USBCON)
           #if ENABLED(SERIAL_STATS_DROPPED_RX)
diff --git a/Marlin/src/gcode/sdcard/M20.cpp b/Marlin/src/gcode/sdcard/M20.cpp
index 9307808b0e6f..c45fcb038a97 100644
--- a/Marlin/src/gcode/sdcard/M20.cpp
+++ b/Marlin/src/gcode/sdcard/M20.cpp
@@ -31,9 +31,9 @@
  * M20: List SD card to serial output
  */
 void GcodeSuite::M20() {
-  SERIAL_ECHOLNPGM(MSG_BEGIN_FILE_LIST);
+  SERIAL_ECHOLNPGM(STR_BEGIN_FILE_LIST);
   card.ls();
-  SERIAL_ECHOLNPGM(MSG_END_FILE_LIST);
+  SERIAL_ECHOLNPGM(STR_END_FILE_LIST);
 }
 
 #endif // SDSUPPORT
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temperature/M105.cpp
index b45d6928a58a..7d68ccadc0f1 100644
--- a/Marlin/src/gcode/temperature/M105.cpp
+++ b/Marlin/src/gcode/temperature/M105.cpp
@@ -31,7 +31,7 @@ void GcodeSuite::M105() {
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
-  SERIAL_ECHOPGM(MSG_OK);
+  SERIAL_ECHOPGM(STR_OK);
 
   #if HAS_TEMP_SENSOR
 
diff --git a/Marlin/src/gcode/temperature/M303.cpp b/Marlin/src/gcode/temperature/M303.cpp
index 87bb84b10bce..31f7bf350117 100644
--- a/Marlin/src/gcode/temperature/M303.cpp
+++ b/Marlin/src/gcode/temperature/M303.cpp
@@ -52,7 +52,7 @@ void GcodeSuite::M303() {
   #endif
   const heater_ind_t e = (heater_ind_t)parser.intval('E');
   if (!WITHIN(e, SI, EI)) {
-    SERIAL_ECHOLNPGM(MSG_PID_BAD_EXTRUDER_NUM);
+    SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM);
     #if ENABLED(EXTENSIBLE_UI)
       ExtUI::OnPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
index aabc5ef27ae0..96845d40658e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
@@ -137,16 +137,16 @@ namespace ExtUI {
       SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
         case PID_BAD_EXTRUDER_NUM:
-          StatusScreen::setStatusMessage(MSG_PID_BAD_EXTRUDER_NUM);
+          StatusScreen::setStatusMessage(STR_PID_BAD_EXTRUDER_NUM);
           break;
         case PID_TEMP_TOO_HIGH:
-          StatusScreen::setStatusMessage(MSG_PID_TEMP_TOO_HIGH);
+          StatusScreen::setStatusMessage(STR_PID_TEMP_TOO_HIGH);
           break;
         case PID_TUNING_TIMEOUT:
-          StatusScreen::setStatusMessage(MSG_PID_TIMEOUT);
+          StatusScreen::setStatusMessage(STR_PID_TIMEOUT);
           break;
         case PID_DONE:
-          StatusScreen::setStatusMessage(MSG_PID_AUTOTUNE_FINISHED);
+          StatusScreen::setStatusMessage(STR_PID_AUTOTUNE_FINISHED);
           break;
       }
       GOTO_SCREEN(StatusScreen);
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index 103dcc036481..862b2cd536cc 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -74,7 +74,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
           1
         #endif
       )
-      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
+      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
       .enabled(
         #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
           1
@@ -142,7 +142,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
           1
         #endif
       )
-      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
+      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
       .tag(12).button( BTN_POS(3,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index 0c53dca61b4e..41ced01cfec3 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -62,7 +62,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
           1
         #endif
       )
-      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
+      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
 
 
       .tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
index 9901bbf45b0e..4510c93416d4 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
@@ -62,34 +62,34 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
   .text(BTN_POS(1,1), BTN_SIZE(6,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
   .font(font_tiny);
   #if PIN_EXISTS(X_MAX)
-    PIN_ENABLED (1, 2, PSTR(MSG_X_MAX), X_MAX, X_MAX_ENDSTOP_INVERTING)
+    PIN_ENABLED (1, 2, PSTR(STR_X_MAX), X_MAX, X_MAX_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(1, 2, PSTR(MSG_X_MAX), X_MAX)
+    PIN_DISABLED(1, 2, PSTR(STR_X_MAX), X_MAX)
   #endif
   #if PIN_EXISTS(Y_MAX)
-    PIN_ENABLED (3, 2, PSTR(MSG_Y_MAX), Y_MAX, Y_MAX_ENDSTOP_INVERTING)
+    PIN_ENABLED (3, 2, PSTR(STR_Y_MAX), Y_MAX, Y_MAX_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(3, 2, PSTR(MSG_Y_MAX), Y_MAX)
+    PIN_DISABLED(3, 2, PSTR(STR_Y_MAX), Y_MAX)
   #endif
   #if PIN_EXISTS(Z_MAX)
-    PIN_ENABLED (5, 2, PSTR(MSG_Z_MAX), Z_MAX, Z_MAX_ENDSTOP_INVERTING)
+    PIN_ENABLED (5, 2, PSTR(STR_Z_MAX), Z_MAX, Z_MAX_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(5, 2, PSTR(MSG_Z_MAX), Z_MAX)
+    PIN_DISABLED(5, 2, PSTR(STR_Z_MAX), Z_MAX)
   #endif
   #if PIN_EXISTS(X_MIN)
-    PIN_ENABLED (1, 3, PSTR(MSG_X_MIN), X_MIN, X_MIN_ENDSTOP_INVERTING)
+    PIN_ENABLED (1, 3, PSTR(STR_X_MIN), X_MIN, X_MIN_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(1, 3, PSTR(MSG_X_MIN), X_MIN)
+    PIN_DISABLED(1, 3, PSTR(STR_X_MIN), X_MIN)
   #endif
   #if PIN_EXISTS(Y_MIN)
-    PIN_ENABLED (3, 3, PSTR(MSG_Y_MIN), Y_MIN, Y_MIN_ENDSTOP_INVERTING)
+    PIN_ENABLED (3, 3, PSTR(STR_Y_MIN), Y_MIN, Y_MIN_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(3, 3, PSTR(MSG_Y_MIN), Y_MIN)
+    PIN_DISABLED(3, 3, PSTR(STR_Y_MIN), Y_MIN)
   #endif
   #if PIN_EXISTS(Z_MIN)
-    PIN_ENABLED (5, 3, PSTR(MSG_Z_MIN), Z_MIN, Z_MIN_ENDSTOP_INVERTING)
+    PIN_ENABLED (5, 3, PSTR(STR_Z_MIN), Z_MIN, Z_MIN_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(5, 3, PSTR(MSG_Z_MIN), Z_MIN)
+    PIN_DISABLED(5, 3, PSTR(STR_Z_MIN), Z_MIN)
   #endif
   #if ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FIL_RUNOUT)
     PIN_ENABLED (1, 4, GET_TEXT_F(MSG_RUNOUT_1), FIL_RUNOUT, FIL_RUNOUT_INVERTING)
@@ -102,9 +102,9 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
     PIN_DISABLED(3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2)
   #endif
   #if PIN_EXISTS(Z_MIN_PROBE)
-    PIN_ENABLED (5, 4, PSTR(MSG_Z_PROBE), Z_MIN_PROBE, Z_MIN_PROBE_ENDSTOP_INVERTING)
+    PIN_ENABLED (5, 4, PSTR(STR_Z_PROBE), Z_MIN_PROBE, Z_MIN_PROBE_ENDSTOP_INVERTING)
   #else
-    PIN_DISABLED(5, 4, PSTR(MSG_Z_PROBE), Z_MIN_PROBE)
+    PIN_DISABLED(5, 4, PSTR(STR_Z_PROBE), Z_MIN_PROBE)
   #endif
 
   #if HAS_SOFTWARE_ENDSTOPS
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
index ae224e9c1135..406a01626027 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
@@ -41,7 +41,7 @@ void NozzleOffsetScreen::onRedraw(draw_mode_t what) {
   widgets_t w(what);
   w.precision(2).units(GET_TEXT_F(MSG_UNITS_MM));
 
-  w.heading(                          GET_TEXT_F(MSG_OFFSETS_MENU));
+  w.heading(                          GET_TEXT_F(STR_OFFSETS_MENU));
   w.color(Theme::x_axis).adjuster(2,  GET_TEXT_F(MSG_AXIS_X), ExtUI::getNozzleOffset_mm(X, E1));
   w.color(Theme::y_axis).adjuster(4,  GET_TEXT_F(MSG_AXIS_Y), ExtUI::getNozzleOffset_mm(Y, E1));
   w.color(Theme::z_axis).adjuster(6,  GET_TEXT_F(MSG_AXIS_Z), ExtUI::getNozzleOffset_mm(Z, E1));
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
index d9910ffa0420..777c447cd412 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
@@ -74,7 +74,7 @@ void NudgeNozzleScreen::onRedraw(draw_mode_t what) {
 
       #if HOTENDS > 1
         format_position(str, getNozzleOffset_mm(X, E1), getNozzleOffset_mm(Y, E1), getNozzleOffset_mm(Z, E1));
-        w.text_field(0, GET_TEXT_F(MSG_OFFSETS_MENU), str);
+        w.text_field(0, GET_TEXT_F(STR_OFFSETS_MENU), str);
       #endif
     }
   #endif
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 7ec280122ccd..5c6f11d7cb48 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -136,16 +136,16 @@ namespace ExtUI {
       SERIAL_ECHOLNPAIR("OnPidTuning:",rst);
       switch(rst) {
         case PID_BAD_EXTRUDER_NUM:
-          ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_BAD_EXTRUDER_NUM));
+          ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_BAD_EXTRUDER_NUM));
           break;
         case PID_TEMP_TOO_HIGH:
-          ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_TEMP_TOO_HIGH));
+          ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_TEMP_TOO_HIGH));
           break;
         case PID_TUNING_TIMEOUT:
-          ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_TIMEOUT));
+          ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_TIMEOUT));
           break;
         case PID_DONE:
-          ScreenHandler.setstatusmessagePGM(PSTR(MSG_PID_AUTOTUNE_FINISHED));
+          ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_AUTOTUNE_FINISHED));
           break;
       }
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 1ebd9374c502..03bcedb7305a 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -85,13 +85,13 @@ void menu_cancelobject();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_CURRENT_PWM(LABEL,I) EDIT_ITEM_P(long5, PSTR(LABEL), &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-      EDIT_CURRENT_PWM(MSG_X MSG_Y, 0);
+      EDIT_CURRENT_PWM(STR_X STR_Y, 0);
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-      EDIT_CURRENT_PWM(MSG_Z, 1);
+      EDIT_CURRENT_PWM(STR_Z, 1);
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-      EDIT_CURRENT_PWM(MSG_E, 2);
+      EDIT_CURRENT_PWM(STR_E, 2);
     #endif
     END_MENU();
   }
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index d2285e083560..809c719ff9ae 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -327,7 +327,7 @@ void menu_configuration() {
     #endif
 
     #if HAS_HOTEND_OFFSET
-      SUBMENU(MSG_OFFSETS_MENU, menu_tool_offsets);
+      SUBMENU(STR_OFFSETS_MENU, menu_tool_offsets);
     #endif
 
     #if ENABLED(DUAL_X_CARRIAGE)
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index ed70a3e7f103..4d971e4e3ab4 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -38,28 +38,28 @@ void menu_tmc_current() {
   START_MENU();
   BACK_ITEM(MSG_TMC_DRIVERS);
   #if AXIS_IS_TMC(X)
-    TMC_EDIT_STORED_I_RMS(X, MSG_X);
+    TMC_EDIT_STORED_I_RMS(X, STR_X);
   #endif
   #if AXIS_IS_TMC(Y)
-    TMC_EDIT_STORED_I_RMS(Y, MSG_Y);
+    TMC_EDIT_STORED_I_RMS(Y, STR_Y);
   #endif
   #if AXIS_IS_TMC(Z)
-    TMC_EDIT_STORED_I_RMS(Z, MSG_Z);
+    TMC_EDIT_STORED_I_RMS(Z, STR_Z);
   #endif
   #if AXIS_IS_TMC(X2)
-    TMC_EDIT_STORED_I_RMS(X2, MSG_X2);
+    TMC_EDIT_STORED_I_RMS(X2, STR_X2);
   #endif
   #if AXIS_IS_TMC(Y2)
-    TMC_EDIT_STORED_I_RMS(Y2, MSG_Y2);
+    TMC_EDIT_STORED_I_RMS(Y2, STR_Y2);
   #endif
   #if AXIS_IS_TMC(Z2)
-    TMC_EDIT_STORED_I_RMS(Z2, MSG_Z2);
+    TMC_EDIT_STORED_I_RMS(Z2, STR_Z2);
   #endif
   #if AXIS_IS_TMC(Z3)
-    TMC_EDIT_STORED_I_RMS(Z3, MSG_Z3);
+    TMC_EDIT_STORED_I_RMS(Z3, STR_Z3);
   #endif
   #if AXIS_IS_TMC(Z4)
-    TMC_EDIT_STORED_I_RMS(Z4, MSG_Z4);
+    TMC_EDIT_STORED_I_RMS(Z4, STR_Z4);
   #endif
   #if AXIS_IS_TMC(E0)
     TMC_EDIT_STORED_I_RMS(E0, LCD_STR_E0);
@@ -96,28 +96,28 @@ void menu_tmc_current() {
     START_MENU();
     BACK_ITEM(MSG_TMC_DRIVERS);
     #if AXIS_HAS_STEALTHCHOP(X)
-      TMC_EDIT_STORED_HYBRID_THRS(X, MSG_X);
+      TMC_EDIT_STORED_HYBRID_THRS(X, STR_X);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Y)
-      TMC_EDIT_STORED_HYBRID_THRS(Y, MSG_Y);
+      TMC_EDIT_STORED_HYBRID_THRS(Y, STR_Y);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z)
-      TMC_EDIT_STORED_HYBRID_THRS(Z, MSG_Z);
+      TMC_EDIT_STORED_HYBRID_THRS(Z, STR_Z);
     #endif
     #if AXIS_HAS_STEALTHCHOP(X2)
-      TMC_EDIT_STORED_HYBRID_THRS(X2, MSG_X2);
+      TMC_EDIT_STORED_HYBRID_THRS(X2, STR_X2);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Y2)
-      TMC_EDIT_STORED_HYBRID_THRS(Y2, MSG_Y2);
+      TMC_EDIT_STORED_HYBRID_THRS(Y2, STR_Y2);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z2)
-      TMC_EDIT_STORED_HYBRID_THRS(Z2, MSG_Z2);
+      TMC_EDIT_STORED_HYBRID_THRS(Z2, STR_Z2);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z3)
-      TMC_EDIT_STORED_HYBRID_THRS(Z3, MSG_Z3);
+      TMC_EDIT_STORED_HYBRID_THRS(Z3, STR_Z3);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z4)
-      TMC_EDIT_STORED_HYBRID_THRS(Z4, MSG_Z4);
+      TMC_EDIT_STORED_HYBRID_THRS(Z4, STR_Z4);
     #endif
     #if AXIS_HAS_STEALTHCHOP(E0)
       TMC_EDIT_STORED_HYBRID_THRS(E0, LCD_STR_E0);
@@ -181,28 +181,28 @@ void menu_tmc_current() {
     STATIC_ITEM(MSG_TMC_STEALTH_ENABLED);
     BACK_ITEM(MSG_TMC_DRIVERS);
     #if AXIS_HAS_STEALTHCHOP(X)
-      TMC_EDIT_STEP_MODE(X, MSG_X);
+      TMC_EDIT_STEP_MODE(X, STR_X);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Y)
-      TMC_EDIT_STEP_MODE(Y, MSG_Y);
+      TMC_EDIT_STEP_MODE(Y, STR_Y);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z)
-      TMC_EDIT_STEP_MODE(Z, MSG_Z);
+      TMC_EDIT_STEP_MODE(Z, STR_Z);
     #endif
     #if AXIS_HAS_STEALTHCHOP(X2)
-      TMC_EDIT_STEP_MODE(X2, MSG_X2);
+      TMC_EDIT_STEP_MODE(X2, STR_X2);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Y2)
-      TMC_EDIT_STEP_MODE(Y2, MSG_Y2);
+      TMC_EDIT_STEP_MODE(Y2, STR_Y2);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z2)
-      TMC_EDIT_STEP_MODE(Z2, MSG_Z2);
+      TMC_EDIT_STEP_MODE(Z2, STR_Z2);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z3)
-      TMC_EDIT_STEP_MODE(Z3, MSG_Z3);
+      TMC_EDIT_STEP_MODE(Z3, STR_Z3);
     #endif
     #if AXIS_HAS_STEALTHCHOP(Z4)
-      TMC_EDIT_STEP_MODE(Z4, MSG_Z4);
+      TMC_EDIT_STEP_MODE(Z4, STR_Z4);
     #endif
     #if AXIS_HAS_STEALTHCHOP(E0)
       TMC_EDIT_STEP_MODE(E0, LCD_STR_E0);
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index d291f972d3e5..018f471c3412 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -386,7 +386,7 @@ void Endstops::event_handler() {
     #define ENDSTOP_HIT_TEST_Z() _ENDSTOP_HIT_TEST(Z,'Z')
 
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM(MSG_ENDSTOPS_HIT);
+    SERIAL_ECHOPGM(STR_ENDSTOPS_HIT);
     ENDSTOP_HIT_TEST_X();
     ENDSTOP_HIT_TEST_Y();
     ENDSTOP_HIT_TEST_Z();
@@ -415,7 +415,7 @@ void Endstops::event_handler() {
 static void print_es_state(const bool is_hit, PGM_P const label=nullptr) {
   if (label) serialprintPGM(label);
   SERIAL_ECHOPGM(": ");
-  serialprintPGM(is_hit ? PSTR(MSG_ENDSTOP_HIT) : PSTR(MSG_ENDSTOP_OPEN));
+  serialprintPGM(is_hit ? PSTR(STR_ENDSTOP_HIT) : PSTR(STR_ENDSTOP_OPEN));
   SERIAL_EOL();
 }
 
@@ -423,7 +423,7 @@ void _O2 Endstops::report_states() {
   #if ENABLED(BLTOUCH)
     bltouch._set_SW_mode();
   #endif
-  SERIAL_ECHOLNPGM(MSG_M119_REPORT);
+  SERIAL_ECHOLNPGM(STR_M119_REPORT);
   #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
   #if HAS_X_MIN
     ES_REPORT(X_MIN);
@@ -474,11 +474,11 @@ void _O2 Endstops::report_states() {
     ES_REPORT(Z4_MAX);
   #endif
   #if HAS_CUSTOM_PROBE_PIN
-    print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
+    print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(STR_Z_PROBE));
   #endif
   #if HAS_FILAMENT_SENSOR
     #if NUM_RUNOUT_SENSORS == 1
-      print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
+      print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
     #else
       #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
       for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
@@ -487,7 +487,7 @@ void _O2 Endstops::report_states() {
           default: continue;
           REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
         }
-        SERIAL_ECHOPGM(MSG_FILAMENT_RUNOUT_SENSOR);
+        SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
         if (i > 1) SERIAL_CHAR(' ', '0' + i);
         print_es_state(extDigitalRead(pin) != FIL_RUNOUT_INVERTING);
       }
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 84ab09b76780..9f6cbf1b387b 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1018,7 +1018,7 @@ void prepare_move_to_destination() {
 
       #if ENABLED(PREVENT_COLD_EXTRUSION)
         ignore_e = thermalManager.tooColdToExtrude(active_extruder);
-        if (ignore_e) SERIAL_ECHO_MSG(MSG_ERR_COLD_EXTRUDE_STOP);
+        if (ignore_e) SERIAL_ECHO_MSG(STR_ERR_COLD_EXTRUDE_STOP);
       #endif
 
       #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
@@ -1030,13 +1030,13 @@ void prepare_move_to_destination() {
             MIXER_STEPPER_LOOP(e) {
               if (e_delta * collector[e] > (EXTRUDE_MAXLENGTH)) {
                 ignore_e = true;
-                SERIAL_ECHO_MSG(MSG_ERR_LONG_EXTRUDE_STOP);
+                SERIAL_ECHO_MSG(STR_ERR_LONG_EXTRUDE_STOP);
                 break;
               }
             }
           #else
             ignore_e = true;
-            SERIAL_ECHO_MSG(MSG_ERR_LONG_EXTRUDE_STOP);
+            SERIAL_ECHO_MSG(STR_ERR_LONG_EXTRUDE_STOP);
           #endif
         }
       #endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index b39ac993b40b..bf01c771aef6 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1748,7 +1748,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
             position_float.e = target_float.e;
           #endif
           de = 0; // no difference
-          SERIAL_ECHO_MSG(MSG_ERR_COLD_EXTRUDE_STOP);
+          SERIAL_ECHO_MSG(STR_ERR_COLD_EXTRUDE_STOP);
         }
       #endif // PREVENT_COLD_EXTRUSION
       #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
@@ -1770,7 +1770,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
               position_float.e = target_float.e;
             #endif
             de = 0; // no difference
-            SERIAL_ECHO_MSG(MSG_ERR_LONG_EXTRUDE_STOP);
+            SERIAL_ECHO_MSG(STR_ERR_LONG_EXTRUDE_STOP);
           }
         }
       #endif // PREVENT_LENGTHY_EXTRUDE
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 43c4992ecbed..3fa09c8834ec 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -183,7 +183,7 @@ void PrintCounter::saveStats() {
 
 #if HAS_SERVICE_INTERVALS
   inline void _service_when(char buffer[], const char * const msg, const uint32_t when) {
-    SERIAL_ECHOPGM(MSG_STATS);
+    SERIAL_ECHOPGM(STR_STATS);
     serialprintPGM(msg);
     SERIAL_ECHOLNPAIR(" in ", duration_t(when).toString(buffer));
   }
@@ -192,7 +192,7 @@ void PrintCounter::saveStats() {
 void PrintCounter::showStats() {
   char buffer[21];
 
-  SERIAL_ECHOPGM(MSG_STATS);
+  SERIAL_ECHOPGM(STR_STATS);
   SERIAL_ECHOLNPAIR(
     "Prints: ", data.totalPrints,
     ", Finished: ", data.finishedPrints,
@@ -200,7 +200,7 @@ void PrintCounter::showStats() {
                     - ((isRunning() || isPaused()) ? 1 : 0) // Remove 1 from failures with an active counter
   );
 
-  SERIAL_ECHOPGM(MSG_STATS);
+  SERIAL_ECHOPGM(STR_STATS);
   duration_t elapsed = data.printTime;
   elapsed.toString(buffer);
   SERIAL_ECHOPAIR("Total time: ", buffer);
@@ -217,7 +217,7 @@ void PrintCounter::showStats() {
     SERIAL_CHAR(')');
   #endif
 
-  SERIAL_ECHOPAIR("\n" MSG_STATS "Filament used: ", data.filamentUsed / 1000);
+  SERIAL_ECHOPAIR("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
   SERIAL_CHAR('m');
   SERIAL_EOL();
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index cf74d464fe2f..e22ee22d5746 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -392,7 +392,7 @@ bool Probe::set_deployed(const bool deploy) {
         _BV(X_AXIS)
       #endif
     )) {
-      SERIAL_ERROR_MSG(MSG_STOP_UNHOMED);
+      SERIAL_ERROR_MSG(STR_STOP_UNHOMED);
       stop();
       return true;
     }
@@ -771,7 +771,7 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
   if (isnan(measured_z)) {
     stow();
     LCD_MESSAGEPGM(MSG_LCD_PROBING_FAILED);
-    SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
+    SERIAL_ERROR_MSG(STR_ERR_PROBING_FAILED);
   }
 
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< Probe::probe_at_point");
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 66fc39228dd3..68639d40f003 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2462,9 +2462,9 @@ void Stepper::report_positions() {
   #endif
 
   #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
-    SERIAL_ECHOPAIR(MSG_COUNT_A, pos.x, " B:", pos.y);
+    SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
   #else
-    SERIAL_ECHOPAIR(MSG_COUNT_X, pos.x, " Y:", pos.y);
+    SERIAL_ECHOPAIR(STR_COUNT_X, pos.x, " Y:", pos.y);
   #endif
   #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
     SERIAL_ECHOLNPAIR(" C:", pos.z);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index de64c28c8563..7cee5fb1ea6d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -111,6 +111,9 @@
 
 Temperature thermalManager;
 
+const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
+           str_t_heating_failed[] PROGMEM = STR_T_HEATING_FAILED;
+
 /**
  * Macros to include the heater id in temp errors. The compiler's dead-code
  * elimination should (hopefully) optimize out the unused strings.
@@ -404,14 +407,14 @@ volatile bool Temperature::raw_temps_ready = false;
     #endif
 
     if (target > GHV(BED_MAXTEMP - 10, temp_range[heater].maxtemp - 15)) {
-      SERIAL_ECHOLNPGM(MSG_PID_TEMP_TOO_HIGH);
+      SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       #if ENABLED(EXTENSIBLE_UI)
         ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
       #endif
       return;
     }
 
-    SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_START);
+    SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_START);
 
     disable_all_heaters();
 
@@ -472,27 +475,27 @@ volatile bool Temperature::raw_temps_ready = false;
               LIMIT(bias, 20, max_pow - 20);
               d = (bias > max_pow >> 1) ? max_pow - 1 - bias : bias;
 
-              SERIAL_ECHOPAIR(MSG_BIAS, bias, MSG_D, d, MSG_T_MIN, minT, MSG_T_MAX, maxT);
+              SERIAL_ECHOPAIR(STR_BIAS, bias, STR_D_COLON, d, STR_T_MIN, minT, STR_T_MAX, maxT);
               if (cycles > 2) {
                 const float Ku = (4.0f * d) / (float(M_PI) * (maxT - minT) * 0.5f),
                             Tu = float(t_low + t_high) * 0.001f,
                             pf = isbed ? 0.2f : 0.6f,
                             df = isbed ? 1.0f / 3.0f : 1.0f / 8.0f;
 
-                SERIAL_ECHOPAIR(MSG_KU, Ku, MSG_TU, Tu);
+                SERIAL_ECHOPAIR(STR_KU, Ku, STR_TU, Tu);
                 if (isbed) { // Do not remove this otherwise PID autotune won't work right for the bed!
                   tune_pid.Kp = Ku * 0.2f;
                   tune_pid.Ki = 2 * tune_pid.Kp / Tu;
                   tune_pid.Kd = tune_pid.Kp * Tu / 3;
                   SERIAL_ECHOLNPGM("\n" " No overshoot"); // Works far better for the bed. Classic and some have bad ringing.
-                  SERIAL_ECHOLNPAIR(MSG_KP, tune_pid.Kp, MSG_KI, tune_pid.Ki, MSG_KD, tune_pid.Kd);
+                  SERIAL_ECHOLNPAIR(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
                 }
                 else {
                   tune_pid.Kp = Ku * pf;
                   tune_pid.Kd = tune_pid.Kp * Tu * df;
                   tune_pid.Ki = 2 * tune_pid.Kp / Tu;
-                  SERIAL_ECHOLNPGM("\n" MSG_CLASSIC_PID);
-                  SERIAL_ECHOLNPAIR(MSG_KP, tune_pid.Kp, MSG_KI, tune_pid.Ki, MSG_KD, tune_pid.Kd);
+                  SERIAL_ECHOLNPGM("\n" STR_CLASSIC_PID);
+                  SERIAL_ECHOLNPAIR(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
                 }
 
                 /**
@@ -520,7 +523,7 @@ volatile bool Temperature::raw_temps_ready = false;
         #define MAX_OVERSHOOT_PID_AUTOTUNE 30
       #endif
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
-        SERIAL_ECHOLNPGM(MSG_PID_TEMP_TOO_HIGH);
+        SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         #if ENABLED(EXTENSIBLE_UI)
           ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
         #endif
@@ -553,10 +556,10 @@ volatile bool Temperature::raw_temps_ready = false;
                 if (current_temp > watch_temp_target) heated = true;     // - Flag if target temperature reached
               }
               else if (ELAPSED(ms, temp_change_ms))                 // Watch timer expired
-                _temp_error(heater, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+                _temp_error(heater, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
             }
             else if (current_temp < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?
-              _temp_error(heater, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+              _temp_error(heater, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
           }
         #endif
       } // every 2 seconds
@@ -569,12 +572,12 @@ volatile bool Temperature::raw_temps_ready = false;
         #if ENABLED(EXTENSIBLE_UI)
           ExtUI::OnPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
         #endif
-        SERIAL_ECHOLNPGM(MSG_PID_TIMEOUT);
+        SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
       }
 
       if (cycles > ncycles && cycles > 2) {
-        SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_FINISHED);
+        SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_FINISHED);
 
         #if HAS_PID_FOR_BOTH
           const char * const estring = GHV(PSTR("bed"), NUL_STR);
@@ -782,12 +785,12 @@ void Temperature::_temp_error(const heater_ind_t heater, PGM_P const serial_msg,
   ) {
     SERIAL_ERROR_START();
     serialprintPGM(serial_msg);
-    SERIAL_ECHOPGM(MSG_STOPPED_HEATER);
+    SERIAL_ECHOPGM(STR_STOPPED_HEATER);
     if (heater >= 0) SERIAL_ECHO((int)heater);
     #if HAS_HEATED_CHAMBER
-      else if (heater == H_CHAMBER) SERIAL_ECHOPGM(MSG_HEATER_CHAMBER);
+      else if (heater == H_CHAMBER) SERIAL_ECHOPGM(STR_HEATER_CHAMBER);
     #endif
-    else SERIAL_ECHOPGM(MSG_HEATER_BED);
+    else SERIAL_ECHOPGM(STR_HEATER_BED);
     SERIAL_EOL();
   }
 
@@ -817,11 +820,11 @@ void Temperature::_temp_error(const heater_ind_t heater, PGM_P const serial_msg,
 }
 
 void Temperature::max_temp_error(const heater_ind_t heater) {
-  _temp_error(heater, PSTR(MSG_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
+  _temp_error(heater, PSTR(STR_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
 }
 
 void Temperature::min_temp_error(const heater_ind_t heater) {
-  _temp_error(heater, PSTR(MSG_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
+  _temp_error(heater, PSTR(STR_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
 }
 
 #if HOTENDS
@@ -909,18 +912,18 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
         if (ee == active_extruder) {
           SERIAL_ECHO_START();
           SERIAL_ECHOPAIR(
-            MSG_PID_DEBUG, ee,
-            MSG_PID_DEBUG_INPUT, temp_hotend[ee].celsius,
-            MSG_PID_DEBUG_OUTPUT, pid_output
+            STR_PID_DEBUG, ee,
+            STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius,
+            STR_PID_DEBUG_OUTPUT, pid_output
           );
           #if DISABLED(PID_OPENLOOP)
           {
             SERIAL_ECHOPAIR(
-              MSG_PID_DEBUG_PTERM, work_pid[ee].Kp,
-              MSG_PID_DEBUG_ITERM, work_pid[ee].Ki,
-              MSG_PID_DEBUG_DTERM, work_pid[ee].Kd
+              STR_PID_DEBUG_PTERM, work_pid[ee].Kp,
+              STR_PID_DEBUG_ITERM, work_pid[ee].Ki,
+              STR_PID_DEBUG_DTERM, work_pid[ee].Kd
               #if ENABLED(PID_EXTRUSION_SCALING)
-                , MSG_PID_DEBUG_CTERM, work_pid[ee].Kc
+                , STR_PID_DEBUG_CTERM, work_pid[ee].Kc
               #endif
             );
           }
@@ -996,9 +999,9 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
       SERIAL_ECHOLNPAIR(
         " PID_BED_DEBUG : Input ", temp_bed.celsius, " Output ", pid_output,
         #if DISABLED(PID_OPENLOOP)
-          MSG_PID_DEBUG_PTERM, work_pid.Kp,
-          MSG_PID_DEBUG_ITERM, work_pid.Ki,
-          MSG_PID_DEBUG_DTERM, work_pid.Kd,
+          STR_PID_DEBUG_PTERM, work_pid.Kp,
+          STR_PID_DEBUG_ITERM, work_pid.Ki,
+          STR_PID_DEBUG_DTERM, work_pid.Kd,
         #endif
       );
     }
@@ -1054,7 +1057,7 @@ void Temperature::manage_heater() {
     HOTEND_LOOP() {
       #if ENABLED(THERMAL_PROTECTION_HOTENDS)
         if (degHotend(e) > temp_range[e].maxtemp)
-          _temp_error((heater_ind_t)e, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+          _temp_error((heater_ind_t)e, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
       #endif
 
       #if HEATER_IDLE_HANDLER
@@ -1072,7 +1075,7 @@ void Temperature::manage_heater() {
         // Make sure temperature is increasing
         if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) {  // Time to check this extruder?
           if (degHotend(e) < watch_hotend[e].target)                            // Failed to increase enough?
-            _temp_error((heater_ind_t)e, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+            _temp_error((heater_ind_t)e, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
           else                                                                  // Start again if the target is still far off
             start_watching_hotend(e);
         }
@@ -1081,7 +1084,7 @@ void Temperature::manage_heater() {
       #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
         // Make sure measured temperatures are close together
         if (ABS(temp_hotend[0].celsius - redundant_temperature) > MAX_REDUNDANT_TEMP_SENSOR_DIFF)
-          _temp_error(H_E0, PSTR(MSG_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
+          _temp_error(H_E0, PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
       #endif
 
     } // HOTEND_LOOP
@@ -1107,14 +1110,14 @@ void Temperature::manage_heater() {
 
     #if ENABLED(THERMAL_PROTECTION_BED)
       if (degBed() > BED_MAXTEMP)
-        _temp_error(H_BED, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+        _temp_error(H_BED, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
     #endif
 
     #if WATCH_BED
       // Make sure temperature is increasing
       if (watch_bed.elapsed(ms)) {        // Time to check the bed?
         if (degBed() < watch_bed.target)                                // Failed to increase enough?
-          _temp_error(H_BED, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+          _temp_error(H_BED, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
         else                                                            // Start again if the target is still far off
           start_watching_bed();
       }
@@ -1185,14 +1188,14 @@ void Temperature::manage_heater() {
 
     #if ENABLED(THERMAL_PROTECTION_CHAMBER)
       if (degChamber() > CHAMBER_MAXTEMP)
-        _temp_error(H_CHAMBER, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+        _temp_error(H_CHAMBER, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
     #endif
 
     #if WATCH_CHAMBER
       // Make sure temperature is increasing
       if (watch_chamber.elapsed(ms)) {              // Time to check the chamber?
         if (degChamber() < watch_chamber.target)    // Failed to increase enough?
-          _temp_error(H_CHAMBER, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
+          _temp_error(H_CHAMBER, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
         else
           start_watching_chamber();                 // Start again if the target is still far off
       }
@@ -1404,7 +1407,7 @@ void Temperature::manage_heater() {
       {
         SERIAL_ERROR_START();
         SERIAL_ECHO((int)e);
-        SERIAL_ECHOLNPGM(MSG_INVALID_EXTRUDER_NUM);
+        SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
         kill();
         return 0;
       }
@@ -2067,7 +2070,7 @@ void Temperature::init() {
         sm.state = TRRunaway;
 
       case TRRunaway:
-        _temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY), GET_TEXT(MSG_THERMAL_RUNAWAY));
+        _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
     }
   }
 
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index cf104e7b5ac1..021878c1eaf8 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -700,7 +700,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
   inline void invalid_extruder_error(const uint8_t e) {
     SERIAL_ECHO_START();
     SERIAL_CHAR('T'); SERIAL_ECHO(int(e));
-    SERIAL_CHAR(' '); SERIAL_ECHOLNPGM(MSG_INVALID_EXTRUDER);
+    SERIAL_CHAR(' '); SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER);
   }
 #endif
 
@@ -843,7 +843,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       #endif
       if (should_swap) {
         if (too_cold) {
-          SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
+          SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
           #if ENABLED(SINGLENOZZLE)
             active_extruder = new_tool;
             return;
@@ -1073,7 +1073,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     #endif
 
     SERIAL_ECHO_START();
-    SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(active_extruder));
+    SERIAL_ECHOLNPAIR(STR_ACTIVE_EXTRUDER, int(active_extruder));
 
   #endif // EXTRUDERS > 1
 }
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 426d540c7e25..2bde9501f7d4 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -248,7 +248,7 @@ void CardReader::printListing(SdFile parent, const char * const prepend/*=nullpt
       SdFile child;
       if (!child.open(&parent, dosFilename, O_READ)) {
         SERIAL_ECHO_START();
-        SERIAL_ECHOLNPAIR(MSG_SD_CANT_OPEN_SUBDIR, dosFilename);
+        SERIAL_ECHOLNPAIR(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
       }
       printListing(child, path);
       // close() is done automatically by destructor of SdFile
@@ -318,7 +318,7 @@ void CardReader::ls() {
       if (!dir.open(&diveDir, segment, O_READ)) {
         SERIAL_EOL();
         SERIAL_ECHO_START();
-        SERIAL_ECHOPAIR(MSG_SD_CANT_OPEN_SUBDIR, segment);
+        SERIAL_ECHOPAIR(STR_SD_CANT_OPEN_SUBDIR, segment);
         break;
       }
 
@@ -362,14 +362,14 @@ void CardReader::mount() {
     #if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
       && !sd2card.init(SPI_SPEED, LCD_SDSS)
     #endif
-  ) SERIAL_ECHO_MSG(MSG_SD_INIT_FAIL);
+  ) SERIAL_ECHO_MSG(STR_SD_INIT_FAIL);
   else if (!volume.init(&sd2card))
-    SERIAL_ERROR_MSG(MSG_SD_VOL_INIT_FAIL);
+    SERIAL_ERROR_MSG(STR_SD_VOL_INIT_FAIL);
   else if (!root.openRoot(&volume))
-    SERIAL_ERROR_MSG(MSG_SD_OPENROOT_FAIL);
+    SERIAL_ERROR_MSG(STR_SD_OPENROOT_FAIL);
   else {
     flag.mounted = true;
-    SERIAL_ECHO_MSG(MSG_SD_CARD_OK);
+    SERIAL_ECHO_MSG(STR_SD_CARD_OK);
     #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
       settings.first_load();
     #endif
@@ -446,7 +446,7 @@ void CardReader::getAbsFilename(char *dst) {
 }
 
 void openFailed(const char * const fname) {
-  SERIAL_ECHOLNPAIR(MSG_SD_OPEN_FILE_FAIL, fname, ".");
+  SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, fname, ".");
 }
 
 void announceOpen(const uint8_t doing, const char * const path) {
@@ -511,8 +511,8 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
   if (file.open(curDir, fname, O_READ)) {
     filesize = file.fileSize();
     sdpos = 0;
-    SERIAL_ECHOLNPAIR(MSG_SD_FILE_OPENED, fname, MSG_SD_SIZE, filesize);
-    SERIAL_ECHOLNPGM(MSG_SD_FILE_SELECTED);
+    SERIAL_ECHOLNPAIR(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
+    SERIAL_ECHOLNPGM(STR_SD_FILE_SELECTED);
 
     selectFileByName(fname);
     ui.set_status(longFilename[0] ? longFilename : fname);
@@ -521,6 +521,10 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
     openFailed(fname);
 }
 
+inline void echo_write_to_file(char * const fname) {
+  SERIAL_ECHOLNPAIR(STR_SD_WRITE_TO_FILE, fname);
+}
+
 //
 // Open a file by DOS path for write
 //
@@ -542,7 +546,7 @@ void CardReader::openFileWrite(char * const path) {
     #if ENABLED(EMERGENCY_PARSER)
       emergency_parser.disable();
     #endif
-    SERIAL_ECHOLNPAIR(MSG_SD_WRITE_TO_FILE, fname);
+    echo_write_to_file(fname);
     ui.set_status(fname);
   }
   else
@@ -574,13 +578,13 @@ void CardReader::removeFile(const char * const name) {
 
 void CardReader::report_status() {
   if (isPrinting()) {
-    SERIAL_ECHOPGM(MSG_SD_PRINTING_BYTE);
+    SERIAL_ECHOPGM(STR_SD_PRINTING_BYTE);
     SERIAL_ECHO(sdpos);
     SERIAL_CHAR('/');
     SERIAL_ECHOLN(filesize);
   }
   else
-    SERIAL_ECHOLNPGM(MSG_SD_NOT_PRINTING);
+    SERIAL_ECHOLNPGM(STR_SD_NOT_PRINTING);
 }
 
 void CardReader::write_command(char * const buf) {
@@ -598,7 +602,7 @@ void CardReader::write_command(char * const buf) {
   end[3] = '\0';
   file.write(begin);
 
-  if (file.writeError) SERIAL_ERROR_MSG(MSG_SD_ERR_WRITE_TO_FILE);
+  if (file.writeError) SERIAL_ERROR_MSG(STR_SD_ERR_WRITE_TO_FILE);
 }
 
 //
@@ -739,7 +743,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile*& curDir, const
 
     // Open curDir
     if (!sub->open(curDir, dosSubdirname, O_READ)) {
-      SERIAL_ECHOLNPAIR(MSG_SD_OPEN_FILE_FAIL, dosSubdirname, ".");
+      SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, dosSubdirname, ".");
       return nullptr;
     }
 
@@ -779,7 +783,7 @@ void CardReader::cd(const char * relpath) {
   }
   else {
     SERIAL_ECHO_START();
-    SERIAL_ECHOLNPAIR(MSG_SD_CANT_ENTER_SUBDIR, relpath);
+    SERIAL_ECHOLNPAIR(STR_SD_CANT_ENTER_SUBDIR, relpath);
   }
 }
 
@@ -1113,9 +1117,9 @@ void CardReader::fileHasFinished() {
     if (!isMounted()) return;
     if (recovery.file.isOpen()) return;
     if (!recovery.file.open(&root, recovery.filename, read ? O_READ : O_CREAT | O_WRITE | O_TRUNC | O_SYNC))
-      SERIAL_ECHOLNPAIR(MSG_SD_OPEN_FILE_FAIL, recovery.filename, ".");
+      SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, recovery.filename, ".");
     else if (!read)
-      SERIAL_ECHOLNPAIR(MSG_SD_WRITE_TO_FILE, recovery.filename);
+      echo_write_to_file(recovery.filename);
   }
 
   // Removing the job recovery file currently requires closing

From cdcd45d651adb4b8997ea27d8815fa59b3efea14 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 26 Feb 2020 04:04:02 -0500
Subject: [PATCH 269/565] Set LCD status for EEPROM errors (#16977)

---
 Marlin/src/MarlinCore.cpp                 | 22 +++++++++++-----------
 Marlin/src/lcd/language/language_en.h     |  3 +++
 Marlin/src/lcd/ultralcd.cpp               |  6 ++++--
 Marlin/src/lcd/ultralcd.h                 |  4 ++--
 Marlin/src/module/configuration_store.cpp |  9 +++++++++
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index a07948e0c951..ab469d5818b3 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -995,32 +995,28 @@ void setup() {
     ui.show_bootscreen();
   #endif
 
+  ui.reset_status();        // Load welcome message early. (Retained if no errors exist.)
+
   #if ENABLED(SDSUPPORT)
-    card.mount(); // Mount the SD card before settings.first_load
+    card.mount();           // Mount the SD card before settings.first_load
   #endif
-
-  // Load data from EEPROM if available (or use defaults)
-  // This also updates variables in the planner, elsewhere
-  settings.first_load();
+                            // Load data from EEPROM if available (or use defaults)
+  settings.first_load();    // This also updates variables in the planner, elsewhere
 
   #if ENABLED(TOUCH_BUTTONS)
     touch.init();
   #endif
 
-  #if HAS_M206_COMMAND
-    // Initialize current position based on home_offset
+  #if HAS_M206_COMMAND      // Initialize current position based on home_offset
     current_position += home_offset;
   #endif
 
-  // Vital to init stepper/planner equivalent for current_position
-  sync_plan_position();
+  sync_plan_position();     // Vital to init stepper/planner equivalent for current_position
 
   thermalManager.init();    // Initialize temperature loop
 
   print_job_timer.init();   // Initial setup of print job timer
 
-  ui.reset_status();        // Print startup message after print statistics are loaded
-
   endstops.init();          // Init endstops and pullups
 
   stepper.init();           // Init stepper. This enables interrupts!
@@ -1175,6 +1171,10 @@ void setup() {
   #if ENABLED(PRUSA_MMU2)
     mmu2.init();
   #endif
+
+  #if HAS_SERVICE_INTERVALS
+    ui.reset_status(true);  // Show service messages or keep current status
+  #endif
 }
 
 /**
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 6f1adbbf8413..b5f508973df6 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -314,6 +314,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Load Settings");
   PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Restore Defaults");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initialize EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Err: EEPROM CRC");
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Err: EEPROM Index");
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Err: EEPROM Version");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Update");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Refresh");
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 8ad02acfbaf7..422c8b0b81c4 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1453,7 +1453,7 @@ void MarlinUI::update() {
   /**
    * Reset the status message
    */
-  void MarlinUI::reset_status() {
+  void MarlinUI::reset_status(const bool no_welcome) {
     PGM_P printing = GET_TEXT(MSG_PRINTING);
     PGM_P welcome  = GET_TEXT(WELCOME_MSG);
     #if SERVICE_INTERVAL_1 > 0
@@ -1485,8 +1485,10 @@ void MarlinUI::update() {
       else if (print_job_timer.needsService(3)) msg = service3;
     #endif
 
-    else
+    else if (!no_welcome)
       msg = welcome;
+    else
+      return;
 
     set_status_P(msg, -1);
   }
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index 8a328c4b9147..f614e2009b82 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -402,7 +402,7 @@ class MarlinUI {
     static void set_status(const char* const message, const bool persist=false);
     static void set_status_P(PGM_P const message, const int8_t level=0);
     static void status_printf_P(const uint8_t level, PGM_P const fmt, ...);
-    static void reset_status();
+    static void reset_status(const bool no_welcome=false);
 
   #else // No LCD
 
@@ -416,7 +416,7 @@ class MarlinUI {
     static inline void refresh() {}
     static inline void return_to_status() {}
     static inline void set_alert_status_P(PGM_P const) {}
-    static inline void reset_status() {}
+    static inline void reset_status(const bool=false) {}
     static inline void reset_alert_level() {}
     static constexpr bool has_status() { return false; }
 
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index efd9dadede11..906038638f87 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1397,6 +1397,9 @@ void MarlinSettings::postprocess() {
       }
       DEBUG_ECHO_START();
       DEBUG_ECHOLNPAIR("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
+      #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
+        ui.set_status_P(GET_TEXT(MSG_ERR_EEPROM_VERSION));
+      #endif
       eeprom_error = true;
     }
     else {
@@ -2205,11 +2208,17 @@ void MarlinSettings::postprocess() {
       if (eeprom_error) {
         DEBUG_ECHO_START();
         DEBUG_ECHOLNPAIR("Index: ", int(eeprom_index - (EEPROM_OFFSET)), " Size: ", datasize());
+        #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
+          ui.set_status_P(GET_TEXT(MSG_ERR_EEPROM_INDEX));
+        #endif
       }
       else if (working_crc != stored_crc) {
         eeprom_error = true;
         DEBUG_ERROR_START();
         DEBUG_ECHOLNPAIR("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
+        #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
+          ui.set_status_P(GET_TEXT(MSG_ERR_EEPROM_CRC));
+        #endif
       }
       else if (!validating) {
         DEBUG_ECHO_START();

From 5ebba4b19fbfc4126e092cc382d0f878e3234f77 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 04:11:03 -0600
Subject: [PATCH 270/565] More serial strings

---
 Marlin/src/feature/pause.cpp                                | 6 +++---
 .../ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp    | 4 ++--
 .../lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp | 2 +-
 .../lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp | 2 +-
 .../lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp   | 2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp                  | 2 +-
 Marlin/src/module/endstops.cpp                              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index cfda05612ba5..95b5cc953f86 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -175,7 +175,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
     #if HAS_LCD_MENU
       if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_INSERT, mode);
     #endif
-    SERIAL_ECHO_MSG(_PMSG(MSG_FILAMENT_CHANGE_INSERT));
+    SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_INSERT));
 
     #if HAS_BUZZER
       filament_change_beep(max_beep_count, true);
@@ -480,7 +480,7 @@ void show_continue_prompt(const bool is_reload) {
     lcd_pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
   #endif
   SERIAL_ECHO_START();
-  serialprintPGM(is_reload ? PSTR(_PMSG(MSG_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(MSG_FILAMENT_CHANGE_WAIT) "\n"));
+  serialprintPGM(is_reload ? PSTR(_PMSG(STR_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(STR_FILAMENT_CHANGE_WAIT) "\n"));
 }
 
 void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
@@ -530,7 +530,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       #if HAS_LCD_MENU
         lcd_pause_show_message(PAUSE_MESSAGE_HEAT);
       #endif
-      SERIAL_ECHO_MSG(_PMSG(MSG_FILAMENT_CHANGE_HEAT));
+      SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_HEAT));
 
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("HeaterTimeout"), PSTR("Reheat"));
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index 862b2cd536cc..103dcc036481 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -74,7 +74,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
           1
         #endif
       )
-      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
+      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
       .enabled(
         #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
           1
@@ -142,7 +142,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
           1
         #endif
       )
-      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
+      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
       .tag(12).button( BTN_POS(3,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index 41ced01cfec3..0c53dca61b4e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -62,7 +62,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
           1
         #endif
       )
-      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
+      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
 
 
       .tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
index 406a01626027..ae224e9c1135 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
@@ -41,7 +41,7 @@ void NozzleOffsetScreen::onRedraw(draw_mode_t what) {
   widgets_t w(what);
   w.precision(2).units(GET_TEXT_F(MSG_UNITS_MM));
 
-  w.heading(                          GET_TEXT_F(STR_OFFSETS_MENU));
+  w.heading(                          GET_TEXT_F(MSG_OFFSETS_MENU));
   w.color(Theme::x_axis).adjuster(2,  GET_TEXT_F(MSG_AXIS_X), ExtUI::getNozzleOffset_mm(X, E1));
   w.color(Theme::y_axis).adjuster(4,  GET_TEXT_F(MSG_AXIS_Y), ExtUI::getNozzleOffset_mm(Y, E1));
   w.color(Theme::z_axis).adjuster(6,  GET_TEXT_F(MSG_AXIS_Z), ExtUI::getNozzleOffset_mm(Z, E1));
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
index 777c447cd412..d9910ffa0420 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
@@ -74,7 +74,7 @@ void NudgeNozzleScreen::onRedraw(draw_mode_t what) {
 
       #if HOTENDS > 1
         format_position(str, getNozzleOffset_mm(X, E1), getNozzleOffset_mm(Y, E1), getNozzleOffset_mm(Z, E1));
-        w.text_field(0, GET_TEXT_F(STR_OFFSETS_MENU), str);
+        w.text_field(0, GET_TEXT_F(MSG_OFFSETS_MENU), str);
       #endif
     }
   #endif
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 809c719ff9ae..d2285e083560 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -327,7 +327,7 @@ void menu_configuration() {
     #endif
 
     #if HAS_HOTEND_OFFSET
-      SUBMENU(STR_OFFSETS_MENU, menu_tool_offsets);
+      SUBMENU(MSG_OFFSETS_MENU, menu_tool_offsets);
     #endif
 
     #if ENABLED(DUAL_X_CARRIAGE)
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 018f471c3412..58de4a8d05f9 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -424,7 +424,7 @@ void _O2 Endstops::report_states() {
     bltouch._set_SW_mode();
   #endif
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
-  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
+  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(STR_##S))
   #if HAS_X_MIN
     ES_REPORT(X_MIN);
   #endif

From 70af080813f9f0ff387b2ed60ab65c18e6a89cfc Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 26 Feb 2020 23:12:53 +1300
Subject: [PATCH 271/565] Add LPC1768 Serial ports for pinsDebug (#16980)

---
 Marlin/src/pins/pinsDebug.h | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 2006bb8bc34b..f247c7cacf7a 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -45,7 +45,7 @@
 #line 46
 
 // manually add pins that have names that are macros which don't play well with these macros
-#if (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM))
+#if (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM) || defined(TARGET_LPC1768))
   #if SERIAL_PORT == 0
     static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
     static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
@@ -116,6 +116,9 @@ const PinInfo pin_array[] PROGMEM = {
     #elif AVR_ATmega1284_FAMILY
       { RXD_NAME_0, 8, true },
       { TXD_NAME_0, 9, true },
+    #elif defined(TARGET_LPC1768)
+      { RXD_NAME_0, 3, true },
+      { TXD_NAME_0, 2, true },
     #endif
   #elif SERIAL_PORT == 1
     #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
@@ -124,16 +127,25 @@ const PinInfo pin_array[] PROGMEM = {
     #elif AVR_ATmega1284_FAMILY
       { RXD_NAME_1, 10, true },
       { TXD_NAME_1, 11, true },
+    #elif defined(TARGET_LPC1768)
+      { RXD_NAME_1, 16, true },
+      { TXD_NAME_1, 15, true },
     #endif
   #elif SERIAL_PORT == 2
     #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
       { RXD_NAME_2, 17, true },
       { TXD_NAME_2, 16, true },
+    #elif defined(TARGET_LPC1768)
+      { RXD_NAME_2, 11, true },
+      { TXD_NAME_2, 10, true },
     #endif
   #elif SERIAL_PORT == 3
     #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
       { RXD_NAME_3, 15, true },
       { TXD_NAME_3, 14, true },
+    #elif defined(TARGET_LPC1768)
+      { RXD_NAME_3, 1, true },
+      { TXD_NAME_3, 0, true },
     #endif
   #endif
 
@@ -145,6 +157,9 @@ const PinInfo pin_array[] PROGMEM = {
       #elif AVR_ATmega1284_FAMILY
         { RXD_NAME_0, 8, true },
         { TXD_NAME_0, 9, true },
+      #elif defined(TARGET_LPC1768)
+        { RXD_NAME_0, 3, true },
+        { TXD_NAME_0, 2, true },
       #endif
     #elif SERIAL_PORT_2 == 1
       #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
@@ -153,16 +168,25 @@ const PinInfo pin_array[] PROGMEM = {
       #elif AVR_ATmega1284_FAMILY
         { RXD_NAME_1, 10, true },
         { TXD_NAME_1, 11, true },
+      #elif defined(TARGET_LPC1768)
+        { RXD_NAME_1, 16, true },
+        { TXD_NAME_1, 15, true },
       #endif
     #elif SERIAL_PORT_2 == 2
       #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
         { RXD_NAME_2, 17, true },
         { TXD_NAME_2, 16, true },
+      #elif defined(TARGET_LPC1768)
+        { RXD_NAME_2, 11, true },
+        { TXD_NAME_2, 10, true },
       #endif
     #elif SERIAL_PORT_2 == 3
       #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
         { RXD_NAME_3, 15, true },
         { TXD_NAME_3, 14, true },
+      #elif defined(TARGET_LPC1768)
+        { RXD_NAME_3, 1, true },
+        { TXD_NAME_3, 0, true },
       #endif
     #endif
   #endif

From 28008aced08ed187643a19a1931f1b6a060ae3bb Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 26 Feb 2020 05:18:34 -0500
Subject: [PATCH 272/565] Correct SKR expansion port pins (#16974)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h  | 152 +++++++++----------
 Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h  |  59 +++----
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h |  78 +++++-----
 3 files changed, 145 insertions(+), 144 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index d7af23242723..bd0ad468de0b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -187,32 +187,32 @@
 
 /**
  *               _____                                              _____
- *           NC | · · | GND                                     5V | · · | GND
- *        RESET | · · | 1.31 (SD_DETECT)             (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
- *  (MOSI) 0.18 | · · | 3.25 (BTN_EN2)               (LCD_D5) 1.21 | · · | 1.20 (LCD_D4)
- * (SD_SS) 0.16 | · · | 3.26 (BTN_EN1)               (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
- *   (SCK) 0.15 | · · | 0.17 (MISO)                 (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
+ *           NC | 1 2 | GND                                     5V | 1 2 | GND
+ *        RESET | 3 4 | 1.31 (SD_DETECT)             (LCD_D7) 1.23 | 3 4 | 1.22 (LCD_D6)
+ *  (MOSI) 0.18 | 5 6   3.25 (BTN_EN2)               (LCD_D5) 1.21 | 5 6   1.20 (LCD_D4)
+ * (SD_SS) 0.16 | 7 8 | 3.26 (BTN_EN1)               (LCD_RS) 1.19 | 7 8 | 1.18 (LCD_EN)
+ *   (SCK) 0.15 | 9 10| 0.17 (MISO)                 (BTN_ENC) 0.28 | 9 10| 1.30 (BEEPER)
  *               -----                                              -----
  *               EXP2                                               EXP1
  */
 
-#define EXP1_1_PIN          P1_30
-#define EXP1_2_PIN          P1_18
-#define EXP1_3_PIN          P1_20
-#define EXP1_4_PIN          P1_22
-#define EXP1_6_PIN          P0_28
-#define EXP1_7_PIN          P1_19
-#define EXP1_8_PIN          P1_21
-#define EXP1_9_PIN          P1_23
-
-#define EXP2_1_PIN          P0_17
-#define EXP2_2_PIN          P3_26
-#define EXP2_3_PIN          P3_25
-#define EXP2_4_PIN          P1_31
-#define EXP2_6_PIN          P0_15
-#define EXP2_7_PIN          P0_16
-#define EXP2_8_PIN          P0_18
-#define EXP2_9_PIN          -1
+#define EXPA1_03_PIN        P1_23
+#define EXPA1_04_PIN        P1_22
+#define EXPA1_05_PIN        P1_21
+#define EXPA1_06_PIN        P1_20
+#define EXPA1_07_PIN        P1_19
+#define EXPA1_08_PIN        P1_18
+#define EXPA1_09_PIN        P0_28
+#define EXPA1_10_PIN        P1_30
+
+#define EXPA2_03_PIN        -1
+#define EXPA2_04_PIN        P1_31
+#define EXPA2_05_PIN        P0_18
+#define EXPA2_06_PIN        P3_25
+#define EXPA2_07_PIN        P0_16
+#define EXPA2_08_PIN        P3_26
+#define EXPA2_09_PIN        P0_15
+#define EXPA2_10_PIN        P0_17
 
 #if HAS_SPI_LCD
 
@@ -232,114 +232,114 @@
     *
     *                  BEFORE                          AFTER
     *                  _____                           _____
-    *           GND 1 | · · |  2 5V              5V 1 | · · |  2 GND
-    *            CS 3 | · · |  4 BTN_EN2         CS 3 | · · |  4 BTN_EN2
-    *           SID 5 | · · |  6 BTN_EN1        SID 5 | · · |  6 BTN_EN1
-    *          open 7 | · · |  8 BTN_ENC        CLK 7 | · · |  8 BTN_ENC
-    *           CLK 9 | · · | 10 Beeper        open 9 | · · | 10 Beeper
+    *           GND 1 | 1 2 |  2 5V              5V 1 | 1 2 |  2 GND
+    *            CS 3 | 3 4 |  4 BTN_EN2         CS 3 | 3 4 |  4 BTN_EN2
+    *           SID 5 | 5 6    6 BTN_EN1        SID 5 | 5 6    6 BTN_EN1
+    *          open 7 | 7 8 |  8 BTN_ENC        CLK 7 | 7 8 |  8 BTN_ENC
+    *           CLK 9 | 9 10| 10 Beeper        open 9 | 9 10| 10 Beeper
     *                  -----                           -----
     *                   LCD                             LCD
     */
 
-    #define LCD_PINS_RS    EXP1_9_PIN
+    #define LCD_PINS_RS    EXPA1_03_PIN
 
-    #define BTN_EN1        EXP1_3_PIN
-    #define BTN_EN2        EXP1_4_PIN
-    #define BTN_ENC        EXP1_2_PIN
+    #define BTN_EN1        EXPA1_06_PIN
+    #define BTN_EN2        EXPA1_04_PIN
+    #define BTN_ENC        EXPA1_08_PIN
 
-    #define LCD_PINS_ENABLE EXP1_8_PIN
-    #define LCD_PINS_D4    EXP1_7_PIN
+    #define LCD_PINS_ENABLE EXPA1_05_PIN
+    #define LCD_PINS_D4    EXPA1_07_PIN
 
   #elif ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    EXP1_4_PIN
+    #define LCD_PINS_RS    EXPA1_04_PIN
 
-    #define BTN_EN1        EXP1_2_PIN
-    #define BTN_EN2        EXP1_3_PIN
-    #define BTN_ENC        EXP1_6_PIN   // (58) open-drain
+    #define BTN_EN1        EXPA1_08_PIN
+    #define BTN_EN2        EXPA1_06_PIN
+    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXP1_9_PIN
-    #define LCD_PINS_D4    EXP1_8_PIN
+    #define LCD_PINS_ENABLE EXPA1_03_PIN
+    #define LCD_PINS_D4    EXPA1_05_PIN
 
   #else // !CR10_STOCKDISPLAY
 
-    #define LCD_PINS_RS    EXP1_7_PIN
+    #define LCD_PINS_RS    EXPA1_07_PIN
 
-    #define BTN_EN1        EXP2_2_PIN   // (31) J3-2 & AUX-4
-    #define BTN_EN2        EXP2_3_PIN   // (33) J3-4 & AUX-4
-    #define BTN_ENC        EXP1_6_PIN   // (58) open-drain
+    #define BTN_EN1        EXPA2_08_PIN   // (31) J3-2 & AUX-4
+    #define BTN_EN2        EXPA2_06_PIN   // (33) J3-4 & AUX-4
+    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXP1_2_PIN
-    #define LCD_PINS_D4    EXP1_3_PIN
+    #define LCD_PINS_ENABLE EXPA1_08_PIN
+    #define LCD_PINS_D4    EXPA1_06_PIN
 
-    #define LCD_SDSS       EXP2_7_PIN   // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN  EXP2_4_PIN   // (49) (NOT 5V tolerant)
+    #define LCD_SDSS       EXPA2_07_PIN   // (16) J3-7 & AUX-4
+    #define SD_DETECT_PIN  EXPA2_04_PIN   // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    EXP1_2_PIN
-      #define DOGLCD_A0    EXP1_7_PIN
-      #define DOGLCD_SCK   EXP2_6_PIN
-      #define DOGLCD_MOSI  EXP2_8_PIN
+      #define DOGLCD_CS    EXPA1_08_PIN
+      #define DOGLCD_A0    EXPA1_07_PIN
+      #define DOGLCD_SCK   EXPA2_09_PIN
+      #define DOGLCD_MOSI  EXPA2_05_PIN
 
       #define LCD_BACKLIGHT_PIN -1
 
       #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN EXP1_3_PIN   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN EXPA1_06_PIN   // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN EXP1_8_PIN
+          #define RGB_LED_R_PIN EXPA1_05_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN EXP1_4_PIN
+          #define RGB_LED_G_PIN EXPA1_04_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN EXP1_9_PIN
+          #define RGB_LED_B_PIN EXPA1_03_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    EXP1_8_PIN
+        #define NEOPIXEL_PIN    EXPA1_05_PIN
       #endif
 
     #else // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_CS    EXP1_8_PIN
-        #define DOGLCD_A0    EXP1_4_PIN
-        #define DOGLCD_SCK   EXP2_6_PIN
-        #define DOGLCD_MOSI  EXP2_8_PIN
+        #define DOGLCD_CS    EXPA1_05_PIN
+        #define DOGLCD_A0    EXPA1_04_PIN
+        #define DOGLCD_SCK   EXPA2_09_PIN
+        #define DOGLCD_MOSI  EXPA2_05_PIN
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 
         /**
          * Creality Ender-2 display pinout
          *                   _____
-         *               5V | · · | GND
-         *     (MOSI) P1_23 | · · | P1_22 (LCD_CS)
-         *   (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
-         *      RESET P1_19 | · · | P1_18 (BTN_EN1)
-         *  (BTN_ENC) P0_28 | · · | P1_30 (SCK)
+         *               5V | 1 2 | GND
+         *     (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
+         *   (LCD_A0) P1_21 | 5 6   P1_20 (BTN_EN2)
+         *      RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
+         *  (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
          *                   -----
          *                    EXP1
          */
 
-        #define BTN_EN1      EXP1_2_PIN
-        #define BTN_EN2      EXP1_3_PIN
-        #define BTN_ENC      EXP1_6_PIN
-        #define DOGLCD_CS    EXP1_4_PIN
-        #define DOGLCD_A0    EXP1_8_PIN
-        #define DOGLCD_SCK   EXP1_1_PIN
-        #define DOGLCD_MOSI  EXP1_9_PIN
+        #define BTN_EN1      EXPA1_08_PIN
+        #define BTN_EN2      EXPA1_06_PIN
+        #define BTN_ENC      EXPA1_09_PIN
+        #define DOGLCD_CS    EXPA1_04_PIN
+        #define DOGLCD_A0    EXPA1_05_PIN
+        #define DOGLCD_SCK   EXPA1_10_PIN
+        #define DOGLCD_MOSI  EXPA1_03_PIN
         #define FORCE_SOFT_SPI
         #define LCD_BACKLIGHT_PIN -1
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 EXP1_8_PIN
-        #define LCD_PINS_D6 EXP1_4_PIN
-        #define LCD_PINS_D7 EXP1_9_PIN
+        #define LCD_PINS_D5 EXPA1_05_PIN
+        #define LCD_PINS_D6 EXPA1_04_PIN
+        #define LCD_PINS_D7 EXPA1_03_PIN
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -357,7 +357,7 @@
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           EXP2_7_PIN
+  #define SS_PIN           EXPA2_07_PIN
 #endif
 
 /**
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
index 33445f7d0f2f..f5c35bbdcdd6 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
@@ -163,53 +163,54 @@
 
 /**
  *                 _____
- *             5V | · · | GND
- *  (LCD_EN) PB7  | · · | PB8  (LCD_RS)
- *  (LCD_D4) PB9  | · · | PA10 (BTN_EN2)
- *          RESET | · · | PA9  (BTN_EN1)
- * (BTN_ENC) PB6  | · · | PA15 (BEEPER)
+ *             5V | 1 2 | GND
+ *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
+ *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
+ *          RESET | 7 8 | PA9  (BTN_EN1)
+ * (BTN_ENC) PB6  | 9 10| PA15 (BEEPER)
  *                 -----
  *                 EXP1
  */
-#define EXP1_1_PIN         PA15
-#define EXP1_2_PIN         PA9
-#define EXP1_3_PIN         PA10
-#define EXP1_4_PIN         PB8
-#define EXP1_6_PIN         PB6
-#define EXP1_7_PIN         -1
-#define EXP1_8_PIN         PB9
-#define EXP1_9_PIN         PB7
+
+#define EXPA1_03_PIN       PB7
+#define EXPA1_04_PIN       PB8
+#define EXPA1_05_PIN       PB9
+#define EXPA1_06_PIN       PA10
+#define EXPA1_07_PIN       -1
+#define EXPA1_08_PIN       PA9
+#define EXPA1_09_PIN       PB6
+#define EXPA1_10_PIN       PA15
 
 #if HAS_SPI_LCD
-  #define BTN_ENC          EXP1_6_PIN
-  #define BTN_EN1          EXP1_2_PIN
-  #define BTN_EN2          EXP1_3_PIN
+  #define BTN_ENC          EXPA1_09_PIN
+  #define BTN_EN1          EXPA1_08_PIN
+  #define BTN_EN2          EXPA1_06_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN     EXP1_1_PIN
+    #define BEEPER_PIN     EXPA1_10_PIN
 
-    #define LCD_PINS_RS    EXP1_4_PIN
-    #define LCD_PINS_ENABLE EXP1_9_PIN
-    #define LCD_PINS_D4    EXP1_8_PIN
+    #define LCD_PINS_RS    EXPA1_04_PIN
+    #define LCD_PINS_ENABLE EXPA1_03_PIN
+    #define LCD_PINS_D4    EXPA1_05_PIN
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
      *                   _____
-     *               5V | · · | GND
-     *      (MOSI) PB7  | · · | PB8  (LCD_RS)
-     *    (LCD_A0) PB9  | · · | PA10 (BTN_EN2)
-     *            RESET | · · | PA9  (BTN_EN1)
-     *   (BTN_ENC) PB6  | · · | PA15 (SCK)
+     *               5V | 1 2 | GND
+     *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
+     *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
+     *            RESET | 7 8 | PA9  (BTN_EN1)
+     *   (BTN_ENC) PB6  | 9 10| PA15 (SCK)
      *                   -----
      *                    EXP1
      */
 
-    #define DOGLCD_CS    EXP1_4_PIN
-    #define DOGLCD_A0    EXP1_8_PIN
-    #define DOGLCD_SCK   EXP1_1_PIN
-    #define DOGLCD_MOSI  EXP1_9_PIN
+    #define DOGLCD_CS    EXPA1_04_PIN
+    #define DOGLCD_A0    EXPA1_05_PIN
+    #define DOGLCD_SCK   EXPA1_10_PIN
+    #define DOGLCD_MOSI  EXPA1_03_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN -1
 
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
index 9785c7bd410f..77a412ad613b 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
@@ -103,70 +103,70 @@
 
 /**
  *                 _____
- *             5V | · · | GND
- *  (LCD_EN) PB7  | · · | PB8  (LCD_RS)
- *  (LCD_D4) PB9  | · · | PA10 (BTN_EN2)
- *          RESET | · · | PA9  (BTN_EN1)
- * (BTN_ENC) PB6  | · · | PB5  (BEEPER)
+ *             5V | 1 2 | GND
+ *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
+ *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
+ *          RESET | 7 8 | PA9  (BTN_EN1)
+ * (BTN_ENC) PB6  | 9 10| PB5  (BEEPER)
  *                 -----
  *                 EXP1
  */
 
-#define EXP1_1_PIN         PB5
-#define EXP1_2_PIN         PA9
-#define EXP1_3_PIN         PA10
-#define EXP1_4_PIN         PB8
-#define EXP1_6_PIN         PB6
-#define EXP1_7_PIN         -1
-#define EXP1_8_PIN         PB9
-#define EXP1_9_PIN         PB7
+#define EXPA1_03_PIN       PB7
+#define EXPA1_04_PIN       PB8
+#define EXPA1_05_PIN       PB9
+#define EXPA1_06_PIN       PA10
+#define EXPA1_07_PIN       -1
+#define EXPA1_08_PIN       PA9
+#define EXPA1_09_PIN       PB6
+#define EXPA1_10_PIN       PB5
 
 #if HAS_SPI_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN     EXP1_1_PIN
+    #define BEEPER_PIN     EXPA1_10_PIN
 
-    #define BTN_EN1        EXP1_2_PIN
-    #define BTN_EN2        EXP1_3_PIN
-    #define BTN_ENC        EXP1_6_PIN
+    #define BTN_EN1        EXPA1_08_PIN
+    #define BTN_EN2        EXPA1_06_PIN
+    #define BTN_ENC        EXPA1_09_PIN
 
-    #define LCD_PINS_RS    EXP1_4_PIN
-    #define LCD_PINS_ENABLE EXP1_9_PIN
-    #define LCD_PINS_D4    EXP1_8_PIN
+    #define LCD_PINS_RS    EXPA1_04_PIN
+    #define LCD_PINS_ENABLE EXPA1_03_PIN
+    #define LCD_PINS_D4    EXPA1_05_PIN
 
   #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
 
-    #define LCD_PINS_RS    EXP1_8_PIN
-    #define LCD_PINS_ENABLE EXP1_6_PIN
-    #define LCD_PINS_D4    EXP1_4_PIN
-    #define LCD_PINS_D5    EXP1_3_PIN
-    #define LCD_PINS_D6    EXP1_2_PIN
-    #define LCD_PINS_D7    EXP1_1_PIN
+    #define LCD_PINS_RS    EXPA1_05_PIN
+    #define LCD_PINS_ENABLE EXPA1_09_PIN
+    #define LCD_PINS_D4    EXPA1_04_PIN
+    #define LCD_PINS_D5    EXPA1_06_PIN
+    #define LCD_PINS_D6    EXPA1_08_PIN
+    #define LCD_PINS_D7    EXPA1_10_PIN
     #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
      *                   _____
-     *               5V | · · | GND
-     *      (MOSI) PB7  | · · | PB8  (LCD_RS)
-     *    (LCD_A0) PB9  | · · | PA10 (BTN_EN2)
-     *            RESET | · · | PA9  (BTN_EN1)
-     *   (BTN_ENC) PB6  | · · | PB5  (SCK)
+     *               5V | 1 2 | GND
+     *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
+     *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
+     *            RESET | 7 8 | PA9  (BTN_EN1)
+     *   (BTN_ENC) PB6  | 9 10| PB5  (SCK)
      *                   -----
      *                    EXP1
      */
-    #define BTN_EN1        EXP1_2_PIN
-    #define BTN_EN2        EXP1_3_PIN
-    #define BTN_ENC        EXP1_6_PIN
-
-    #define DOGLCD_CS      EXP1_4_PIN
-    #define DOGLCD_A0      EXP1_8_PIN
-    #define DOGLCD_SCK     EXP1_1_PIN
-    #define DOGLCD_MOSI    EXP1_9_PIN
+    #define BTN_EN1        EXPA1_08_PIN
+    #define BTN_EN2        EXPA1_06_PIN
+    #define BTN_ENC        EXPA1_09_PIN
+
+    #define DOGLCD_CS      EXPA1_04_PIN
+    #define DOGLCD_A0      EXPA1_05_PIN
+    #define DOGLCD_SCK     EXPA1_10_PIN
+    #define DOGLCD_MOSI    EXPA1_03_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN -1
 

From b5c2190b38b062b9ec09d404766a314648fbd8ad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 04:32:30 -0600
Subject: [PATCH 273/565] String optimize followup

---
 Marlin/src/sd/cardreader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 2bde9501f7d4..b2b0d90e9671 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -521,7 +521,7 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
     openFailed(fname);
 }
 
-inline void echo_write_to_file(char * const fname) {
+inline void echo_write_to_file(const char * const fname) {
   SERIAL_ECHOLNPAIR(STR_SD_WRITE_TO_FILE, fname);
 }
 

From e76f2ed4cb18ab3527c3334f5997878dc84206f8 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 26 Feb 2020 23:34:21 +1300
Subject: [PATCH 274/565] Fix Trinamic pulse rate auto-assignment (#16966)

---
 Marlin/src/inc/Conditionals_post.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6785ea01e81c..31497c9e8a61 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -645,7 +645,7 @@
     #define MINIMUM_STEPPER_PULSE 2
   #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
     #define MINIMUM_STEPPER_PULSE 1
-  #elif TRINAMICS
+  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
     #define MINIMUM_STEPPER_PULSE 0
   #elif HAS_DRIVER(LV8729)
     #define MINIMUM_STEPPER_PULSE 0
@@ -665,7 +665,7 @@
     #define MAXIMUM_STEPPER_RATE 500000
   #elif HAS_DRIVER(LV8729)
     #define MAXIMUM_STEPPER_RATE 1000000
-  #elif TRINAMICS
+  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
     #define MAXIMUM_STEPPER_RATE 5000000
   #else
     #define MAXIMUM_STEPPER_RATE 250000

From cf597e2bb1de6acab4753dde82221f5cfd8eb1c1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 05:33:48 -0600
Subject: [PATCH 275/565] Allow weird probe values in G33

---
 Marlin/src/gcode/calibrate/G33.cpp |  2 +-
 Marlin/src/module/probe.cpp        | 10 +++++-----
 Marlin/src/module/probe.h          |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index acf668f94018..ac2cdf7d4da8 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -190,7 +190,7 @@ static float std_dev_points(float z_pt[NPP + 1], const bool _0p_cal, const bool
  */
 static float calibration_probe(const xy_pos_t &xy, const bool stow) {
   #if HAS_BED_PROBE
-    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true);
+    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, false);
   #else
     UNUSED(stow);
     return lcd_probe_pt(xy);
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index e22ee22d5746..858dcae747ac 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -559,7 +559,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
  *
  * @return The Z position of the bed at the current XY or NAN on error.
  */
-float Probe::run_z_probe() {
+float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
   if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::run_z_probe", current_position);
 
@@ -572,7 +572,7 @@ float Probe::run_z_probe() {
 
     // Do a first probe at the fast speed
     if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))         // No probe trigger?
-      || current_position.z > -offset.z + _MAX(Z_CLEARANCE_BETWEEN_PROBES, 4) / 2  // Probe triggered too high?
+      || (sanity_check && current_position.z > -offset.z + _MAX(Z_CLEARANCE_BETWEEN_PROBES, 4) / 2)  // Probe triggered too high?
     ) {
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOLNPGM("FAST Probe fail!");
@@ -617,7 +617,7 @@ float Probe::run_z_probe() {
     {
       // Probe downward slowly to find the bed
       if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))      // No probe trigger?
-        || current_position.z > -offset.z + _MAX(Z_CLEARANCE_MULTI_PROBE, 4) / 2  // Probe triggered too high?
+        || (sanity_check && current_position.z > -offset.z + _MAX(Z_CLEARANCE_MULTI_PROBE, 4) / 2)  // Probe triggered too high?
       ) {
         if (DEBUGGING(LEVELING)) {
           DEBUG_ECHOLNPGM("SLOW Probe fail!");
@@ -709,7 +709,7 @@ float Probe::run_z_probe() {
  *   - Raise to the BETWEEN height
  * - Return the probed Z position
  */
-float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
+float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/, const bool sanity_check/*=true*/) {
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOLNPAIR(
       ">>> Probe::probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
@@ -751,7 +751,7 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
   do_blocking_move_to(npos);
 
   float measured_z = NAN;
-  if (!deploy()) measured_z = run_z_probe() + offset.z;
+  if (!deploy()) measured_z = run_z_probe(sanity_check) + offset.z;
   if (!isnan(measured_z)) {
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
     if (big_raise || raise_after == PROBE_PT_RAISE)
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index b70c01364ab3..6f17090e69c0 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -48,8 +48,8 @@ class Probe {
     #ifdef Z_AFTER_PROBING
       static void move_z_after_probing();
     #endif
-    static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true);
-    static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true) {
+    static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true);
+    static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true) {
       return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
     }
     #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
@@ -164,7 +164,7 @@ class Probe {
 private:
   static bool probe_down_to_z(const float z, const feedRate_t fr_mm_s);
   static void do_z_raise(const float z_raise);
-  static float run_z_probe();
+  static float run_z_probe(const bool sanity_check=true);
 };
 
 extern Probe probe;

From ec1b86d9cb3a08f77beb2aaa8363c7bff0a9e175 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 05:38:25 -0600
Subject: [PATCH 276/565] Serial strings in macros

---
 Marlin/src/lcd/menu/menu_tmc.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index 4d971e4e3ab4..0350d788eb15 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -32,7 +32,7 @@
 #include "../../module/stepper/indirection.h"
 #include "../../feature/tmc_util.h"
 
-#define TMC_EDIT_STORED_I_RMS(ST,MSG) EDIT_ITEM_P(uint16_4, PSTR(MSG), &stepper##ST.val_mA, 100, 3000, []{ stepper##ST.refresh_stepper_current(); })
+#define TMC_EDIT_STORED_I_RMS(ST,STR) EDIT_ITEM_P(uint16_4, PSTR(STR), &stepper##ST.val_mA, 100, 3000, []{ stepper##ST.refresh_stepper_current(); })
 
 void menu_tmc_current() {
   START_MENU();
@@ -90,7 +90,7 @@ void menu_tmc_current() {
 
 #if ENABLED(HYBRID_THRESHOLD)
 
-  #define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) EDIT_ITEM_P(uint8, PSTR(MSG), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
+  #define TMC_EDIT_STORED_HYBRID_THRS(ST, STR) EDIT_ITEM_P(uint8, PSTR(STR), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
 
   void menu_tmc_hybrid_thrs() {
     START_MENU();
@@ -150,7 +150,7 @@ void menu_tmc_current() {
 
 #if ENABLED(SENSORLESS_HOMING)
 
-  #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_P(int4, PSTR(MSG_##ST), &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, []{ stepper##ST.refresh_homing_thrs(); });
+  #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_P(int4, PSTR(STR_##ST), &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, []{ stepper##ST.refresh_homing_thrs(); });
 
   void menu_tmc_homing_thrs() {
     START_MENU();
@@ -174,7 +174,7 @@ void menu_tmc_current() {
 
 #if HAS_STEALTHCHOP
 
-  #define TMC_EDIT_STEP_MODE(ST, MSG) EDIT_ITEM_P(bool, PSTR(MSG), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
+  #define TMC_EDIT_STEP_MODE(ST, STR) EDIT_ITEM_P(bool, PSTR(STR), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
 
   void menu_tmc_step_mode() {
     START_MENU();

From daa32013b1798e8d7c8da79ef0de9b1d49fac036 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 26 Feb 2020 06:26:30 -0600
Subject: [PATCH 277/565] Sanity check for LPC serial pin conflict (#16981)

---
 Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp  |  6 +--
 Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h | 49 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
index a486078db1bf..1b80b211fb73 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
@@ -32,21 +32,21 @@
   }
 #endif
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 1)
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
   MarlinSerial MSerial1((LPC_UART_TypeDef *) LPC_UART1);
   extern "C" void UART1_IRQHandler() {
     MSerial1.IRQHandler();
   }
 #endif
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 2)
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
   MarlinSerial MSerial2(LPC_UART2);
   extern "C" void UART2_IRQHandler() {
     MSerial2.IRQHandler();
   }
 #endif
 
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 3)
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
   MarlinSerial MSerial3(LPC_UART3);
   extern "C" void UART3_IRQHandler() {
     MSerial3.IRQHandler();
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
index 8dffb5624cb1..a1fa34204013 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
@@ -76,3 +76,52 @@
 #if ENABLED(BAUD_RATE_GCODE)
   #error "BAUD_RATE_GCODE is not yet supported on LPC176x."
 #endif
+
+/**
+ * Flag any serial port conflicts
+ *
+ *   Port  |  TX   |  RX   |
+ *    ---  |  ---  |  ---  |
+ * Serial  | P0_02 | P0_03 |
+ * Serial1 | P0_15 | P0_16 |
+ * Serial2 | P0_10 | P0_11 |
+ * Serial3 | P0_00 | P0_01 |
+ */
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
+  #if  X_CS_PIN == P0_02 || TMC_SW_MISO == P0_02 || (E_STEPPERS && E_MUX1_PIN == P0_02) \
+    || Y_CS_PIN == P0_03 || TMC_SW_MOSI == P0_03 || (E_STEPPERS && E_MUX0_PIN == P0_03)
+    #error "Serial port assignment (0) conflicts with other pins!"
+  #endif
+#endif
+
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
+  #if TMC_SW_SCK == P0_15
+    #error "Serial port assignment (1) conflicts with other pins!"
+  #elif HAS_SPI_LCD
+    #if  BTN_EN2 == P0_15 || SCK_PIN == P0_15 || LCD_PINS_D4 == P0_15 || DOGLCD_SCK == P0_15 || LCD_RESET_PIN == P0_15 || LCD_PINS_RS == P0_15 || SHIFT_CLK == P0_15 \
+      || BTN_EN1 == P0_16 || LCD_SDSS == P0_16 || LCD_PINS_RS == P0_16 || MISO_PIN == P0_16 || DOGLCD_A0 == P0_16 || SS_PIN == P0_16 || LCD_SDSS == P0_16 || DOGLCD_CS == P0_16 || LCD_RESET_PIN == P0_16 || LCD_BACKLIGHT_PIN == P0_16
+      #error "Serial port assignment (1) conflicts with other pins!"
+    #endif
+  #endif
+#endif
+
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
+  #if  Y_MIN_PIN == P0_10 || Z_MIN_PROBE_PIN == P0_10 \
+    || X_ENABLE_PIN == P0_10 || Y_ENABLE_PIN == P0_10 || X2_ENABLE_PIN == P0_10 || Y2_ENABLE_PIN == P0_10 || Z2_ENABLE_PIN == P0_10 || Z3_ENABLE_PIN == P0_10 || Z4_ENABLE_PIN == P0_10 \
+    || X2_CS_PIN == P0_10 || Y2_CS_PIN == P0_10 || Z2_CS_PIN == P0_10 || Z3_CS_PIN == P0_10 || Z4_CS_PIN == P0_10 \
+    || X_DIR_PIN == P0_11 || Y_DIR_PIN == P0_11 || X2_DIR_PIN == P0_11 || Y2_DIR_PIN == P0_11 || Z2_DIR_PIN == P0_11 || Z3_DIR_PIN == P0_11 || Z4_DIR_PIN == P0_11 \
+    || X2_STEP_PIN == P0_11 || Y2_STEP_PIN == P0_11 || Z2_STEP_PIN == P0_11 || Z3_STEP_PIN == P0_11 || Z4_STEP_PIN == P0_11
+    #error "Serial port assignment (2) conflicts with other pins!"
+  #elif  (E_STEPPERS > 1 && (E1_ENABLE_PIN == P0_10 || E1_CS_PIN == P0_10)) || (E_STEPPERS > 0 && (E0_DIR_PIN == P0_11 || E0_STEP_PIN == P0_11))
+    #error "Serial port assignment (2) conflicts with other pins!"
+  #endif
+#endif
+
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
+  #if  X_MIN_PIN == P0_00 || Y_SERIAL_TX_PIN == P0_00 || Y_SERIAL_RX_PIN == P0_00 \
+    || X_MAX_PIN == P0_01 || X_SERIAL_TX_PIN == P0_01 || X_SERIAL_RX_PIN == P0_01
+    #error "Serial port assignment (2) conflicts with other pins!"
+  #elif E_STEPPERS > 1 && (E1_DIR_PIN == P0_00 || E1_STEP_PIN == P0_01)
+    #error "Serial port assignment (2) conflicts with other pins!"
+  #endif
+#endif

From 0a7e7a6fa59172f61d3d6ed94d9ccf055c85bf27 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 26 Feb 2020 06:26:54 -0600
Subject: [PATCH 278/565] Allow servo features in combination (#16960)

---
 Marlin/src/feature/bltouch.h              |  3 -
 Marlin/src/gcode/config/M281.cpp          |  6 ++
 Marlin/src/inc/Conditionals_LCD.h         |  4 ++
 Marlin/src/inc/Conditionals_post.h        | 10 ----
 Marlin/src/module/configuration_store.cpp |  4 +-
 Marlin/src/module/servo.h                 | 69 +++++++++++++++--------
 6 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/Marlin/src/feature/bltouch.h b/Marlin/src/feature/bltouch.h
index 58c5b9ad36bc..af75fb8b2972 100644
--- a/Marlin/src/feature/bltouch.h
+++ b/Marlin/src/feature/bltouch.h
@@ -105,7 +105,4 @@ class BLTouch {
   static void mode_conv_proc(const bool M5V);
 };
 
-// Deploy/stow angles for use by servo.cpp / servo.h
-#define BLTOUCH_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
-
 extern BLTouch bltouch;
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index 3a07807f3797..e925cd5b1215 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -30,6 +30,12 @@ void GcodeSuite::M281() {
   if (!parser.seenval('P')) return;
   const int servo_index = parser.value_int();
   if (WITHIN(servo_index, 0, NUM_SERVOS - 1)) {
+    #if ENABLED(BLTOUCH)
+      if (servo_index == Z_PROBE_SERVO_NR) {
+        SERIAL_ERROR_MSG("BLTouch angles can't be changed.");
+        return;
+      }
+    #endif
     bool angle_change = false;
     if (parser.seen('L')) {
       servo_angles[servo_index][0] = parser.value_int();
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7373e65d6702..9227f2c81a0e 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -502,6 +502,10 @@
  * Set a flag for a servo probe (or BLTouch)
  */
 #define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
+#define HAS_SERVO_ANGLES (HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE))
+#if !HAS_SERVO_ANGLES
+  #undef EDITABLE_SERVO_ANGLES
+#endif
 
 /**
  * Set flags for enabled probes
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 31497c9e8a61..159aefa5d5fd 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1546,16 +1546,6 @@
 #define HAS_SERVO_3 (PIN_EXISTS(SERVO3) && NUM_SERVOS > 3)
 #define HAS_SERVOS  (NUM_SERVOS > 0)
 
-#if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
-  #define Z_PROBE_SERVO_NR -1
-#endif
-
-#define HAS_SERVO_ANGLES (EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE) || (HAS_Z_SERVO_PROBE && defined(Z_PROBE_SERVO_NR)))
-
-#if !HAS_SERVO_ANGLES || ENABLED(BLTOUCH)
-  #undef EDITABLE_SERVO_ANGLES
-#endif
-
 // Sensors
 #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
 
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 906038638f87..3fe38d4ade8f 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2541,7 +2541,7 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(EDITABLE_SERVO_ANGLES)
-    COPY(servo_angles, base_servo_angles);
+    COPY(servo_angles, base_servo_angles);  // When not editable only one copy of servo angles exists
   #endif
 
   //
@@ -3091,7 +3091,7 @@ void MarlinSettings::reset() {
             #endif
           #elif ENABLED(SWITCHING_NOZZLE)
             case SWITCHING_NOZZLE_SERVO_NR:
-          #elif (ENABLED(BLTOUCH) && defined(BLTOUCH_ANGLES)) || (defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR))
+          #elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
             case Z_PROBE_SERVO_NR:
           #endif
             CONFIG_ECHO_START();
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 5f9291e97d20..335ce698e012 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -31,46 +31,65 @@
 #if HAS_SERVO_ANGLES
 
   #if ENABLED(SWITCHING_EXTRUDER)
-    #ifndef SWITCHING_EXTRUDER_E23_SERVO_NR
-      #define SWITCHING_EXTRUDER_E23_SERVO_NR -1
-    #endif
+    // Switching extruder can have 2 or 4 angles
     #if EXTRUDERS > 3
       #define REQ_ANGLES 4
     #else
       #define REQ_ANGLES 2
     #endif
-    #define SADATA    SWITCHING_EXTRUDER_SERVO_ANGLES
-    #define ASRC(N,E) (SWITCHING_EXTRUDER_SERVO_NR == N ? asrc[E] : SWITCHING_EXTRUDER_E23_SERVO_NR == N ? asrc[E+2] : 0)
-  #elif ENABLED(SWITCHING_NOZZLE)
-    #define SADATA    SWITCHING_NOZZLE_SERVO_ANGLES
-    #define ASRC(N,E) (SWITCHING_NOZZLE_SERVO_NR == N ? asrc[E] : 0)
-  #elif defined(Z_PROBE_SERVO_NR)
-    #define ASRC(N,E) (Z_PROBE_SERVO_NR == N ? asrc[E] : 0)
+    constexpr uint16_t sase[] = SWITCHING_EXTRUDER_SERVO_ANGLES;
+    static_assert(COUNT(sase) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
+  #else
+    constexpr uint16_t sase[4] = { 0 };
+  #endif
+
+  #if ENABLED(SWITCHING_NOZZLE)
+    constexpr uint16_t sasn[] = SWITCHING_NOZZLE_SERVO_ANGLES;
+    static_assert(COUNT(sasn) == 2, "SWITCHING_NOZZLE_SERVO_ANGLES needs 2 angles.");
+  #else
+    constexpr uint16_t sasn[2] = { 0 };
+  #endif
+
+  #ifdef Z_PROBE_SERVO_NR
     #if ENABLED(BLTOUCH)
       #include "../feature/bltouch.h"
+      #undef Z_SERVO_ANGLES
+      #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
     #endif
-    #ifdef BLTOUCH_ANGLES
-      #define SADATA  BLTOUCH_ANGLES
-    #elif defined(Z_SERVO_ANGLES)
-      #define SADATA  Z_SERVO_ANGLES
-    #else
-      #error "Servo angles are needed!"
-    #endif
+    constexpr uint16_t sazp[] = Z_SERVO_ANGLES;
+    static_assert(COUNT(sazp) == 2, "Z_SERVO_ANGLES needs 2 angles.");
+  #else
+    constexpr uint16_t sazp[2] = { 0 };
   #endif
 
+  #ifndef SWITCHING_EXTRUDER_SERVO_NR
+    #define SWITCHING_EXTRUDER_SERVO_NR -1
+  #endif
+  #ifndef SWITCHING_EXTRUDER_E23_SERVO_NR
+    #define SWITCHING_EXTRUDER_E23_SERVO_NR -1
+  #endif
+  #ifndef SWITCHING_NOZZLE_SERVO_NR
+    #define SWITCHING_NOZZLE_SERVO_NR -1
+  #endif
+  #ifndef Z_PROBE_SERVO_NR
+    #define Z_PROBE_SERVO_NR -1
+  #endif
+
+  #define ASRC(N,I) (                                  \
+      N == SWITCHING_EXTRUDER_SERVO_NR     ? sase[I]   \
+    : N == SWITCHING_EXTRUDER_E23_SERVO_NR ? sase[I+2] \
+    : N == SWITCHING_NOZZLE_SERVO_NR       ? sasn[I]   \
+    : N == Z_PROBE_SERVO_NR                ? sazp[I]   \
+    : 0                                                )
+
   #if ENABLED(EDITABLE_SERVO_ANGLES)
     extern uint16_t servo_angles[NUM_SERVOS][2];
-    #define BASE_SERVO_ANGLES base_servo_angles
+    #define CONST_SERVO_ANGLES base_servo_angles
   #else
-    #define BASE_SERVO_ANGLES servo_angles
-  #endif
-
-  constexpr uint16_t asrc[] = SADATA;
-  #if REQ_ANGLES
-    static_assert(COUNT(asrc) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
+    #define CONST_SERVO_ANGLES servo_angles
   #endif
 
-  constexpr uint16_t BASE_SERVO_ANGLES [NUM_SERVOS][2] = {
+  constexpr uint16_t CONST_SERVO_ANGLES [NUM_SERVOS][2] = {
       { ASRC(0,0), ASRC(0,1) }
     #if NUM_SERVOS > 1
       , { ASRC(1,0), ASRC(1,1) }

From 02cce7d4b40e229338619813912ad62f0480fa3a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 06:39:29 -0600
Subject: [PATCH 279/565] Add TRAVEL_EXTRA_XYJERK option

See #16949

Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
---
 Marlin/Configuration.h        |  2 ++
 Marlin/src/module/planner.cpp | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index fd3687a7fc45..5679aa3093f7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -784,6 +784,8 @@
   #define DEFAULT_YJERK 10.0
   #define DEFAULT_ZJERK  0.3
 
+  //#define TRAVEL_EXTRA_XYJERK 0.0     // Additional jerk allowance for all travel moves
+
   //#define LIMITED_JERK_EDITING        // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
   #if ENABLED(LIMITED_JERK_EDITING)
     #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index bf01c771aef6..dd1109011ed0 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2397,8 +2397,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       LOOP_XYZE(i)
     #endif
     {
-      const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
-                  maxj = max_jerk[i];             // mj : The max jerk setting for this axis
+      const float jerk = ABS(current_speed[i]);   // cs : Starting from zero, change in speed for this axis
+
+      float maxj = max_jerk[i];                   // mj : The max jerk setting for this axis
+
+      #ifdef TRAVEL_EXTRA_XYJERK
+        if ((TRAVEL_EXTRA_XYJERK) && !de <= 0 && (i == X_AXIS || i == Y_AXIS))
+          maxj += TRAVEL_EXTRA_XYJERK;            // Extra jerk allowance for travel moves
+      #endif
+
       if (jerk > maxj) {                          // cs > mj : New current speed too fast?
         if (limited) {                            // limited already?
           const float mjerk = nominal_speed * maxj; // ns*mj

From 025c50cc6d360332df1113118af0d61d1eb9191c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 26 Feb 2020 06:50:13 -0600
Subject: [PATCH 280/565] Quick-homing sensorless back-off (#16872)

---
 Marlin/src/gcode/calibrate/G28.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index bee8182401c5..6841636cf0a7 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -106,6 +106,8 @@
       #if AXIS_HAS_STALLGUARD(Y2)
         tmc_disable_stallguard(stepperY2, stealth_states.y2);
       #endif
+      do_blocking_move_to_xy(-0.5 * x_axis_home_dir, -0.5 * home_dir(Y_AXIS), fr_mm_s / 2);
+      safe_delay(100);
     #endif
   }
 

From 6913a4dfa86e22edd13ed0d5c19b155fa1f2d3cc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 07:10:22 -0600
Subject: [PATCH 281/565] Prevent park_point compile error

---
 Marlin/src/feature/probe_temp_compensation.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_compensation.h
index ddd178e45559..c9ab93e4a99a 100644
--- a/Marlin/src/feature/probe_temp_compensation.h
+++ b/Marlin/src/feature/probe_temp_compensation.h
@@ -57,7 +57,7 @@ class ProbeTempComp {
     static const temp_calib_t cali_info[TSI_COUNT];
 
     // Where to park nozzle to wait for probe cooldown
-    static constexpr xyz_pos_t park_point = { PTC_PARK_POS_X, PTC_PARK_POS_Y, PTC_PARK_POS_Z };
+    static constexpr xyz_pos_t park_point = xyz_pos_t({ PTC_PARK_POS_X, PTC_PARK_POS_Y, PTC_PARK_POS_Z });
 
     static constexpr int  max_bed_temp         = PTC_MAX_BED_TEMP,  // Max temperature to avoid heating errors
 

From 263a7beeb53a619cc319be2e369ef7604f32af4d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 07:24:36 -0600
Subject: [PATCH 282/565] More extra travel jerk changes

Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
---
 Marlin/src/module/planner.cpp | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index dd1109011ed0..7c387ac75304 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2390,6 +2390,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     // Start with a safe speed (from which the machine may halt to stop immediately).
     float safe_speed = nominal_speed;
 
+    #ifdef TRAVEL_EXTRA_XYJERK
+      const float extra_xyjerk = (de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
+    #else
+      constexpr float extra_xyjerk = 0;
+    #endif
+
     uint8_t limited = 0;
     #if HAS_LINEAR_E_JERK
       LOOP_XYZ(i)
@@ -2398,13 +2404,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #endif
     {
       const float jerk = ABS(current_speed[i]);   // cs : Starting from zero, change in speed for this axis
-
-      float maxj = max_jerk[i];                   // mj : The max jerk setting for this axis
-
-      #ifdef TRAVEL_EXTRA_XYJERK
-        if ((TRAVEL_EXTRA_XYJERK) && !de <= 0 && (i == X_AXIS || i == Y_AXIS))
-          maxj += TRAVEL_EXTRA_XYJERK;            // Extra jerk allowance for travel moves
-      #endif
+                  maxj = (max_jerk[axis]          // mj : The max jerk setting for this axis
+                    #ifdef TRAVEL_EXTRA_XYJERK
+                      + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
+                    #endif
+                  );
 
       if (jerk > maxj) {                          // cs > mj : New current speed too fast?
         if (limited) {                            // limited already?
@@ -2457,8 +2461,14 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
             : // v_exit <= v_entry                coasting             axis reversal
               ( (v_entry < 0 || v_exit > 0) ? (v_entry - v_exit) : _MAX(-v_exit, v_entry) );
 
-        if (jerk > max_jerk[axis]) {
-          v_factor *= max_jerk[axis] / jerk;
+        const float maxj = (max_jerk[axis]
+          #ifdef TRAVEL_EXTRA_XYJERK
+            + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
+          #endif
+        );
+
+        if (jerk > maxj) {
+          v_factor *= maxj / jerk;
           ++limited;
         }
       }

From 6fd7f4fe1bfeed6c3b145c760752a379c3bb5cf0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 08:09:57 -0600
Subject: [PATCH 283/565] Fix unified status bed temp display

---
 Marlin/src/lcd/dogm/dogm_Statusscreen.h    |  6 ++++--
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 23 ++++------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 11d4d7093c20..3656b02e0860 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -785,7 +785,9 @@
     #endif
 
   #endif
-#else
+#endif
+
+#ifndef STATUS_BED_WIDTH
   #define STATUS_BED_WIDTH 0
 #endif
 
@@ -1729,7 +1731,7 @@
 
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
 #define DO_DRAW_HOTENDS (HOTENDS > 0)
-#define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
+#define DO_DRAW_BED (HAS_HEATED_BED && HOTENDS <= 4)
 #define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
 #define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
 #define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 75f1c8bddb3f..1ea1424d306b 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -188,21 +188,6 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
             u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(heater, isHeat));
       #endif
 
-      // Draw a heating progress bar, if specified
-      #if DO_DRAW_BED && ENABLED(STATUS_HEAT_PERCENT)
-
-        if (STATIC_HOTEND && isHeat) {
-          const uint8_t bx = STATUS_HOTEND_X(heater) + STATUS_HOTEND_WIDTH(heater) + 1;
-          u8g.drawFrame(bx, STATUS_HEATERS_Y, 3, STATUS_HEATERS_HEIGHT);
-          if (tall) {
-            const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
-            if (PAGE_OVER(STATUS_HEATERS_Y + ph))
-              u8g.drawVLine(bx + 1, STATUS_HEATERS_Y + ph, tall);
-          }
-        }
-
-      #endif
-
     } // PAGE_CONTAINS
 
     if (PAGE_UNDER(7)) {
@@ -240,11 +225,11 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
     const float temp = thermalManager.degBed(),
               target = thermalManager.degTargetBed();
 
-    #if ENABLED(STATUS_HEAT_PERCENT) || (DO_DRAW_BED && DISABLED(STATUS_BED_ANIM))
+    #if ENABLED(STATUS_HEAT_PERCENT) || DISABLED(STATUS_BED_ANIM)
       const bool isHeat = BED_ALT();
     #endif
 
-    #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
+    #if DISABLED(STATUS_BED_ANIM)
       #define STATIC_BED    true
       #define BED_DOT       isHeat
     #else
@@ -513,7 +498,7 @@ void MarlinUI::draw_status_screen() {
       u8g.drawBitmapP(STATUS_HEATERS_X, STATUS_HEATERS_Y, STATUS_HEATERS_BYTEWIDTH, STATUS_HEATERS_HEIGHT, status_heaters_bmp);
   #endif
 
-  #if DO_DRAW_CUTTER
+  #if DO_DRAW_CUTTER && DISABLED(STATUS_COMBINE_HEATERS)
     #if ANIM_CUTTER
       #define CUTTER_BITMAP(S) ((S) ? status_cutter_on_bmp : status_cutter_bmp)
     #else
@@ -537,7 +522,7 @@ void MarlinUI::draw_status_screen() {
       u8g.drawBitmapP(STATUS_BED_X, bedy, STATUS_BED_BYTEWIDTH, bedh, BED_BITMAP(BED_ALT()));
   #endif
 
-  #if DO_DRAW_CHAMBER
+  #if DO_DRAW_CHAMBER && DISABLED(STATUS_COMBINE_HEATERS)
     #if ANIM_CHAMBER
       #define CHAMBER_BITMAP(S) ((S) ? status_chamber_on_bmp : status_chamber_bmp)
     #else

From 18b875dc9f3f67a4a811bf403161dd3f238e74cf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 08:16:46 -0600
Subject: [PATCH 284/565] Allow print recovery after parking

---
 Marlin/src/feature/power_loss_recovery.cpp | 2 +-
 Marlin/src/feature/power_loss_recovery.h   | 7 ++-----
 Marlin/src/gcode/feature/pause/M125.cpp    | 7 +++++++
 Marlin/src/gcode/sdcard/M24_M25.cpp        | 8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/power_loss_recovery.cpp
index aa7dff36e8c9..f331a9f94d68 100644
--- a/Marlin/src/feature/power_loss_recovery.cpp
+++ b/Marlin/src/feature/power_loss_recovery.cpp
@@ -141,7 +141,7 @@ void PrintJobRecovery::prepare() {
 /**
  * Save the current machine state to the power-loss recovery file
  */
-void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*=true*/) {
+void PrintJobRecovery::save(const bool force/*=false*/) {
 
   #if SAVE_INFO_INTERVAL_MS > 0
     static millis_t next_save_ms; // = 0
diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/power_loss_recovery.h
index 84f0d9f698a9..6c4b5d5c3fbc 100644
--- a/Marlin/src/feature/power_loss_recovery.h
+++ b/Marlin/src/feature/power_loss_recovery.h
@@ -159,13 +159,10 @@ class PrintJobRecovery {
     static inline void cancel() { purge(); card.autostart_index = 0; }
 
     static void load();
-    static void save(const bool force=
+    static void save(const bool force=false
       #if ENABLED(SAVE_EACH_CMD_MODE)
-        true
-      #else
-        false
+        || true
       #endif
-      , const bool save_queue=true
     );
 
   #if PIN_EXISTS(POWER_LOSS)
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index c55032b11bdd..6cf0847a9dc4 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -35,6 +35,10 @@
   #include "../../../lcd/ultralcd.h"
 #endif
 
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../../feature/power_loss_recovery.h"
+#endif
+
 /**
  * M125: Store current position and move to parking position.
  *       Called on pause (by M25) to prevent material leaking onto the
@@ -85,6 +89,9 @@ void GcodeSuite::M125() {
   #endif
 
   if (pause_print(retract, park_point, 0, show_lcd)) {
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      if (recovery.enabled) recovery.save(true);
+    #endif
     if (!sd_printing || show_lcd) {
       wait_for_confirmation(false, 0);
       resume_print(0, 0, PAUSE_PARK_RETRACT_LENGTH, 0);
diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sdcard/M24_M25.cpp
index 967b6dfdf37e..db1a671fe406 100644
--- a/Marlin/src/gcode/sdcard/M24_M25.cpp
+++ b/Marlin/src/gcode/sdcard/M24_M25.cpp
@@ -86,10 +86,6 @@ void GcodeSuite::M24() {
  */
 void GcodeSuite::M25() {
 
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    if (recovery.enabled) recovery.save(true, false);
-  #endif
-
   // Set initial pause flag to prevent more commands from landing in the queue while we try to pause
   #if ENABLED(SDSUPPORT)
     if (IS_SD_PRINTING()) card.pauseSDPrint();
@@ -101,6 +97,10 @@ void GcodeSuite::M25() {
 
   #else
 
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      if (recovery.enabled) recovery.save(true);
+    #endif
+
     print_job_timer.pause();
     ui.reset_status();
 

From 832951ec4493da96772386f1177a34ff9c936aee Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 26 Feb 2020 09:23:55 -0600
Subject: [PATCH 285/565] Case-insensitive g-code option (#16932)

---
 Marlin/Configuration_adv.h  |  2 ++
 Marlin/src/gcode/parser.cpp | 21 ++++++++++++++-------
 Marlin/src/gcode/parser.h   | 24 ++++++++++++++++++------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c9e226cef443..ede35a561e08 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2790,6 +2790,8 @@
   //#define GCODE_QUOTED_STRINGS  // Support for quoted string parameters
 #endif
 
+//#define GCODE_CASE_INSENSITIVE  // Accept G-code sent to the firmware in lowercase
+
 /**
  * CNC G-code options
  * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 5a473403a3a3..0fac65300fb4 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -118,11 +118,18 @@ void GCodeParser::parse(char *p) {
 
   reset(); // No codes to report
 
+  auto uppercase = [](char c) {
+    #if ENABLED(GCODE_CASE_INSENSITIVE)
+      if (WITHIN(c, 'a', 'z')) c += 'A' - 'a';
+    #endif
+    return c;
+  };
+
   // Skip spaces
   while (*p == ' ') ++p;
 
   // Skip N[-0-9] if included in the command line
-  if (*p == 'N' && NUMERIC_SIGNED(p[1])) {
+  if (uppercase(*p) == 'N' && NUMERIC_SIGNED(p[1])) {
     #if ENABLED(FASTER_GCODE_PARSER)
       //set('N', p + 1);     // (optional) Set the 'N' parameter value
     #endif
@@ -135,7 +142,7 @@ void GCodeParser::parse(char *p) {
   command_ptr = p;
 
   // Get the command letter, which must be G, M, or T
-  const char letter = *p++;
+  const char letter = uppercase(*p++);
 
   // Nullify asterisk and trailing whitespace
   char *starpos = strchr(p, '*');
@@ -271,7 +278,7 @@ void GCodeParser::parse(char *p) {
     bool quoted_string_arg = false;
   #endif
   string_arg = nullptr;
-  while (const char param = *p++) {              // Get the next parameter. A NUL ends the loop
+  while (const char param = uppercase(*p++)) {  // Get the next parameter. A NUL ends the loop
 
     // Special handling for M32 [P] !/path/to/file.g#
     // The path must be the last parameter
@@ -289,14 +296,14 @@ void GCodeParser::parse(char *p) {
       }
     #endif
 
-    // Arguments MUST be uppercase for fast GCode parsing
     #if ENABLED(FASTER_GCODE_PARSER)
-      #define PARAM_TEST WITHIN(param, 'A', 'Z')
+      // Arguments MUST be uppercase for fast GCode parsing
+      #define PARAM_OK(P) WITHIN((P), 'A', 'Z')
     #else
-      #define PARAM_TEST true
+      #define PARAM_OK(P) true
     #endif
 
-    if (PARAM_TEST) {
+    if (PARAM_OK(param)) {
 
       while (*p == ' ') p++;                    // Skip spaces between parameters & values
 
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 70eb85e31e8e..7c5e1518b37d 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -166,7 +166,6 @@ class GCodeParser {
     #ifdef CPU_32_BIT
       FORCE_INLINE static bool seen(const char * const str) { return !!(codebits & letter_bits(str)); }
     #else
-      // At least one of a list of code letters was seen
       FORCE_INLINE static bool seen(const char * const str) {
         const uint32_t letrbits = letter_bits(str);
         const uint8_t * const cb = (uint8_t*)&codebits;
@@ -177,14 +176,27 @@ class GCodeParser {
 
     static inline bool seen_any() { return !!codebits; }
 
-    #define SEEN_TEST(L) TEST32(codebits, LETTER_BIT(L))
+    FORCE_INLINE static bool seen_test(const char c) { return TEST32(codebits, LETTER_BIT(c)); }
 
   #else // !FASTER_GCODE_PARSER
 
+    #if ENABLED(GCODE_CASE_INSENSITIVE)
+      FORCE_INLINE static char* strgchr(char *p, char g) {
+        auto uppercase = [](char c) {
+          return c + (WITHIN(c, 'a', 'z') ? 'A' - 'a' : 0);
+        };
+        const char d = uppercase(g);
+        for (char cc; (cc = uppercase(*p)); p++) if (cc == d) return p;
+        return nullptr;
+      }
+    #else
+      #define strgchr strchr
+    #endif
+
     // Code is found in the string. If not found, value_ptr is unchanged.
     // This allows "if (seen('A')||seen('B'))" to use the last-found value.
     static inline bool seen(const char c) {
-      char *p = strchr(command_args, c);
+      char *p = strgchr(command_args, c);
       const bool b = !!p;
       if (b) value_ptr = valid_float(&p[1]) ? &p[1] : nullptr;
       return b;
@@ -192,12 +204,12 @@ class GCodeParser {
 
     static inline bool seen_any() { return *command_args == '\0'; }
 
-    #define SEEN_TEST(L) !!strchr(command_args, L)
+    FORCE_INLINE static bool seen_test(const char c) { return (bool)strgchr(command_args, c); }
 
     // At least one of a list of code letters was seen
     static inline bool seen(const char * const str) {
       for (uint8_t i = 0; const char c = str[i]; i++)
-        if (SEEN_TEST(c)) return true;
+        if (seen_test(c)) return true;
       return false;
     }
 
@@ -205,7 +217,7 @@ class GCodeParser {
 
   // Seen any axis parameter
   static inline bool seen_axis() {
-    return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
+    return seen_test('X') || seen_test('Y') || seen_test('Z') || seen_test('E');
   }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)

From 633b716a3a47c2739d3aa05c9cb0c9e3f002bfe9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 11:35:02 -0600
Subject: [PATCH 286/565] Define DIAG pins for MKS SGen-L

---
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 50 ++++++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index a7ff58f8da62..58f9eb549337 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -38,15 +38,53 @@
 #define SERVO0_PIN         P1_23   // SERVO P1.23
 #define SERVO1_PIN         P2_00   // SERVO P2.0
 
+//
+// Trinamic Stallguard pins
+//
+#define X_DIAG_PIN         P1_29   // X-
+#define Y_DIAG_PIN         P1_27   // Y-
+#define Z_DIAG_PIN         P1_25   // Z-
+#define E0_DIAG_PIN        P1_28   // X+
+#define E1_DIAG_PIN        P1_26   // Y+
+
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_29
-#define X_MAX_PIN          P1_28
-#define Y_MIN_PIN          P1_27
-#define Y_MAX_PIN          P1_26
-#define Z_MIN_PIN          P1_25
-#define Z_MAX_PIN          P1_24
+#if X_STALL_SENSITIVITY
+  #define X_STOP_PIN       X_DIAG_PIN
+  #if X_HOME_DIR < 0
+    #define X_MAX_PIN      P1_28   // X+
+  #else
+    #define X_MIN_PIN      P1_28   // X+
+  #endif
+#else
+  #define X_MIN_PIN        P1_29   // X-
+  #define X_MAX_PIN        P1_28   // X+
+#endif
+
+#if Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN       Y_DIAG_PIN
+  #if Y_HOME_DIR < 0
+    #define Y_MAX_PIN      P1_26   // Y+
+  #else
+    #define Y_MIN_PIN      P1_26   // Y+
+  #endif
+#else
+  #define Y_MIN_PIN        P1_27   // Y-
+  #define Y_MAX_PIN        P1_26   // Y+
+#endif
+
+#if Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN       Z_DIAG_PIN
+  #if Z_HOME_DIR < 0
+    #define Z_MAX_PIN      P1_24   // Z+
+  #else
+    #define Z_MIN_PIN      P1_24   // Z+
+  #endif
+#else
+  #define Z_MIN_PIN        P1_25   // Z-
+  #define Z_MAX_PIN        P1_24   // Z+
+#endif
 
 //
 // Z Probe (when not Z_MIN_PIN)

From bafe8d920a780bc5f5c0ad41437a09ffa823432d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Feb 2020 12:02:54 -0600
Subject: [PATCH 287/565] Handle print completed LED event in M0

---
 Marlin/src/MarlinCore.cpp      | 20 +++++---------------
 Marlin/src/gcode/lcd/M0_M1.cpp |  9 +++++++--
 Marlin/src/gcode/parser.h      |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index ab469d5818b3..5a527482ce09 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -412,23 +412,13 @@ void startOrResumeJob() {
     #endif
   }
 
-  #if ENABLED(PRINTER_EVENT_LEDS)
-    #include "feature/leds/printer_event_leds.h"
-  #endif
-
   inline void finishSDPrinting() {
     bool did_state = true;
     switch (card.sdprinting_done_state) {
 
-      #if ENABLED(PRINTER_EVENT_LEDS)
-        case 1:
-          printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
-          break;
-      #endif
-
       #if HAS_RESUME_CONTINUE                   // Display "Click to Continue..."
-        case 2:
-          did_state = queue.enqueue_P(PSTR("M0 S"
+        case 1:
+          did_state = queue.enqueue_P(PSTR("M0Q1S"
             #if HAS_LCD_MENU
               "1800"                            // ...for 30 minutes with LCD
             #else
@@ -438,13 +428,13 @@ void startOrResumeJob() {
           break;
       #endif
 
-      case 3: print_job_timer.stop(); break;
+      case 2: print_job_timer.stop(); break;
 
-      case 4:
+      case 3:
         did_state = print_job_timer.duration() < 60 || queue.enqueue_P(PSTR("M31"));
         break;
 
-      case 5:
+      case 4:
         #if ENABLED(POWER_LOSS_RECOVERY)
           recovery.purge();
         #endif
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 2f110c5c5580..2b35ddf3ff53 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -67,11 +67,16 @@ void GcodeSuite::M0_M1() {
 
   planner.synchronize();
 
+  #if HAS_LEDS_OFF_FLAG
+    if (parser.seen('Q'))
+      printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
+  #endif
+
   #if HAS_LCD_MENU
 
     if (has_message)
       ui.set_status(args, true);
-    else if (!parser.seenval('Q')) {
+    else {
       LCD_MESSAGEPGM(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
         ui.reset_progress_bar_timeout();
@@ -98,7 +103,7 @@ void GcodeSuite::M0_M1() {
   wait_for_user = true;
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), CONTINUE_STR);
+    host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
   #endif
 
   if (ms > 0) ms += millis();  // wait until this time for a click
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 7c5e1518b37d..06e41ccf13d8 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -241,7 +241,7 @@ class GCodeParser {
   // Seen a parameter with a value
   static inline bool seenval(const char c) { return seen(c) && has_value(); }
 
-  // Float removes 'E' to prevent scientific notation interpretation
+  // The value as a string
   static inline char* value_string() { return value_ptr; }
 
   // Float removes 'E' to prevent scientific notation interpretation

From a80eda41bc7bcbe1938fe8809608419aae7ccbb7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 27 Feb 2020 00:03:42 +0000
Subject: [PATCH 288/565] [cron] Bump distribution date (2020-02-27)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 43df5cb7c317..47ccf9be6e82 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-26"
+  #define STRING_DISTRIBUTION_DATE "2020-02-27"
 #endif
 
 /**

From 8164cac79703a7e73577539eb267357113b239b2 Mon Sep 17 00:00:00 2001
From: Makoto Schoppert <makotosan@gmail.com>
Date: Thu, 27 Feb 2020 04:29:44 -0500
Subject: [PATCH 289/565] Fix planner.cpp compile (#16996)

---
 Marlin/src/module/planner.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 7c387ac75304..2067ecc23f56 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2403,10 +2403,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       LOOP_XYZE(i)
     #endif
     {
-      const float jerk = ABS(current_speed[i]);   // cs : Starting from zero, change in speed for this axis
-                  maxj = (max_jerk[axis]          // mj : The max jerk setting for this axis
+      const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
+                  maxj = (max_jerk[i]             // mj : The max jerk setting for this axis
                     #ifdef TRAVEL_EXTRA_XYJERK
-                      + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
+                      + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
                     #endif
                   );
 

From 9f8ee311442cf5ebd4d353348b8fa81cb64e2115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= <roman.moravcik@gmail.com>
Date: Thu, 27 Feb 2020 10:38:46 +0100
Subject: [PATCH 290/565] Update Slovak language (#17002)

---
 Marlin/src/lcd/language/language_sk.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 7e6fe72ed9e6..4205cd598822 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -67,9 +67,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Domov os Z");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto-zarovn. Z");
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Parkovanie XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Kliknutím spusťte");
+  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Kliknutím začnete");
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Ďalší bod");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Meranie hotové!");
+  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Vyrovnanie hotové!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Výška rovnania");
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Nastaviť ofsety");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastavené");
@@ -173,10 +173,10 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Postranné body");
   PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Typ siete bodov");
   PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Exportovať sieť");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Exportovať do PC");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Exportovať do CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Záloha do PC");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Info. o UBL do PC");
+  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Export do hosta");
+  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Export do CSV");
+  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Externá záloha");
+  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Info. o výst. UBL");
   PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Hustota mriežky");
   PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Ručné vyplnenie");
   PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Chytré vyplnenie");
@@ -304,6 +304,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Načítať nastavenie");
   PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Obnoviť nastavenie");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inicializ. EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Chyba: EEPROM CRC");
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Chyba: EEPROM Index");
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Chyba: Verzia EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Aktualizovať z SD");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reštart. tlačiar.");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Obnoviť");

From be62ab2d02f58634013a78a2e243a50c1cd4a1c4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Feb 2020 06:16:33 -0600
Subject: [PATCH 291/565] Move reachable test to Probe class

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp |  4 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp       | 14 +----
 Marlin/src/gcode/calibrate/G34_M422.cpp     |  4 +-
 Marlin/src/gcode/calibrate/G76_M871.cpp     |  2 +-
 Marlin/src/gcode/calibrate/M48.cpp          |  8 +--
 Marlin/src/gcode/probe/G30.cpp              |  2 +-
 Marlin/src/module/motion.h                  | 59 +++------------------
 Marlin/src/module/probe.cpp                 |  4 +-
 Marlin/src/module/probe.h                   | 49 +++++++++++++++++
 9 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index a0a12ea621d2..fa82cccdacfc 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1249,7 +1249,7 @@
         if (isnan(z_values[i][j])) {                  // Invalid mesh point?
 
           // Skip points the probe can't reach
-          if (!position_is_reachable_by_probe(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
+          if (!probe.can_reach(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
             continue;
 
           found_a_NAN = true;
@@ -1316,7 +1316,7 @@
           // Also for round beds, there are grid points outside the bed the nozzle can't reach.
           // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
 
-          if (probe_relative ? !position_is_reachable_by_probe(mpos) : !position_is_reachable(mpos))
+          if (!(probe_relative ? probe.can_reach(mpos) : position_is_reachable(mpos)))
             continue;
 
           // Reachable. Check if it's the best_so_far location to the nozzle.
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 5173505164fb..c81e5f0a8a7d 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -417,17 +417,7 @@ G29_TYPE GcodeSuite::G29() {
         );
       }
 
-      if (
-        #if IS_SCARA || ENABLED(DELTA)
-             !position_is_reachable_by_probe(probe_position_lf.x, 0)
-          || !position_is_reachable_by_probe(probe_position_rb.x, 0)
-          || !position_is_reachable_by_probe(0, probe_position_lf.y)
-          || !position_is_reachable_by_probe(0, probe_position_rb.y)
-        #else
-             !position_is_reachable_by_probe(probe_position_lf)
-          || !position_is_reachable_by_probe(probe_position_rb)
-        #endif
-      ) {
+      if (!probe.good_bounds(probe_position_lf, probe_position_rb)) {
         SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
         G29_RETURN(false);
       }
@@ -704,7 +694,7 @@ G29_TYPE GcodeSuite::G29() {
 
           #if IS_KINEMATIC
             // Avoid probing outside the round or hexagonal area
-            if (!position_is_reachable_by_probe(probePos)) continue;
+            if (!probe.can_reach(probePos)) continue;
           #endif
 
           if (verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", int(pt_index), "/", int(GRID_MAX_POINTS), ".");
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index e7bc63828f1f..7144038ebd39 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -432,11 +432,11 @@ void GcodeSuite::M422() {
   };
 
   if (is_probe_point) {
-    if (!position_is_reachable_by_probe(pos.x, Y_CENTER)) {
+    if (!probe.can_reach(pos.x, Y_CENTER)) {
       SERIAL_ECHOLNPGM("?(X) out of bounds.");
       return;
     }
-    if (!position_is_reachable_by_probe(pos)) {
+    if (!probe.can_reach(pos)) {
       SERIAL_ECHOLNPGM("?(Y) out of bounds.");
       return;
     }
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 4340084ec6d4..8cd9c8a0cf47 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -116,7 +116,7 @@ void GcodeSuite::G76() {
       temp_comp.measure_point_x - probe.offset_xy.x,
       temp_comp.measure_point_y - probe.offset_xy.y
     );
-    if (!position_is_reachable_by_probe(destination)) {
+    if (!probe.can_reach(destination)) {
       SERIAL_ECHOLNPGM("!Probe position unreachable - aborting.");
       return;
     }
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 8fba7a646fe9..fb8651779951 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -80,11 +80,11 @@ void GcodeSuite::M48() {
   xy_float_t next_pos = current_position;
 
   const xy_pos_t probe_pos = {
-    parser.linearval('X', next_pos.x + probe.offset_xy.x),
-    parser.linearval('Y', next_pos.y + probe.offset_xy.y)
+    parser.linearval('X', next_pos.x + probe.offset_xy.x),  // If no X use the probe's current X position
+    parser.linearval('Y', next_pos.y + probe.offset_xy.y)   // If no Y, ditto
   };
 
-  if (!position_is_reachable_by_probe(probe_pos)) {
+  if (!probe.can_reach(probe_pos)) {
     SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");
     return;
   }
@@ -179,7 +179,7 @@ void GcodeSuite::M48() {
           #else
             // If we have gone out too far, we can do a simple fix and scale the numbers
             // back in closer to the origin.
-            while (!position_is_reachable_by_probe(next_pos)) {
+            while (!probe.can_reach(next_pos)) {
               next_pos *= 0.8f;
               if (verbose_level > 3)
                 SERIAL_ECHOLNPAIR_P(PSTR("Moving inward: X"), next_pos.x, SP_Y_STR, next_pos.y);
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index 8b2ada9ceca8..21d56b3fd47b 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -43,7 +43,7 @@ void GcodeSuite::G30() {
   const xy_pos_t pos = { parser.linearval('X', current_position.x + probe.offset_xy.x),
                          parser.linearval('Y', current_position.y + probe.offset_xy.y) };
 
-  if (!position_is_reachable_by_probe(pos)) return;
+  if (!probe.can_reach(pos)) return;
 
   // Disable leveling so the planner won't mess with us
   #if HAS_LEVELING
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index c50da25a3e27..f1c2dc069cff 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -30,10 +30,6 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_BED_PROBE
-  #include "probe.h"
-#endif
-
 #if IS_SCARA
   #include "scara.h"
 #endif
@@ -58,7 +54,7 @@ FORCE_INLINE bool homing_needed() {
 }
 
 // Error margin to work around float imprecision
-constexpr float slop = 0.0001;
+constexpr float fslop = 0.0001;
 
 extern bool relative_mode;
 
@@ -306,7 +302,7 @@ void homeaxis(const AxisEnum axis);
   // Return true if the given point is within the printable area
   inline bool position_is_reachable(const float &rx, const float &ry, const float inset=0) {
     #if ENABLED(DELTA)
-      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + slop);
+      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + fslop);
     #elif IS_SCARA
       const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
       return (
@@ -322,67 +318,24 @@ void homeaxis(const AxisEnum axis);
     return position_is_reachable(pos.x, pos.y, inset);
   }
 
-  #if HAS_BED_PROBE
-
-    #if HAS_PROBE_XY_OFFSET
-
-      // Return true if the both nozzle and the probe can reach the given point.
-      // Note: This won't work on SCARA since the probe offset rotates with the arm.
-      inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-        return position_is_reachable(rx - probe.offset_xy.x, ry - probe.offset_xy.y)
-               && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));
-      }
-
-    #else
-
-      FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-        return position_is_reachable(rx, ry, MIN_PROBE_EDGE);
-      }
-
-    #endif
-
-  #endif // HAS_BED_PROBE
-
 #else // CARTESIAN
 
   // Return true if the given position is within the machine bounds.
   inline bool position_is_reachable(const float &rx, const float &ry) {
-    if (!WITHIN(ry, Y_MIN_POS - slop, Y_MAX_POS + slop)) return false;
+    if (!WITHIN(ry, Y_MIN_POS - fslop, Y_MAX_POS + fslop)) return false;
     #if ENABLED(DUAL_X_CARRIAGE)
       if (active_extruder)
-        return WITHIN(rx, X2_MIN_POS - slop, X2_MAX_POS + slop);
+        return WITHIN(rx, X2_MIN_POS - fslop, X2_MAX_POS + fslop);
       else
-        return WITHIN(rx, X1_MIN_POS - slop, X1_MAX_POS + slop);
+        return WITHIN(rx, X1_MIN_POS - fslop, X1_MAX_POS + fslop);
     #else
-      return WITHIN(rx, X_MIN_POS - slop, X_MAX_POS + slop);
+      return WITHIN(rx, X_MIN_POS - fslop, X_MAX_POS + fslop);
     #endif
   }
   inline bool position_is_reachable(const xy_pos_t &pos) { return position_is_reachable(pos.x, pos.y); }
 
-  #if HAS_BED_PROBE
-
-    /**
-     * Return whether the given position is within the bed, and whether the nozzle
-     * can reach the position required to put the probe at the given position.
-     *
-     * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
-     *          nozzle must be be able to reach +10,-10.
-     */
-    inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-      return position_is_reachable(rx - probe.offset_xy.x, ry - probe.offset_xy.y)
-          && WITHIN(rx, probe.min_x() - slop, probe.max_x() + slop)
-          && WITHIN(ry, probe.min_y() - slop, probe.max_y() + slop);
-    }
-
-  #endif // HAS_BED_PROBE
-
 #endif // CARTESIAN
 
-#if !HAS_BED_PROBE
-  FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
-#endif
-FORCE_INLINE bool position_is_reachable_by_probe(const xy_pos_t &pos) { return position_is_reachable_by_probe(pos.x, pos.y); }
-
 /**
  * Duplication mode
  */
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 858dcae747ac..67c1655374b8 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -89,7 +89,7 @@ Probe probe;
 xyz_pos_t Probe::offset; // Initialized by settings.load()
 
 #if HAS_PROBE_XY_OFFSET
-  const xyz_pos_t &Probe::offset_xy = probe.offset;
+  const xyz_pos_t &Probe::offset_xy = Probe::offset;
 #endif
 
 #if ENABLED(Z_PROBE_SLED)
@@ -727,7 +727,7 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
   // TODO: Adapt for SCARA, where the offset rotates
   xyz_pos_t npos = { rx, ry };
   if (probe_relative) {                                     // The given position is in terms of the probe
-    if (!position_is_reachable_by_probe(npos)) {
+    if (!can_reach(npos)) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
       return NAN;
     }
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 6f17090e69c0..84a8f953cab2 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -27,6 +27,8 @@
 
 #include "../inc/MarlinConfig.h"
 
+#include "motion.h"
+
 #if HAS_BED_PROBE
   enum ProbePtRaise : uint8_t {
     PROBE_PT_NONE,      // No raise or stow after run_z_probe
@@ -45,6 +47,39 @@ class Probe {
 
     static bool set_deployed(const bool deploy);
 
+
+    #if IS_KINEMATIC
+
+      #if HAS_PROBE_XY_OFFSET
+        // Return true if the both nozzle and the probe can reach the given point.
+        // Note: This won't work on SCARA since the probe offset rotates with the arm.
+        static inline bool can_reach(const float &rx, const float &ry) {
+          return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y) // The nozzle can go where it needs to go?
+              && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));       // Can the nozzle also go near there?
+        }
+      #else
+        FORCE_INLINE static bool can_reach(const float &rx, const float &ry) {
+          return position_is_reachable(rx, ry, MIN_PROBE_EDGE);
+        }
+      #endif
+
+    #else
+
+      /**
+       * Return whether the given position is within the bed, and whether the nozzle
+       * can reach the position required to put the probe at the given position.
+       *
+       * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
+       *          nozzle must be be able to reach +10,-10.
+       */
+      static inline bool can_reach(const float &rx, const float &ry) {
+        return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y)
+            && WITHIN(rx, min_x() - fslop, max_x() + fslop)
+            && WITHIN(ry, min_y() - fslop, max_y() + fslop);
+      }
+
+    #endif
+
     #ifdef Z_AFTER_PROBING
       static void move_z_after_probing();
     #endif
@@ -62,8 +97,22 @@ class Probe {
 
     static bool set_deployed(const bool) { return false; }
 
+    FORCE_INLINE static bool can_reach(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
+
   #endif
 
+  FORCE_INLINE static bool can_reach(const xy_pos_t &pos) { return can_reach(pos.x, pos.y); }
+
+  FORCE_INLINE static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) {
+    return (
+      #if IS_KINEMATIC
+         can_reach(lf.x, 0) && can_reach(rb.x, 0) && can_reach(0, lf.y) && can_reach(0, rb.y)
+      #else
+         can_reach(lf) && can_reach(rb)
+      #endif
+    );
+  }
+
   // Use offset_xy for read only access
   // More optimal the XY offset is known to always be zero.
   #if HAS_PROBE_XY_OFFSET

From e5d39063a24e68cd625fd93764d3a9121d04d63c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Feb 2020 06:18:27 -0600
Subject: [PATCH 292/565] Cleanups for PTC

---
 Marlin/src/feature/probe_temp_compensation.h | 16 ++++++++--------
 Marlin/src/gcode/calibrate/G76_M871.cpp      | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_compensation.h
index c9ab93e4a99a..2ed10eeb990a 100644
--- a/Marlin/src/feature/probe_temp_compensation.h
+++ b/Marlin/src/feature/probe_temp_compensation.h
@@ -57,16 +57,16 @@ class ProbeTempComp {
     static const temp_calib_t cali_info[TSI_COUNT];
 
     // Where to park nozzle to wait for probe cooldown
-    static constexpr xyz_pos_t park_point = xyz_pos_t({ PTC_PARK_POS_X, PTC_PARK_POS_Y, PTC_PARK_POS_Z });
+    static constexpr float park_point_x = PTC_PARK_POS_X,
+                           park_point_y = PTC_PARK_POS_Y,
+                           park_point_z = PTC_PARK_POS_Z,
+                           // XY coordinates of nozzle for probing the bed
+                           measure_point_x     = PTC_PROBE_POS_X,   // Coordinates to probe
+                           measure_point_y     = PTC_PROBE_POS_Y;
+                           //measure_point_x     = 12.0f,           // Coordinates to probe on MK52 magnetic heatbed
+                           //measure_point_y     =  7.3f;
 
     static constexpr int  max_bed_temp         = PTC_MAX_BED_TEMP,  // Max temperature to avoid heating errors
-
-                          // XY coordinates of nozzle for probing the bed
-                          measure_point_x      = PTC_PROBE_POS_X,   // X-coordinate to probe
-                          measure_point_y      = PTC_PROBE_POS_Y,   // Y-coordinate to probe
-                          //measure_point_x    = 12.0f,             // X-coordinate to probe on MK52 magnetic heatbed
-                          //measure_point_y    =  7.3f,             // Y-coordinate to probe on MK52 magnetic heatbed
-
                           probe_calib_bed_temp = max_bed_temp,      // Bed temperature while calibrating probe
                           bed_calib_probe_temp = 30;                // Probe temperature while calibrating bed
 
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 8cd9c8a0cf47..029e58bdd478 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -105,8 +105,8 @@ void GcodeSuite::G76() {
 
   if (do_bed_cal || do_probe_cal) {
     // Ensure park position is reachable
-    if (!position_is_reachable(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y)
-      || !(WITHIN(ProbeTempComp::park_point.z, Z_MIN_POS - 0.001f, Z_MAX_POS + 0.001f))
+    if (!position_is_reachable(temp_comp.park_point_x, temp_comp.park_point_y)
+      || !(WITHIN(temp_comp.park_point_z, Z_MIN_POS - 0.001f, Z_MAX_POS + 0.001f))
     ) {
       SERIAL_ECHOLNPGM("!Park position unreachable - aborting.");
       return;
@@ -161,7 +161,7 @@ void GcodeSuite::G76() {
       SERIAL_ECHOLNPAIR("Target Bed: ", target_bed, "; Probe: ", target_probe);
 
       // Park nozzle
-      do_blocking_move_to(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y, ProbeTempComp::park_point.z);
+      do_blocking_move_to(temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z);
 
       // Wait for heatbed to reach target temp and probe to cool below target temp
       SERIAL_ECHOLNPGM("Waiting for bed and probe to reach target temp.");
@@ -186,9 +186,9 @@ void GcodeSuite::G76() {
 
       if (timeout) break;
 
-      // Move probe to probing point and wait for probe to reach target temp
+      // Move the nozzle to the probing point and wait for the probe to reach target temp
       destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
-      do_blocking_move_to(destination.x, destination.y, destination.z);
+      do_blocking_move_to(destination);
       SERIAL_ECHOLNPGM("Waiting for probe heating.");
       while (thermalManager.degProbe() < target_probe) {
         idle(
@@ -207,7 +207,7 @@ void GcodeSuite::G76() {
       destination.z = 5.0;
       do_blocking_move_to_z(destination.z);
 
-      // Do a single probe
+      // Do a single probe at the current position
       remember_feedrate_scaling_off();
       const float measured_z = probe.probe_at_point(
         destination.x + probe.offset_xy.x,
@@ -252,7 +252,7 @@ void GcodeSuite::G76() {
   if (do_probe_cal) {
 
     // Park nozzle
-    do_blocking_move_to(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y, ProbeTempComp::park_point.z);
+    do_blocking_move_to(temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z);
 
     // Initialize temperatures
     uint16_t target_bed = temp_comp.probe_calib_bed_temp,

From 77b82d300a2afdc9b96d23ab0abb929ca0df36b4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Feb 2020 06:34:48 -0600
Subject: [PATCH 293/565] Add idle_no_sleep

---
 Marlin/src/MarlinCore.h                 | 10 ++++++++-
 Marlin/src/feature/pause.cpp            |  9 ++++----
 Marlin/src/gcode/calibrate/G76_M871.cpp | 30 +++++--------------------
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 5a8157bde1f6..fd2cbeaba9a2 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -40,10 +40,18 @@ void stop();
 
 void idle(
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    bool no_stepper_sleep = false  // pass true to keep steppers from disabling on timeout
+    bool no_stepper_sleep=false    // Pass true to keep steppers from timing out
   #endif
 );
 
+inline void idle_no_sleep() {
+  idle(
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      true
+    #endif
+  );
+}
+
 #if ENABLED(EXPERIMENTAL_I2CBUS)
   #include "feature/twibus.h"
   extern TWIBus i2c;
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 95b5cc953f86..175a2d21cde1 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -202,7 +202,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
       #if HAS_BUZZER
         filament_change_beep(max_beep_count);
       #endif
-      idle(true);
+      idle_no_sleep();
     }
   }
 
@@ -280,7 +280,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
           lcd_pause_show_message(PAUSE_MESSAGE_OPTION);
-          while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle(true);
+          while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle_no_sleep();
         }
       #endif
 
@@ -541,7 +541,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       #endif
 
       // Wait for LCD click or M108
-      while (wait_for_user) idle(true);
+      while (wait_for_user) idle_no_sleep();
 
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_INFO, PSTR("Reheating"));
@@ -576,8 +576,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
         filament_change_beep(max_beep_count, true);
       #endif
     }
-
-    idle(true);
+    idle_no_sleep();
   }
   #if ENABLED(DUAL_X_CARRIAGE)
     active_extruder = saved_ext;
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 029e58bdd478..ef1a18e1123e 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -137,11 +137,7 @@ void GcodeSuite::G76() {
     while (thermalManager.degBed() > target_bed
       || thermalManager.degProbe() > target_probe
     ) {
-      idle(
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          true
-        #endif
-      );
+      idle_no_sleep();
       const millis_t ms = millis();
       if (ELAPSED(ms, next_temp_report)) {
         thermalManager.print_heater_states(active_extruder);
@@ -167,11 +163,7 @@ void GcodeSuite::G76() {
       SERIAL_ECHOLNPGM("Waiting for bed and probe to reach target temp.");
       const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
       while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1 || thermalManager.degProbe() > target_probe) {
-        idle(
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            true
-          #endif
-        );
+        idle_no_sleep();
         const millis_t ms = millis();
         if (ELAPSED(ms, next_temp_report)) {
           thermalManager.print_heater_states(active_extruder);
@@ -191,11 +183,7 @@ void GcodeSuite::G76() {
       do_blocking_move_to(destination);
       SERIAL_ECHOLNPGM("Waiting for probe heating.");
       while (thermalManager.degProbe() < target_probe) {
-        idle(
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            true
-          #endif
-        );
+        idle_no_sleep();
         const millis_t ms = millis();
         if (ELAPSED(ms, next_temp_report)) {
           thermalManager.print_heater_states(active_extruder);
@@ -262,11 +250,7 @@ void GcodeSuite::G76() {
     while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
            || thermalManager.degProbe() > target_probe
     ) {
-      idle(
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          true
-        #endif
-      );
+      idle_no_sleep();
       const millis_t ms = millis();
       if (ELAPSED(ms, next_temp_report)) {
         thermalManager.print_heater_states(active_extruder);
@@ -293,11 +277,7 @@ void GcodeSuite::G76() {
 
       const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
       while (thermalManager.degProbe() < target_probe) {
-        idle(
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            true
-          #endif
-        );
+        idle_no_sleep();
         const millis_t ms = millis();
         if (ELAPSED(ms, next_temp_report)) {
           thermalManager.print_heater_states(active_extruder);

From 4f557235279c0db03bdf6f0d35256d163b7d412a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Feb 2020 07:47:40 -0600
Subject: [PATCH 294/565] RUMBA has 3 E plugs

---
 Marlin/src/module/temperature.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 7cee5fb1ea6d..20a08240cdb9 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1660,10 +1660,9 @@ void Temperature::init() {
   #endif
 
   #if MB(RUMBA)
+    // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
     #define _AD(N) ANY(HEATER_##N##_USES_AD595, HEATER_##N##_USES_AD8495)
-    #if  _AD(0) || _AD(1) || _AD(2) /* RUMBA has 3 E plugs // || _AD(3) || _AD(4) || _AD(5) || _AD(6) || _AD(7) */ \
-      || _AD(BED) || _AD(CHAMBER)
-      // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
+    #if  _AD(0) || _AD(1) || _AD(2) || _AD(BED) || _AD(CHAMBER)
       MCUCR = _BV(JTD);
       MCUCR = _BV(JTD);
     #endif

From a75a25cd7ca6af30da92b1b6e17d2e5327cb07df Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Feb 2020 06:44:20 -0600
Subject: [PATCH 295/565] Replace direct call to G28(true)

---
 Marlin/src/gcode/calibrate/G76_M871.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index ef1a18e1123e..2471d53e0415 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -121,7 +121,7 @@ void GcodeSuite::G76() {
       return;
     }
 
-    G28(true);
+    process_subcommands_now_P(PSTR("G28"));
   }
 
   /******************************************

From bfbd976c09128725644fabb96d2153774c22460c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Feb 2020 06:44:01 -0600
Subject: [PATCH 296/565] General G76 cleanup

---
 Marlin/src/gcode/calibrate/G76_M871.cpp | 61 ++++++++++---------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 2471d53e0415..90413b3215c6 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -92,10 +92,8 @@ void GcodeSuite::G76() {
     set_bltouch_deployed(false);
   #endif
 
-  bool do_bed_cal = parser.boolval('B'),
-       do_probe_cal = parser.boolval('P');
-  if (!do_bed_cal && !do_probe_cal)
-    do_bed_cal = do_probe_cal = true;
+  bool do_bed_cal = parser.boolval('B'), do_probe_cal = parser.boolval('P');
+  if (!do_bed_cal && !do_probe_cal) do_bed_cal = do_probe_cal = true;
 
   // Synchronize with planner
   planner.synchronize();
@@ -133,10 +131,8 @@ void GcodeSuite::G76() {
     uint16_t target_bed = temp_comp.cali_info_init[TSI_BED].start_temp,
              target_probe = temp_comp.bed_calib_probe_temp;
 
-    SERIAL_ECHOLNPGM("Waiting for printer to cool down.");
-    while (thermalManager.degBed() > target_bed
-      || thermalManager.degProbe() > target_probe
-    ) {
+    SERIAL_ECHOLNPGM("Waiting for cooling.");
+    while (thermalManager.degBed() > target_bed || thermalManager.degProbe() > target_probe) {
       idle_no_sleep();
       const millis_t ms = millis();
       if (ELAPSED(ms, next_temp_report)) {
@@ -151,16 +147,16 @@ void GcodeSuite::G76() {
     #endif
 
     bool timeout = false;
-    while (true) {
+    for (;;) {
       thermalManager.setTargetBed(target_bed);
 
-      SERIAL_ECHOLNPAIR("Target Bed: ", target_bed, "; Probe: ", target_probe);
+      SERIAL_ECHOLNPAIR("Target Bed:", target_bed, " Probe:", target_probe);
 
       // Park nozzle
       do_blocking_move_to(temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z);
 
       // Wait for heatbed to reach target temp and probe to cool below target temp
-      SERIAL_ECHOLNPGM("Waiting for bed and probe to reach target temp.");
+      SERIAL_ECHOLNPGM("Waiting for bed / probe to reach target.");
       const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
       while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1 || thermalManager.degProbe() > target_probe) {
         idle_no_sleep();
@@ -179,7 +175,7 @@ void GcodeSuite::G76() {
       if (timeout) break;
 
       // Move the nozzle to the probing point and wait for the probe to reach target temp
-      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
+      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y);
       do_blocking_move_to(destination);
       SERIAL_ECHOLNPGM("Waiting for probe heating.");
       while (thermalManager.degProbe() < target_probe) {
@@ -197,15 +193,12 @@ void GcodeSuite::G76() {
 
       // Do a single probe at the current position
       remember_feedrate_scaling_off();
-      const float measured_z = probe.probe_at_point(
-        destination.x + probe.offset_xy.x,
-        destination.y + probe.offset_xy.y,
-        PROBE_PT_NONE
-      );
+      const xy_pos_t probe_xy = destination + probe.offset_xy;
+      const float measured_z = probe.probe_at_point(probe_xy, PROBE_PT_NONE);
       restore_feedrate_and_scaling();
 
       if (isnan(measured_z)) {
-        SERIAL_ECHOLNPGM("!Received NAN measurement - aborting.");
+        SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
         break;
       }
       else
@@ -224,7 +217,7 @@ void GcodeSuite::G76() {
     if (temp_comp.finish_calibration(TSI_BED))
       SERIAL_ECHOLNPGM("Successfully calibrated bed.");
     else
-      SERIAL_ECHOLNPGM("!Failed to calibrated bed - reset calibration values.");
+      SERIAL_ECHOLNPGM("!Failed to calibrate bed. Values reset.");
 
     // Cleanup
     thermalManager.setTargetBed(0);
@@ -243,9 +236,11 @@ void GcodeSuite::G76() {
     do_blocking_move_to(temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z);
 
     // Initialize temperatures
-    uint16_t target_bed = temp_comp.probe_calib_bed_temp,
-             target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
+    const uint16_t target_bed = temp_comp.probe_calib_bed_temp;
     thermalManager.setTargetBed(target_bed);
+
+    uint16_t target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
+
     SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
     while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
            || thermalManager.degProbe() > target_probe
@@ -264,16 +259,12 @@ void GcodeSuite::G76() {
     #endif
 
     bool timeout = false;
-    while (true) {
+    for (;;) {
       // Move probe to probing point and wait for it to reach target temperature
-      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
+      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y);
       do_blocking_move_to(destination);
 
-      SERIAL_ECHOLNPAIR(
-        "Bed temp: ", target_bed,
-        "; Probe temp: ", target_probe,
-        "  Waiting for probe heating."
-      );
+      SERIAL_ECHOLNPAIR("Waiting for probe heating. Bed:", target_bed, " Probe:", target_probe);
 
       const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
       while (thermalManager.degProbe() < target_probe) {
@@ -284,7 +275,7 @@ void GcodeSuite::G76() {
           next_temp_report = ms + 1000;
         }
         if (ELAPSED(ms, probe_timeout_ms)) {
-          SERIAL_ECHOLNPGM("!Probe heating aborted due to timeout.");
+          SERIAL_ECHOLNPGM("!Probe heating timed out.");
           timeout = true;
           break;
         }
@@ -298,11 +289,8 @@ void GcodeSuite::G76() {
 
       // Do a single probe
       remember_feedrate_scaling_off();
-      const float measured_z = probe.probe_at_point(
-        destination.x + probe.offset_xy.x,
-        destination.y + probe.offset_xy.y,
-        PROBE_PT_NONE
-      );
+      const xy_pos_t probe_xy = destination + probe.offset_xy;
+      const float measured_z = probe.probe_at_point(probe_xy, PROBE_PT_NONE);
       restore_feedrate_and_scaling();
 
       if (isnan(measured_z)) {
@@ -323,9 +311,10 @@ void GcodeSuite::G76() {
 
     SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
     if (temp_comp.finish_calibration(TSI_PROBE))
-      SERIAL_ECHOLNPGM("Successfully calibrated probe.");
+      SERIAL_ECHOPGM("Successfully calibrated");
     else
-      SERIAL_ECHOLNPGM("!Failed to calibrated probe.");
+      SERIAL_ECHOPGM("!Failed to calibrate");
+    SERIAL_ECHOLNPGM(" probe.");
 
     // Cleanup
     thermalManager.setTargetBed(0);

From f8497b8171af0c20e54416cc440bdcdd973c3326 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 28 Feb 2020 00:03:53 +0000
Subject: [PATCH 297/565] [cron] Bump distribution date (2020-02-28)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 47ccf9be6e82..ef24cbcce706 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-27"
+  #define STRING_DISTRIBUTION_DATE "2020-02-28"
 #endif
 
 /**

From c6694201346aaa351943d56f183451b76cec0c8d Mon Sep 17 00:00:00 2001
From: Anders Sahlman <57940217+AndersSahlman@users.noreply.github.com>
Date: Fri, 28 Feb 2020 02:58:35 +0100
Subject: [PATCH 298/565] Pass along sanity_check for (G33) probing (#17006)

---
 Marlin/src/module/probe.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 84a8f953cab2..c457fad48053 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -85,7 +85,7 @@ class Probe {
     #endif
     static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true);
     static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true) {
-      return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
+      return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative, sanity_check);
     }
     #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
       static const char msg_wait_for_bed_heating[25];

From 97e87d82628840a7ee197225551a62f36bd4d95c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 27 Feb 2020 22:47:44 -0600
Subject: [PATCH 299/565] Fix G76 reachable test (#17005)

---
 Marlin/src/gcode/calibrate/G76_M871.cpp | 172 +++++++++---------------
 1 file changed, 67 insertions(+), 105 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 90413b3215c6..2457bc911010 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -86,6 +86,33 @@ void GcodeSuite::G76() {
     return;
   #endif
 
+  auto report_temps = [](millis_t &ntr, millis_t timeout=0) {
+    idle_no_sleep();
+    const millis_t ms = millis();
+    if (ELAPSED(ms, ntr)) {
+      ntr = ms + 1000;
+      thermalManager.print_heater_states(active_extruder);
+    }
+    return (timeout && ELAPSED(ms, timeout));
+  };
+
+  auto wait_for_temps = [&](const float tb, const float tp, millis_t &ntr, const millis_t timeout=0) {
+    SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
+    while (fabs(thermalManager.degBed() - tb) > 0.1f || thermalManager.degProbe() > tp)
+      if (report_temps(ntr, timeout)) return true;
+    return false;
+  };
+
+  auto g76_probe = [](const xy_pos_t &xypos) {
+    do_blocking_move_to_z(5.0); // Raise nozzle before probing
+    const float measured_z = probe.probe_at_point(xypos, PROBE_PT_NONE, 0, false);  // verbose=0, probe_relative=false
+    if (isnan(measured_z))
+      SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
+    else
+      SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+    return measured_z;
+  };
+
   #if ENABLED(BLTOUCH)
     // Make sure any BLTouch error condition is cleared
     bltouch_command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY);
@@ -98,111 +125,76 @@ void GcodeSuite::G76() {
   // Synchronize with planner
   planner.synchronize();
 
-  // Report temperatures every second and handle heating timeouts
-  millis_t next_temp_report = millis() + 1000;
+  const xyz_pos_t parkpos = { temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z };
+  const xy_pos_t ppos = { temp_comp.measure_point_x, temp_comp.measure_point_y };
 
   if (do_bed_cal || do_probe_cal) {
     // Ensure park position is reachable
-    if (!position_is_reachable(temp_comp.park_point_x, temp_comp.park_point_y)
-      || !(WITHIN(temp_comp.park_point_z, Z_MIN_POS - 0.001f, Z_MAX_POS + 0.001f))
-    ) {
-      SERIAL_ECHOLNPGM("!Park position unreachable - aborting.");
-      return;
+    bool reachable = position_is_reachable(parkpos) || WITHIN(parkpos.z, Z_MIN_POS - fslop, Z_MAX_POS + fslop);
+    if (!reachable)
+      SERIAL_ECHOLNPGM("!Park");
+    else {
+      // Ensure probe position is reachable
+      reachable = probe.can_reach(ppos);
+      if (!reachable) SERIAL_ECHOLNPGM("!Probe");
     }
-    // Ensure probe position is reachable
-    destination.set(
-      temp_comp.measure_point_x - probe.offset_xy.x,
-      temp_comp.measure_point_y - probe.offset_xy.y
-    );
-    if (!probe.can_reach(destination)) {
-      SERIAL_ECHOLNPGM("!Probe position unreachable - aborting.");
+
+    if (!reachable) {
+      SERIAL_ECHOLNPGM(" position unreachable - aborting.");
       return;
     }
 
     process_subcommands_now_P(PSTR("G28"));
   }
 
+  remember_feedrate_scaling_off();
+
+  // Nozzle position based on probe position
+  const xy_pos_t noz_pos = ppos - probe.offset_xy;
+
   /******************************************
    * Calibrate bed temperature offsets
    ******************************************/
 
+  // Report temperatures every second and handle heating timeouts
+  millis_t next_temp_report = millis() + 1000;
+
   if (do_bed_cal) {
 
     uint16_t target_bed = temp_comp.cali_info_init[TSI_BED].start_temp,
              target_probe = temp_comp.bed_calib_probe_temp;
 
     SERIAL_ECHOLNPGM("Waiting for cooling.");
-    while (thermalManager.degBed() > target_bed || thermalManager.degProbe() > target_probe) {
-      idle_no_sleep();
-      const millis_t ms = millis();
-      if (ELAPSED(ms, next_temp_report)) {
-        thermalManager.print_heater_states(active_extruder);
-        next_temp_report = ms + 1000;
-      }
-    }
+    while (thermalManager.degBed() > target_bed || thermalManager.degProbe() > target_probe)
+      report_temps(next_temp_report);
 
     // Disable leveling so it won't mess with us
     #if HAS_LEVELING
       set_bed_leveling_enabled(false);
     #endif
 
-    bool timeout = false;
     for (;;) {
       thermalManager.setTargetBed(target_bed);
 
       SERIAL_ECHOLNPAIR("Target Bed:", target_bed, " Probe:", target_probe);
 
       // Park nozzle
-      do_blocking_move_to(temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z);
+      do_blocking_move_to(parkpos);
 
       // Wait for heatbed to reach target temp and probe to cool below target temp
-      SERIAL_ECHOLNPGM("Waiting for bed / probe to reach target.");
-      const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
-      while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1 || thermalManager.degProbe() > target_probe) {
-        idle_no_sleep();
-        const millis_t ms = millis();
-        if (ELAPSED(ms, next_temp_report)) {
-          thermalManager.print_heater_states(active_extruder);
-          next_temp_report = ms + 1000;
-        }
-        if (ELAPSED(ms, probe_timeout_ms)) {
-          SERIAL_ECHOLNPGM("!Bed heating timeout.");
-          timeout = true;
-          break;
-        }
+      if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + 900UL * 1000UL)) {
+        SERIAL_ECHOLNPGM("!Bed heating timeout.");
+        break;
       }
 
-      if (timeout) break;
-
       // Move the nozzle to the probing point and wait for the probe to reach target temp
-      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y);
-      do_blocking_move_to(destination);
+      do_blocking_move_to_xy(noz_pos);
       SERIAL_ECHOLNPGM("Waiting for probe heating.");
-      while (thermalManager.degProbe() < target_probe) {
-        idle_no_sleep();
-        const millis_t ms = millis();
-        if (ELAPSED(ms, next_temp_report)) {
-          thermalManager.print_heater_states(active_extruder);
-          next_temp_report = ms + 1000;
-        }
-      }
-
-      // Raise nozzle before probing
-      destination.z = 5.0;
-      do_blocking_move_to_z(destination.z);
+      while (thermalManager.degProbe() < target_probe)
+        report_temps(next_temp_report);
 
-      // Do a single probe at the current position
-      remember_feedrate_scaling_off();
-      const xy_pos_t probe_xy = destination + probe.offset_xy;
-      const float measured_z = probe.probe_at_point(probe_xy, PROBE_PT_NONE);
-      restore_feedrate_and_scaling();
-
-      if (isnan(measured_z)) {
-        SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
-        break;
-      }
-      else
-        SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+      const float measured_z = g76_probe(noz_pos);
+      if (isnan(measured_z)) break;
 
       if (target_bed == temp_comp.cali_info_init[TSI_BED].start_temp)
         temp_comp.prepare_new_calibration(measured_z);
@@ -233,7 +225,7 @@ void GcodeSuite::G76() {
   if (do_probe_cal) {
 
     // Park nozzle
-    do_blocking_move_to(temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z);
+    do_blocking_move_to(parkpos);
 
     // Initialize temperatures
     const uint16_t target_bed = temp_comp.probe_calib_bed_temp;
@@ -241,17 +233,8 @@ void GcodeSuite::G76() {
 
     uint16_t target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
 
-    SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
-    while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
-           || thermalManager.degProbe() > target_probe
-    ) {
-      idle_no_sleep();
-      const millis_t ms = millis();
-      if (ELAPSED(ms, next_temp_report)) {
-        thermalManager.print_heater_states(active_extruder);
-        next_temp_report = ms + 1000;
-      }
-    }
+    // Wait for heatbed to reach target temp and probe to cool below target temp
+    wait_for_temps(target_bed, target_probe, next_temp_report);
 
     // Disable leveling so it won't mess with us
     #if HAS_LEVELING
@@ -261,44 +244,21 @@ void GcodeSuite::G76() {
     bool timeout = false;
     for (;;) {
       // Move probe to probing point and wait for it to reach target temperature
-      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y);
-      do_blocking_move_to(destination);
+      do_blocking_move_to_xy(noz_pos);
 
       SERIAL_ECHOLNPAIR("Waiting for probe heating. Bed:", target_bed, " Probe:", target_probe);
-
       const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
       while (thermalManager.degProbe() < target_probe) {
-        idle_no_sleep();
-        const millis_t ms = millis();
-        if (ELAPSED(ms, next_temp_report)) {
-          thermalManager.print_heater_states(active_extruder);
-          next_temp_report = ms + 1000;
-        }
-        if (ELAPSED(ms, probe_timeout_ms)) {
+        if (report_temps(next_temp_report, probe_timeout_ms)) {
           SERIAL_ECHOLNPGM("!Probe heating timed out.");
           timeout = true;
           break;
         }
       }
-
       if (timeout) break;
 
-      // Raise nozzle before probing
-      destination.z = 5.0;
-      do_blocking_move_to_z(destination.z);
-
-      // Do a single probe
-      remember_feedrate_scaling_off();
-      const xy_pos_t probe_xy = destination + probe.offset_xy;
-      const float measured_z = probe.probe_at_point(probe_xy, PROBE_PT_NONE);
-      restore_feedrate_and_scaling();
-
-      if (isnan(measured_z)) {
-        SERIAL_ECHOLNPGM("!Received NAN measurement - aborting.");
-        break;
-      }
-      else
-        SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+      const float measured_z = g76_probe(noz_pos);
+      if (isnan(measured_z)) break;
 
       if (target_probe == temp_comp.cali_info_init[TSI_PROBE].start_temp)
         temp_comp.prepare_new_calibration(measured_z);
@@ -325,6 +285,8 @@ void GcodeSuite::G76() {
     SERIAL_ECHOLNPGM("Final compensation values:");
     temp_comp.print_offsets();
   } // do_probe_cal
+
+  restore_feedrate_and_scaling();
 }
 
 /**

From ac755fce82a1749ad96c4fe3a61a9ec2dae24814 Mon Sep 17 00:00:00 2001
From: jufimu12 <jufimu12@gmail.com>
Date: Fri, 28 Feb 2020 18:42:51 +0100
Subject: [PATCH 300/565] Fix G34 "Decreasing accuracy" bug (#17013)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/calibrate/G34_M422.cpp | 72 ++++++++++++++++---------
 1 file changed, 47 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 7144038ebd39..7923ef9231e1 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -155,8 +155,12 @@ void GcodeSuite::G34() {
     // Move the Z coordinate realm towards the positive - dirty trick
     current_position.z -= z_probe * 0.5f;
 
-    float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f),
-          z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
+    #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f);
+    #else
+      float last_z_align_level_indicator = 10000.0f;
+    #endif
+    float z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
           z_maxdiff = 0.0f,
           amplification = z_auto_align_amplification;
 
@@ -167,7 +171,7 @@ void GcodeSuite::G34() {
       bool adjustment_reverse = false;
     #endif
 
-    for (iteration = 0; iteration < z_auto_align_iterations; ++iteration) {
+    LOOP_L_N(iteration, z_auto_align_iterations) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
 
       SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
@@ -177,7 +181,7 @@ void GcodeSuite::G34() {
             z_measured_max = -100000.0f;
 
       // Probe all positions (one per Z-Stepper)
-      for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
+      LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
         // iteration odd/even --> downward / upward stepper sequence
         const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
 
@@ -227,14 +231,14 @@ void GcodeSuite::G34() {
         // This allows the actual adjustment logic to be shared by both algorithms.
         linear_fit_data lfd;
         incremental_LSF_reset(&lfd);
-        for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
+        LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
           SERIAL_ECHOLNPAIR("PROBEPT_", i + '1', ": ", z_measured[i]);
           incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
         }
         finish_incremental_LSF(&lfd);
 
         z_measured_min = 100000.0f;
-        for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
+        LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
           z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y);
           z_measured_min = _MIN(z_measured_min, z_measured[i]);
         }
@@ -250,12 +254,37 @@ void GcodeSuite::G34() {
         #endif
       );
 
+      #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+        // Check if the applied corrections go in the correct direction.
+        // Calculate the sum of the absolute deviations from the mean of the probe measurements.
+        // Compare to the last iteration to ensure it's getting better.
+
+        // Calculate mean value as a reference
+        float z_measured_mean = 0.0f;
+        LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) z_measured_mean += z_measured[zstepper];
+        z_measured_mean /= NUM_Z_STEPPER_DRIVERS;
+
+        // Calculate the sum of the absolute deviations from the mean value
+        float z_align_level_indicator = 0.0f;
+        LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS)
+          z_align_level_indicator += ABS(z_measured[zstepper] - z_measured_mean);
+
+        // If it's getting worse, stop and throw an error
+        if (last_z_align_level_indicator < z_align_level_indicator * 0.7f) {
+          SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
+          err_break = true;
+          break;
+        }
+
+        last_z_align_level_indicator = z_align_level_indicator;
+      #endif
+
       // The following correction actions are to be enabled for select Z-steppers only
       stepper.set_separate_multi_axis(true);
 
       bool success_break = true;
       // Correct the individual stepper offsets
-      for (uint8_t zstepper = 0; zstepper < NUM_Z_STEPPER_DRIVERS; ++zstepper) {
+      LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) {
         // Calculate current stepper move
         float z_align_move = z_measured[zstepper] - z_measured_min;
         const float z_align_abs = ABS(z_align_move);
@@ -263,21 +292,16 @@ void GcodeSuite::G34() {
         #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
           // Optimize one iteration's correction based on the first measurements
           if (z_align_abs) amplification = (iteration == 1) ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
-        #endif
 
-        // Check for less accuracy compared to last move
-        if (last_z_align_move[zstepper] < z_align_abs * 0.7f) {
-          SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
-          #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+          // Check for less accuracy compared to last move
+          if (last_z_align_move[zstepper] < z_align_abs * 0.7f) {
+            SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
             adjustment_reverse = !adjustment_reverse;
-          #else
-            err_break = true;
-            break;
-          #endif
-        }
+          }
 
-        // Remember the alignment for the next iteration
-        last_z_align_move[zstepper] = z_align_abs;
+          // Remember the alignment for the next iteration
+          last_z_align_move[zstepper] = z_align_abs;
+        #endif
 
         // Stop early if all measured points achieve accuracy target
         if (z_align_abs > z_auto_align_accuracy) success_break = false;
@@ -322,11 +346,9 @@ void GcodeSuite::G34() {
 
     // Restore the active tool after homing
     #if HOTENDS > 1
-      tool_change(old_tool_index, (
+      tool_change(old_tool_index, (true
         #if ENABLED(PARKING_EXTRUDER)
-          false // Fetch the previous toolhead
-        #else
-          true
+          && false // Fetch the previous toolhead
         #endif
       ));
     #endif
@@ -367,10 +389,10 @@ void GcodeSuite::G34() {
 void GcodeSuite::M422() {
 
   if (!parser.seen_any()) {
-    for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
+    LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
       SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + '1', SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
     #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-      for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
+      LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
         SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + '1', SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
     #endif
     return;

From 9b145c7c73e0d3cda5f7b97e9f475a5b92c6ace4 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 29 Feb 2020 07:26:54 +1300
Subject: [PATCH 301/565] Reverse encoder for FYSETC Mini 12864 2.1 + SKR 1.3
 (#17010)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index bd0ad468de0b..767ab397d0f8 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -300,6 +300,7 @@
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
         #define NEOPIXEL_PIN    EXPA1_05_PIN
+        #define REVERSE_ENCODER_DIRECTION
       #endif
 
     #else // !FYSETC_MINI_12864

From b946530ef6c430da921364f4ad5d0e425ea68933 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 29 Feb 2020 00:03:54 +0000
Subject: [PATCH 302/565] [cron] Bump distribution date (2020-02-29)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ef24cbcce706..0e4e6ef983b4 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-28"
+  #define STRING_DISTRIBUTION_DATE "2020-02-29"
 #endif
 
 /**

From 39c34e4992c274943b35918d6ed9d66508bbb88a Mon Sep 17 00:00:00 2001
From: ManuelMcLure <manuel@mclure.org>
Date: Fri, 28 Feb 2020 21:28:17 -0800
Subject: [PATCH 303/565] Use ADC resolution in AD595/8495 calculation (#17018)

Fixes thermocouple reading on LP1768 (which uses 12-bit resolution).
---
 Marlin/src/module/temperature.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 20a08240cdb9..c9547b3e9f8d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1232,8 +1232,8 @@ void Temperature::manage_heater() {
   UNUSED(ms);
 }
 
-#define TEMP_AD595(RAW)  ((RAW) * 5.0 * 100.0 / 1024.0 / (OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET)
-#define TEMP_AD8495(RAW) ((RAW) * 6.6 * 100.0 / 1024.0 / (OVERSAMPLENR) * (TEMP_SENSOR_AD8495_GAIN) + TEMP_SENSOR_AD8495_OFFSET)
+#define TEMP_AD595(RAW)  ((RAW) * 5.0 * 100.0 / float(HAL_ADC_RANGE) / (OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET)
+#define TEMP_AD8495(RAW) ((RAW) * 6.6 * 100.0 / float(HAL_ADC_RANGE) / (OVERSAMPLENR) * (TEMP_SENSOR_AD8495_GAIN) + TEMP_SENSOR_AD8495_OFFSET)
 
 /**
  * Bisect search for the range of the 'raw' value, then interpolate

From 730804289c3134102aa0c1db4f5845b088531f85 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 29 Feb 2020 04:14:40 -0600
Subject: [PATCH 304/565] Catch more LPC1768 pin conflicts (#17019)

---
 Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h | 170 ++++++++++++++++---
 Marlin/src/inc/Conditionals_LCD.h            |  42 ++++-
 Marlin/src/inc/Conditionals_adv.h            | 107 +++++++++++-
 Marlin/src/inc/Conditionals_post.h           | 152 +----------------
 Marlin/src/inc/SanityCheck.h                 |   5 +
 5 files changed, 296 insertions(+), 180 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
index a1fa34204013..db3a0ffc6ea9 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
@@ -88,40 +88,168 @@
  * Serial3 | P0_00 | P0_01 |
  */
 #if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
-  #if  X_CS_PIN == P0_02 || TMC_SW_MISO == P0_02 || (E_STEPPERS && E_MUX1_PIN == P0_02) \
-    || Y_CS_PIN == P0_03 || TMC_SW_MOSI == P0_03 || (E_STEPPERS && E_MUX0_PIN == P0_03)
-    #error "Serial port assignment (0) conflicts with other pins!"
+  #define IS_TX0(P) (P == P0_02)
+  #define IS_RX0(P) (P == P0_03)
+  #if IS_TX0(TMC_SW_MISO) || IS_RX0(TMC_SW_MOSI)
+    #error "Serial port pins (0) conflict with Trinamic SPI pins!"
+  #elif ENABLED(MK2_MULTIPLEXER) && (IS_TX0(E_MUX1_PIN) || IS_RX0(E_MUX0_PIN))
+    #error "Serial port pins (0) conflict with MK2 multiplexer pins!"
+  #elif (AXIS_HAS_SPI(X) && IS_TX0(X_CS_PIN)) || (AXIS_HAS_SPI(Y) && IS_RX0(Y_CS_PIN))
+    #error "Serial port pins (0) conflict with X/Y axis SPI pins!"
   #endif
+  #undef IS_TX0
+  #undef IS_RX0
 #endif
 
 #if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
-  #if TMC_SW_SCK == P0_15
-    #error "Serial port assignment (1) conflicts with other pins!"
+  #define IS_TX1(P) (P == P0_15)
+  #define IS_RX1(P) (P == P0_16)
+  #if IS_TX1(TMC_SW_SCK)
+    #error "Serial port pins (1) conflict with other pins!"
   #elif HAS_SPI_LCD
-    #if  BTN_EN2 == P0_15 || SCK_PIN == P0_15 || LCD_PINS_D4 == P0_15 || DOGLCD_SCK == P0_15 || LCD_RESET_PIN == P0_15 || LCD_PINS_RS == P0_15 || SHIFT_CLK == P0_15 \
-      || BTN_EN1 == P0_16 || LCD_SDSS == P0_16 || LCD_PINS_RS == P0_16 || MISO_PIN == P0_16 || DOGLCD_A0 == P0_16 || SS_PIN == P0_16 || LCD_SDSS == P0_16 || DOGLCD_CS == P0_16 || LCD_RESET_PIN == P0_16 || LCD_BACKLIGHT_PIN == P0_16
-      #error "Serial port assignment (1) conflicts with other pins!"
+    #if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1)
+      #error "Serial port pins (1) conflict with Encoder Buttons!"
+    #elif IS_TX1(SCK_PIN) || IS_TX1(LCD_PINS_D4) || IS_TX1(DOGLCD_SCK) || IS_TX1(LCD_RESET_PIN) || IS_TX1(LCD_PINS_RS) || IS_TX1(SHIFT_CLK) \
+      || IS_RX1(LCD_SDSS) || IS_RX1(LCD_PINS_RS) || IS_RX1(MISO_PIN) || IS_RX1(DOGLCD_A0) || IS_RX1(SS_PIN) || IS_RX1(LCD_SDSS) || IS_RX1(DOGLCD_CS) || IS_RX1(LCD_RESET_PIN) || IS_RX1(LCD_BACKLIGHT_PIN)
+      #error "Serial port pins (1) conflict with LCD pins!"
     #endif
   #endif
+  #undef IS_TX1
+  #undef IS_RX1
 #endif
 
 #if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
-  #if  Y_MIN_PIN == P0_10 || Z_MIN_PROBE_PIN == P0_10 \
-    || X_ENABLE_PIN == P0_10 || Y_ENABLE_PIN == P0_10 || X2_ENABLE_PIN == P0_10 || Y2_ENABLE_PIN == P0_10 || Z2_ENABLE_PIN == P0_10 || Z3_ENABLE_PIN == P0_10 || Z4_ENABLE_PIN == P0_10 \
-    || X2_CS_PIN == P0_10 || Y2_CS_PIN == P0_10 || Z2_CS_PIN == P0_10 || Z3_CS_PIN == P0_10 || Z4_CS_PIN == P0_10 \
-    || X_DIR_PIN == P0_11 || Y_DIR_PIN == P0_11 || X2_DIR_PIN == P0_11 || Y2_DIR_PIN == P0_11 || Z2_DIR_PIN == P0_11 || Z3_DIR_PIN == P0_11 || Z4_DIR_PIN == P0_11 \
-    || X2_STEP_PIN == P0_11 || Y2_STEP_PIN == P0_11 || Z2_STEP_PIN == P0_11 || Z3_STEP_PIN == P0_11 || Z4_STEP_PIN == P0_11
-    #error "Serial port assignment (2) conflicts with other pins!"
-  #elif  (E_STEPPERS > 1 && (E1_ENABLE_PIN == P0_10 || E1_CS_PIN == P0_10)) || (E_STEPPERS > 0 && (E0_DIR_PIN == P0_11 || E0_STEP_PIN == P0_11))
-    #error "Serial port assignment (2) conflicts with other pins!"
+  #define IS_TX2(P) (P == P0_10)
+  #define IS_RX2(P) (P == P0_11)
+  #if  IS_TX2(X2_ENABLE_PIN) || IS_RX2(X2_DIR_PIN) || IS_RX2(X2_STEP_PIN) || (AXIS_HAS_SPI(X2) && IS_TX2(X2_CS_PIN))
+    #error "Serial port pins (2) conflict with X2 pins!"
+  #elif IS_TX2(Y2_ENABLE_PIN) || IS_RX2(Y2_DIR_PIN) || IS_RX2(Y2_STEP_PIN) || (AXIS_HAS_SPI(Y2) && IS_TX2(Y2_CS_PIN))
+    #error "Serial port pins (2) conflict with Y2 pins!"
+  #elif IS_TX2(Z2_ENABLE_PIN) || IS_RX2(Z2_DIR_PIN) || IS_RX2(Z2_STEP_PIN) || (AXIS_HAS_SPI(Z2) && IS_TX2(Z2_CS_PIN))
+    #error "Serial port pins (2) conflict with Z2 pins!"
+  #elif IS_TX2(Z3_ENABLE_PIN) || IS_RX2(Z3_DIR_PIN) || IS_RX2(Z3_STEP_PIN) || (AXIS_HAS_SPI(Z3) && IS_TX2(Z3_CS_PIN))
+    #error "Serial port pins (2) conflict with Z3 pins!"
+  #elif IS_TX2(Z4_ENABLE_PIN) || IS_RX2(Z4_DIR_PIN) || IS_RX2(Z4_STEP_PIN) || (AXIS_HAS_SPI(Z4) && IS_TX2(Z4_CS_PIN))
+    #error "Serial port pins (2) conflict with Z4 pins!"
+  #elif IS_RX2(X_DIR_PIN) || IS_RX2(Y_DIR_PIN)
+    #error "Serial port pins (2) conflict with other pins!"
+  #elif Y_HOME_DIR < 0 && IS_TX2(Y_STOP_PIN)
+    #error "Serial port pins (2) conflict with Y endstop pin!"
+  #elif HAS_CUSTOM_PROBE_PIN && IS_TX2(Z_MIN_PROBE_PIN)
+    #error "Serial port pins (2) conflict with probe pin!"
+  #elif IS_TX2(X_ENABLE_PIN) || IS_RX2(X_DIR_PIN) || IS_TX2(Y_ENABLE_PIN) || IS_RX2(Y_DIR_PIN)
+    #error "Serial port pins (2) conflict with X/Y stepper pins!"
+  #elif EXTRUDERS > 1 && (IS_TX2(E1_ENABLE_PIN) || (AXIS_HAS_SPI(E1) && IS_TX2(E1_CS_PIN)))
+    #error "Serial port pins (2) conflict with E1 stepper pins!"
+  #elif EXTRUDERS && (IS_RX2(E0_DIR_PIN) || IS_RX2(E0_STEP_PIN))
+    #error "Serial port pins (2) conflict with E stepper pins!"
   #endif
+  #undef IS_TX2
+  #undef IS_RX2
 #endif
 
 #if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
-  #if  X_MIN_PIN == P0_00 || Y_SERIAL_TX_PIN == P0_00 || Y_SERIAL_RX_PIN == P0_00 \
-    || X_MAX_PIN == P0_01 || X_SERIAL_TX_PIN == P0_01 || X_SERIAL_RX_PIN == P0_01
-    #error "Serial port assignment (2) conflicts with other pins!"
-  #elif E_STEPPERS > 1 && (E1_DIR_PIN == P0_00 || E1_STEP_PIN == P0_01)
-    #error "Serial port assignment (2) conflicts with other pins!"
+  #define PIN_IS_TX3(P) (PIN_EXISTS(P) && P##_PIN == P0_00)
+  #define PIN_IS_RX3(P) (P##_PIN == P0_01)
+  #if PIN_IS_TX3(X_MIN) || PIN_IS_RX3(X_MAX)
+    #error "Serial port pins (3) conflict with X endstop pins!"
+  #elif PIN_IS_TX3(Y_SERIAL_TX) || PIN_IS_TX3(Y_SERIAL_RX) \
+    ||  PIN_IS_RX3(X_SERIAL_TX) || PIN_IS_RX3(X_SERIAL_RX)
+    #error "Serial port pins (3) conflict with X/Y axis UART pins!"
+  #elif PIN_IS_TX3(X2_DIR) || PIN_IS_RX3(X2_STEP)
+    #error "Serial port pins (3) conflict with X2 pins!"
+  #elif PIN_IS_TX3(Y2_DIR) || PIN_IS_RX3(Y2_STEP)
+    #error "Serial port pins (3) conflict with Y2 pins!"
+  #elif PIN_IS_TX3(Z2_DIR) || PIN_IS_RX3(Z2_STEP)
+    #error "Serial port pins (3) conflict with Z2 pins!"
+  #elif PIN_IS_TX3(Z3_DIR) || PIN_IS_RX3(Z3_STEP)
+    #error "Serial port pins (3) conflict with Z3 pins!"
+  #elif PIN_IS_TX3(Z4_DIR) || PIN_IS_RX3(Z4_STEP)
+    #error "Serial port pins (3) conflict with Z4 pins!"
+  #elif EXTRUDERS > 1 && (PIN_IS_TX3(E1_DIR) || PIN_IS_RX3(E1_STEP))
+    #error "Serial port pins (3) conflict with E1 pins!"
   #endif
+  #undef PIN_IS_TX3
+  #undef PIN_IS_RX3
+#endif
+
+//
+// Flag any i2c pin conflicts
+//
+#if ANY(DIGIPOT_I2C, DIGIPOT_MCP4018, DAC_STEPPER_CURRENT, EXPERIMENTAL_I2CBUS, I2C_POSITION_ENCODERS, NEOPIXEL_LED, PCA9632, I2C_EEPROM)
+  #define USEDI2CDEV_M 1  // <Arduino>/Wire.cpp
+
+  #if USEDI2CDEV_M == 0         // P0_27 [D57] (AUX-1) .......... P0_28 [D58] (AUX-1)
+    #define PIN_IS_SDA0(P) (P##_PIN == P0_27)
+    #define IS_SCL0(P)     (P == P0_28)
+    #if ENABLED(SDSUPPORT) && PIN_IS_SDA0(SD_DETECT)
+      #error "SDA0 overlaps with SD_DETECT_PIN!"
+    #elif PIN_IS_SDA0(E0_AUTO_FAN)
+      #error "SDA0 overlaps with E0_AUTO_FAN_PIN!"
+    #elif PIN_IS_SDA0(BEEPER)
+      #error "SDA0 overlaps with BEEPER_PIN!"
+    #elif IS_SCL0(BTN_ENC)
+      #error "SCL0 overlaps with Encoder Button!"
+    #elif IS_SCL0(SS_PIN)
+      #error "SCL0 overlaps with SS_PIN!"
+    #elif IS_SCL0(LCD_SDSS)
+      #error "SCL0 overlaps with LCD_SDSS!"
+    #endif
+    #undef PIN_IS_SDA0
+    #undef IS_SCL0
+  #elif USEDI2CDEV_M == 1       // P0_00 [D20] (SCA) ............ P0_01 [D21] (SCL)
+    #define PIN_IS_SDA1(P) (PIN_EXISTS(P) && P##_PIN == P0_00)
+    #define PIN_IS_SCL1(P) (P##_PIN == P0_01)
+    #if PIN_IS_SDA1(X_MIN) || PIN_IS_SCL1(X_MAX)
+      #error "One or more i2c (1) pins overlaps with X endstop pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(X2_DIR) || PIN_IS_SCL1(X2_STEP)
+      #error "One or more i2c (1) pins overlaps with X2 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Y2_DIR) || PIN_IS_SCL1(Y2_STEP)
+      #error "One or more i2c (1) pins overlaps with Y2 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Z2_DIR) || PIN_IS_SCL1(Z2_STEP)
+      #error "One or more i2c (1) pins overlaps with Z2 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Z3_DIR) || PIN_IS_SCL1(Z3_STEP)
+      #error "One or more i2c (1) pins overlaps with Z3 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Z4_DIR) || PIN_IS_SCL1(Z4_STEP)
+      #error "One or more i2c (1) pins overlaps with Z4 pins! Disable i2c peripherals."
+    #elif EXTRUDERS > 1 && (PIN_IS_SDA1(E1_DIR) || PIN_IS_SCL1(E1_STEP))
+      #error "One or more i2c (1) pins overlaps with E1 pins! Disable i2c peripherals."
+    #endif
+    #undef PIN_IS_SDA1
+    #undef PIN_IS_SCL1
+  #elif USEDI2CDEV_M == 2     // P0_10 [D38] (X_ENABLE_PIN) ... P0_11 [D55] (X_DIR_PIN)
+    #define PIN_IS_SDA2(P) (P##_PIN == P0_10)
+    #define PIN_IS_SCL2(P) (P##_PIN == P0_11)
+    #if PIN_IS_SDA2(Y_STOP)
+      #error "i2c SDA2 overlaps with Y endstop pin!"
+    #elif HAS_CUSTOM_PROBE_PIN && PIN_IS_SDA2(Z_MIN_PROBE)
+      #error "i2c SDA2 overlaps with Z probe pin!"
+    #elif PIN_IS_SDA2(X_ENABLE) || PIN_IS_SDA2(Y_ENABLE)
+      #error "i2c SDA2 overlaps with X/Y ENABLE pin!"
+    #elif AXIS_HAS_SPI(X) && PIN_IS_SDA2(X_CS)
+      #error "i2c SDA2 overlaps with X CS pin!"
+    #elif PIN_IS_SDA2(X2_ENABLE)
+      #error "i2c SDA2 overlaps with X2 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Y2_ENABLE)
+      #error "i2c SDA2 overlaps with Y2 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Z2_ENABLE)
+      #error "i2c SDA2 overlaps with Z2 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Z3_ENABLE)
+      #error "i2c SDA2 overlaps with Z3 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Z4_ENABLE)
+      #error "i2c SDA2 overlaps with Z4 enable pin! Disable i2c peripherals."
+    #elif EXTRUDERS > 1 && PIN_IS_SDA2(E1_ENABLE)
+      #error "i2c SDA2 overlaps with E1 enable pin! Disable i2c peripherals."
+    #elif EXTRUDERS > 1 && AXIS_HAS_SPI(E1) && PIN_IS_SDA2(E1_CS)
+      #error "i2c SDA2 overlaps with E1 CS pin! Disable i2c peripherals."
+    #elif EXTRUDERS && (PIN_IS_SDA2(E0_STEP) || PIN_IS_SDA2(E0_DIR))
+      #error "i2c SCL2 overlaps with E0 STEP/DIR pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(X_DIR) || PIN_IS_SDA2(Y_DIR)
+      #error "One or more i2c pins overlaps with X/Y DIR pin! Disable i2c peripherals."
+    #endif
+    #undef PIN_IS_SDA2
+    #undef PIN_IS_SCL2
+  #endif
+
+  #undef USEDI2CDEV_M
 #endif
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9227f2c81a0e..640bae93a8c3 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -433,23 +433,42 @@
 #ifndef HOTENDS
   #define HOTENDS EXTRUDERS
 #endif
-
 #ifndef E_STEPPERS
   #define E_STEPPERS EXTRUDERS
 #endif
-
 #ifndef E_MANUAL
   #define E_MANUAL EXTRUDERS
 #endif
 
+// Helper macros for extruder and hotend arrays
 #define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
+#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
+#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1)
+#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
+#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1)
 
 #define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
 #define SWITCHING_NOZZLE_TWO_SERVOS defined(SWITCHING_NOZZLE_E1_SERVO_NR)
 
-#define HAS_HOTEND_OFFSET (HOTENDS > 1)
 #define HAS_DUPLICATION_MODE EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
 
+#define HAS_HOTEND_OFFSET (HOTENDS > 1)
+
+/**
+ * Default hotend offsets, if not defined
+ */
+#if HAS_HOTEND_OFFSET
+  #ifndef HOTEND_OFFSET_X
+    #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
+  #endif
+  #ifndef HOTEND_OFFSET_Y
+    #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
+  #endif
+  #ifndef HOTEND_OFFSET_Z
+    #define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
+  #endif
+#endif
+
 /**
  * DISTINCT_E_FACTORS affects how some E factors are accessed
  */
@@ -575,8 +594,23 @@
 
 #define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
 
-#define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
+// Linear advance uses Jerk since E is an isolated axis
+#define HAS_LINEAR_E_JERK  (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
+
+// This flag indicates some kind of jerk storage is needed
+#define HAS_CLASSIC_JERK   (ENABLED(CLASSIC_JERK) || IS_KINEMATIC)
+
+// E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
+#define HAS_CLASSIC_E_JERK (ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE)))
 
 #ifndef SPI_SPEED
   #define SPI_SPEED SPI_FULL_SPEED
 #endif
+
+/**
+ * This setting is also used by M109 when trying to calculate
+ * a ballpark safe margin to prevent wait-forever situation.
+ */
+#ifndef EXTRUDE_MINTEMP
+  #define EXTRUDE_MINTEMP 170
+#endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index e5cb00c11228..b042c5e96e3e 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -56,11 +56,22 @@
   #undef SHOW_TEMP_ADC_VALUES
 #endif
 
+#if !NUM_SERIAL
+  #undef BAUD_RATE_GCODE
+#endif
+
 // Multiple Z steppers
 #ifndef NUM_Z_STEPPER_DRIVERS
   #define NUM_Z_STEPPER_DRIVERS 1
 #endif
 
+#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  #undef Z_STEPPER_ALIGN_AMP
+#endif
+#ifndef Z_STEPPER_ALIGN_AMP
+  #define Z_STEPPER_ALIGN_AMP 1.0
+#endif
+
 #define HAS_CUTTER EITHER(SPINDLE_FEATURE, LASER_FEATURE)
 
 #if !defined(__AVR__) || !defined(USBCON)
@@ -121,9 +132,6 @@
   #define LED_CONTROL_MENU
   #define LED_USER_PRESET_STARTUP
   #define LED_COLOR_PRESETS
-  #ifndef LED_USER_PRESET_RED
-    #define LED_USER_PRESET_RED        255
-  #endif
   #ifndef LED_USER_PRESET_GREEN
     #define LED_USER_PRESET_GREEN      128
   #endif
@@ -135,6 +143,32 @@
   #endif
 #endif
 
+// Set defaults for unspecified LED user colors
+#if ENABLED(LED_CONTROL_MENU)
+  #ifndef LED_USER_PRESET_RED
+    #define LED_USER_PRESET_RED       255
+  #endif
+  #ifndef LED_USER_PRESET_GREEN
+    #define LED_USER_PRESET_GREEN     255
+  #endif
+  #ifndef LED_USER_PRESET_BLUE
+    #define LED_USER_PRESET_BLUE      255
+  #endif
+  #ifndef LED_USER_PRESET_WHITE
+    #define LED_USER_PRESET_WHITE     0
+  #endif
+  #ifndef LED_USER_PRESET_BRIGHTNESS
+    #ifdef NEOPIXEL_BRIGHTNESS
+      #define LED_USER_PRESET_BRIGHTNESS NEOPIXEL_BRIGHTNESS
+    #else
+      #define LED_USER_PRESET_BRIGHTNESS 255
+    #endif
+  #endif
+#endif
+
+// If platform requires early initialization of watchdog to properly boot
+#define EARLY_WATCHDOG (ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM))
+
 // Extensible UI pin mapping for RepRapDiscount
 #define TOUCH_UI_ULTIPANEL ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
 
@@ -143,7 +177,68 @@
   #define POLL_JOG
 #endif
 
-// G60/G61 Position Save
-#if SAVED_POSITIONS > 256
-  #error "SAVED_POSITIONS must be an integer from 0 to 256."
+/**
+ * Driver Timings
+ * NOTE: Driver timing order is longest-to-shortest duration.
+ *       Preserve this ordering when adding new drivers.
+ */
+
+#ifndef MINIMUM_STEPPER_POST_DIR_DELAY
+  #if HAS_DRIVER(TB6560)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 15000
+  #elif HAS_DRIVER(TB6600)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 1500
+  #elif HAS_DRIVER(DRV8825)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 650
+  #elif HAS_DRIVER(LV8729)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 500
+  #elif HAS_DRIVER(A5984)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 400
+  #elif HAS_DRIVER(A4988)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 200
+  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 20
+  #else
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 0   // Expect at least 10µS since one Stepper ISR must transpire
+  #endif
+#endif
+
+#ifndef MINIMUM_STEPPER_PRE_DIR_DELAY
+  #define MINIMUM_STEPPER_PRE_DIR_DELAY MINIMUM_STEPPER_POST_DIR_DELAY
+#endif
+
+#ifndef MINIMUM_STEPPER_PULSE
+  #if HAS_DRIVER(TB6560)
+    #define MINIMUM_STEPPER_PULSE 30
+  #elif HAS_DRIVER(TB6600)
+    #define MINIMUM_STEPPER_PULSE 3
+  #elif HAS_DRIVER(DRV8825)
+    #define MINIMUM_STEPPER_PULSE 2
+  #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
+    #define MINIMUM_STEPPER_PULSE 1
+  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
+    #define MINIMUM_STEPPER_PULSE 0
+  #elif HAS_DRIVER(LV8729)
+    #define MINIMUM_STEPPER_PULSE 0
+  #else
+    #define MINIMUM_STEPPER_PULSE 2
+  #endif
+#endif
+
+#ifndef MAXIMUM_STEPPER_RATE
+  #if HAS_DRIVER(TB6560)
+    #define MAXIMUM_STEPPER_RATE 15000
+  #elif HAS_DRIVER(TB6600)
+    #define MAXIMUM_STEPPER_RATE 150000
+  #elif HAS_DRIVER(DRV8825)
+    #define MAXIMUM_STEPPER_RATE 250000
+  #elif HAS_DRIVER(A4988)
+    #define MAXIMUM_STEPPER_RATE 500000
+  #elif HAS_DRIVER(LV8729)
+    #define MAXIMUM_STEPPER_RATE 1000000
+  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
+    #define MAXIMUM_STEPPER_RATE 5000000
+  #else
+    #define MAXIMUM_STEPPER_RATE 250000
+  #endif
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 159aefa5d5fd..d40e92869318 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -40,9 +40,6 @@
   #define NOT_A_PIN 0 // For PINS_DEBUGGING
 #endif
 
-#define HAS_CLASSIC_JERK (ENABLED(CLASSIC_JERK) || IS_KINEMATIC)
-#define HAS_CLASSIC_E_JERK (ENABLED(CLASSIC_JERK) || DISABLED(LIN_ADVANCE))
-
 /**
  * Axis lengths and center
  */
@@ -579,99 +576,6 @@
   HEATER_0_USES_THERMISTOR, HEATER_1_USES_THERMISTOR, HEATER_2_USES_THERMISTOR, HEATER_3_USES_THERMISTOR, \
   HEATER_4_USES_THERMISTOR, HEATER_5_USES_THERMISTOR, HEATER_6_USES_THERMISTOR, HEATER_7_USES_THERMISTOR )
 
-/**
- * Default hotend offsets, if not defined
- */
-#if HAS_HOTEND_OFFSET
-  #ifndef HOTEND_OFFSET_X
-    #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
-  #endif
-  #ifndef HOTEND_OFFSET_Y
-    #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
-  #endif
-  #ifndef HOTEND_OFFSET_Z
-    #define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
-  #endif
-#endif
-
-/**
- * ARRAY_BY_EXTRUDERS based on EXTRUDERS
- */
-#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
-#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1)
-
-/**
- * ARRAY_BY_HOTENDS based on HOTENDS
- */
-#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
-#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1)
-
-/**
- * Driver Timings
- * NOTE: Driver timing order is longest-to-shortest duration.
- *       Preserve this ordering when adding new drivers.
- */
-
-#ifndef MINIMUM_STEPPER_POST_DIR_DELAY
-  #if HAS_DRIVER(TB6560)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 15000
-  #elif HAS_DRIVER(TB6600)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 1500
-  #elif HAS_DRIVER(DRV8825)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 650
-  #elif HAS_DRIVER(LV8729)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 500
-  #elif HAS_DRIVER(A5984)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 400
-  #elif HAS_DRIVER(A4988)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 200
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 20
-  #else
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 0   // Expect at least 10µS since one Stepper ISR must transpire
-  #endif
-#endif
-
-#ifndef MINIMUM_STEPPER_PRE_DIR_DELAY
-  #define MINIMUM_STEPPER_PRE_DIR_DELAY MINIMUM_STEPPER_POST_DIR_DELAY
-#endif
-
-#ifndef MINIMUM_STEPPER_PULSE
-  #if HAS_DRIVER(TB6560)
-    #define MINIMUM_STEPPER_PULSE 30
-  #elif HAS_DRIVER(TB6600)
-    #define MINIMUM_STEPPER_PULSE 3
-  #elif HAS_DRIVER(DRV8825)
-    #define MINIMUM_STEPPER_PULSE 2
-  #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
-    #define MINIMUM_STEPPER_PULSE 1
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
-    #define MINIMUM_STEPPER_PULSE 0
-  #elif HAS_DRIVER(LV8729)
-    #define MINIMUM_STEPPER_PULSE 0
-  #else
-    #define MINIMUM_STEPPER_PULSE 2
-  #endif
-#endif
-
-#ifndef MAXIMUM_STEPPER_RATE
-  #if HAS_DRIVER(TB6560)
-    #define MAXIMUM_STEPPER_RATE 15000
-  #elif HAS_DRIVER(TB6600)
-    #define MAXIMUM_STEPPER_RATE 150000
-  #elif HAS_DRIVER(DRV8825)
-    #define MAXIMUM_STEPPER_RATE 250000
-  #elif HAS_DRIVER(A4988)
-    #define MAXIMUM_STEPPER_RATE 500000
-  #elif HAS_DRIVER(LV8729)
-    #define MAXIMUM_STEPPER_RATE 1000000
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
-    #define MAXIMUM_STEPPER_RATE 5000000
-  #else
-    #define MAXIMUM_STEPPER_RATE 250000
-  #endif
-#endif
-
 /**
  * X_DUAL_ENDSTOPS endstop reassignment
  */
@@ -1522,6 +1426,7 @@
 #if !HAS_TEMP_SENSOR
   #undef AUTO_REPORT_TEMPERATURES
 #endif
+#define HAS_AUTO_REPORTING EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
 
 #if !HAS_AUTO_CHAMBER_FAN || AUTO_CHAMBER_IS_E
   #undef AUTO_POWER_CHAMBER_FAN
@@ -1618,20 +1523,6 @@
 
 #endif // HAS_MICROSTEPS
 
-#if !HAS_TEMP_SENSOR
-  #undef AUTO_REPORT_TEMPERATURES
-#endif
-
-#define HAS_AUTO_REPORTING EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
-
-/**
- * This setting is also used by M109 when trying to calculate
- * a ballpark safe margin to prevent wait-forever situation.
- */
-#ifndef EXTRUDE_MINTEMP
-  #define EXTRUDE_MINTEMP 170
-#endif
-
 /**
  * Heater signal inversion defaults
  */
@@ -2121,29 +2012,6 @@
   #define MAX_VFAT_ENTRIES (2)
 #endif
 
-// Set defaults for unspecified LED user colors
-#if ENABLED(LED_CONTROL_MENU)
-  #ifndef LED_USER_PRESET_RED
-    #define LED_USER_PRESET_RED       255
-  #endif
-  #ifndef LED_USER_PRESET_GREEN
-    #define LED_USER_PRESET_GREEN     255
-  #endif
-  #ifndef LED_USER_PRESET_BLUE
-    #define LED_USER_PRESET_BLUE      255
-  #endif
-  #ifndef LED_USER_PRESET_WHITE
-    #define LED_USER_PRESET_WHITE     0
-  #endif
-  #ifndef LED_USER_PRESET_BRIGHTNESS
-    #ifdef NEOPIXEL_BRIGHTNESS
-      #define LED_USER_PRESET_BRIGHTNESS NEOPIXEL_BRIGHTNESS
-    #else
-      #define LED_USER_PRESET_BRIGHTNESS 255
-    #endif
-  #endif
-#endif
-
 // Nozzle park for Delta
 #if BOTH(NOZZLE_PARK_FEATURE, DELTA)
   #undef NOZZLE_PARK_Z_FEEDRATE
@@ -2180,13 +2048,10 @@
 #endif
 
 // Defined here to catch the above defines
-#if ENABLED(SDCARD_SORT_ALPHA)
-  #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
+#if ENABLED(SDCARD_SORT_ALPHA) && (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
+  #define HAS_FOLDER_SORTING 1
 #endif
 
-// If platform requires early initialization of watchdog to properly boot
-#define EARLY_WATCHDOG (ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM))
-
 #if HAS_SPI_LCD
   // Get LCD character width/height, which may be overridden by pins, configs, etc.
   #ifndef LCD_WIDTH
@@ -2223,14 +2088,3 @@
     #define INIT_SDCARD_ON_BOOT
   #endif
 #endif
-
-#if !NUM_SERIAL
-  #undef BAUD_RATE_GCODE
-#endif
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-  #undef Z_STEPPER_ALIGN_AMP
-#endif
-#ifndef Z_STEPPER_ALIGN_AMP
-  #define Z_STEPPER_ALIGN_AMP 1.0
-#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f340e758abef..f5a875ffe995 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2732,3 +2732,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if HAS_TMC_SPI && ALL(MONITOR_DRIVER_STATUS, SDSUPPORT, USES_SHARED_SPI)
   #error "MONITOR_DRIVER_STATUS and SDSUPPORT cannot be used together on boards with shared SPI."
 #endif
+
+// G60/G61 Position Save
+#if SAVED_POSITIONS > 256
+  #error "SAVED_POSITIONS must be an integer from 0 to 256."
+#endif

From 6c9ca1bec260b0d7d6fd2c8291beda08d58aee66 Mon Sep 17 00:00:00 2001
From: Vert <vert@vertshobbies.com>
Date: Sat, 29 Feb 2020 05:35:10 -0500
Subject: [PATCH 305/565] Clarify GT2560 common pins (#17021)

---
 Marlin/src/pins/mega/pins_GT2560_V3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index 4d6cee56f42b..b6aa61aa004b 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * GT2560 V3.0 pin assignment
+ * GT3560 RevB + GT2560 V3.0 + GT2560 V3.1 + GT2560 V4.0 pin assignment
  */
 
 #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)

From 1d609d2bbd4e798399ea1e2243b12d78bce04ecd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 1 Mar 2020 00:04:02 +0000
Subject: [PATCH 306/565] [cron] Bump distribution date (2020-03-01)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0e4e6ef983b4..75daa57707a1 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-02-29"
+  #define STRING_DISTRIBUTION_DATE "2020-03-01"
 #endif
 
 /**

From f7d663c7dba807bb30fe7f100585636f82396000 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 29 Feb 2020 04:27:04 -0600
Subject: [PATCH 307/565] Improvements for MarlinMesh.scad

---
 buildroot/share/scripts/MarlinMesh.scad | 156 ++++++++++++++++--------
 1 file changed, 102 insertions(+), 54 deletions(-)

diff --git a/buildroot/share/scripts/MarlinMesh.scad b/buildroot/share/scripts/MarlinMesh.scad
index 7616ded699a0..6d78bb96492d 100644
--- a/buildroot/share/scripts/MarlinMesh.scad
+++ b/buildroot/share/scripts/MarlinMesh.scad
@@ -10,17 +10,13 @@
  *                                      *
  \**************************************/
 
-//$t = 0.15; // comment out during animation
+$t = 0.15; // comment out during animation!
+X = 0; Y = 1;
+L = 0; R = 1; F = 2; B = 3;
 
 //
-// Mesh info and points
+// Sample Mesh - Replace with your own
 //
-
-mesh_width    = 200;   // X Size in mm of the probed area
-mesh_height   = 200;   // Y Size...
-zprobe_offset = 0;     // Added to the points
-NAN           = 0;     // Z to use for un-measured points
-
 measured_z = [
   [ -1.20, -1.13, -1.09, -1.03, -1.19 ],
   [ -1.16, -1.25, -1.27, -1.25, -1.08 ],
@@ -29,6 +25,28 @@ measured_z = [
   [ -1.13, -0.99, -1.03, -1.06, -1.32 ]
 ];
 
+//
+// An offset to add to all points in the mesh
+//
+zadjust     = 0;
+
+//
+// Mesh characteristics
+//
+bed_size = [ 200, 200 ];
+
+mesh_inset  = [ 10, 10, 10, 10 ]; // L, F, R, B
+
+mesh_bounds = [
+  [ mesh_inset[L], mesh_inset[F] ],
+  [ bed_size[X] - mesh_inset[R], bed_size[Y] - mesh_inset[B] ]
+];
+
+mesh_size = mesh_bounds[1] - mesh_bounds[0];
+
+                      // NOTE: Marlin meshes already subtract the probe offset
+NAN         = 0;      // Z to use for un-measured points
+
 //
 // Geometry
 //
@@ -45,6 +63,7 @@ alternation   = 2;     // direction change modulus (try it)
 
 show_plane    = true;
 show_labels   = true;
+show_coords   = true;
 arrow_length  = 5;
 
 label_font_lg = "Arial";
@@ -62,8 +81,8 @@ mean_value = (big_z + lil_z) / 2.0;
 mesh_points_y = len(measured_z);
 mesh_points_x = len(measured_z[0]);
 
-xspace = mesh_width / (mesh_points_x - 1);
-yspace = mesh_height / (mesh_points_y - 1);
+xspace = mesh_size[X] / (mesh_points_x - 1);
+yspace = mesh_size[Y] / (mesh_points_y - 1);
 
 // At $t=0 and $t=1 scale will be 100%
 z_scale_factor = min_z_scale + (($t > 0.5) ? 1.0 - $t : $t) * (max_z_scale - min_z_scale) * 2;
@@ -72,6 +91,8 @@ z_scale_factor = min_z_scale + (($t > 0.5) ? 1.0 - $t : $t) * (max_z_scale - min
 // Min and max recursive functions for 1D and 2D arrays
 // Return the smallest or largest value in the array
 //
+function some_1D(b,i) = (i<len(b)-1) ? (b[i] && some_1D(b,i+1)) : b[i] != 0;
+function some_2D(a,j) = (j<len(a)-1) ? some_2D(a,j+1) : some_1D(a[j], 0);
 function min_1D(b,i) = (i<len(b)-1) ? min(b[i], min_1D(b,i+1)) : b[i];
 function min_2D(a,j) = (j<len(a)-1) ? min_2D(a,j+1) : min_1D(a[j], 0);
 function max_1D(b,i) = (i<len(b)-1) ? max(b[i], max_1D(b,i+1)) : b[i];
@@ -98,36 +119,59 @@ function pos(x,y,z) = [x * xspace, y * yspace, z_scale_factor * (z - mean_value)
 //
 module point_markers(show_home=true) {
   // Mark the home position 0,0
-  color([0,0,0,0.25]) translate([1,1]) cylinder(r=1, h=z_scale_factor, center=true);
+  if (show_home)
+    translate([1,1]) color([0,0,0,0.25])
+      cylinder(r=1, h=z_scale_factor, center=true);
 
   for (x=[0:mesh_points_x-1], y=[0:mesh_points_y-1]) {
-    z = measured_z[y][x];
+    z = measured_z[y][x] - zadjust;
     down = z < mean_value;
-    translate(pos(x, y, z)) {
+    xyz = pos(x, y, z);
+    translate([ xyz[0], xyz[1] ]) {
+
+      // Show the XY as well as the Z!
+      if (show_coords) {
+        color("black")
+        translate([0,0,0.5]) {
+          $fn=8;
+          rotate([0,0]) {
+            posx = floor(mesh_bounds[0][X] + x * xspace);
+            posy = floor(mesh_bounds[0][Y] + y * yspace);
+            text(str(posx, ",", posy), 2, label_font_sm, halign="center", valign="center");
+          }
+        }
+      }
 
-      // Label each point with the Z
-      if (show_labels) {
+      translate([ 0, 0, xyz[2] ]) {
+        // Label each point with the Z
         v = z - mean_value;
+        if (show_labels) {
 
-        color(abs(v) < 0.1 ? [0,0.5,0] : [0.25,0,0])
-        translate([0,0,down?-10:10]) {
+          color(abs(v) < 0.1 ? [0,0.5,0] : [0.25,0,0])
+          translate([0,0,down?-10:10]) {
 
-          $fn=8;
-          rotate([90,0])
-            text(str(z), 6, label_font_lg, halign="center", valign="center");
+            $fn=8;
+            rotate([90,0])
+              text(str(z), 6, label_font_lg, halign="center", valign="center");
 
-          translate([0,0,down?-6:6]) rotate([90,0])
-            text(str(down ? "" : "+", v), 3, label_font_sm, halign="center", valign="center");
+            if (v)
+              translate([0,0,down?-6:6]) rotate([90,0])
+                text(str(down || !v ? "" : "+", v), 3, label_font_sm, halign="center", valign="center");
+          }
         }
-      }
 
-      // Show an arrow pointing up or down
-      rotate([0, down ? 180 : 0]) translate([0,0,-1])
-        cylinder(
-          r1=0.5,
-          r2=0.1,
-          h=arrow_length, $fn=12, center=1
-        );
+        // Show an arrow pointing up or down
+        if (v) {
+          rotate([0, down ? 180 : 0]) translate([0,0,-1])
+            cylinder(
+              r1=0.5,
+              r2=0.1,
+              h=arrow_length, $fn=12, center=1
+            );
+        }
+        else
+          color([1,0,1,0.4]) sphere(r=1.0, $fn=20, center=1);
+      }
     }
   }
 }
@@ -161,7 +205,7 @@ module tesselated_square(s, alt=false) {
  * The simplest mesh display
  */
 module simple_mesh(show_plane=show_plane) {
-  if (show_plane) color(plane_color) cube([mesh_width, mesh_height, thickness]);
+  if (show_plane) color(plane_color) cube([mesh_size[X], mesh_size[Y], thickness]);
   color(mesh_color)
     for (x=[0:mesh_points_x-2], y=[0:mesh_points_y-2])
       tesselated_square(grid_square(x, y));
@@ -171,30 +215,34 @@ module simple_mesh(show_plane=show_plane) {
  * Subdivide the mesh into smaller squares.
  */
 module bilinear_mesh(show_plane=show_plane,tesselation=tesselation) {
-  if (show_plane) color(plane_color) translate([-5,-5]) cube([mesh_width+10, mesh_height+10, thickness]);
-  tesselation = tesselation % 4;
-  color(mesh_color)
-  for (x=[0:mesh_points_x-2], y=[0:mesh_points_y-2]) {
-    square = grid_square(x, y);
-    if (tesselation < 1) {
-      tesselated_square(square,(x%alternation)-(y%alternation));
-    }
-    else {
-      subdiv_4 = subdivided_square(square);
-      if (tesselation < 2) {
-        for (i=[0:3]) tesselated_square(subdiv_4[i],i%alternation);
+  if (show_plane) color(plane_color) translate([-5,-5]) cube([mesh_size[X]+10, mesh_size[Y]+10, thickness]);
+
+  if (some_2D(measured_z, 0)) {
+
+    tesselation = tesselation % 4;
+    color(mesh_color)
+    for (x=[0:mesh_points_x-2], y=[0:mesh_points_y-2]) {
+      square = grid_square(x, y);
+      if (tesselation < 1) {
+        tesselated_square(square,(x%alternation)-(y%alternation));
       }
       else {
-        for (i=[0:3]) {
-          subdiv_16 = subdivided_square(subdiv_4[i]);
-          if (tesselation < 3) {
-            for (j=[0:3]) tesselated_square(subdiv_16[j],j%alternation);
-          }
-          else {
-            for (j=[0:3]) {
-              subdiv_64 = subdivided_square(subdiv_16[j]);
-              if (tesselation < 4) {
-                for (k=[0:3]) tesselated_square(subdiv_64[k]);
+        subdiv_4 = subdivided_square(square);
+        if (tesselation < 2) {
+          for (i=[0:3]) tesselated_square(subdiv_4[i],i%alternation);
+        }
+        else {
+          for (i=[0:3]) {
+            subdiv_16 = subdivided_square(subdiv_4[i]);
+            if (tesselation < 3) {
+              for (j=[0:3]) tesselated_square(subdiv_16[j],j%alternation);
+            }
+            else {
+              for (j=[0:3]) {
+                subdiv_64 = subdivided_square(subdiv_16[j]);
+                if (tesselation < 4) {
+                  for (k=[0:3]) tesselated_square(subdiv_64[k]);
+                }
               }
             }
           }
@@ -249,7 +297,7 @@ function subdivided_square(a) = [
 
 //================================================ Run the plan
 
-translate([-mesh_width / 2, -mesh_height / 2]) {
+translate([-mesh_size[X] / 2, -mesh_size[Y] / 2]) {
   $fn = 12;
   point_markers();
   bilinear_mesh();

From 5e9a10dbaeaa885a670af0bd7ef3e7c068f5a7b8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 07:36:25 -0600
Subject: [PATCH 308/565] Use PSTR for common labels

---
 Marlin/src/MarlinCore.cpp                   | 10 +++++++++-
 Marlin/src/MarlinCore.h                     |  4 +++-
 Marlin/src/feature/dac/stepper_dac.cpp      | 10 +++++-----
 Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp |  8 ++++----
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp  |  4 ++--
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp       |  6 +++---
 Marlin/src/module/planner.cpp               | 11 +++++++----
 Marlin/src/module/scara.cpp                 |  6 ++++--
 Marlin/src/module/stepper.cpp               |  4 ++--
 9 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5a527482ce09..124fb6f038fc 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -192,7 +192,15 @@ const char NUL_STR[] PROGMEM = "",
            SP_X_STR[] PROGMEM = " X",
            SP_Y_STR[] PROGMEM = " Y",
            SP_Z_STR[] PROGMEM = " Z",
-           SP_E_STR[] PROGMEM = " E";
+           SP_E_STR[] PROGMEM = " E",
+              X_LBL[] PROGMEM =  "X:",
+              Y_LBL[] PROGMEM =  "Y:",
+              Z_LBL[] PROGMEM =  "Z:",
+              E_LBL[] PROGMEM =  "E:",
+           SP_X_LBL[] PROGMEM = " X:",
+           SP_Y_LBL[] PROGMEM = " Y:",
+           SP_Z_LBL[] PROGMEM = " Z:",
+           SP_E_LBL[] PROGMEM = " E:";
 
 bool Running = true;
 
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index fd2cbeaba9a2..141ce7156e3a 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -123,4 +123,6 @@ void protected_pin_err();
 #endif
 
 extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
-                  SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];
+                  SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
+                  X_LBL[], Y_LBL[], Z_LBL[], E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[];
+
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index cb3856f28704..c8c1cb2494b0 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -88,11 +88,11 @@ void dac_print_values() {
 
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
   SERIAL_ECHO_START();
-  SERIAL_ECHOLNPAIR(
-    " X:", dac_perc(X_AXIS), " (", dac_amps(X_AXIS), ")"
-    " Y:", dac_perc(Y_AXIS), " (", dac_amps(Y_AXIS), ")"
-    " Z:", dac_perc(Z_AXIS), " (", dac_amps(Z_AXIS), ")"
-    " E:", dac_perc(E_AXIS), " (", dac_amps(E_AXIS), ")"
+  SERIAL_ECHOLNPAIR_P(
+    SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")")
+    SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")")
+    SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")")
+    SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")")
   );
 }
 
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index 7cee7db4b4df..0e6374b8d257 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -1212,10 +1212,10 @@ void MarlinUI::draw_status_screen() {
         #define _LCD_W_POS 12
         #define _PLOT_X 1
         #define _MAP_X 3
-        #define _LABEL(C,X,Y) lcd_put_u8str(X, Y, C)
-        #define _XLABEL(X,Y) _LABEL("X:",X,Y)
-        #define _YLABEL(X,Y) _LABEL("Y:",X,Y)
-        #define _ZLABEL(X,Y) _LABEL("Z:",X,Y)
+        #define _LABEL(C,X,Y) lcd_put_u8str_P(X, Y, C)
+        #define _XLABEL(X,Y) _LABEL(X_LBL,X,Y)
+        #define _YLABEL(X,Y) _LABEL(Y_LBL,X,Y)
+        #define _ZLABEL(X,Y) _LABEL(Z_LBL,X,Y)
       #else
         #define _LCD_W_POS 8
         #define _PLOT_X 0
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 1ea1424d306b..908dfdf8f2b7 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -652,11 +652,11 @@ void MarlinUI::draw_status_screen() {
           }
         }
         else if (progress_state == 2 && estimation_string[0]) {
-          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "R:");
+          lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, PSTR("R:"));
           lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
         }
         else if (elapsed_string[0]) {
-          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "E:");
+          lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, E_LBL);
           lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
         }
 
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 8dd24e2737f1..4bfa3c71b38e 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -548,9 +548,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       if (PAGE_UNDER(7)) {
         const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
                        lpos = pos.asLogical();
-        lcd_put_u8str(5, 7, "X:");
+        lcd_put_u8str_P(5, 7, X_LBL);
         lcd_put_u8str(ftostr52(lpos.x));
-        lcd_put_u8str(74, 7, "Y:");
+        lcd_put_u8str_P(74, 7, Y_LBL);
         lcd_put_u8str(ftostr52(lpos.y));
       }
 
@@ -563,7 +563,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
         lcd_put_wchar(')');
 
         // Show the location value
-        lcd_put_u8str(74, LCD_PIXEL_HEIGHT, "Z:");
+        lcd_put_u8str_P(74, LCD_PIXEL_HEIGHT, Z_LBL);
         if (!isnan(ubl.z_values[x_plot][y_plot]))
           lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
         else
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 2067ecc23f56..fe1eec459f45 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2628,21 +2628,24 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
       SERIAL_ECHOPAIR("->", target.a);
       SERIAL_ECHOPAIR(") B:", b);
     #else
-      SERIAL_ECHOPAIR(" X:", a);
+      SERIAL_ECHOPAIR_P(SP_X_LBL, a);
       SERIAL_ECHOPAIR(" (", position.x);
       SERIAL_ECHOPAIR("->", target.x);
-      SERIAL_ECHOPAIR(") Y:", b);
+      SERIAL_CHAR(')');
+      SERIAL_ECHOPAIR_P(SP_Y_LBL, b);
     #endif
     SERIAL_ECHOPAIR(" (", position.y);
     SERIAL_ECHOPAIR("->", target.y);
     #if ENABLED(DELTA)
       SERIAL_ECHOPAIR(") C:", c);
     #else
-      SERIAL_ECHOPAIR(") Z:", c);
+      SERIAL_CHAR(')');
+      SERIAL_ECHOPAIR_P(SP_Z_LBL, c);
     #endif
     SERIAL_ECHOPAIR(" (", position.z);
     SERIAL_ECHOPAIR("->", target.z);
-    SERIAL_ECHOPAIR(") E:", e);
+    SERIAL_CHAR(')');
+    SERIAL_ECHOPAIR_P(SP_E_LBL, e);
     SERIAL_ECHOPAIR(" (", position.e);
     SERIAL_ECHOPAIR("->", target.e);
     SERIAL_ECHOLNPGM(")");
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index f7eb8d192b93..5fbbfd65a6bc 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -53,11 +53,13 @@ void scara_set_axis_is_at_home(const AxisEnum axis) {
       current_position[axis] = cartes[axis];
     #else
       // MP_SCARA uses a Cartesian XY home position
-      // SERIAL_ECHOLNPAIR("homeposition X:", homeposition.x, " Y:", homeposition.y);
+      // SERIAL_ECHOPGM("homeposition");
+      // SERIAL_ECHOLNPAIR_P(SP_X_LBL, homeposition.x, SP_Y_LBL, homeposition.y);
       current_position[axis] = homeposition[axis];
     #endif
 
-    // SERIAL_ECHOLNPAIR("Cartesian X:", current_position.x, " Y:", current_position.y);
+    // SERIAL_ECHOPGM("Cartesian");
+    // SERIAL_ECHOLNPAIR_P(SP_X_LBL, current_position.x, SP_Y_LBL, current_position.y);
     update_software_endstops(axis);
   }
 }
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 68639d40f003..d4bbe36f1340 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2464,12 +2464,12 @@ void Stepper::report_positions() {
   #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
     SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
   #else
-    SERIAL_ECHOPAIR(STR_COUNT_X, pos.x, " Y:", pos.y);
+    SERIAL_ECHOPAIR_P(PSTR(STR_COUNT_X), pos.x, SP_Y_LBL, pos.y);
   #endif
   #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
     SERIAL_ECHOLNPAIR(" C:", pos.z);
   #else
-    SERIAL_ECHOLNPAIR(" Z:", pos.z);
+    SERIAL_ECHOLNPAIR_P(SP_Z_LBL, pos.z);
   #endif
 }
 

From 3473b21710e236669017ddab2650f566499dde64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 09:50:53 -0600
Subject: [PATCH 309/565] Move millis_t includes

---
 Marlin/src/HAL/HAL_LPC1768/main.cpp         | 1 +
 Marlin/src/HAL/HAL_STM32/Servo.h            | 2 ++
 Marlin/src/HAL/shared/Delay.h               | 1 -
 Marlin/src/core/types.h                     | 2 +-
 Marlin/src/core/utility.h                   | 1 +
 Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp
index d7ba62fe5e98..149153e8a734 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp
@@ -37,6 +37,7 @@ extern "C" {
 
 #include "../../sd/cardreader.h"
 #include "../../inc/MarlinConfig.h"
+#include "../../core/millis_t.h"
 #include "HAL.h"
 #include "timers.h"
 
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.h b/Marlin/src/HAL/HAL_STM32/Servo.h
index 1f841f8184aa..e8b3c4b100b4 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.h
+++ b/Marlin/src/HAL/HAL_STM32/Servo.h
@@ -24,6 +24,8 @@
 
 #include <Servo.h>
 
+#include "../../core/millis_t.h"
+
 // Inherit and expand on the official library
 class libServo : public Servo {
   public:
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 78bf6745ea54..5cb68b150349 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -29,7 +29,6 @@
  *  DELAY_US(count): Delay execution in microseconds
  */
 
-#include "../../core/millis_t.h"
 #include "../../core/macros.h"
 
 #if defined(__arm__) || defined(__thumb__)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index d563963cf75c..17301bd8c120 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <stddef.h>
 
-#include "millis_t.h"
+#include "../inc/MarlinConfigPre.h"
 
 class __FlashStringHelper;
 typedef const __FlashStringHelper *progmem_str;
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index e34f9dd58a0e..c2da0291966c 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -23,6 +23,7 @@
 
 #include "../inc/MarlinConfigPre.h"
 #include "../core/types.h"
+#include "../core/millis_t.h"
 
 // Delay that ensures heaters and watchdog are kept alive
 void safe_delay(millis_t ms);
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index 0e6374b8d257..d79a7ccf61e3 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -829,7 +829,7 @@ void MarlinUI::draw_status_screen() {
                 && !printingIsActive()
               #endif
             ) {
-              xy_pos_t lpos = current_position; toLogical(lpos);
+              const xy_pos_t lpos = current_position.asLogical();
               _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink);
               lcd_put_wchar(' ');
               _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink);

From c4db8e49a7429a696431c0d3419b545d13eead31 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 10:36:15 -0600
Subject: [PATCH 310/565] XYZ_CHAR macro

---
 Marlin/src/core/types.h                       |  1 +
 Marlin/src/core/utility.cpp                   | 24 +++++++++----------
 Marlin/src/gcode/calibrate/M425.cpp           |  6 ++---
 Marlin/src/gcode/calibrate/M666.cpp           |  4 ++--
 Marlin/src/gcode/control/M605.cpp             |  2 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |  4 ++--
 .../src/gcode/feature/trinamic/M911-M914.cpp  |  2 +-
 Marlin/src/gcode/gcode.cpp                    |  2 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |  2 +-
 Marlin/src/gcode/host/M114.cpp                |  4 ++--
 Marlin/src/gcode/motion/M290.cpp              |  4 ++--
 Marlin/src/module/motion.cpp                  |  4 ++--
 12 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 17301bd8c120..c56ce41895e9 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -483,3 +483,4 @@ struct XYZEval {
 #undef FI
 
 const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' };
+#define XYZ_CHAR(A) ('X' + char(A))
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 64783d070f0a..d2e3459d18f3 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -139,17 +139,17 @@ void safe_delay(millis_t ms) {
     #endif
 
     #if HAS_ABL_OR_UBL
-      SERIAL_ECHOLNPGM("Auto Bed Leveling: "
-        #if ENABLED(AUTO_BED_LEVELING_LINEAR)
-          "LINEAR"
-        #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-          "BILINEAR"
-        #elif ENABLED(AUTO_BED_LEVELING_3POINT)
-          "3POINT"
-        #elif ENABLED(AUTO_BED_LEVELING_UBL)
-          "UBL"
-        #endif
-      );
+      SERIAL_ECHOPGM("Auto Bed Leveling: ");
+      #if ENABLED(AUTO_BED_LEVELING_LINEAR)
+        SERIAL_ECHOLNPGM("LINEAR");
+      #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
+        SERIAL_ECHOLNPGM("BILINEAR");
+      #elif ENABLED(AUTO_BED_LEVELING_3POINT)
+        SERIAL_ECHOLNPGM("3POINT");
+      #elif ENABLED(AUTO_BED_LEVELING_UBL)
+        SERIAL_ECHOLNPGM("UBL");
+      #endif
+
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
@@ -160,7 +160,7 @@ void safe_delay(millis_t ms) {
           SERIAL_ECHOPGM("ABL Adjustment X");
           LOOP_XYZ(a) {
             float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
-            SERIAL_CHAR(' ', 'X' + char(a));
+            SERIAL_CHAR(' ', XYZ_CHAR(a));
             if (v > 0) SERIAL_CHAR('+');
             SERIAL_ECHO(v);
           }
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index a54c7cf746fc..41c80daf7c7b 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::M425() {
   bool noArgs = true;
 
   LOOP_XYZ(a) {
-    if (parser.seen(axis_codes[a])) {
+    if (parser.seen(XYZ_CHAR(a))) {
       planner.synchronize();
       backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
       noArgs = false;
@@ -75,7 +75,7 @@ void GcodeSuite::M425() {
     SERIAL_ECHOLNPAIR("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
     LOOP_XYZ(a) {
-      SERIAL_CHAR(' ', axis_codes[a]);
+      SERIAL_CHAR(' ', XYZ_CHAR(a));
       SERIAL_ECHO(backlash.distance_mm[a]);
       SERIAL_EOL();
     }
@@ -88,7 +88,7 @@ void GcodeSuite::M425() {
       SERIAL_ECHOPGM("  Average measured backlash (mm):");
       if (backlash.has_any_measurement()) {
         LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) {
-          SERIAL_CHAR(' ', axis_codes[a]);
+          SERIAL_CHAR(' ', XYZ_CHAR(a));
           SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
         }
       }
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index 094b32708b4d..721cbcfaa053 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -40,10 +40,10 @@
   void GcodeSuite::M666() {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> M666");
     LOOP_XYZ(i) {
-      if (parser.seen(axis_codes[i])) {
+      if (parser.seen(XYZ_CHAR(i))) {
         const float v = parser.value_linear_units();
         if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v;
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", axis_codes[i], "] = ", delta_endstop_adj[i]);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", XYZ_CHAR(i), "] = ", delta_endstop_adj[i]);
       }
     }
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< M666");
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 99bab4ddc960..ab5efbbb48bd 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -138,7 +138,7 @@
 
         HOTEND_LOOP() {
           DEBUG_ECHOPAIR_P(SP_T_STR, int(e));
-          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", int(e), "].", axis_codes[a] | 0x20, "=", hotend_offset[e][a]);
+          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", int(e), "].", XYZ_CHAR(a) | 0x20, "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
         DEBUG_EOL();
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index e6e5180192e6..2ec2f85fe5cf 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -56,10 +56,10 @@ void GcodeSuite::G61(void) {
 
   SERIAL_ECHOPAIR(STR_RESTORING_POS " S", int(slot));
   LOOP_XYZ(i) {
-    destination[i] = parser.seen(axis_codes[i])
+    destination[i] = parser.seen(XYZ_CHAR(i))
       ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
       : current_position[i];
-    SERIAL_CHAR(' ', axis_codes[i]);
+    SERIAL_CHAR(' ', XYZ_CHAR(i));
     SERIAL_ECHO_F(destination[i]);
   }
   SERIAL_EOL();
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 505ac14d8777..4629bccab0cf 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -348,7 +348,7 @@
 
     bool report = true;
     const uint8_t index = parser.byteval('I');
-    LOOP_XYZ(i) if (parser.seen(axis_codes[i])) {
+    LOOP_XYZ(i) if (parser.seen(XYZ_CHAR(i))) {
       const int16_t value = parser.value_int();
       report = false;
       switch (i) {
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0d2b656dd6e7..f6b8e6f59ba5 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -135,7 +135,7 @@ void GcodeSuite::get_destination_from_command() {
 
   // Get new XYZ position, whether absolute or relative
   LOOP_XYZ(i) {
-    if ( (seen[i] = parser.seenval(axis_codes[i])) ) {
+    if ( (seen[i] = parser.seenval(XYZ_CHAR(i))) ) {
       const float v = parser.value_axis_units((AxisEnum)i);
       if (skip_move)
         destination[i] = current_position[i];
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index e4cac5174bf7..13e82a0c7316 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -38,7 +38,7 @@
  */
 void GcodeSuite::M206() {
   LOOP_XYZ(i)
-    if (parser.seen(axis_codes[i]))
+    if (parser.seen(XYZ_CHAR(i)))
       set_home_offset((AxisEnum)i, parser.value_linear_units());
 
   #if ENABLED(MORGAN_SCARA)
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index acdd925301a7..fc67f762d24e 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -45,8 +45,8 @@
 
   void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
-    for (uint8_t a = X_AXIS; a <= Z_AXIS; a++) {
-      SERIAL_CHAR(' ', axis_codes[a], ':');
+    LOOP_XYZ(a) {
+      SERIAL_CHAR(' ', XYZ_CHAR(a), ':');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
     SERIAL_EOL();
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 4f6489d3b912..5fef948fa483 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -76,8 +76,8 @@
  */
 void GcodeSuite::M290() {
   #if ENABLED(BABYSTEP_XY)
-    for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
-      if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
+    LOOP_XYZ(a)
+      if (parser.seenval(XYZ_CHAR(a)) || (a == Z_AXIS && parser.seenval('S'))) {
         const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
         babystep.add_mm((AxisEnum)a, offs);
         #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 9f6cbf1b387b..8bad4473c5b7 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -587,7 +587,7 @@ void restore_feedrate_and_scaling() {
     #endif
 
   if (DEBUGGING(LEVELING))
-    SERIAL_ECHOLNPAIR("Axis ", axis_codes[axis], " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
+    SERIAL_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
 }
 
   /**
@@ -1779,7 +1779,7 @@ void homeaxis(const AxisEnum axis) {
 #if HAS_WORKSPACE_OFFSET
   void update_workspace_offset(const AxisEnum axis) {
     workspace_offset[axis] = home_offset[axis] + position_shift[axis];
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", axis_codes[axis], " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
   }
 #endif
 

From edd1b76a9a4467204c3ca1bb95da3db55d062e2c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 10:41:14 -0600
Subject: [PATCH 311/565] Fix set_current_from_steppers_for_axis(E_AXIS) bug

---
 Marlin/src/module/motion.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 8bad4473c5b7..e15e955367e3 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -272,20 +272,21 @@ void get_cartesian_from_steppers() {
  */
 void set_current_from_steppers_for_axis(const AxisEnum axis) {
   get_cartesian_from_steppers();
+  xyze_pos_t pos = cartes;
+  pos.e = planner.get_axis_position_mm(E_AXIS);
 
   #if HAS_POSITION_MODIFIERS
-    xyze_pos_t pos = { cartes.x, cartes.y, cartes.z, current_position.e };
     planner.unapply_modifiers(pos
       #if HAS_LEVELING
         , true
       #endif
     );
-    const xyze_pos_t &cartes = pos;
   #endif
+
   if (axis == ALL_AXES)
-    current_position = cartes;
+    current_position = pos;
   else
-    current_position[axis] = cartes[axis];
+    current_position[axis] = pos[axis];
 }
 
 /**

From 4a3fcd0bf980b82120d230af57aa9e78a3838809 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 1 Mar 2020 15:37:16 -0800
Subject: [PATCH 312/565] Fix three extruder with auto-fan build (#17035)

---
 Marlin/src/core/macros.h                    |  4 ++--
 buildroot/share/tests/BIGTREE_SKR_PRO-tests | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 5e0797d67c04..557234208cd0 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -473,7 +473,7 @@
     ( DEFER2(__RREPEAT2)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP,V) ) \
     ( /* Do nothing */ )
 #define __RREPEAT2() _RREPEAT2
-#define RREPEAT_S(S,N,OP)        EVAL(_RREPEAT(S,SUB##S(N),OP))
+#define RREPEAT_S(S,N,OP)        EVAL1024(_RREPEAT(S,SUB##S(N),OP))
 #define RREPEAT(N,OP)            RREPEAT_S(0,N,OP)
-#define RREPEAT2_S(S,N,OP,V...)  EVAL(_RREPEAT2(S,SUB##S(N),OP,V))
+#define RREPEAT2_S(S,N,OP,V...)  EVAL1024(_RREPEAT2(S,SUB##S(N),OP,V))
 #define RREPEAT2(N,OP,V...)      RREPEAT2_S(0,N,OP,V)
diff --git a/buildroot/share/tests/BIGTREE_SKR_PRO-tests b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
index 094e01d9c73a..238b54d4f87f 100644
--- a/buildroot/share/tests/BIGTREE_SKR_PRO-tests
+++ b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
@@ -14,5 +14,16 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
 opt_set SERIAL_PORT 1
 exec_test $1 $2 "BigTreeTech SKR Pro Default Configuration"
 
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
+opt_set SERIAL_PORT -1
+opt_set EXTRUDERS 3
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set E0_AUTO_FAN_PIN PC10
+opt_set E1_AUTO_FAN_PIN PC11
+opt_set E2_AUTO_FAN_PIN PC12
+exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders with Auto-Fan"
+
 # clean up
 restore_configs

From 45fae55929233415031c319b54445f4e511be085 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 1 Mar 2020 15:39:00 -0800
Subject: [PATCH 313/565] Fix SKR nested comment warning (#17037)

---
 .../PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
index fd1f29645957..a772f64fb7ee 100644
--- a/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
@@ -355,7 +355,7 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
     {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
   #else
-  #error "USB in HS mode isn't supported by the board"
+    #error "USB in HS mode isn't supported by the board"
     {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
     {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
     {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
@@ -366,7 +366,8 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
     {PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR
     {PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT
-  #endif /* USE_USB_HS_IN_FS */
+  #endif // USE_USB_HS_IN_FS
+  */
   {NC,    NP,    0}
 };
 #endif

From 4b256a6fa8bb2c324b0a6a6ef0454b3e0ec8f991 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Mon, 2 Mar 2020 12:59:00 +1300
Subject: [PATCH 314/565] Revert FYSETC Mini encoder change (#17040)

Reverting #17010
---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 767ab397d0f8..bd0ad468de0b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -300,7 +300,6 @@
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
         #define NEOPIXEL_PIN    EXPA1_05_PIN
-        #define REVERSE_ENCODER_DIRECTION
       #endif
 
     #else // !FYSETC_MINI_12864

From ac93df43cdaccedee696b7c44ccc82cd83575d49 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 2 Mar 2020 00:04:18 +0000
Subject: [PATCH 315/565] [cron] Bump distribution date (2020-03-02)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 75daa57707a1..7631b949fc69 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-01"
+  #define STRING_DISTRIBUTION_DATE "2020-03-02"
 #endif
 
 /**

From 362c9ae79a9f37bddca4cf13d0cf889b84b7e40e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 19:08:21 -0600
Subject: [PATCH 316/565] Clean up use of extra_xyjerk

---
 Marlin/src/module/planner.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index fe1eec459f45..b42cadc3b7a1 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2404,12 +2404,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #endif
     {
       const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
-                  maxj = (max_jerk[i]             // mj : The max jerk setting for this axis
-                    #ifdef TRAVEL_EXTRA_XYJERK
-                      + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
-                    #endif
-                  );
-
+                  maxj = (max_jerk[i] + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0.0f)); // mj : The max jerk setting for this axis
       if (jerk > maxj) {                          // cs > mj : New current speed too fast?
         if (limited) {                            // limited already?
           const float mjerk = nominal_speed * maxj; // ns*mj
@@ -2461,11 +2456,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
             : // v_exit <= v_entry                coasting             axis reversal
               ( (v_entry < 0 || v_exit > 0) ? (v_entry - v_exit) : _MAX(-v_exit, v_entry) );
 
-        const float maxj = (max_jerk[axis]
-          #ifdef TRAVEL_EXTRA_XYJERK
-            + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
-          #endif
-        );
+        const float maxj = (max_jerk[axis] + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0.0f));
 
         if (jerk > maxj) {
           v_factor *= maxj / jerk;

From 5da6819277951aaf12a10f36ef5b99444a4dab3a Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 1 Mar 2020 17:54:22 -0800
Subject: [PATCH 317/565] Fix build issues with REPRAPWORLD_KEYPAD (#17038)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/ultralcd.cpp                | 53 +++++++++-------------
 Marlin/src/pins/ramps/pins_RAMPS.h         | 26 +++++++----
 buildroot/share/tests/megaatmega2560-tests |  6 ++-
 3 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 422c8b0b81c4..87d061c908b3 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -391,7 +391,7 @@ bool MarlinUI::get_blink() {
 
     void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
       move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
-      encoderPosition = dir;
+      ui.encoderPosition = dir;
       switch (axis) {
         case X_AXIS: lcd_move_x(); break;
         case Y_AXIS: lcd_move_y(); break;
@@ -1149,27 +1149,6 @@ void MarlinUI::update() {
 
 #if HAS_ENCODER_ACTION
 
-  #if DISABLED(ADC_KEYPAD) && (ENABLED(REPRAPWORLD_KEYPAD) || !HAS_DIGITAL_BUTTONS)
-
-    /**
-     * Setup Rotary Encoder Bit Values (for two pin encoders to indicate movement)
-     * These values are independent of which pins are used for EN_A and EN_B indications
-     * The rotary encoder part is also independent to the chipset used for the LCD
-     */
-    #define GET_SHIFT_BUTTON_STATES(DST) \
-      uint8_t new_##DST = 0; \
-      WRITE(SHIFT_LD, LOW); \
-      WRITE(SHIFT_LD, HIGH); \
-      for (int8_t i = 0; i < 8; i++) { \
-        new_##DST >>= 1; \
-        if (READ(SHIFT_OUT)) SBI(new_##DST, 7); \
-        WRITE(SHIFT_CLK, HIGH); \
-        WRITE(SHIFT_CLK, LOW); \
-      } \
-      DST = ~new_##DST; //invert it, because a pressed switch produces a logical 0
-
-  #endif
-
   /**
    * Read encoder buttons from the hardware registers
    * Warning: This function is called from interrupt context!
@@ -1266,16 +1245,26 @@ void MarlinUI::update() {
         }
       #endif
 
-      #if HAS_SHIFT_ENCODER
-
-        GET_SHIFT_BUTTON_STATES((
-          #if ENABLED(REPRAPWORLD_KEYPAD)
-            keypad_buttons
-          #else
-            buttons
-          #endif
-        ));
-
+      #if HAS_SHIFT_ENCODER      
+        /**
+         * Set up Rotary Encoder bit values (for two pin encoders to indicate movement).
+         * These values are independent of which pins are used for EN_A / EN_B indications.
+         * The rotary encoder part is also independent of the LCD chipset.
+         */
+        uint8_t val = 0;
+        WRITE(SHIFT_LD, LOW);
+        WRITE(SHIFT_LD, HIGH);
+        LOOP_L_N(i, 8) {
+          val >>= 1;
+          if (READ(SHIFT_OUT)) SBI(val, 7);
+          WRITE(SHIFT_CLK, HIGH);
+          WRITE(SHIFT_CLK, LOW);
+        }
+        #if ENABLED(REPRAPWORLD_KEYPAD)
+          keypad_buttons = ~val;
+        #else
+          buttons = ~val;
+        #endif
       #endif
 
     } // next_button_update_ms
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 82c19dd1535f..4ec882bccef9 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -647,7 +647,7 @@
           #define NEOPIXEL_PIN    25
         #endif
 
-    #endif
+      #endif
 
     #elif ENABLED(MINIPANEL)
 
@@ -685,14 +685,7 @@
       #define BEEPER_PIN        33
 
       // Buttons are directly attached to AUX-2
-      #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-      #elif ENABLED(PANEL_ONE)
+      #if ENABLED(PANEL_ONE)
         #define BTN_EN1         59   // AUX2 PIN 3
         #define BTN_EN2         63   // AUX2 PIN 4
         #define BTN_ENC         49   // AUX3 PIN 7
@@ -711,3 +704,18 @@
   #endif // NEWPANEL
 
 #endif // HAS_SPI_LCD
+
+#if ENABLED(REPRAPWORLD_KEYPAD)
+  #define SHIFT_OUT        40
+  #define SHIFT_CLK        44
+  #define SHIFT_LD         42
+  #ifndef BTN_EN1
+    #define BTN_EN1        64
+  #endif
+  #ifndef BTN_EN2
+    #define BTN_EN2        59
+  #endif
+  #ifndef BTN_ENC
+    #define BTN_ENC        63
+  #endif
+#endif
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests
index a49536529f9e..463261ee7fdf 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/megaatmega2560-tests
@@ -146,12 +146,14 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Cyrillic"
 # Test DUAL_X_CARRIAGE
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RUMBA
+opt_set MOTHERBOARD BOARD_TT_OSCAR
 opt_set LCD_LANGUAGE pt
 opt_set EXTRUDERS 2
 opt_set TEMP_SENSOR_1 1
 opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
-exec_test $1 $2 "Rumba | DUAL_X_CARRIAGE"
+opt_enable REPRAPWORLD_KEYPAD
+opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
+exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
 
 #
 # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER

From 393dde50282ddd921d2c570c54e935b989f6e118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 2 Mar 2020 08:00:13 +0500
Subject: [PATCH 318/565] =?UTF-8?q?#31=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20(=D1=82=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B5=D0=BD=D1=8F)?=
 =?UTF-8?q?=20#32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                      | 43 ++++++++++++++-------
 Marlin/Configuration_adv.h                  | 38 +++++++++---------
 Marlin/Version.h                            |  2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h |  2 +-
 4 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 31c863cc5aad..6e939c520843 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -146,7 +146,7 @@
 
 // Choose the name from boards.h that matches your setup
 #ifndef MOTHERBOARD
-  #define MOTHERBOARD BOARD_BIGTREE_SKR_V1_3
+  #define MOTHERBOARD BOARD_BTT_SKR_V1_3
 #endif
 
 // Name displayed in the LCD "Ready" message and Info menu
@@ -723,7 +723,11 @@
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
 //#define Z4_DRIVER_TYPE A4988
+#if (GITHUB_USER==URSOFT)
+#define E0_DRIVER_TYPE LV8729
+#else
 #define E0_DRIVER_TYPE TMC2208_STANDALONE
+#endif
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
@@ -775,8 +779,11 @@
  * Override with M92
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
+#if (GITHUB_USER==URSOFT)
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 * 2 }
+#else
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 }
-
+#endif
 /**
  * Default Max Feed Rate (mm/s)
  * Override with M203
@@ -1098,7 +1105,11 @@
 // @section extruder
 
 // For direct drive extruder v9 set to true, for geared extruder set to false.
+#if (GITHUB_USER==URSOFT)
+#define INVERT_E0_DIR true
+#else
 #define INVERT_E0_DIR false
+#endif
 #define INVERT_E1_DIR false
 #define INVERT_E2_DIR false
 #define INVERT_E3_DIR false
@@ -1355,10 +1366,10 @@
 #define LEVEL_BED_CORNERS
 
 #if ENABLED(LEVEL_BED_CORNERS)
-  #define LEVEL_CORNERS_INSET 30    // (mm) An inset for corner leveling
-  #define LEVEL_CORNERS_Z_HOP  4.0  // (mm) Move nozzle up before moving between corners
-  #define LEVEL_CORNERS_HEIGHT 0.2  // (mm) Z height of nozzle at leveling points
-  #define LEVEL_CENTER_TOO        // Move to the center after the last corner
+  #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
+  #define LEVEL_CORNERS_HEIGHT      0.2   // (mm) Z height of nozzle at leveling points
+  #define LEVEL_CORNERS_Z_HOP       4.0   // (mm) Z height of nozzle between leveling points
+  #define LEVEL_CENTER_TOO              // Move to the center after the last corner
 #endif
 
 /**
@@ -1808,8 +1819,9 @@
 //
 // Note: Usually sold with a white PCB.
 //
+#if (GITHUB_USER!=URSOFT)
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
-
+#endif
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
 // http://doku.radds.org/dokumentation/lcd-display/
@@ -2018,7 +2030,10 @@
 //#define FYSETC_MINI_12864_X_X    // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2    // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0    // Type A/B. Discreet RGB Backlight
-//#define FYSETC_MINI_12864_2_1    // Type A/B. Neopixel RGB Backlight
+#if (GITHUB_USER==URSOFT)
+ #define FYSETC_MINI_12864_2_1    // Type A/B. Neopixel RGB Backlight
+ #define LCD_CONTRAST_MIN 190
+#endif
 //#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
 
 //
@@ -2241,20 +2256,22 @@
 #endif
 
 // Support for Adafruit Neopixel LED driver
-//#define NEOPIXEL_LED
+#if (GITHUB_USER==URSOFT)
+ #define NEOPIXEL_LED
+#endif
 #if ENABLED(NEOPIXEL_LED)
   #define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
-  #define NEOPIXEL_PIN     4       // LED driving pin
+  //#define NEOPIXEL_PIN     4       // LED driving pin
   //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
   //#define NEOPIXEL2_PIN    5
-  #define NEOPIXEL_PIXELS 30       // Number of LEDs in the strip, larger of 2 strips if 2 neopixel strips are used
-  #define NEOPIXEL_IS_SEQUENTIAL   // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
+  //#define NEOPIXEL_PIXELS 30       // Number of LEDs in the strip, larger of 2 strips if 2 neopixel strips are used
+  //#define NEOPIXEL_IS_SEQUENTIAL   // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
   #define NEOPIXEL_BRIGHTNESS 127  // Initial brightness (0-255)
   //#define NEOPIXEL_STARTUP_TEST  // Cycle through colors at startup
 
   // Use a single Neopixel LED for static (background) lighting
   //#define NEOPIXEL_BKGD_LED_INDEX  0               // Index of the LED to use
-  //#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 } // R, G, B, W
+  //#define NEOPIXEL_BKGD_COLOR { 0, 255, 0, 0 } // R, G, B, W
 #endif
 
 /**
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2be1c9b07eb1..1ba32e1c71e4 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -943,15 +943,17 @@
    * LED Control Menu
    * Add LED Control to the LCD menu
    */
-  //#define LED_CONTROL_MENU
+#if (GITHUB_USER==URSOFT)
+  #define LED_CONTROL_MENU
+#endif
   #if ENABLED(LED_CONTROL_MENU)
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
     #if ENABLED(LED_COLOR_PRESETS)
       #define LED_USER_PRESET_RED        255  // User defined RED value
       #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
       #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
-      #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
-      #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
+      #define LED_USER_PRESET_WHITE        0  // User defined WHITE value
+      #define LED_USER_PRESET_BRIGHTNESS 128  // User defined intensity
       //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
     #endif
   #endif
@@ -959,7 +961,7 @@
 #endif // HAS_LCD_MENU
 
 // Scroll a longer status message into view
-//#define STATUS_MESSAGE_SCROLLING
+#define STATUS_MESSAGE_SCROLLING
 
 // On the Info Screen, display XY with one decimal place when possible
 //#define LCD_DECIMAL_SMALL_XY
@@ -968,7 +970,7 @@
 #define LCD_TIMEOUT_TO_STATUS 60000
 
 // Add an 'M73' G-code to set the current percentage
-//#define LCD_SET_PROGRESS_MANUALLY
+#define LCD_SET_PROGRESS_MANUALLY
 
 // Show the E position (filament used) during printing
 //#define LCD_SHOW_E_TOTAL
@@ -1083,7 +1085,7 @@
   #endif
  
   // Enable this option to scroll long filenames in the SD card menu
-  //#define SCROLL_LONG_FILENAMES
+  #define SCROLL_LONG_FILENAMES
 
   // Leave the heaters on after Stop Print (not recommended!)
   //#define SD_ABORT_NO_COOLDOWN
@@ -1173,7 +1175,7 @@
      *
      * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE', 'LCD_AND_ONBOARD' ]
      */
-    #define SDCARD_CONNECTION LCD_AND_ONBOARD
+    #define SDCARD_CONNECTION LCD_AND_ONBOARD //_AND_ONBOARD
   #endif
 
 #endif // SDSUPPORT
@@ -1253,10 +1255,10 @@
   #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
   //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
-  //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
-  //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
+  #define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
+  #define STATUS_HEAT_PERCENT       // Show heating in a progress bar
   //#define BOOT_MARLIN_LOGO_SMALL    // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
-  //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
+  #define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
 
   // Frivolous Game Options
   //#define MARLIN_BRICKOUT
@@ -1637,8 +1639,8 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MINIMUM_STEPPER_POST_DIR_DELAY 20
-#define MINIMUM_STEPPER_PRE_DIR_DELAY 20
+//#define MINIMUM_STEPPER_POST_DIR_DELAY 20
+//#define MINIMUM_STEPPER_PRE_DIR_DELAY 20
 
 /**
  * Minimum stepper driver pulse width (in µs)
@@ -1651,7 +1653,7 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MINIMUM_STEPPER_PULSE 2
+//#define MINIMUM_STEPPER_PULSE 2
 
 /**
  * Maximum stepping rate (in Hz) the stepper driver allows
@@ -1665,7 +1667,7 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MAXIMUM_STEPPER_RATE 400000
+//#define MAXIMUM_STEPPER_RATE 400000
 
 // @section temperature
 
@@ -1690,7 +1692,7 @@
 
 // The ASCII buffer for serial input
 #define MAX_CMD_SIZE 96
-#define BUFSIZE 4
+#define BUFSIZE 32
 
 // Transmission to Host Buffer Size
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
@@ -1699,7 +1701,7 @@
 // For debug-echo: 128 bytes for the optimal speed.
 // Other output doesn't need to be that speedy.
 // :[0, 2, 4, 8, 16, 32, 64, 128, 256]
-#define TX_BUFFER_SIZE 0
+#define TX_BUFFER_SIZE 32
 
 // Host Receive Buffer Size
 // Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
@@ -1840,7 +1842,7 @@
                                                   // This short retract is done immediately, before parking the nozzle.
   #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     60  // (mm/s) Unload filament feedrate. This can be pretty fast.
   #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_UNLOAD_LENGTH        0  // (mm) The length of filament for a complete unload.
+  #define FILAMENT_CHANGE_UNLOAD_LENGTH      790  // (mm) The length of filament for a complete unload.
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
                                                   //   Set to 0 for manual unloading.
@@ -1849,7 +1851,7 @@
                                                   // 0 to disable start loading and skip to fast load only
   #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  60  // (mm/s) Load filament feedrate. This can be pretty fast.
   #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_FAST_LOAD_LENGTH     0  // (mm) Load length of filament, from extruder gear to nozzle.
+  #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   790  // (mm) Load length of filament, from extruder gear to nozzle.
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
   //#define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted.
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4ff96ffe61a9..c9a39be66138 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-#define SHORT_BUILD_VERSION "bf-2.0.x.3" //last is build No
+#define SHORT_BUILD_VERSION "bf-2.0.x.4" //last is build No
 
 /**
  * Verbose version identifier which should contain a reference to the location
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 9b0ff5293af3..8518e6c42946 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -249,7 +249,7 @@
 
       #define LCD_BACKLIGHT_PIN -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
+      //#define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
       #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.

From cc822bf70fd4683a00fcf5c3ea5b5e6a62a0d10b Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 1 Mar 2020 19:19:02 -0800
Subject: [PATCH 319/565] Fix some 8 extruders issues, GTR build (#17043)

---
 .github/workflows/test-builds.yml            |  1 +
 Marlin/src/inc/Conditionals_LCD.h            |  4 +-
 Marlin/src/module/temperature.cpp            |  8 ++--
 Marlin/src/pins/pins.h                       |  2 +-
 Marlin/src/pins/sensitive_pins.h             |  6 +--
 Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h    |  8 ++--
 buildroot/share/tests/BIGTREE_GTR_V1_0-tests | 39 ++++++++++++++++++++
 platformio.ini                               |  3 +-
 8 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 buildroot/share/tests/BIGTREE_GTR_V1_0-tests

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 59722e3ca5a3..be3868573602 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -53,6 +53,7 @@ jobs:
         - STM32F103VE_longer
         - STM32F407VE_black
         - BIGTREE_SKR_PRO
+        - BIGTREE_GTR_V1_0
         - mks_robin
         - ARMED
         - FYSETC_S6
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 640bae93a8c3..b4da3439bb8a 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -443,9 +443,9 @@
 // Helper macros for extruder and hotend arrays
 #define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
 #define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
-#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1)
+#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1, v1, v1)
 #define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
-#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1)
+#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1, v1, v1)
 
 #define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
 #define SWITCHING_NOZZLE_TWO_SERVOS defined(SWITCHING_NOZZLE_E1_SERVO_NR)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c9547b3e9f8d..73a91049dadd 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -101,11 +101,13 @@
 
 #if HOTEND_USES_THERMISTOR
   #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-    static void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
+    static const void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
     static constexpr uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN };
   #else
-    static void* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS((void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE, (void*)HEATER_2_TEMPTABLE, (void*)HEATER_3_TEMPTABLE, (void*)HEATER_4_TEMPTABLE, (void*)HEATER_5_TEMPTABLE);
-    static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN, HEATER_3_TEMPTABLE_LEN, HEATER_4_TEMPTABLE_LEN, HEATER_5_TEMPTABLE_LEN);
+    #define NEXT_TEMPTABLE(N) ,HEATER_##N##_TEMPTABLE
+    #define NEXT_TEMPTABLE_LEN(N) ,HEATER_##N##_TEMPTABLE_LEN
+    static const void* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE));
+    static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE_LEN REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE_LEN));
   #endif
 #endif
 
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index ce03a3468d31..920c124a5ccf 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -35,7 +35,7 @@
  *    These numbers are the same in any pin mapping.
  */
 
-#define MAX_EXTRUDERS 6
+#define MAX_EXTRUDERS 8
 
 #if   MB(RAMPS_13_EFB, RAMPS_14_EFB, RAMPS_PLUS_EFB, RAMPS_14_RE_ARM_EFB, RAMPS_SMART_EFB, RAMPS_DUO_EFB, RAMPS4DUE_EFB)
   #define IS_RAMPS_EFB
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 807ee99e235f..180bc8d6f6cb 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -278,9 +278,9 @@
 #endif
 
 #define _E6_CS
+#define _E6_MS1
 #define _E6_MS2
 #define _E6_MS3
-#define _E6_MS4
 
 #if E_NEEDED(6)
   #if PIN_EXISTS(E6_CS) && AXIS_HAS_SPI(E6)
@@ -302,9 +302,9 @@
 #endif
 
 #define _E7_CS
+#define _E7_MS1
+#define _E7_MS2
 #define _E7_MS3
-#define _E7_MS4
-#define _E7_MS5
 
 #if E_NEEDED(7)
   #if PIN_EXISTS(E7_CS) && AXIS_HAS_SPI(E7)
diff --git a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
index aa2152c84fae..0500c5d95327 100644
--- a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
@@ -237,8 +237,8 @@
 #define TEMP_3_PIN         PA3   // T4 <-> E3
 #define TEMP_4_PIN         PF9   // T5 <-> E4
 #define TEMP_5_PIN         PF10  // T6 <-> E5
-//#define TEMP_6_PIN         PF7   // T7 <-> E6
-//#define TEMP_7_PIN         PF5   // T8 <-> E7
+#define TEMP_6_PIN         PF7   // T7 <-> E6
+#define TEMP_7_PIN         PF5   // T8 <-> E7
 
 #define TEMP_BED_PIN       PC0   // T0 <-> Bed
 
@@ -266,8 +266,8 @@
 #define HEATER_3_PIN       PD15  // Heater3
 #define HEATER_4_PIN       PD13  // Heater4
 #define HEATER_5_PIN       PD12  // Heater5
-//#define HEATER_6_PIN       PE13 // Heater6
-//#define HEATER_7_PIN       PI6  // Heater7
+#define HEATER_6_PIN       PE13 // Heater6
+#define HEATER_7_PIN       PI6  // Heater7
 
 #define HEATER_BED_PIN     PA2   // Hotbed
 
diff --git a/buildroot/share/tests/BIGTREE_GTR_V1_0-tests b/buildroot/share/tests/BIGTREE_GTR_V1_0-tests
new file mode 100644
index 000000000000..0738a2818b48
--- /dev/null
+++ b/buildroot/share/tests/BIGTREE_GTR_V1_0-tests
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#
+# Build tests for BigTreeTech GTR 1.0
+#
+
+# exit on first failure
+set -e
+
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
+opt_set SERIAL_PORT -1
+opt_set EXTRUDERS 8
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set TEMP_SENSOR_3 1
+opt_set TEMP_SENSOR_4 1
+opt_set TEMP_SENSOR_5 1
+opt_set TEMP_SENSOR_6 1
+opt_set TEMP_SENSOR_7 1
+# Not necessary to enable auto-fan for all extruders to hit problematic code paths
+opt_set E0_AUTO_FAN_PIN PC10
+opt_set E1_AUTO_FAN_PIN PC11
+opt_set E2_AUTO_FAN_PIN PC12
+exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan"
+
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
+opt_set SERIAL_PORT -1
+opt_set EXTRUDERS 6
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set TEMP_SENSOR_3 1
+opt_set TEMP_SENSOR_4 1
+opt_set TEMP_SENSOR_5 1
+opt_set NUM_Z_STEPPER_DRIVERS 3
+exec_test $1 $2 "BigTreeTech GTR 6 Extruders Triple Z"
+
+# clean up
+restore_configs
diff --git a/platformio.ini b/platformio.ini
index 405efd8624ee..f69842cafe56 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -681,13 +681,12 @@ debug_init_break  =
 [env:BIGTREE_GTR_V1_0]
 platform          = ststm32@>=5.7.0
 framework         = arduino
-platform_packages = framework-arduinoststm32@>=3.10700.191028
+platform_packages = framework-arduinoststm32@>=3.107,<4
 board             = BigTree_SKR_Pro
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407IG\"
   -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
-
   -IMarlin/src/HAL/HAL_STM32
 lib_deps          =
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip

From 870a1f753acfaed0cbffe2ba406e4d3c02316503 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 20:21:30 -0600
Subject: [PATCH 320/565] Fix undefined STATUS_CHAMBER_WIDTH

---
 Marlin/src/lcd/dogm/dogm_Statusscreen.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 3656b02e0860..3384f5798aca 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -854,7 +854,9 @@
     };
 
   #endif
-#else // HAS_HEATED_CHAMBER
+#endif
+
+#ifndef STATUS_CHAMBER_WIDTH
   #define STATUS_CHAMBER_WIDTH 0
 #endif
 

From 736521a3f1124a84a023e5ba1f030e09a95f16dc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 1 Mar 2020 17:39:46 -0600
Subject: [PATCH 321/565] Balance mega tests, shorten some env names

---
 .github/workflows/test-builds.yml             |  16 +-
 Marlin/src/pins/pins.h                        | 226 +++++++++---------
 Marlin/src/pins/rambo/pins_MINIRAMBO.h        |   2 +-
 buildroot/share/git/mftest                    |   6 +-
 ...RC_bigtree-tests => STM32F103RC_btt-tests} |   0
 ...ee_USB-tests => STM32F103RC_btt_USB-tests} |   0
 ...RE_bigtree-tests => STM32F103RE_btt-tests} |   0
 ...ee_USB-tests => STM32F103RE_btt_USB-tests} |   0
 buildroot/share/tests/mega1280-tests          |  60 +++++
 .../{megaatmega2560-tests => mega2560-tests}  |  35 ---
 buildroot/share/tests/megaatmega1280-tests    |  27 ---
 ..._atmega1284p-tests => sanguino1284p-tests} |   0
 ...no_atmega644p-tests => sanguino644p-tests} |   0
 buildroot/share/vscode/auto_build.py          |   8 +-
 platformio.ini                                |  34 +--
 15 files changed, 206 insertions(+), 208 deletions(-)
 rename buildroot/share/tests/{STM32F103RC_bigtree-tests => STM32F103RC_btt-tests} (100%)
 rename buildroot/share/tests/{STM32F103RC_bigtree_USB-tests => STM32F103RC_btt_USB-tests} (100%)
 rename buildroot/share/tests/{STM32F103RE_bigtree-tests => STM32F103RE_btt-tests} (100%)
 rename buildroot/share/tests/{STM32F103RE_bigtree_USB-tests => STM32F103RE_btt_USB-tests} (100%)
 create mode 100644 buildroot/share/tests/mega1280-tests
 rename buildroot/share/tests/{megaatmega2560-tests => mega2560-tests} (92%)
 delete mode 100644 buildroot/share/tests/megaatmega1280-tests
 rename buildroot/share/tests/{sanguino_atmega1284p-tests => sanguino1284p-tests} (100%)
 rename buildroot/share/tests/{sanguino_atmega644p-tests => sanguino644p-tests} (100%)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index be3868573602..b92b01528781 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -29,7 +29,7 @@ jobs:
         - DUE
         - esp32
         - linux_native
-        - megaatmega2560
+        - mega2560
         - teensy31
         - teensy35
         - SAMD51_grandcentral_m4
@@ -37,17 +37,17 @@ jobs:
         # Extended AVR Environments
 
         - FYSETC_F6_13
-        - megaatmega1280
+        - mega1280
         - rambo
-        - sanguino_atmega1284p
-        - sanguino_atmega644p
+        - sanguino1284p
+        - sanguino644p
 
         # Extended STM32 Environments
 
-        - STM32F103RC_bigtree
-        - STM32F103RC_bigtree_USB
-        - STM32F103RE_bigtree
-        - STM32F103RE_bigtree_USB
+        - STM32F103RC_btt
+        - STM32F103RC_btt_USB
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
         - STM32F103RC_fysetc
         - jgaurora_a5s_a1
         - STM32F103VE_longer
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 920c124a5ccf..4f1483d55fa5 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -56,138 +56,138 @@
 //
 
 #if MB(RAMPS_OLD)
-  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EFB)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EEB)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EFF)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EEF)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_SF)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EFB)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EEB)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EFF)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EEF)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_SF)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EFB)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EEB)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EFF)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EEF)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_SF)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 
 //
 // RAMPS Derivatives - ATmega1280, ATmega2560
 //
 
 #elif MB(3DRAG)
-  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(K8200)
-  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
 #elif MB(K8400)
-  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
 #elif MB(K8800)
-  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
 #elif MB(BAM_DICE)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(BAM_DICE_DUE)
-  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MKS_BASE)
-  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_14)
-  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_15)
-  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_16)
-  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_HEROIC)
-  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:mega2560
 #elif MB(MKS_GEN_13)
-  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MKS_GEN_L)
-  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(KFB_2)
-  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:mega2560
 #elif MB(ZRIB_V20)
-  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
+  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (MKS_GEN_13)
 #elif MB(FELIX2)
-  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RIGIDBOARD)
-  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RIGIDBOARD_V2)
-  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(SAINSMART_2IN1)
-  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(ULTIMAKER)
-  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(ULTIMAKER_OLD)
-  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(AZTEEG_X3)
-  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:mega2560
 #elif MB(AZTEEG_X3_PRO)
-  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:mega2560
 #elif MB(ULTIMAIN_2)
-  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_RAPTOR)
-  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_RAPTOR2)
-  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_TREX2PLUS)
-  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_TREX3)
-  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:mega2560
 #elif MB(RUMBA)
-  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:mega2560
 #elif MB(RUMBA_RAISE3D)
-  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:mega2560
 #elif MB(RL200)
-  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:mega2560
 #elif MB(BQ_ZUM_MEGA_3D)
-  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:mega2560
 #elif MB(MAKEBOARD_MINI)
-  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_13)
-  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_14)
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_14_11)
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_ENDER_4)
-  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_CREALITY)
-  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:mega2560
 #elif MB(RAMPS_DAGOMA)
-  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:mega2560
 #elif MB(FYSETC_F6_13)
   #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:FYSETC_F6_13
 #elif MB(FYSETC_F6_14)
   #include "ramps/pins_FYSETC_F6_14.h"          // ATmega2560                             env:FYSETC_F6_14
 #elif MB(DUPLICATOR_I3_PLUS)
-  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:mega2560
 #elif MB(VORON)
-  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:mega2560
 #elif MB(TRONXY_V3_1_0)
-  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:mega2560
 #elif MB(Z_BOLT_X_SERIES)
-  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:mega2560
 #elif MB(TT_OSCAR)
-  #include "ramps/pins_TT_OSCAR.h"              // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TT_OSCAR.h"              // ATmega2560                             env:mega2560
 #elif MB(TANGO)
-  #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:mega2560
 #elif MB(MKS_GEN_L_V2)
-  #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:mega2560
 
 //
 // RAMBo and derivatives
@@ -209,114 +209,114 @@
 //
 
 #elif MB(CNCONTROLS_11)
-  #include "mega/pins_CNCONTROLS_11.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_CNCONTROLS_11.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(CNCONTROLS_12)
-  #include "mega/pins_CNCONTROLS_12.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_CNCONTROLS_12.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(CNCONTROLS_15)
-  #include "mega/pins_CNCONTROLS_15.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_CNCONTROLS_15.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MIGHTYBOARD_REVE)
-  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(CHEAPTRONIC)
-  #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:mega2560
 #elif MB(CHEAPTRONIC_V2)
-  #include "mega/pins_CHEAPTRONICv2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_CHEAPTRONICv2.h"          // ATmega2560                             env:mega2560
 #elif MB(MEGATRONICS)
-  #include "mega/pins_MEGATRONICS.h"            // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGATRONICS.h"            // ATmega2560                             env:mega2560
 #elif MB(MEGATRONICS_2)
-  #include "mega/pins_MEGATRONICS_2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGATRONICS_2.h"          // ATmega2560                             env:mega2560
 #elif MB(MEGATRONICS_3, MEGATRONICS_31, MEGATRONICS_32)
-  #include "mega/pins_MEGATRONICS_3.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGATRONICS_3.h"          // ATmega2560                             env:mega2560
 #elif MB(ELEFU_3)
-  #include "mega/pins_ELEFU_3.h"                // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_ELEFU_3.h"                // ATmega2560                             env:mega2560
 #elif MB(LEAPFROG)
-  #include "mega/pins_LEAPFROG.h"               // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_LEAPFROG.h"               // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MEGACONTROLLER)
-  #include "mega/pins_MEGACONTROLLER.h"         // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGACONTROLLER.h"         // ATmega2560                             env:mega2560
 #elif MB(GT2560_REV_A)
-  #include "mega/pins_GT2560_REV_A.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_GT2560_REV_A.h"           // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(GT2560_REV_A_PLUS)
-  #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(GT2560_V3)
-  #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_MC2)
-  #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_A20)
-  #include "mega/pins_GT2560_V3_A20.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_GT2560_V3_A20.h"          // ATmega2560                             env:mega2560
 #elif MB(EINSTART_S)
-  #include "mega/pins_EINSTART-S.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_EINSTART-S.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(WANHAO_ONEPLUS)
-  #include "mega/pins_WANHAO_ONEPLUS.h"         // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_WANHAO_ONEPLUS.h"         // ATmega2560                             env:mega2560
 #elif MB(OVERLORD)
-  #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:mega2560
 #elif MB(HJC2560C_REV2)
-  #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:mega2560
 #elif MB(LEAPFROG_XEED2015)
-  #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:mega2560
 #elif MB(PICA)
-  #include "mega/pins_PICA.h"                   // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_PICA.h"                   // ATmega2560                             env:mega2560
 #elif MB(PICA_REVB)
-  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561
 //
 
 #elif MB(MINITRONICS)
-  #include "mega/pins_MINITRONICS.h"            // ATmega1281                             env:megaatmega1280
+  #include "mega/pins_MINITRONICS.h"            // ATmega1281                             env:mega1280
 #elif MB(SILVER_GATE)
-  #include "mega/pins_SILVER_GATE.h"            // ATmega2561                             env:megaatmega2560
+  #include "mega/pins_SILVER_GATE.h"            // ATmega2561                             env:mega2560
 
 //
 // Sanguinololu and Derivatives - ATmega644P, ATmega1284P
 //
 
 #elif MB(SANGUINOLOLU_11)
-  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(SANGUINOLOLU_12)
-  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI)
-  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_MAKR3D)
-  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_CREALITY)
-  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_MALYAN)
-  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_TRONXY)
-  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(STB_11)
-  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(AZTEEG_X1)
-  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 
 //
 // Other ATmega644P, ATmega644, ATmega1284P
 //
 
 #elif MB(GEN3_MONOLITHIC)
-  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino_atmega644p
+  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino644p
 #elif MB(GEN3_PLUS)
-  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(GEN6)
-  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(GEN6_DELUXE)
-  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_CUSTOM)
-  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_12)
-  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_13)
-  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_14)
-  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(OMCA_A)
-  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino_atmega644p
+  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino644p
 #elif MB(OMCA)
-  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino_atmega644p
+  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino644p
 #elif MB(ANET_10)
-  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino_atmega1284p
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p
 #elif MB(SETHI)
-  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 
 //
 // Teensyduino - AT90USB1286, AT90USB1286P
@@ -491,13 +491,13 @@
 #elif MB(MKS_ROBIN_LITE)
   #include "stm32/pins_MKS_ROBIN_LITE.h"        // STM32F1                                env:mks_robin_lite
 #elif MB(BTT_SKR_MINI_V1_1)
-  #include "stm32/pins_BTT_SKR_MINI_V1_1.h"     // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32/pins_BTT_SKR_MINI_V1_1.h"     // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_0)
-  #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_2)
-  #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_E3_DIP)
-  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RE_bigtree env:STM32F103RE_bigtree_USB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(JGAURORA_A5S_A1)
   #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
 #elif MB(FYSETC_AIO_II)
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 6aabf594ac20..50aec546a633 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -26,7 +26,7 @@
  */
 
 #ifndef __AVR_ATmega2560__
-  #error "Oops! Select 'RAMBo' in 'Tools > Board.'"
+  #error "Oops! Select 'RAMBo' in 'Tools > Board' or the Mega2560 environment in PlatformIO."
 #endif
 
 #if MB(MINIRAMBO_10A)
diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index 0b2d9ef78f55..b2d7cddfe51f 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -34,9 +34,9 @@ case $TESTENV in
     lin*) TESTENV='linux_native' ;;
  lpc?(8)) TESTENV='LPC1768' ;;
     lpc9) TESTENV='LPC1769' ;;
-    m128) TESTENV='megaatmega1280' ;;
-    m256) TESTENV='megaatmega2560' ;;
-    mega) TESTENV='megaatmega2560' ;;
+    m128) TESTENV='mega1280' ;;
+    m256) TESTENV='mega2560' ;;
+    mega) TESTENV='mega2560' ;;
      stm) TESTENV='STM32F103RE' ;;
       f1) TESTENV='STM32F103RE' ;;
       f4) TESTENV='STM32F4' ;;
diff --git a/buildroot/share/tests/STM32F103RC_bigtree-tests b/buildroot/share/tests/STM32F103RC_btt-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RC_bigtree-tests
rename to buildroot/share/tests/STM32F103RC_btt-tests
diff --git a/buildroot/share/tests/STM32F103RC_bigtree_USB-tests b/buildroot/share/tests/STM32F103RC_btt_USB-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RC_bigtree_USB-tests
rename to buildroot/share/tests/STM32F103RC_btt_USB-tests
diff --git a/buildroot/share/tests/STM32F103RE_bigtree-tests b/buildroot/share/tests/STM32F103RE_btt-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RE_bigtree-tests
rename to buildroot/share/tests/STM32F103RE_btt-tests
diff --git a/buildroot/share/tests/STM32F103RE_bigtree_USB-tests b/buildroot/share/tests/STM32F103RE_btt_USB-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RE_bigtree_USB-tests
rename to buildroot/share/tests/STM32F103RE_btt_USB-tests
diff --git a/buildroot/share/tests/mega1280-tests b/buildroot/share/tests/mega1280-tests
new file mode 100644
index 000000000000..c2d55a92e555
--- /dev/null
+++ b/buildroot/share/tests/mega1280-tests
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+#
+# Build tests for AVR ATmega1280
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+#restore_configs
+#exec_test $1 $2 "Default Configuration"
+
+#
+# Test MESH_BED_LEVELING feature, with LCD
+#
+restore_configs
+opt_set LCD_LANGUAGE an
+opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
+           MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
+           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
+exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
+
+#
+# Test DUAL_X_CARRIAGE
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_TT_OSCAR
+opt_set LCD_LANGUAGE pt
+opt_set EXTRUDERS 2
+opt_set TEMP_SENSOR_1 1
+opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE REPRAPWORLD_KEYPAD
+opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
+exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
+
+#
+# Delta Config (generic) + Probeless
+#
+use_example_configs delta/generic
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
+exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
+
+#
+# Delta Config (generic) + ABL bilinear + BLTOUCH
+use_example_configs delta/generic
+opt_set LCD_LANGUAGE cz
+opt_set X_DRIVER_TYPE L6470
+opt_set Y_DRIVER_TYPE L6470
+opt_set Z_DRIVER_TYPE L6470
+opt_add L6470_CHAIN_SCK_PIN  53
+opt_add L6470_CHAIN_MISO_PIN 49
+opt_add L6470_CHAIN_MOSI_PIN 40
+opt_add L6470_CHAIN_SS_PIN   42
+opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
+exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
+
+# clean up
+restore_configs
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/mega2560-tests
similarity index 92%
rename from buildroot/share/tests/megaatmega2560-tests
rename to buildroot/share/tests/mega2560-tests
index 463261ee7fdf..a896c38733d9 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -142,19 +142,6 @@ opt_set MIXING_STEPPERS 5
 opt_set LCD_LANGUAGE ru
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Cyrillic"
 
-#
-# Test DUAL_X_CARRIAGE
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TT_OSCAR
-opt_set LCD_LANGUAGE pt
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
-opt_enable REPRAPWORLD_KEYPAD
-opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
-exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
-
 #
 # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
 #
@@ -298,21 +285,6 @@ exec_test $1 $2 "Full-featured CR-10S config"
 #use_example_configs Hephestos_2
 #exec_test $1 $2 "Stuff"
 
-#
-# Delta Config (generic) + ABL bilinear + BLTOUCH
-use_example_configs delta/generic
-opt_set LCD_LANGUAGE cz
-opt_set X_DRIVER_TYPE L6470
-opt_set Y_DRIVER_TYPE L6470
-opt_set Z_DRIVER_TYPE L6470
-opt_add L6470_CHAIN_SCK_PIN  53
-opt_add L6470_CHAIN_MISO_PIN 49
-opt_add L6470_CHAIN_MOSI_PIN 40
-opt_add L6470_CHAIN_SS_PIN   42
-opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
-exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
-
 #
 # Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
 #
@@ -322,13 +294,6 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EE
            OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY
 exec_test $1 $2 "RAMPS | DELTA | OLED_PANEL_TINYBOY2 | UBL | Allen Key | EEPROM"
 
-#
-# Delta Config (generic) + Probeless
-#
-use_example_configs delta/generic
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
-exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
-
 #
 # Delta Config (FLSUN AC because it's complex)
 #
diff --git a/buildroot/share/tests/megaatmega1280-tests b/buildroot/share/tests/megaatmega1280-tests
deleted file mode 100644
index 4e5ad253552f..000000000000
--- a/buildroot/share/tests/megaatmega1280-tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for AVR ATmega1280
-#
-
-# exit on first failure
-set -e
-
-#
-# Build with the default configurations
-#
-#restore_configs
-#exec_test $1 $2 "Default Configuration"
-
-#
-# Test MESH_BED_LEVELING feature, with LCD
-#
-restore_configs
-opt_set LCD_LANGUAGE an
-opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
-           MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
-           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
-exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
-
-
-# clean up
-restore_configs
diff --git a/buildroot/share/tests/sanguino_atmega1284p-tests b/buildroot/share/tests/sanguino1284p-tests
similarity index 100%
rename from buildroot/share/tests/sanguino_atmega1284p-tests
rename to buildroot/share/tests/sanguino1284p-tests
diff --git a/buildroot/share/tests/sanguino_atmega644p-tests b/buildroot/share/tests/sanguino644p-tests
similarity index 100%
rename from buildroot/share/tests/sanguino_atmega644p-tests
rename to buildroot/share/tests/sanguino644p-tests
diff --git a/buildroot/share/vscode/auto_build.py b/buildroot/share/vscode/auto_build.py
index f9258846a57b..1d4ea12c7bec 100644
--- a/buildroot/share/vscode/auto_build.py
+++ b/buildroot/share/vscode/auto_build.py
@@ -600,13 +600,13 @@ def invalid_board():
           target_env = 'DUE_USB'
         else:
           target_env = 'DUE'
-    elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree':
-      if env_A == 'STM32F103RE_bigtree':
+    elif env_A == 'STM32F103RC_btt' or env_A == 'STM32F103RE_btt':
+      if env_A == 'STM32F103RE_btt':
         get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE')
         if 1 == get_answer_val:
-          env_A = 'STM32F103RC_bigtree'
+          env_A = 'STM32F103RC_btt'
       target_env = env_A
-      if env_A == 'STM32F103RC_bigtree':
+      if env_A == 'STM32F103RC_btt':
         get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
         if 1 == get_answer_val:
           target_env += '_512K'
diff --git a/platformio.ini b/platformio.ini
index f69842cafe56..89afb91235ff 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,7 +18,7 @@
 [platformio]
 src_dir      = Marlin
 boards_dir   = buildroot/share/PlatformIO/boards
-default_envs = megaatmega2560
+default_envs = mega2560
 
 [common]
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
@@ -57,7 +57,7 @@ monitor_speed = 250000
 #
 # ATmega2560
 #
-[env:megaatmega2560]
+[env:mega2560]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -68,7 +68,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 #
 # ATmega1280
 #
-[env:megaatmega1280]
+[env:mega1280]
 platform          = atmelavr
 board             = megaatmega1280
 board_build.f_cpu = 16000000L
@@ -112,7 +112,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 #
 # Sanguinololu (ATmega644p)
 #
-[env:sanguino_atmega644p]
+[env:sanguino644p]
 platform      = atmelavr
 board         = sanguino_atmega644p
 lib_deps      = ${common.lib_deps}
@@ -122,7 +122,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 #
 # Sanguinololu (ATmega1284p)
 #
-[env:sanguino_atmega1284p]
+[env:sanguino1284p]
 platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
@@ -284,13 +284,13 @@ upload_protocol   = serial
 #
 # BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
 #
-#   STM32F103RC_bigtree ............. RCT6 with 256K
-#   STM32F103RC_bigtree_USB ......... RCT6 with 256K (USB mass storage)
-#   STM32F103RC_bigtree_512K ........ RCT6 with 512K
-#   STM32F103RC_bigtree_512K_USB .... RCT6 with 512K (USB mass storage)
+#   STM32F103RC_btt ............. RCT6 with 256K
+#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
+#   STM32F103RC_btt_512K ........ RCT6 with 512K
+#   STM32F103RC_btt_512K_USB .... RCT6 with 512K (USB mass storage)
 #
 
-[env:STM32F103RC_bigtree]
+[env:STM32F103RC_btt]
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
@@ -304,7 +304,7 @@ lib_deps          = ${common.lib_deps}
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
-[env:STM32F103RC_bigtree_USB]
+[env:STM32F103RC_btt_USB]
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
@@ -318,7 +318,7 @@ lib_deps          = ${common.lib_deps}
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
-[env:STM32F103RC_bigtree_512K]
+[env:STM32F103RC_btt_512K]
 platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
@@ -333,7 +333,7 @@ lib_deps          = ${common.lib_deps}
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
-[env:STM32F103RC_bigtree_512K_USB]
+[env:STM32F103RC_btt_512K_USB]
 platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
@@ -365,10 +365,10 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 #
-#   STM32F103RE_bigtree ............. RET6
-#   STM32F103RE_bigtree_USB ......... RET6 (USB mass storage)
+#   STM32F103RE_btt ............. RET6
+#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
 #
-[env:STM32F103RE_bigtree]
+[env:STM32F103RE_btt]
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
@@ -384,7 +384,7 @@ debug_tool        = stlink
 upload_protocol   = stlink
 monitor_speed     = 115200
 
-[env:STM32F103RE_bigtree_USB]
+[env:STM32F103RE_btt_USB]
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino

From e9a9ceb87933587cabd04abe7d5b786a2e2affcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 2 Mar 2020 09:43:24 +0500
Subject: [PATCH 322/565] #12 for #31 (12864)

---
 Marlin/src/inc/Conditionals_post.h         |  6 +++---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 485c183b2af1..5fa5bc2cd270 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1966,9 +1966,6 @@
   #if ENABLED(BLTOUCH) && !defined(BLTOUCH_DELAY)
     #define BLTOUCH_DELAY 500
   #endif
-  #if SD_CONNECTION_IS(LCD_AND_ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
-    #define SHARED_SD_CARD
-  #endif
 #endif
 
 #ifndef __SAM3X8E__ //todo: hal: broken hal encapsulation
@@ -2087,6 +2084,9 @@
     #undef SD_DETECT_PIN
     #define SHARED_SD_CARD
   #endif
+  #if SD_CONNECTION_IS(LCD_AND_ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
+    #define SHARED_SD_CARD
+  #endif
   #if DISABLED(SHARED_SD_CARD)
     #define INIT_SDCARD_ON_BOOT
   #endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 908dfdf8f2b7..60acae164ba9 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -299,6 +299,9 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
 
 #endif // DO_DRAW_CHAMBER
 
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+ #include "../../module/endstops.h"
+#endif
 //
 // Before homing, blink '123' <-> '???'.
 // Homed but unknown... '123' <-> '   '.
@@ -311,8 +314,13 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     #endif
     axis
   );
+#if ENABLED(LCD_SHOW_ENDSTOPS_STATUS)
+  uint32_t axisName = (endstops.axis_min(axis) ? L'x' : L'X') + uint8_t(axis);
+#else
+  uint32_t axisName = L'X' + uint8_t(axis);
+#endif
   const uint8_t offs = (XYZ_SPACING) * a;
-  lcd_put_wchar(X_LABEL_POS + offs, XYZ_BASELINE, axis_codes[axis]);
+  lcd_put_wchar(X_LABEL_POS + offs, XYZ_BASELINE, axisName);
   lcd_moveto(X_VALUE_POS + offs, XYZ_BASELINE);
   if (blink)
     lcd_put_u8str(value);

From f1eda3c542421f5f818bbc73b33c2f215a893fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 2 Mar 2020 11:56:19 +0500
Subject: [PATCH 323/565] #31 -> #23

---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 60acae164ba9..d5ef3518ad96 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -37,6 +37,7 @@
 
 #include "../../module/motion.h"
 #include "../../module/temperature.h"
+#include "../../module/planner.h"
 
 #if ENABLED(FILAMENT_LCD_DISPLAY)
   #include "../../feature/filwidth.h"
@@ -280,6 +281,13 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
       u8g.drawBox(tx, 20 - 2, 2, 2);
       u8g.setColorIndex(1); // restore black on white
     }
+    #if HAS_LEVELING
+      if(planner.leveling_active) { 
+        if(blink) u8g.setColorIndex(0); // set to white on black
+        u8g.drawHLine(STATUS_BED_X + 3, STATUS_HEATERS_Y + 10, STATUS_BED_WIDTH - 3);
+        if(blink) u8g.setColorIndex(1); // restore black on white
+      }
+    #endif
 
   }
 

From b1a50d54e2a6f8e415a72e0e2d275304029d8ada Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 12:03:43 -0600
Subject: [PATCH 324/565] HAS_TRINAMIC => HAS_TRINAMIC_CONFIG

---
 Marlin/Configuration_adv.h                       |  4 ++--
 Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h         |  2 +-
 Marlin/src/MarlinCore.cpp                        |  4 ++--
 Marlin/src/core/drivers.h                        | 14 +++++++-------
 Marlin/src/feature/power.cpp                     |  2 +-
 Marlin/src/feature/tmc_util.cpp                  |  6 +++---
 Marlin/src/feature/tmc_util.h                    |  4 ++--
 Marlin/src/gcode/control/M80_M81.cpp             |  2 +-
 Marlin/src/gcode/feature/trinamic/M122.cpp       |  4 ++--
 Marlin/src/gcode/feature/trinamic/M906.cpp       |  4 ++--
 Marlin/src/gcode/feature/trinamic/M911-M914.cpp  |  4 ++--
 Marlin/src/gcode/gcode.cpp                       |  2 +-
 Marlin/src/gcode/gcode.h                         |  2 +-
 Marlin/src/inc/Conditionals_adv.h                |  6 +++---
 Marlin/src/inc/Conditionals_post.h               |  2 +-
 .../screens/advanced_settings_menu.cpp           | 10 +++++-----
 .../screens/bio_advanced_settings.cpp            |  6 +++---
 .../lib/ftdi_eve_touch_ui/screens/screens.cpp    |  2 +-
 .../lib/ftdi_eve_touch_ui/screens/screens.h      |  2 +-
 .../screens/stepper_bump_sensitivity_screen.cpp  |  4 ++--
 .../screens/stepper_current_screen.cpp           |  2 +-
 Marlin/src/lcd/extensible_ui/ui_api.cpp          |  4 ++--
 Marlin/src/lcd/extensible_ui/ui_api.h            |  2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp            |  2 +-
 Marlin/src/lcd/menu/menu_tmc.cpp                 |  4 ++--
 Marlin/src/lcd/ultralcd.cpp                      |  2 +-
 Marlin/src/module/configuration_store.cpp        | 16 ++++++++--------
 Marlin/src/module/stepper/indirection.cpp        |  4 ++--
 Marlin/src/module/stepper/indirection.h          |  2 +-
 Marlin/src/module/stepper/trinamic.cpp           |  4 ++--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h      |  2 +-
 31 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ede35a561e08..261ef90ad677 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2015,7 +2015,7 @@
  * TMCStepper library is required to use TMC stepper drivers.
  * https://github.com/teemuatlut/TMCStepper
  */
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
   #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256
@@ -2345,7 +2345,7 @@
    */
   #define TMC_ADV() {  }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
 
 // @section L64XX
 
diff --git a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h b/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
index 87864bcaf67b..1c7c68f2169c 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
@@ -56,7 +56,7 @@
 /**
  * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
  */
-#if HAS_TRINAMIC && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
+#if HAS_TRINAMIC_CONFIG && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
   #error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
 #endif
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 124fb6f038fc..a8bff9a7907d 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -110,7 +110,7 @@
   #include "feature/I2CPositionEncoder.h"
 #endif
 
-#if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
+#if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
   #include "feature/tmc_util.h"
 #endif
 
@@ -1162,7 +1162,7 @@ void setup() {
     host_action_prompt_end();
   #endif
 
-  #if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
+  #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
     test_tmc_connection(true, true, true, true);
   #endif
 
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 306329d6fe98..9ffedd9111e6 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -90,13 +90,13 @@
 
 // Test for supported TMC drivers that require advanced configuration
 // Does not match standalone configurations
-#define HAS_TRINAMIC (    HAS_DRIVER(TMC2130) \
-                       || HAS_DRIVER(TMC2160) \
-                       || HAS_DRIVER(TMC2208) \
-                       || HAS_DRIVER(TMC2209) \
-                       || HAS_DRIVER(TMC2660) \
-                       || HAS_DRIVER(TMC5130) \
-                       || HAS_DRIVER(TMC5160) )
+#define HAS_TRINAMIC_CONFIG (    HAS_DRIVER(TMC2130) \
+                              || HAS_DRIVER(TMC2160) \
+                              || HAS_DRIVER(TMC2208) \
+                              || HAS_DRIVER(TMC2209) \
+                              || HAS_DRIVER(TMC2660) \
+                              || HAS_DRIVER(TMC5130) \
+                              || HAS_DRIVER(TMC5160) )
 
 #define HAS_TRINAMIC_STANDALONE (    HAS_DRIVER(TMC2130_STANDALONE) \
                                   || HAS_DRIVER(TMC2208_STANDALONE) \
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index f1979c376192..cf18e2130c7c 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -108,7 +108,7 @@ void Power::power_on() {
   if (!powersupply_on) {
     PSU_PIN_ON();
 
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
       delay(PSU_POWERUP_DELAY); // Wait for power to settle
       restore_stepper_drivers();
     #endif
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index a2723fd3935b..e5e69eed50b3 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -22,7 +22,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "tmc_util.h"
 #include "../MarlinCore.h"
@@ -954,7 +954,7 @@
     static void tmc_get_ic_registers(TMC2208Stepper, const TMC_get_registers_enum) { SERIAL_CHAR('\t'); }
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     template<class TMC>
     static void tmc_get_registers(TMC &st, const TMC_get_registers_enum i) {
       switch (i) {
@@ -1257,4 +1257,4 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
   if (axis_connection) ui.set_status_P(GET_TEXT(MSG_ERROR_TMC));
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 5102a9d5bfa0..ccae8b660ca4 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -24,7 +24,7 @@
 #include "../inc/MarlinConfig.h"
 #include "../lcd/ultralcd.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include <TMCStepper.h>
 #include "../module/planner.h"
@@ -400,4 +400,4 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
   void tmc_init_cs_pins();
 #endif
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index f9c40a20a9ce..e8d9aa2fdf0c 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -44,7 +44,7 @@
   // Could be moved to a feature, but this is all the data
   bool powersupply_on;
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     #include "../../feature/tmc_util.h"
   #endif
 
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index bba6e7e752aa..0eb93a8006d7 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
@@ -53,4 +53,4 @@ void GcodeSuite::M122() {
   test_tmc_connection(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index bb2659913ac7..95ad310ed0e0 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
@@ -170,4 +170,4 @@ void GcodeSuite::M906() {
   }
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 4629bccab0cf..582e779cc2d6 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
@@ -426,4 +426,4 @@
   }
 #endif // USE_SENSORLESS
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index f6b8e6f59ba5..f5df73763069 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -785,7 +785,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         #endif
       #endif
 
-      #if HAS_TRINAMIC
+      #if HAS_TRINAMIC_CONFIG
         case 122: M122(); break;                                  // M122: Report driver configuration and status
         case 906: M906(); break;                                  // M906: Set motor current in milliamps using axis codes X, Y, Z, E
         #if HAS_STEALTHCHOP
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index c44c17081131..0fb4a4e8ed8e 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -912,7 +912,7 @@ class GcodeSuite {
     static void M900();
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     static void M122();
     static void M906();
     #if HAS_STEALTHCHOP
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index b042c5e96e3e..155258be4344 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -196,7 +196,7 @@
     #define MINIMUM_STEPPER_POST_DIR_DELAY 400
   #elif HAS_DRIVER(A4988)
     #define MINIMUM_STEPPER_POST_DIR_DELAY 200
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
+  #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
     #define MINIMUM_STEPPER_POST_DIR_DELAY 20
   #else
     #define MINIMUM_STEPPER_POST_DIR_DELAY 0   // Expect at least 10µS since one Stepper ISR must transpire
@@ -216,7 +216,7 @@
     #define MINIMUM_STEPPER_PULSE 2
   #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
     #define MINIMUM_STEPPER_PULSE 1
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
+  #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
     #define MINIMUM_STEPPER_PULSE 0
   #elif HAS_DRIVER(LV8729)
     #define MINIMUM_STEPPER_PULSE 0
@@ -236,7 +236,7 @@
     #define MAXIMUM_STEPPER_RATE 500000
   #elif HAS_DRIVER(LV8729)
     #define MAXIMUM_STEPPER_RATE 1000000
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
+  #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
     #define MAXIMUM_STEPPER_RATE 5000000
   #else
     #define MAXIMUM_STEPPER_RATE 250000
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d40e92869318..32243afc3754 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1290,7 +1290,7 @@
 #define HAS_SOLENOID_7    (PIN_EXISTS(SOL7))
 
 // Trinamic Stepper Drivers
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
   #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
   // Disable Z axis sensorless homing if a probe is used to home the Z axis
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index 103dcc036481..6029382838e6 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -58,13 +58,13 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(16).button( BTN_POS(1,6),  BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
       .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
       .tag(13).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
@@ -120,13 +120,13 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .enabled(1)
       .tag(3) .button( BTN_POS(2,1),  BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
       .tag(13).button( BTN_POS(3,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
@@ -189,7 +189,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     case 11: GOTO_SCREEN(FilamentMenu); break;
     #endif
     case 12: GOTO_SCREEN(EndstopStatesScreen); break;
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
     case 13: GOTO_SCREEN(StepperCurrentScreen); break;
     case 14: GOTO_SCREEN(StepperBumpSensitivityScreen); break;
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index 0c53dca61b4e..6c9f74f93f09 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -45,13 +45,13 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
 
       .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
       .tag(3) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
@@ -100,7 +100,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
     case 2: GOTO_SCREEN(DisplayTuningScreen);              break;
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
     case 3: GOTO_SCREEN(StepperCurrentScreen);             break;
     case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);     break;
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
index bc9280005400..69c1cf1420b7 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
@@ -58,7 +58,7 @@ SCREEN_TABLE {
 #endif
   DECL_SCREEN(MoveAxisScreen),
   DECL_SCREEN(StepsScreen),
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   DECL_SCREEN(StepperCurrentScreen),
   DECL_SCREEN(StepperBumpSensitivityScreen),
 #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
index 176c8145e34e..02c5b148310d 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
@@ -455,7 +455,7 @@ class StepsScreen : public BaseNumericAdjustmentScreen, public CachedScreen<STEP
     static bool onTouchHeld(uint8_t tag);
 };
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   class StepperCurrentScreen : public BaseNumericAdjustmentScreen, public CachedScreen<STEPPER_CURRENT_SCREEN_CACHE> {
     public:
       static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
index 9aa28aff39d8..2e05ad5c5728 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
+#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
 
 #include "screens.h"
 
@@ -74,4 +74,4 @@ bool StepperBumpSensitivityScreen::onTouchHeld(uint8_t tag) {
   return true;
 }
 
-#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC
+#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
index acc94684e096..5abcea7a6748 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
+#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 7ef7614b8df8..759d290af6f0 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -75,7 +75,7 @@
   #define IFSD(A,B) (B)
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "../../feature/tmc_util.h"
   #include "../../module/stepper/indirection.h"
 #endif
@@ -445,7 +445,7 @@ namespace ExtUI {
     void setSoftEndstopState(const bool value) { soft_endstops_enabled = value; }
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     float getAxisCurrent_mA(const axis_t axis) {
       switch (axis) {
         #if AXIS_IS_TMC(X)
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h
index 10df2bc72d99..61fecaed46a8 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extensible_ui/ui_api.h
@@ -97,7 +97,7 @@ namespace ExtUI {
     void setSoftEndstopState(const bool);
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     float getAxisCurrent_mA(const axis_t);
     float getAxisCurrent_mA(const extruder_t);
     void  setAxisCurrent_mA(const float, const axis_t);
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 03bcedb7305a..2a53f9490eec 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -544,7 +544,7 @@ void menu_advanced_settings() {
     SUBMENU(MSG_DRIVE_STRENGTH, menu_pwm);
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     SUBMENU(MSG_TMC_DRIVERS, menu_tmc);
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index 0350d788eb15..296a132e149a 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_TRINAMIC && HAS_LCD_MENU
+#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU
 
 #include "menu.h"
 #include "../../module/stepper/indirection.h"
@@ -249,4 +249,4 @@ void menu_tmc() {
   END_MENU();
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 87d061c908b3..47cd8df80ef6 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -103,7 +103,7 @@ MarlinUI ui;
   #include "../feature/bedlevel/bedlevel.h"
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "../feature/tmc_util.h"
 #endif
 
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 3fe38d4ade8f..346fd64de361 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -113,7 +113,7 @@
   #include "../feature/bltouch.h"
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "stepper/indirection.h"
   #include "../feature/tmc_util.h"
 #endif
@@ -313,7 +313,7 @@ typedef struct SettingsDataStruct {
   float planner_filament_size[EXTRUDERS];               // M200 T D  planner.filament_size[]
 
   //
-  // HAS_TRINAMIC
+  // HAS_TRINAMIC_CONFIG
   //
   tmc_stepper_current_t tmc_stepper_current;            // M906 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
   tmc_hybrid_threshold_t tmc_hybrid_threshold;          // M913 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
@@ -985,7 +985,7 @@ void MarlinSettings::postprocess() {
 
       tmc_stepper_current_t tmc_stepper_current = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-      #if HAS_TRINAMIC
+      #if HAS_TRINAMIC_CONFIG
         #if AXIS_IS_TMC(X)
           tmc_stepper_current.X = stepperX.getMilliamps();
         #endif
@@ -1862,7 +1862,7 @@ void MarlinSettings::postprocess() {
         tmc_stepper_current_t currents;
         EEPROM_READ(currents);
 
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
 
           #define SET_CURR(Q) stepper##Q.rms_current(currents.Q ? currents.Q : Q##_CURRENT)
           if (!validating) {
@@ -2034,7 +2034,7 @@ void MarlinSettings::postprocess() {
         tmc_stealth_enabled_t tmc_stealth_enabled;
         EEPROM_READ(tmc_stealth_enabled);
 
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
 
           #define SET_STEPPING_MODE(ST) stepper##ST.stored.stealthChop_enabled = tmc_stealth_enabled.ST; stepper##ST.refresh_stepping_mode();
           if (!validating) {
@@ -2788,7 +2788,7 @@ void MarlinSettings::reset() {
   #define CONFIG_ECHO_MSG(STR)      do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); }while(0)
   #define CONFIG_ECHO_HEADING(STR)  config_heading(forReplay, PSTR(STR))
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     inline void say_M906(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M906"); }
     #if HAS_STEALTHCHOP
       void say_M569(const bool forReplay, const char * const etc=nullptr, const bool newLine = false) {
@@ -3298,7 +3298,7 @@ void MarlinSettings::reset() {
       #endif
     #endif
 
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
 
       /**
        * TMC stepper driver current
@@ -3599,7 +3599,7 @@ void MarlinSettings::reset() {
 
       #endif // HAS_STEALTHCHOP
 
-    #endif // HAS_TRINAMIC
+    #endif // HAS_TRINAMIC_CONFIG
 
     /**
      * Linear Advance
diff --git a/Marlin/src/module/stepper/indirection.cpp b/Marlin/src/module/stepper/indirection.cpp
index d468a2afdd62..2ddbfe62e390 100644
--- a/Marlin/src/module/stepper/indirection.cpp
+++ b/Marlin/src/module/stepper/indirection.cpp
@@ -33,7 +33,7 @@
 #include "indirection.h"
 
 void restore_stepper_drivers() {
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     restore_trinamic_drivers();
   #endif
 }
@@ -47,7 +47,7 @@ void reset_stepper_drivers() {
     L64xxManager.init_to_defaults();
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     reset_trinamic_drivers();
   #endif
 }
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 295c3aca2e90..99a224c7276c 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -40,7 +40,7 @@
   #include "TMC26X.h"
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "trinamic.h"
 #endif
 
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 0b14aaf64779..14598f9c73dc 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -27,7 +27,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "trinamic.h"
 #include "../stepper.h"
@@ -818,4 +818,4 @@ void reset_trinamic_drivers() {
   stepper.set_directions();
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index 15b63494094b..104f40fdf16c 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -103,7 +103,7 @@
 
 // Trinamic driver support
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   // Using TMC devices in intelligent mode requires extra connections to each device. Unfortunately
   // the SKR does not have many free pins (especially if a display is in use). The SPI-based devices
   // will require 3 connections (clock, mosi, miso), plus a chip select line (CS) for each driver.

From 6b5347ee3949aca63118f25b0e6116d06db3f158 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 29 Feb 2020 04:28:07 -0600
Subject: [PATCH 325/565] Improved M900

---
 Marlin/src/gcode/feature/advance/M900.cpp | 140 +++++++++++-----------
 Marlin/src/module/configuration_store.cpp |   4 +-
 2 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index fd500261b6ee..a8384108b58e 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -29,11 +29,10 @@
 #include "../../../module/stepper.h"
 
 #if ENABLED(EXTRA_LIN_ADVANCE_K)
-  float saved_extruder_advance_K[EXTRUDERS];
+  float other_extruder_advance_K[EXTRUDERS];
   uint8_t lin_adv_slot = 0;
 #endif
 
-
 /**
  * M900: Get or Set Linear Advance K-factor
  *  T<tool>     Which tool to address
@@ -43,100 +42,107 @@
  */
 void GcodeSuite::M900() {
 
+  auto echo_value_oor = [] (const char ltr, const bool ten=true) {
+    SERIAL_CHAR('?'); SERIAL_CHAR(ltr);
+    SERIAL_ECHOPGM(" value out of range");
+    if (ten) SERIAL_ECHOPGM(" (0-10)");
+    SERIAL_ECHOLNPGM(".");
+  }
+
+  if (!parser.seen_any()) {
+
+    #if ENABLED(EXTRA_LIN_ADVANCE_K)
+
+      #if EXTRUDERS < 2
+        SERIAL_ECHOLNPAIR("Advance S", int(new_slot), " K", kref, "(S", int(!new_slot), " K", lref, ")");
+      #else
+        LOOP_L_N(i, EXTRUDERS) {
+          const bool slot = TEST(lin_adv_slot, i);
+          SERIAL_ECHOLNPAIR("Advance T", int(i), " S", int(slot), " K", planner.extruder_advance_K[i],
+                            "(S", int(!slot), " K", other_extruder_advance_K[i], ")");
+          SERIAL_EOL();
+        }
+      #endif
+
+    #else
+
+      SERIAL_ECHO_START();
+      #if EXTRUDERS < 2
+        SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
+      #else
+        SERIAL_ECHOPGM("Advance K");
+        LOOP_L_N(i, EXTRUDERS) {
+          SERIAL_CHAR(' ', '0' + i, ':');
+          SERIAL_ECHO(planner.extruder_advance_K[i]);
+        }
+        SERIAL_EOL();
+      #endif
+
+    #endif
+
+    return;
+  }
+
   #if EXTRUDERS < 2
     constexpr uint8_t tool_index = 0;
   #else
     const uint8_t tool_index = parser.intval('T', active_extruder);
     if (tool_index >= EXTRUDERS) {
-      SERIAL_ECHOLNPGM("?T value out of range.");
+      echo_value_oor('T', false);
       return;
     }
   #endif
 
+  float &kref = planner.extruder_advance_K[tool_index],
+        &lref = other_extruder_advance_K[tool_index];
+  const float oldK = kref, oldOther = lref;
+  float newK = oldK;
+
   #if ENABLED(EXTRA_LIN_ADVANCE_K)
 
-    bool ext_slot = TEST(lin_adv_slot, tool_index);
-
-    if (parser.seenval('S')) {
-      const bool slot = parser.value_bool();
-      if (ext_slot != slot) {
-        ext_slot = slot;
-        SET_BIT_TO(lin_adv_slot, tool_index, slot);
-        planner.synchronize();
-        const float temp = planner.extruder_advance_K[tool_index];
-        planner.extruder_advance_K[tool_index] = saved_extruder_advance_K[tool_index];
-        saved_extruder_advance_K[tool_index] = temp;
-      }
+    const bool old_slot = TEST(lin_adv_slot, tool_index), // The tool's current slot (0 or 1)
+               new_slot = parser.boolval('S', old_slot);  // The passed slot (default = current)
+
+    // If a new slot is being selected swap the current and
+    // saved K values. Do here so K/L will apply correctly.
+    if (new_slot != old_slot) {                       // Not the same slot?
+      SET_BIT_TO(lin_adv_slot, tool_index, new_slot); // Update the slot for the tool
+      newK = oldOther;                                // Get new K value from backup
+      lref = oldK;                                    // Save K to backup
     }
 
+    // Set the main K value. Apply if the main slot is active.
     if (parser.seenval('K')) {
       const float newK = parser.value_float();
-      if (WITHIN(newK, 0, 10)) {
-        if (ext_slot)
-          saved_extruder_advance_K[tool_index] = newK;
-        else {
-          planner.synchronize();
-          planner.extruder_advance_K[tool_index] = newK;
-        }
-      }
-      else
-        SERIAL_ECHOLNPGM("?K value out of range (0-10).");
+      if (!WITHIN(newK, 0, 10)) echo_value_oor('K');
+      else if (new_slot)        lref = newK;          // S1 Knn
+      else                      newK = newK;          // S0 Knn
     }
 
+    // Set the extra K value. Apply if the extra slot is active.
     if (parser.seenval('L')) {
       const float newL = parser.value_float();
-      if (WITHIN(newL, 0, 10)) {
-        if (!ext_slot)
-          saved_extruder_advance_K[tool_index] = newL;
-        else {
-          planner.synchronize();
-          planner.extruder_advance_K[tool_index] = newL;
-        }
-      }
-      else
-        SERIAL_ECHOLNPGM("?L value out of range (0-10).");
-    }
-
-    if (!parser.seen_any()) {
-      #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance S", ext_slot, " K", planner.extruder_advance_K[0],
-                          "(Slot ", 1 - ext_slot, " K", saved_extruder_advance_K[0], ")");
-      #else
-        LOOP_L_N(i, EXTRUDERS) {
-          const int slot = (int)TEST(lin_adv_slot, i);
-          SERIAL_ECHOLNPAIR("Advance T", int(i), " S", slot, " K", planner.extruder_advance_K[i],
-                            "(Slot ", 1 - slot, " K", saved_extruder_advance_K[i], ")");
-          SERIAL_EOL();
-        }
-      #endif
+      if (!WITHIN(newL, 0, 10)) echo_value_oor('L');
+      else if (!new_slot)       lref = newL;          // S0 Lnn
+      else                      newK = newL;          // S1 Lnn
     }
 
   #else
 
     if (parser.seenval('K')) {
       const float newK = parser.value_float();
-      if (WITHIN(newK, 0, 10)) {
-        planner.synchronize();
-        planner.extruder_advance_K[tool_index] = newK;
-      }
+      if (WITHIN(newK, 0, 10))
+        newK = newK;
       else
-        SERIAL_ECHOLNPGM("?K value out of range (0-10).");
-    }
-    else {
-      SERIAL_ECHO_START();
-      #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
-      #else
-        SERIAL_ECHOPGM("Advance K");
-        LOOP_L_N(i, EXTRUDERS) {
-          SERIAL_CHAR(' '); SERIAL_ECHO(int(i));
-          SERIAL_CHAR('='); SERIAL_ECHO(planner.extruder_advance_K[i]);
-        }
-        SERIAL_EOL();
-      #endif
+        echo_value_oor('K');
     }
 
   #endif
+
+  if (newK != oldK) {
+    planner.synchronize();
+    kref = newK;
+  }
 }
 
 #endif // LIN_ADVANCE
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 346fd64de361..77fc18bb5367 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -101,7 +101,7 @@
 #endif
 
 #if ENABLED(EXTRA_LIN_ADVANCE_K)
-  extern float saved_extruder_advance_K[EXTRUDERS];
+  extern float other_extruder_advance_K[EXTRUDERS];
 #endif
 
 #if EXTRUDERS > 1
@@ -2717,7 +2717,7 @@ void MarlinSettings::reset() {
     LOOP_L_N(i, EXTRUDERS) {
       planner.extruder_advance_K[i] = LIN_ADVANCE_K;
       #if ENABLED(EXTRA_LIN_ADVANCE_K)
-        saved_extruder_advance_K[i] = LIN_ADVANCE_K;
+        other_extruder_advance_K[i] = LIN_ADVANCE_K;
       #endif
     }
   #endif

From 49c5f614c6ac9326275a2daf8f771df41041f142 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 16:59:04 -0600
Subject: [PATCH 326/565] Minor motion style changes

---
 Marlin/src/MarlinCore.cpp              |  2 +-
 Marlin/src/gcode/feature/pause/G61.cpp |  2 +-
 Marlin/src/gcode/motion/G0_G1.cpp      |  4 +--
 Marlin/src/gcode/probe/G38.cpp         |  4 +--
 Marlin/src/module/motion.cpp           | 43 +++++++++++++-------------
 Marlin/src/module/motion.h             |  2 +-
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index a8bff9a7907d..dec731532de1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -650,7 +650,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
       // travel moves have been received so enact them
       delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
       destination = current_position;
-      prepare_move_to_destination();
+      prepare_line_to_destination();
     }
   #endif
 
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index 2ec2f85fe5cf..60e6bcf0408f 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -65,7 +65,7 @@ void GcodeSuite::G61(void) {
   SERIAL_EOL();
 
   // Move to the saved position
-  prepare_move_to_destination();
+  prepare_line_to_destination();
 }
 
 #endif // SAVED_POSITIONS
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 8f0dfc71b2f6..069d76fdad97 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -100,9 +100,9 @@ void GcodeSuite::G0_G1(
     #endif // FWRETRACT
 
     #if IS_SCARA
-      fast_move ? prepare_fast_move_to_destination() : prepare_move_to_destination();
+      fast_move ? prepare_fast_move_to_destination() : prepare_line_to_destination();
     #else
-      prepare_move_to_destination();
+      prepare_line_to_destination();
     #endif
 
     #ifdef G0_FEEDRATE
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index 11b7ce5af74d..512e1ff89f49 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -34,7 +34,7 @@
 inline void G38_single_probe(const uint8_t move_value) {
   endstops.enable(true);
   G38_move = move_value;
-  prepare_move_to_destination();
+  prepare_line_to_destination();
   planner.synchronize();
   G38_move = 0;
   endstops.hit_on_purpose();
@@ -77,7 +77,7 @@ inline bool G38_run_probe() {
       // Move away by the retract distance
       destination = current_position + retract_mm;
       endstops.enable(false);
-      prepare_move_to_destination();
+      prepare_line_to_destination();
       planner.synchronize();
 
       REMEMBER(fr, feedrate_mm_s, feedrate_mm_s * 0.25);
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index e15e955367e3..ecfb5233d2ad 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -104,7 +104,7 @@ xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
 /**
  * Cartesian Destination
  *   The destination for a move, filled in by G-code movement commands,
- *   and expected by functions like 'prepare_move_to_destination'.
+ *   and expected by functions like 'prepare_line_to_destination'.
  *   G-codes can set destination using 'get_destination_from_command'
  */
 xyze_pos_t destination; // {0}
@@ -340,7 +340,7 @@ void _internal_move_to_destination(const feedRate_t &fr_mm_s/*=0.0f*/
       prepare_fast_move_to_destination();
     else
   #endif
-      prepare_move_to_destination();
+      prepare_line_to_destination();
 
   feedrate_mm_s = old_feedrate;
   feedrate_percentage = old_pct;
@@ -660,6 +660,16 @@ void restore_feedrate_and_scaling() {
 #endif // HAS_SOFTWARE_ENDSTOPS
 
 #if !UBL_SEGMENTED
+
+FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
+  const millis_t ms = millis();
+  thermalManager.manage_heater();  // This returns immediately if not really needed.
+  if (ELAPSED(ms, next_idle_ms)) {
+    next_idle_ms = ms + 200UL;
+    idle();
+  }
+}
+
 #if IS_KINEMATIC
 
   #if IS_SCARA
@@ -679,7 +689,7 @@ void restore_feedrate_and_scaling() {
   /**
    * Prepare a linear move in a DELTA or SCARA setup.
    *
-   * Called from prepare_move_to_destination as the
+   * Called from prepare_line_to_destination as the
    * default Delta/SCARA segmenter.
    *
    * This calls planner.buffer_line several times, adding
@@ -752,17 +762,10 @@ void restore_feedrate_and_scaling() {
     xyze_pos_t raw = current_position;
 
     // Calculate and execute the segments
+    millis_t next_idle_ms = millis() + 200UL;
     while (--segments) {
-
-      static millis_t next_idle_ms = millis() + 200UL;
-      thermalManager.manage_heater();  // This returns immediately if not really needed.
-      if (ELAPSED(millis(), next_idle_ms)) {
-        next_idle_ms = millis() + 200UL;
-        idle();
-      }
-
+      segment_idle(next_idle_ms);
       raw += segment_distance;
-
       if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, cartesian_segment_mm
         #if ENABLED(SCARA_FEEDRATE_SCALING)
           , inv_duration
@@ -831,13 +834,9 @@ void restore_feedrate_and_scaling() {
       xyze_pos_t raw = current_position;
 
       // Calculate and execute the segments
+      millis_t next_idle_ms = millis() + 200UL;
       while (--segments) {
-        static millis_t next_idle_ms = millis() + 200UL;
-        thermalManager.manage_heater();  // This returns immediately if not really needed.
-        if (ELAPSED(millis(), next_idle_ms)) {
-          next_idle_ms = millis() + 200UL;
-          idle();
-        }
+        segment_idle(next_idle_ms);
         raw += segment_distance;
         if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm
           #if ENABLED(SCARA_FEEDRATE_SCALING)
@@ -866,7 +865,7 @@ void restore_feedrate_and_scaling() {
    *
    * Return true if 'current_position' was set to 'destination'
    */
-  inline bool prepare_move_to_destination_cartesian() {
+  inline bool line_to_destination_cartesian() {
     const float scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
     #if HAS_MESH
       if (planner.leveling_active && planner.leveling_active_at_z(destination.z)) {
@@ -1009,7 +1008,7 @@ void restore_feedrate_and_scaling() {
  *
  * Before exit, current_position is set to destination.
  */
-void prepare_move_to_destination() {
+void prepare_line_to_destination() {
   apply_motion_limits(destination);
 
   #if EITHER(PREVENT_COLD_EXTRUSION, PREVENT_LENGTHY_EXTRUDE)
@@ -1059,12 +1058,12 @@ void prepare_move_to_destination() {
       #if IS_KINEMATIC // UBL using Kinematic / Cartesian cases as a workaround for now.
         ubl.line_to_destination_segmented(MMS_SCALED(feedrate_mm_s))
       #else
-        prepare_move_to_destination_cartesian()
+        line_to_destination_cartesian()
       #endif
     #elif IS_KINEMATIC
       line_to_destination_kinematic()
     #else
-      prepare_move_to_destination_cartesian()
+      line_to_destination_cartesian()
     #endif
   ) return;
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index f1c2dc069cff..8e0eee7e33c3 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -182,7 +182,7 @@ void sync_plan_position_e();
  */
 void line_to_current_position(const feedRate_t &fr_mm_s=feedrate_mm_s);
 
-void prepare_move_to_destination();
+void prepare_line_to_destination();
 
 void _internal_move_to_destination(const feedRate_t &fr_mm_s=0.0f
   #if IS_KINEMATIC

From 2c4e054e9aef2a037395355c82df436cbe3b1aa3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 12:48:37 -0600
Subject: [PATCH 327/565] Fix fastio pin comment

---
 Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
index f9f0d3ceee10..b62156caa774 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
@@ -26,7 +26,7 @@
  *
  *   Hardware Pin  : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
  *   Port          : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
- *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 72 75 76 77 74 xx xx xx xx xx
+ *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
  */
 
 #include "../fastio.h"

From 66334820ca380d2958c697a4abeb6b9028a9ee15 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Mon, 2 Mar 2020 11:13:04 -0800
Subject: [PATCH 328/565] Add TMC micro-steps sanity check (#17044)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/inc/SanityCheck.h | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f5a875ffe995..885158afe757 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2150,6 +2150,47 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 #undef INVALID_TMC_ADDRESS
 
+#define _TMC_MICROSTEP_IS_VALID(MS) (MS == 0 || MS == 2 || MS == 4 || MS == 8 || MS == 16 || MS == 32 || MS == 64 || MS == 128 || MS == 256)
+#define TMC_MICROSTEP_IS_VALID(M) (!AXIS_IS_TMC(M) || _TMC_MICROSTEP_IS_VALID(M##_MICROSTEPS))
+#define INVALID_TMC_MS(ST) static_assert(0, "Invalid " STRINGIFY(ST) "_MICROSTEPS. Valid values are 0, 2, 4, 8, 16, 32, 64, 128, and 256.")
+
+#if !TMC_MICROSTEP_IS_VALID(X)
+  INVALID_TMC_MS(X);
+#elif !TMC_MICROSTEP_IS_VALID(Y)
+  INVALID_TMC_MS(Y)
+#elif !TMC_MICROSTEP_IS_VALID(Z)
+  INVALID_TMC_MS(Z)
+#elif !TMC_MICROSTEP_IS_VALID(X2)
+  INVALID_TMC_MS(X2);
+#elif !TMC_MICROSTEP_IS_VALID(Y2)
+  INVALID_TMC_MS(Y2)
+#elif !TMC_MICROSTEP_IS_VALID(Z2)
+  INVALID_TMC_MS(Z2)
+#elif !TMC_MICROSTEP_IS_VALID(Z3)
+  INVALID_TMC_MS(Z3)
+#elif !TMC_MICROSTEP_IS_VALID(Z4)
+  INVALID_TMC_MS(Z4)
+#elif !TMC_MICROSTEP_IS_VALID(E0)
+  INVALID_TMC_MS(E0)
+#elif !TMC_MICROSTEP_IS_VALID(E1)
+  INVALID_TMC_MS(E1)
+#elif !TMC_MICROSTEP_IS_VALID(E2)
+  INVALID_TMC_MS(E2)
+#elif !TMC_MICROSTEP_IS_VALID(E3)
+  INVALID_TMC_MS(E3)
+#elif !TMC_MICROSTEP_IS_VALID(E4)
+  INVALID_TMC_MS(E4)
+#elif !TMC_MICROSTEP_IS_VALID(E5)
+  INVALID_TMC_MS(E5)
+#elif !TMC_MICROSTEP_IS_VALID(E6)
+  INVALID_TMC_MS(E6)
+#elif !TMC_MICROSTEP_IS_VALID(E7)
+  INVALID_TMC_MS(E7)
+#endif
+#undef INVALID_TMC_MS
+#undef TMC_MICROSTEP_IS_VALID
+#undef _TMC_MICROSTEP_IS_VALID
+
 #if ENABLED(DELTA) && (ENABLED(STEALTHCHOP_XY) != ENABLED(STEALTHCHOP_Z))
   #error "STEALTHCHOP_XY and STEALTHCHOP_Z must be the same on DELTA."
 #endif

From 624ab24a5c5b93d3d5fa3636144a89885abe9ae7 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 3 Mar 2020 08:14:08 +1300
Subject: [PATCH 329/565] Suppress thisItemNr warning (#17049)

---
 Marlin/src/lcd/menu/menu.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 5299fefde2b7..0e8d1e27ca75 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -322,10 +322,10 @@ class MenuItem_bool : public MenuEditItemBase {
  *   _menuLineNr is the menu item to draw and process
  *   _thisItemNr is the index of each MENU_ITEM or STATIC_ITEM
  */
-#define SCREEN_OR_MENU_LOOP(IS_MENU)                \
-  scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU); \
-  int8_t _menuLineNr = encoderTopLine, _thisItemNr; \
-  bool _skipStatic = IS_MENU; UNUSED(_thisItemNr);  \
+#define SCREEN_OR_MENU_LOOP(IS_MENU)                    \
+  scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU);     \
+  int8_t _menuLineNr = encoderTopLine, _thisItemNr = 0; \
+  bool _skipStatic = IS_MENU; UNUSED(_thisItemNr);      \
   for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
     _thisItemNr = 0
 

From af23c0480ec1e7172285103ca72d777a5b6fde7c Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 3 Mar 2020 08:17:52 +1300
Subject: [PATCH 330/565] Don't define 'valptr' if unused (#17048)

---
 Marlin/src/gcode/parser.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 0fac65300fb4..4ece6ede469e 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -312,7 +312,9 @@ void GCodeParser::parse(char *p) {
         char * const valptr = has_val ? is_str ? unescape_string(p) : p : nullptr;
       #else
         const bool has_val = valid_float(p);
-        char * const valptr = has_val ? p : nullptr;
+        #if ENABLED(FASTER_GCODE_PARSER)
+          char * const valptr = has_val ? p : nullptr;
+        #endif
       #endif
 
       #if ENABLED(DEBUG_GCODE_PARSER)

From 5aa528781fee639183e02be2ff893f7193d87635 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 13:22:48 -0600
Subject: [PATCH 331/565] Fix ambiguous type

Co-Authored-By: Andrew Kroll <xxxajk@gmail.com>
---
 Marlin/src/module/motion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index ecfb5233d2ad..ac0909fcc125 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -622,7 +622,7 @@ void restore_feedrate_and_scaling() {
       ) {
         const float dist_2 = HYPOT2(target.x - offs.x, target.y - offs.y);
         if (dist_2 > delta_max_radius_2)
-          target *= delta_max_radius / SQRT(dist_2); // 200 / 300 = 0.66
+          target *= float(delta_max_radius / SQRT(dist_2)); // 200 / 300 = 0.66
       }
 
     #else

From 9bd6dec1311a4ec94b874a60c0a725d4d6c62dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Tue, 3 Mar 2020 00:23:22 +0500
Subject: [PATCH 332/565] fix #33

---
 Marlin/Configuration.h                    |  1 +
 Marlin/Configuration_adv.h                |  6 +--
 Marlin/src/feature/leds/leds.cpp          |  5 ++-
 Marlin/src/feature/leds/leds.h            |  4 ++
 Marlin/src/module/configuration_store.cpp | 49 +++++++++++++++++++++++
 5 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 4c69ff293bdc..9e1c7d97ef3f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2264,6 +2264,7 @@
 // Support for Adafruit Neopixel LED driver
 #if (GITHUB_USER==URSOFT)
  #define NEOPIXEL_LED
+ #define NEOPIXEL_EEPROM_STORE_HACK // store user color to EERPOM (unused area) // https://github.com/ursoft/Marlin/issues/33
 #endif
 #if ENABLED(NEOPIXEL_LED)
   #define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a30400a4983d..9f5d7f7edf15 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -967,13 +967,13 @@
 #endif
   #if ENABLED(LED_CONTROL_MENU)
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
-    #if ENABLED(LED_COLOR_PRESETS)
+    #if ENABLED(LED_COLOR_PRESETS) // UlTi color:
       #define LED_USER_PRESET_RED        255  // User defined RED value
       #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
       #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
       #define LED_USER_PRESET_WHITE        0  // User defined WHITE value
-      #define LED_USER_PRESET_BRIGHTNESS 128  // User defined intensity
-      //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
+      #define LED_USER_PRESET_BRIGHTNESS  32  // User defined intensity - very low, you my use EEPROM to improve it
+      #define LED_USER_PRESET_STARTUP         // Have the printer display the user preset color on startup
     #endif
   #endif
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 995693ffc50c..25ad1e267aff 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -43,7 +43,10 @@
 #endif
 
 #if ENABLED(LED_COLOR_PRESETS)
-  const LEDColor LEDLights::defaultLEDColor = MakeLEDColor(
+  #ifndef NEOPIXEL_EEPROM_STORE_HACK
+   const 
+  #endif
+   LEDColor LEDLights::defaultLEDColor = MakeLEDColor(
     LED_USER_PRESET_RED,
     LED_USER_PRESET_GREEN,
     LED_USER_PRESET_BLUE,
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 22184381fc4d..b5458e6dd7ac 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -179,7 +179,11 @@ class LEDLights {
   static inline void set_white() { set_color(LEDColorWhite()); }
 
   #if ENABLED(LED_COLOR_PRESETS)
+   #ifdef NEOPIXEL_EEPROM_STORE_HACK
+    static LEDColor defaultLEDColor;
+   #else
     static const LEDColor defaultLEDColor;
+   #endif
     static inline void set_default()  { set_color(defaultLEDColor); }
     static inline void set_red()      { set_color(LEDColorRed()); }
     static inline void set_orange()   { set_color(LEDColorOrange()); }
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index afe6e99dbd56..88d1e60af402 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -56,6 +56,10 @@
 #include "../gcode/gcode.h"
 #include "../MarlinCore.h"
 
+#ifdef NEOPIXEL_EEPROM_STORE_HACK
+ #include "../feature/leds/leds.h"
+#endif
+
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
   #include "../HAL/shared/persistent_store_api.h"
 #endif
@@ -1137,6 +1141,16 @@ void MarlinSettings::postprocess() {
           .E3 =  30, .E4 =  30, .E5 =  30
         };
       #endif
+      #ifdef NEOPIXEL_EEPROM_STORE_HACK //good bye E4 & E5
+        uint8_t *e4 = (uint8_t *)(&tmc_hybrid_threshold.E4);
+        e4[0] = LEDLights::color.r;
+        e4[1] = LEDLights::color.g;
+        e4[2] = LEDLights::color.b;
+        e4[3] = LEDLights::color.w;
+        e4[4] = LEDLights::color.i;
+        e4[5] = ~(e4[0] ^ e4[1] ^ e4[2] ^ e4[3] ^ e4[4]);
+        LEDLights::defaultLEDColor = LEDLights::color;
+      #endif
       EEPROM_WRITE(tmc_hybrid_threshold);
     }
 
@@ -1929,6 +1943,18 @@ void MarlinSettings::postprocess() {
         tmc_hybrid_threshold_t tmc_hybrid_threshold;
         _FIELD_TEST(tmc_hybrid_threshold);
         EEPROM_READ(tmc_hybrid_threshold);
+        #ifdef NEOPIXEL_EEPROM_STORE_HACK //good bye E4 & E5
+          uint8_t *e4 = (uint8_t *)(&tmc_hybrid_threshold.E4);
+          if(!validating && e4[5] == uint8_t(~(e4[0] ^ e4[1] ^ e4[2] ^ e4[3] ^ e4[4]))) {
+            LEDLights::defaultLEDColor.r = e4[0];
+            LEDLights::defaultLEDColor.g = e4[1];
+            LEDLights::defaultLEDColor.b = e4[2];
+            LEDLights::defaultLEDColor.w = e4[3];
+            LEDLights::defaultLEDColor.i = e4[4];
+            LEDLights::set_default();
+          }
+          e4[0] = e4[1] = e4[2] = e4[3] = e4[4] = e4[5] = 0;
+        #endif
 
         #if ENABLED(HYBRID_THRESHOLD)
           if (!validating) {
@@ -2430,6 +2456,17 @@ void MarlinSettings::reset() {
   planner.settings.min_feedrate_mm_s = feedRate_t(DEFAULT_MINIMUMFEEDRATE);
   planner.settings.min_travel_feedrate_mm_s = feedRate_t(DEFAULT_MINTRAVELFEEDRATE);
 
+  #ifdef NEOPIXEL_EEPROM_STORE_HACK
+   LEDLights::defaultLEDColor = MakeLEDColor(
+    LED_USER_PRESET_RED,
+    LED_USER_PRESET_GREEN,
+    LED_USER_PRESET_BLUE,
+    LED_USER_PRESET_WHITE,
+    LED_USER_PRESET_BRIGHTNESS
+   );
+   LEDLights::set_default();
+  #endif
+
   #if HAS_CLASSIC_JERK
     #ifndef DEFAULT_XJERK
       #define DEFAULT_XJERK 0
@@ -3675,6 +3712,18 @@ void MarlinSettings::reset() {
         #endif
       );
     #endif
+
+    #ifdef NEOPIXEL_EEPROM_STORE_HACK
+      CONFIG_ECHO_HEADING("Display custom light:");
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR(
+        "  M150 B", int(LEDLights::defaultLEDColor.b),
+        " P", int(LEDLights::defaultLEDColor.i),
+        " R", int(LEDLights::defaultLEDColor.r),
+        " U", int(LEDLights::defaultLEDColor.g),
+        " W", int(LEDLights::defaultLEDColor.w)
+      );
+    #endif
   }
 
 #endif // !DISABLE_M503

From ad4a9eb73a099aed88daffd929019324a8471e5e Mon Sep 17 00:00:00 2001
From: jufimu12 <jufimu12@gmail.com>
Date: Mon, 2 Mar 2020 20:35:02 +0100
Subject: [PATCH 333/565] Fix G34 probing range/error bug (#17052)

---
 Marlin/src/gcode/calibrate/G34_M422.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 7923ef9231e1..5dcad991f15c 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -153,7 +153,9 @@ void GcodeSuite::G34() {
     if (!all_axes_known()) home_all_axes();
 
     // Move the Z coordinate realm towards the positive - dirty trick
-    current_position.z -= z_probe * 0.5f;
+    current_position.z += z_probe * 0.5f;
+    sync_plan_position();
+    // Now, the Z origin lies below the build plate. That allows to probe deeper, before run_z_probe throws an error.
 
     #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
       float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f);
@@ -171,7 +173,9 @@ void GcodeSuite::G34() {
       bool adjustment_reverse = false;
     #endif
 
-    LOOP_L_N(iteration, z_auto_align_iterations) {
+    // 'iteration' is declared above and is also used after the for-loop.
+    // *not* the same as LOOP_L_N(iteration, z_auto_align_iterations)
+    for (iteration = 0; iteration < z_auto_align_iterations; ++iteration) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
 
       SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
@@ -192,7 +196,9 @@ void GcodeSuite::G34() {
           DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
 
         // Probe a Z height for each stepper.
-        const float z_probed_height = probe.probe_at_point(z_stepper_align.xy[iprobe], raise_after, 0, true);
+        // Probing sanity check is disabled, as it would trigger even in normal cases because
+        // current_position.z has been manually altered in the "dirty trick" above.
+        const float z_probed_height = probe.probe_at_point(z_stepper_align.xy[iprobe], raise_after, 0, true, false);
         if (isnan(z_probed_height)) {
           SERIAL_ECHOLNPGM("Probing failed.");
           err_break = true;

From 552f7a91d09d53b596abd6612f1f716f6aa75f75 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 2 Mar 2020 17:07:53 -0500
Subject: [PATCH 334/565] Default on/off for Power Loss Recovery (#17051)

---
 Marlin/Configuration_adv.h                | 4 ++++
 Marlin/src/inc/Conditionals_adv.h         | 4 ++++
 Marlin/src/module/configuration_store.cpp | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 261ef90ad677..03173f67ef6e 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1039,9 +1039,13 @@
    * during SD printing. If the recovery file is found at boot time, present
    * an option on the LCD screen to continue the print from the last-known
    * point in the file.
+   *
+   * If the machine reboots when resuming a print you may need to replace or
+   * reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
    */
   //#define POWER_LOSS_RECOVERY
   #if ENABLED(POWER_LOSS_RECOVERY)
+    //#define PLR_ENABLED_DEFAULT  true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
     //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
     //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
     //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 155258be4344..ea2578c460ab 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -65,6 +65,10 @@
   #define NUM_Z_STEPPER_DRIVERS 1
 #endif
 
+#ifndef PLR_ENABLED_DEFAULT
+  #define PLR_ENABLED_DEFAULT true
+#endif
+
 #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
   #undef Z_STEPPER_ALIGN_AMP
 #endif
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 77fc18bb5367..2bac5b2b00f9 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -930,7 +930,7 @@ void MarlinSettings::postprocess() {
         #if ENABLED(POWER_LOSS_RECOVERY)
           recovery.enabled
         #else
-          true
+          PLR_ENABLED_DEFAULT
         #endif
       ;
       EEPROM_WRITE(recovery_enabled);
@@ -2670,7 +2670,7 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    recovery.enable(true);
+    recovery.enable(PLR_ENABLED_DEFAULT);
   #endif
 
   //

From e0c0173f7372f3ffd67d6e794561775f16753c5c Mon Sep 17 00:00:00 2001
From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:08:26 -0800
Subject: [PATCH 335/565] Fix nested comment warning (#17045)

---
 .../PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c b/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
index 3f639f092c60..7f5ca783560c 100644
--- a/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
@@ -323,7 +323,7 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
     {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
   #else
-  #error "USB in HS mode isn't supported by the board"
+    #error "USB in HS mode isn't supported by the board"
     {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
     {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
     {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
@@ -334,7 +334,8 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
     {PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR
     {PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT
-  #endif /* USE_USB_HS_IN_FS */
+  #endif // USE_USB_HS_IN_FS
+  */
   {NC,    NP,    0}
 };
 #endif

From eb4d5120bfa95fecf62f9721fea63f043dbefb4b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 16:22:50 -0600
Subject: [PATCH 336/565] Keep name around for old configs

---
 Marlin/src/core/drivers.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 9ffedd9111e6..52019f4dfed7 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -98,6 +98,8 @@
                               || HAS_DRIVER(TMC5130) \
                               || HAS_DRIVER(TMC5160) )
 
+#define HAS_TRINAMIC HAS_TRINAMIC_CONFIG
+
 #define HAS_TRINAMIC_STANDALONE (    HAS_DRIVER(TMC2130_STANDALONE) \
                                   || HAS_DRIVER(TMC2208_STANDALONE) \
                                   || HAS_DRIVER(TMC2209_STANDALONE) \

From 646599d0d95a2c7dd47b869d5bc93bdb2c95cc4b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 16:51:47 -0600
Subject: [PATCH 337/565] Finish M900 updates

---
 Marlin/src/gcode/feature/advance/M900.cpp | 103 +++++++++++-----------
 buildroot/share/tests/mega2560-tests      |   4 +-
 2 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index a8384108b58e..bbba4f246e99 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -47,41 +47,7 @@ void GcodeSuite::M900() {
     SERIAL_ECHOPGM(" value out of range");
     if (ten) SERIAL_ECHOPGM(" (0-10)");
     SERIAL_ECHOLNPGM(".");
-  }
-
-  if (!parser.seen_any()) {
-
-    #if ENABLED(EXTRA_LIN_ADVANCE_K)
-
-      #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance S", int(new_slot), " K", kref, "(S", int(!new_slot), " K", lref, ")");
-      #else
-        LOOP_L_N(i, EXTRUDERS) {
-          const bool slot = TEST(lin_adv_slot, i);
-          SERIAL_ECHOLNPAIR("Advance T", int(i), " S", int(slot), " K", planner.extruder_advance_K[i],
-                            "(S", int(!slot), " K", other_extruder_advance_K[i], ")");
-          SERIAL_EOL();
-        }
-      #endif
-
-    #else
-
-      SERIAL_ECHO_START();
-      #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
-      #else
-        SERIAL_ECHOPGM("Advance K");
-        LOOP_L_N(i, EXTRUDERS) {
-          SERIAL_CHAR(' ', '0' + i, ':');
-          SERIAL_ECHO(planner.extruder_advance_K[i]);
-        }
-        SERIAL_EOL();
-      #endif
-
-    #endif
-
-    return;
-  }
+  };
 
   #if EXTRUDERS < 2
     constexpr uint8_t tool_index = 0;
@@ -93,9 +59,13 @@ void GcodeSuite::M900() {
     }
   #endif
 
-  float &kref = planner.extruder_advance_K[tool_index],
-        &lref = other_extruder_advance_K[tool_index];
-  const float oldK = kref, oldOther = lref;
+  float &kref = planner.extruder_advance_K[tool_index];
+
+  #if ENABLED(EXTRA_LIN_ADVANCE_K)
+    float &lref = other_extruder_advance_K[tool_index];
+  #endif
+
+  const float oldK = kref;
   float newK = oldK;
 
   #if ENABLED(EXTRA_LIN_ADVANCE_K)
@@ -107,32 +77,32 @@ void GcodeSuite::M900() {
     // saved K values. Do here so K/L will apply correctly.
     if (new_slot != old_slot) {                       // Not the same slot?
       SET_BIT_TO(lin_adv_slot, tool_index, new_slot); // Update the slot for the tool
-      newK = oldOther;                                // Get new K value from backup
+      newK = lref;                                    // Get new K value from backup
       lref = oldK;                                    // Save K to backup
     }
 
     // Set the main K value. Apply if the main slot is active.
     if (parser.seenval('K')) {
-      const float newK = parser.value_float();
-      if (!WITHIN(newK, 0, 10)) echo_value_oor('K');
-      else if (new_slot)        lref = newK;          // S1 Knn
-      else                      newK = newK;          // S0 Knn
+      const float K = parser.value_float();
+      if (!WITHIN(K, 0, 10)) echo_value_oor('K');
+      else if (new_slot)        lref = K;             // S1 Knn
+      else                      newK = K;             // S0 Knn
     }
 
     // Set the extra K value. Apply if the extra slot is active.
     if (parser.seenval('L')) {
-      const float newL = parser.value_float();
-      if (!WITHIN(newL, 0, 10)) echo_value_oor('L');
-      else if (!new_slot)       lref = newL;          // S0 Lnn
-      else                      newK = newL;          // S1 Lnn
+      const float L = parser.value_float();
+      if (!WITHIN(L, 0, 10)) echo_value_oor('L');
+      else if (!new_slot)       lref = L;             // S0 Lnn
+      else                      newK = L;             // S1 Lnn
     }
 
   #else
 
     if (parser.seenval('K')) {
-      const float newK = parser.value_float();
-      if (WITHIN(newK, 0, 10))
-        newK = newK;
+      const float K = parser.value_float();
+      if (WITHIN(K, 0, 10))
+        newK = K;
       else
         echo_value_oor('K');
     }
@@ -143,6 +113,39 @@ void GcodeSuite::M900() {
     planner.synchronize();
     kref = newK;
   }
+
+  if (!parser.seen_any()) {
+
+    #if ENABLED(EXTRA_LIN_ADVANCE_K)
+
+      #if EXTRUDERS < 2
+        SERIAL_ECHOLNPAIR("Advance S", int(new_slot), " K", kref, "(S", int(!new_slot), " K", lref, ")");
+      #else
+        LOOP_L_N(i, EXTRUDERS) {
+          const bool slot = TEST(lin_adv_slot, i);
+          SERIAL_ECHOLNPAIR("Advance T", int(i), " S", int(slot), " K", planner.extruder_advance_K[i],
+                            "(S", int(!slot), " K", other_extruder_advance_K[i], ")");
+          SERIAL_EOL();
+        }
+      #endif
+
+    #else
+
+      SERIAL_ECHO_START();
+      #if EXTRUDERS < 2
+        SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
+      #else
+        SERIAL_ECHOPGM("Advance K");
+        LOOP_L_N(i, EXTRUDERS) {
+          SERIAL_CHAR(' ', '0' + i, ':');
+          SERIAL_ECHO(planner.extruder_advance_K[i]);
+        }
+        SERIAL_EOL();
+      #endif
+
+    #endif
+  }
+
 }
 
 #endif // LIN_ADVANCE
diff --git a/buildroot/share/tests/mega2560-tests b/buildroot/share/tests/mega2560-tests
index a896c38733d9..b09560add59f 100755
--- a/buildroot/share/tests/mega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -45,7 +45,7 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TE
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
-          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
+          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
 
@@ -66,7 +66,7 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES CANCEL_OBJECTS \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
-           MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \
+           MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE EXTRA_LIN_ADVANCE_K QUICK_HOME \
            LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
            BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
 exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..."

From d3e232d1c1a096803d5caddbbe3d54218cd48a48 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 17:05:36 -0600
Subject: [PATCH 338/565] Add single extruder LIN_ADVANCE test

---
 buildroot/share/tests/mega2560-tests | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildroot/share/tests/mega2560-tests b/buildroot/share/tests/mega2560-tests
index b09560add59f..112cc0bb4260 100755
--- a/buildroot/share/tests/mega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -103,7 +103,7 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE | Sle
 #
 restore_configs
 opt_set LCD_LANGUAGE zh_CN
-opt_set EXTRUDERS 5
+opt_set EXTRUDERS 2
 opt_set NUM_SERVOS 1
 opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
@@ -120,8 +120,8 @@ opt_set LCD_LANGUAGE de
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT \
            ULTIMAKERCONTROLLER SDSUPPORT PCA9632 LCD_INFO_MENU \
            AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
-           M100_FREE_MEMORY_WATCHER \
-           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS \
+            LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS M100_FREE_MEMORY_WATCHER \
            NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
            ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES \
            PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL

From 07e22d1d65838bf9149a5afd6b368e023cf44e46 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 17:19:54 -0600
Subject: [PATCH 339/565] Neopixel on LPC uses GPIO toggling

---
 Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
index db3a0ffc6ea9..f301f0219bcd 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
@@ -176,7 +176,7 @@
 //
 // Flag any i2c pin conflicts
 //
-#if ANY(DIGIPOT_I2C, DIGIPOT_MCP4018, DAC_STEPPER_CURRENT, EXPERIMENTAL_I2CBUS, I2C_POSITION_ENCODERS, NEOPIXEL_LED, PCA9632, I2C_EEPROM)
+#if ANY(DIGIPOT_I2C, DIGIPOT_MCP4018, DAC_STEPPER_CURRENT, EXPERIMENTAL_I2CBUS, I2C_POSITION_ENCODERS, PCA9632, I2C_EEPROM)
   #define USEDI2CDEV_M 1  // <Arduino>/Wire.cpp
 
   #if USEDI2CDEV_M == 0         // P0_27 [D57] (AUX-1) .......... P0_28 [D58] (AUX-1)

From 12d05e483573d868e859423eacef6d9049f8b915 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 3 Mar 2020 00:04:10 +0000
Subject: [PATCH 340/565] [cron] Bump distribution date (2020-03-03)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7631b949fc69..52dbedc79135 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-02"
+  #define STRING_DISTRIBUTION_DATE "2020-03-03"
 #endif
 
 /**

From af62d7f937250e359e99e3f848ac5adbb26c99c5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 19:17:52 -0600
Subject: [PATCH 341/565] Fix MMU test

---
 buildroot/share/tests/mega2560-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/tests/mega2560-tests b/buildroot/share/tests/mega2560-tests
index 112cc0bb4260..b0b9b4224289 100755
--- a/buildroot/share/tests/mega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -103,7 +103,7 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE | Sle
 #
 restore_configs
 opt_set LCD_LANGUAGE zh_CN
-opt_set EXTRUDERS 2
+opt_set EXTRUDERS 5
 opt_set NUM_SERVOS 1
 opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \

From 48276646a3fa621402df40b97cc44ad4b93d5c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Tue, 3 Mar 2020 07:35:34 +0500
Subject: [PATCH 342/565] fix #34

---
 Marlin/Configuration_adv.h                 |  3 +-
 Marlin/src/inc/Conditionals_post.h         |  2 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 41 +++++++++++++++++++++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9f5d7f7edf15..7a06fa71d396 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1217,7 +1217,8 @@
  */
 #if HAS_GRAPHICAL_LCD
   // Show SD percentage next to the progress bar
-  //#define DOGM_SD_PERCENT
+  #define DOGM_SD_PERCENT
+  #define DOGM_SD_PRESENT // https://github.com/ursoft/Marlin/issues/34
 
   // Enable to save many cycles by drawing a hollow frame on the Info Screen
   #define XYZ_HOLLOW_FRAME
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5fa5bc2cd270..708947daceb8 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2081,7 +2081,7 @@
     // When sharing the SD card with a PC we want the menu options to
     // mount/unmount the card and refresh it. So we disable card detect.
     //
-    #undef SD_DETECT_PIN
+    //#undef SD_DETECT_PIN
     #define SHARED_SD_CARD
   #endif
   #if SD_CONNECTION_IS(LCD_AND_ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index d5ef3518ad96..09d944ad82de 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -625,7 +625,9 @@ void MarlinUI::draw_status_screen() {
     //
     // SD Card Symbol
     //
-    if (card.isFileOpen() && PAGE_CONTAINS(42, 51)) {
+    if(PAGE_CONTAINS(42, 51)) {
+    #ifndef DOGM_SD_PRESENT
+    if (card.isFileOpen() &&) {
       // Upper box
       u8g.drawBox(42, 42, 8, 7);     // 42-48 (or 41-47)
       // Right edge
@@ -635,6 +637,43 @@ void MarlinUI::draw_status_screen() {
       // Corner pixel
       u8g.drawPixel(50, 43);         // 43 (or 42)
     }
+    #else
+    #if SD_CONNECTION_IS(LCD)
+     bool bigCard = true;
+     bool inserted = IS_SD_INSERTED();
+     bool mounted = card.isMounted();
+    #endif
+    #if SD_CONNECTION_IS(ONBOARD)
+     bool bigCard = false;
+     bool inserted = IS_SD_INSERTED();
+     bool mounted = card.isMounted();
+    #endif
+    #if SD_CONNECTION_IS(LCD_AND_ONBOARD)
+     bool inserted = IS_EXT_SD_INSERTED();
+     bool bigCard = true;
+     bool mounted = false;
+     if(inserted) {
+       mounted = card.isMounted();
+     } else {
+       bigCard = false;
+       inserted = IS_SD_INSERTED();
+       if(inserted) mounted = card.isMountedOnBoard();
+     }
+    #endif
+    if (mounted || (inserted && blink /* not mounted */)) {
+      u8g.drawBox(42, 42, 8, bigCard ? 11 : 6);
+      u8g.drawBox(50, 44, 2, bigCard ? 9 : 4);
+      if(bigCard) u8g.drawFrame(38, 42, 5, 11);
+      else u8g.drawFrame(42, 48, 10, 5);
+      u8g.drawPixel(50, 43);
+
+      if(card.isFileOpen() && blink) { // printing
+        if(bigCard) u8g.drawVLine(40, 44, 7); 
+        else u8g.drawHLine(44, 50, 6); 
+      }
+    } /* else empty */
+    #endif
+    }
   #endif // SDSUPPORT
 
   #if HAS_PRINT_PROGRESS

From 5171e9da93d5913f7e4c75df9fdbe93c7c8fb32e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 20:50:06 -0600
Subject: [PATCH 343/565] No more direct G28 calls

---
 Marlin/src/gcode/calibrate/G28.cpp | 5 ++---
 Marlin/src/gcode/gcode.cpp         | 2 +-
 Marlin/src/gcode/gcode.h           | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 6841636cf0a7..f75462fb9746 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -210,7 +210,7 @@
  *  Z   Home to the Z endstop
  *
  */
-void GcodeSuite::G28(const bool always_home_all) {
+void GcodeSuite::G28() {
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOLNPGM(">>> G28");
     log_machine_info();
@@ -311,7 +311,6 @@ void GcodeSuite::G28(const bool always_home_all) {
   #if ENABLED(DELTA)
 
     home_delta();
-    UNUSED(always_home_all);
 
     #if ENABLED(IMPROVE_HOMING_RELIABILITY)
       end_slow_homing(slow_homing);
@@ -320,7 +319,7 @@ void GcodeSuite::G28(const bool always_home_all) {
   #else // NOT DELTA
 
     const bool homeX = parser.seen('X'), homeY = parser.seen('Y'), homeZ = parser.seen('Z'),
-               home_all = always_home_all || (homeX == homeY && homeX == homeZ),
+               home_all = homeX == homeY && homeX == homeZ, // All or None
                doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ;
 
     destination = current_position;
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index f5df73763069..e53a17eeb01e 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -277,7 +277,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 27: G27(); break;                                    // G27: Nozzle Park
       #endif
 
-      case 28: G28(false); break;                                 // G28: Home all axes, one at a time
+      case 28: G28(); break;                                      // G28: Home one or more axes
 
       #if HAS_LEVELING
         case 29:                                                  // G29: Bed leveling calibration
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 0fb4a4e8ed8e..7360fcb9fbfa 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -434,7 +434,7 @@ class GcodeSuite {
     static void G27();
   #endif
 
-  static void G28(const bool always_home_all);
+  static void G28();
 
   #if HAS_LEVELING
     #if ENABLED(G29_RETRY_AND_RECOVER)

From 3a07b4412d24a6afd430f6d7e1b8c7f3c442a3c2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 2 Mar 2020 21:52:53 -0600
Subject: [PATCH 344/565] Asynchronous M114 and (R)ealtime position option
 (#17032)

---
 Marlin/Configuration_adv.h     |  6 ++--
 Marlin/src/core/types.h        | 26 +++++++++++++++-
 Marlin/src/gcode/host/M114.cpp | 30 +++++++++++++++---
 Marlin/src/module/motion.cpp   | 56 ++++++++++++++++++++++++++--------
 Marlin/src/module/motion.h     |  2 ++
 Marlin/src/module/planner.h    | 22 +++++++++----
 Marlin/src/module/stepper.cpp  | 24 +++++++++------
 Marlin/src/module/stepper.h    |  1 +
 8 files changed, 131 insertions(+), 36 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 03173f67ef6e..10403073550b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -276,8 +276,10 @@
   #define AUTOTEMP_OLDWEIGHT 0.98
 #endif
 
-// Show extra position information with 'M114 D'
-//#define M114_DETAIL
+// Extra options for the M114 "Current Position" report
+//#define M114_DETAIL         // Use 'M114` for details to check planner calculations
+//#define M114_REALTIME       // Real current position based on forward kinematics
+//#define M114_LEGACY         // M114 used to synchronize on every call. Enable if needed.
 
 // Show Temperature ADC value
 // Enable for M105 to include ADC values read from temperature sensors.
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index c56ce41895e9..acab36ec5cad 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -187,6 +187,12 @@ struct XYval {
   };
   FI void set(const T px)                               { x = px; }
   FI void set(const T px, const T py)                   { x = px; y = py; }
+  FI void set(const T (&arr)[XY])                       { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZ])                      { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZE])                     { x = arr[0]; y = arr[1]; }
+  #if XYZE_N > XYZE
+    FI void set(const T (&arr)[XYZE_N])                 { x = arr[0]; y = arr[1]; }
+  #endif
   FI void reset()                                       { x = y = 0; }
   FI T magnitude()                                const { return (T)sqrtf(x*x + y*y); }
   FI operator T* ()                                     { return pos; }
@@ -197,6 +203,8 @@ struct XYval {
   FI XYval<int16_t>    asInt()                    const { return { int16_t(x), int16_t(y) }; }
   FI XYval<int32_t>   asLong()                          { return { int32_t(x), int32_t(y) }; }
   FI XYval<int32_t>   asLong()                    const { return { int32_t(x), int32_t(y) }; }
+  FI XYval<int32_t>   ROUNDL()                          { return { int32_t(LROUND(x)), int32_t(LROUND(y)) }; }
+  FI XYval<int32_t>   ROUNDL()                    const { return { int32_t(LROUND(x)), int32_t(LROUND(y)) }; }
   FI XYval<float>    asFloat()                          { return {   float(x),   float(y) }; }
   FI XYval<float>    asFloat()                    const { return {   float(x),   float(y) }; }
   FI XYval<float> reciprocal()                    const { return {  _RECIP(x),  _RECIP(y) }; }
@@ -290,6 +298,12 @@ struct XYZval {
   FI void set(const T px, const T py)                  { x = px; y = py; }
   FI void set(const T px, const T py, const T pz)      { x = px; y = py; z = pz; }
   FI void set(const XYval<T> pxy, const T pz)          { x = pxy.x; y = pxy.y; z = pz; }
+  FI void set(const T (&arr)[XY])                      { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZ])                     { x = arr[0]; y = arr[1]; z = arr[2]; }
+  FI void set(const T (&arr)[XYZE])                    { x = arr[0]; y = arr[1]; z = arr[2]; }
+  #if XYZE_N > XYZE
+    FI void set(const T (&arr)[XYZE_N])                { x = arr[0]; y = arr[1]; z = arr[2]; }
+  #endif
   FI void reset()                                      { x = y = z = 0; }
   FI T magnitude()                               const { return (T)sqrtf(x*x + y*y + z*z); }
   FI operator T* ()                                    { return pos; }
@@ -300,6 +314,8 @@ struct XYZval {
   FI XYZval<int16_t>   asInt()                   const { return { int16_t(x), int16_t(y), int16_t(z) }; }
   FI XYZval<int32_t>  asLong()                         { return { int32_t(x), int32_t(y), int32_t(z) }; }
   FI XYZval<int32_t>  asLong()                   const { return { int32_t(x), int32_t(y), int32_t(z) }; }
+  FI XYZval<int32_t>  ROUNDL()                         { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)) }; }
+  FI XYZval<int32_t>  ROUNDL()                   const { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)) }; }
   FI XYZval<float>   asFloat()                         { return {   float(x),   float(y),   float(z) }; }
   FI XYZval<float>   asFloat()                   const { return {   float(x),   float(y),   float(z) }; }
   FI XYZval<float> reciprocal()                  const { return {  _RECIP(x),  _RECIP(y),  _RECIP(z) }; }
@@ -397,12 +413,20 @@ struct XYZEval {
   FI void set(const XYval<T> pxy, const T pz, const T pe)     { x = pxy.x;  y = pxy.y;  z = pz;     e = pe;    }
   FI void set(const XYval<T> pxy, const XYval<T> pze)         { x = pxy.x;  y = pxy.y;  z = pze.z;  e = pze.e; }
   FI void set(const XYZval<T> pxyz, const T pe)               { x = pxyz.x; y = pxyz.y; z = pxyz.z; e = pe;    }
+  FI void set(const T (&arr)[XY])                             { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZ])                            { x = arr[0]; y = arr[1]; z = arr[2]; }
+  FI void set(const T (&arr)[XYZE])                           { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+  #if XYZE_N > XYZE
+    FI void set(const T (&arr)[XYZE_N])                       { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+  #endif
   FI XYZEval<T>          copy()                         const { return *this; }
   FI XYZEval<T>           ABS()                         const { return { T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(e)) }; }
   FI XYZEval<int16_t>   asInt()                               { return { int16_t(x), int16_t(y), int16_t(z), int16_t(e) }; }
   FI XYZEval<int16_t>   asInt()                         const { return { int16_t(x), int16_t(y), int16_t(z), int16_t(e) }; }
-  FI XYZEval<int32_t>  asLong()                         const { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
   FI XYZEval<int32_t>  asLong()                               { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
+  FI XYZEval<int32_t>  asLong()                         const { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
+  FI XYZEval<int32_t>  ROUNDL()                               { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(e)) }; }
+  FI XYZEval<int32_t>  ROUNDL()                         const { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(e)) }; }
   FI XYZEval<float>   asFloat()                               { return {   float(x),   float(y),   float(z),   float(e) }; }
   FI XYZEval<float>   asFloat()                         const { return {   float(x),   float(y),   float(z),   float(e) }; }
   FI XYZEval<float> reciprocal()                        const { return {  _RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(e) }; }
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index fc67f762d24e..1a8655135bc3 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -34,7 +34,7 @@
     #include "../../core/debug_out.h"
   #endif
 
-  void report_xyze(const xyze_pos_t &pos, const uint8_t n=4, const uint8_t precision=3) {
+  void report_xyze(const xyze_pos_t &pos, const uint8_t n=XYZE, const uint8_t precision=3) {
     char str[12];
     for (uint8_t a = 0; a < n; a++) {
       SERIAL_CHAR(' ', axis_codes[a], ':');
@@ -42,6 +42,7 @@
     }
     SERIAL_EOL();
   }
+  inline void report_xyz(const xyze_pos_t &pos) { report_xyze(pos, 3); }
 
   void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
@@ -51,23 +52,26 @@
     }
     SERIAL_EOL();
   }
-  inline void report_xyz(const xyze_pos_t &pos) { report_xyze(pos, 3); }
 
   void report_current_position_detail() {
 
+    // Position as sent by G-code
     SERIAL_ECHOPGM("\nLogical:");
     report_xyz(current_position.asLogical());
 
+    // Cartesian position in native machine space
     SERIAL_ECHOPGM("Raw:    ");
     report_xyz(current_position);
 
     xyze_pos_t leveled = current_position;
 
     #if HAS_LEVELING
+      // Current position with leveling applied
       SERIAL_ECHOPGM("Leveled:");
       planner.apply_leveling(leveled);
       report_xyz(leveled);
 
+      // Test planner un-leveling. This should match the Raw result.
       SERIAL_ECHOPGM("UnLevel:");
       xyze_pos_t unleveled = leveled;
       planner.unapply_leveling(unleveled);
@@ -75,6 +79,7 @@
     #endif
 
     #if IS_KINEMATIC
+      // Kinematics applied to the leveled position
       #if IS_SCARA
         SERIAL_ECHOPGM("ScaraK: ");
       #else
@@ -180,12 +185,21 @@
 #endif // M114_DETAIL
 
 /**
- * M114: Report current position to host
+ * M114: Report the current position to host.
+ *       Since steppers are moving, the count positions are
+ *       projected by using planner calculations.
+ *   D - Report more detail. This syncs the planner. (Requires M114_DETAIL)
+ *   E - Report E stepper position (Requires M114_DETAIL)
+ *   R - Report the realtime position instead of projected.
  */
 void GcodeSuite::M114() {
 
   #if ENABLED(M114_DETAIL)
     if (parser.seen('D')) {
+      #if DISABLED(M114_LEGACY)
+        planner.synchronize();
+      #endif
+      report_current_position();
       report_current_position_detail();
       return;
     }
@@ -195,6 +209,12 @@ void GcodeSuite::M114() {
     }
   #endif
 
-  planner.synchronize();
-  report_current_position();
+  #if ENABLED(M114_REALTIME)
+    if (parser.seen('R')) { report_real_position(); return; }
+  #endif
+
+  #if ENABLED(M114_LEGACY)
+    planner.synchronize();
+  #endif
+  report_current_position_projected();
 }
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index ac0909fcc125..1ce225cae582 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -206,17 +206,53 @@ xyz_pos_t cartes;
 /**
  * Output the current position to serial
  */
-void report_current_position() {
-  const xyz_pos_t lpos = current_position.asLogical();
-  SERIAL_ECHOPAIR("X:", lpos.x, " Y:", lpos.y, " Z:", lpos.z, " E:", current_position.e);
 
+inline void report_more_positions() {
   stepper.report_positions();
-
   #if IS_SCARA
     scara_report_positions();
   #endif
 }
 
+// Report the logical position for a given machine position
+inline void report_logical_position(const xyze_pos_t &rpos) {
+  const xyze_pos_t lpos = rpos.asLogical();
+  SERIAL_ECHOPAIR_P(X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z, SP_E_LBL, lpos.e);
+  report_more_positions();
+}
+
+// Report the real current position according to the steppers.
+// Forward kinematics and un-leveling are applied.
+void report_real_position() {
+  get_cartesian_from_steppers();
+  xyze_pos_t npos = cartes;
+  npos.e = planner.get_axis_position_mm(E_AXIS);
+
+  #if HAS_POSITION_MODIFIERS
+    planner.unapply_modifiers(npos
+      #if HAS_LEVELING
+        , true
+      #endif
+    );
+  #endif
+
+  report_logical_position(npos);
+}
+
+// Report the logical current position according to the most recent G-code command
+void report_current_position() { report_logical_position(current_position); }
+
+/**
+ * Report the logical current position according to the most recent G-code command.
+ * The planner.position always corresponds to the last G-code too. This makes M114
+ * suitable for debugging kinematics and leveling while avoiding planner sync that
+ * definitively interrupts the printing flow.
+ */
+void report_current_position_projected() {
+  report_logical_position(current_position);
+  stepper.report_a_position(planner.position);
+}
+
 /**
  * sync_plan_position
  *
@@ -241,11 +277,7 @@ void sync_plan_position_e() { planner.set_e_position_mm(current_position.e); }
  */
 void get_cartesian_from_steppers() {
   #if ENABLED(DELTA)
-    forward_kinematics_DELTA(
-      planner.get_axis_position_mm(A_AXIS),
-      planner.get_axis_position_mm(B_AXIS),
-      planner.get_axis_position_mm(C_AXIS)
-    );
+    forward_kinematics_DELTA(planner.get_axis_positions_mm());
   #else
     #if IS_SCARA
       forward_kinematics_SCARA(
@@ -663,11 +695,11 @@ void restore_feedrate_and_scaling() {
 
 FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
   const millis_t ms = millis();
-  thermalManager.manage_heater();  // This returns immediately if not really needed.
   if (ELAPSED(ms, next_idle_ms)) {
     next_idle_ms = ms + 200UL;
-    idle();
+    return idle();
   }
+  thermalManager.manage_heater();  // Returns immediately on most calls
 }
 
 #if IS_KINEMATIC
@@ -1324,7 +1356,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
     current_position[axis] = distance;
     line_to_current_position(real_fr_mm_s);
   #else
-    abce_pos_t target = { planner.get_axis_position_mm(A_AXIS), planner.get_axis_position_mm(B_AXIS), planner.get_axis_position_mm(C_AXIS), planner.get_axis_position_mm(E_AXIS) };
+    abce_pos_t target = planner.get_axis_positions_mm();
     target[axis] = 0;
     planner.set_machine_position_mm(target);
     target[axis] = distance;
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 8e0eee7e33c3..055c6eeecde2 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -162,7 +162,9 @@ typedef struct { xyz_pos_t min, max; } axis_limits_t;
   #define update_software_endstops(...) NOOP
 #endif
 
+void report_real_position();
 void report_current_position();
+void report_current_position_projected();
 
 void get_cartesian_from_steppers();
 void set_current_from_steppers_for_axis(const AxisEnum axis);
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 6942ec602876..3e5d9d902eea 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -289,6 +289,12 @@ class Planner {
       static float extruder_advance_K[EXTRUDERS];
     #endif
 
+    /**
+     * The current position of the tool in absolute steps
+     * Recalculated if any axis_steps_per_mm are changed by gcode
+     */
+    static xyze_long_t position;
+
     #if HAS_POSITION_FLOAT
       static xyze_pos_t position_float;
     #endif
@@ -305,12 +311,6 @@ class Planner {
 
   private:
 
-    /**
-     * The current position of the tool in absolute steps
-     * Recalculated if any axis_steps_per_mm are changed by gcode
-     */
-    static xyze_long_t position;
-
     /**
      * Speed of previous path line segment
      */
@@ -725,6 +725,16 @@ class Planner {
      */
     static float get_axis_position_mm(const AxisEnum axis);
 
+    static inline abce_pos_t get_axis_positions_mm() {
+      const abce_pos_t out = {
+        get_axis_position_mm(A_AXIS),
+        get_axis_position_mm(B_AXIS),
+        get_axis_position_mm(C_AXIS),
+        get_axis_position_mm(E_AXIS)
+      };
+      return out;
+    }
+
     // SCARA AB axes are in degrees, not mm
     #if IS_SCARA
       FORCE_INLINE static float get_axis_position_degrees(const AxisEnum axis) { return get_axis_position_mm(axis); }
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index d4bbe36f1340..dacef0f2cb6e 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2448,6 +2448,19 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
   return v;
 }
 
+void Stepper::report_a_position(const xyz_long_t &pos) {
+  #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
+    SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
+  #else
+    SERIAL_ECHOPAIR_P(PSTR(STR_COUNT_X), pos.x, SP_Y_LBL, pos.y);
+  #endif
+  #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
+    SERIAL_ECHOLNPAIR(" C:", pos.z);
+  #else
+    SERIAL_ECHOLNPAIR_P(SP_Z_LBL, pos.z);
+  #endif
+}
+
 void Stepper::report_positions() {
 
   #ifdef __AVR__
@@ -2461,16 +2474,7 @@ void Stepper::report_positions() {
     if (was_enabled) wake_up();
   #endif
 
-  #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
-    SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
-  #else
-    SERIAL_ECHOPAIR_P(PSTR(STR_COUNT_X), pos.x, SP_Y_LBL, pos.y);
-  #endif
-  #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
-    SERIAL_ECHOLNPAIR(" C:", pos.z);
-  #else
-    SERIAL_ECHOLNPAIR_P(SP_Z_LBL, pos.z);
-  #endif
+  report_a_position(pos);
 }
 
 #if ENABLED(BABYSTEPPING)
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 6671b946dfcf..46c6c1c16a78 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -411,6 +411,7 @@ class Stepper {
     static void set_axis_position(const AxisEnum a, const int32_t &v);
 
     // Report the positions of the steppers, in steps
+    static void report_a_position(const xyz_long_t &pos);
     static void report_positions();
 
     // Quickly stop all steppers

From 5e28b0f471c4bfa404963c2ce6071c6bb9fbd116 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 21:55:56 -0600
Subject: [PATCH 345/565] Minor EEPROM cleanup

---
 Marlin/src/module/configuration_store.cpp | 101 +++++++++++-----------
 1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 2bac5b2b00f9..d44f63c680bf 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -525,7 +525,7 @@ void MarlinSettings::postprocess() {
    * M500 - Store Configuration
    */
   bool MarlinSettings::save() {
-    float dummy = 0;
+    float dummyf = 0;
     char ver[4] = "ERR";
 
     uint16_t working_crc = 0;
@@ -556,8 +556,8 @@ void MarlinSettings::postprocess() {
       #if HAS_CLASSIC_JERK
         EEPROM_WRITE(planner.max_jerk);
         #if HAS_LINEAR_E_JERK
-          dummy = float(DEFAULT_EJERK);
-          EEPROM_WRITE(dummy);
+          dummyf = float(DEFAULT_EJERK);
+          EEPROM_WRITE(dummyf);
         #endif
       #else
         const xyze_pos_t planner_max_jerk = { 10, 10, 0.4, float(DEFAULT_EJERK) };
@@ -567,8 +567,8 @@ void MarlinSettings::postprocess() {
       #if DISABLED(CLASSIC_JERK)
         EEPROM_WRITE(planner.junction_deviation_mm);
       #else
-        dummy = 0.02f;
-        EEPROM_WRITE(dummy);
+        dummyf = 0.02f;
+        EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -643,12 +643,12 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(mesh_num_y);
         EEPROM_WRITE(mbl.z_values);
       #else // For disabled MBL write a default mesh
-        dummy = 0;
+        dummyf = 0;
         const uint8_t mesh_num_x = 3, mesh_num_y = 3;
-        EEPROM_WRITE(dummy); // z_offset
+        EEPROM_WRITE(dummyf); // z_offset
         EEPROM_WRITE(mesh_num_x);
         EEPROM_WRITE(mesh_num_y);
-        for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummy);
+        for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -672,8 +672,8 @@ void MarlinSettings::postprocess() {
       #if ABL_PLANAR
         EEPROM_WRITE(planner.bed_level_matrix);
       #else
-        dummy = 0;
-        for (uint8_t q = 9; q--;) EEPROM_WRITE(dummy);
+        dummyf = 0;
+        for (uint8_t q = 9; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -697,12 +697,12 @@ void MarlinSettings::postprocess() {
         // For disabled Bilinear Grid write an empty 3x3 grid
         const uint8_t grid_max_x = 3, grid_max_y = 3;
         const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
-        dummy = 0;
+        dummyf = 0;
         EEPROM_WRITE(grid_max_x);
         EEPROM_WRITE(grid_max_y);
         EEPROM_WRITE(bilinear_grid_spacing);
         EEPROM_WRITE(bilinear_start);
-        for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummy);
+        for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -781,35 +781,35 @@ void MarlinSettings::postprocess() {
         _FIELD_TEST(x2_endstop_adj);
 
         // Write dual endstops in X, Y, Z order. Unused = 0.0
-        dummy = 0;
+        dummyf = 0;
         #if ENABLED(X_DUAL_ENDSTOPS)
           EEPROM_WRITE(endstops.x2_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
         #if ENABLED(Y_DUAL_ENDSTOPS)
           EEPROM_WRITE(endstops.y2_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
         #if ENABLED(Z_MULTI_ENDSTOPS)
           EEPROM_WRITE(endstops.z2_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
         #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
           EEPROM_WRITE(endstops.z3_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
         #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
           EEPROM_WRITE(endstops.z4_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
       #endif
@@ -970,9 +970,9 @@ void MarlinSettings::postprocess() {
       #else
 
         const bool volumetric_enabled = false;
-        dummy = DEFAULT_NOMINAL_FILAMENT_DIA;
+        dummyf = DEFAULT_NOMINAL_FILAMENT_DIA;
         EEPROM_WRITE(volumetric_enabled);
-        for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummy);
+        for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf);
 
       #endif
     }
@@ -1245,8 +1245,8 @@ void MarlinSettings::postprocess() {
       #if ENABLED(LIN_ADVANCE)
         EEPROM_WRITE(planner.extruder_advance_K);
       #else
-        dummy = 0;
-        for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummy);
+        dummyf = 0;
+        for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -1403,7 +1403,7 @@ void MarlinSettings::postprocess() {
       eeprom_error = true;
     }
     else {
-      float dummy = 0;
+      float dummyf = 0;
       working_crc = 0;  // Init to 0. Accumulated by EEPROM_READ
 
       _FIELD_TEST(esteppers);
@@ -1442,16 +1442,16 @@ void MarlinSettings::postprocess() {
         #if HAS_CLASSIC_JERK
           EEPROM_READ(planner.max_jerk);
           #if HAS_LINEAR_E_JERK
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
         #else
-          for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
+          for (uint8_t q = 4; q--;) EEPROM_READ(dummyf);
         #endif
 
         #if DISABLED(CLASSIC_JERK)
           EEPROM_READ(planner.junction_deviation_mm);
         #else
-          EEPROM_READ(dummy);
+          EEPROM_READ(dummyf);
         #endif
       }
 
@@ -1508,7 +1508,7 @@ void MarlinSettings::postprocess() {
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           EEPROM_READ(new_z_fade_height);
         #else
-          EEPROM_READ(dummy);
+          EEPROM_READ(dummyf);
         #endif
       }
 
@@ -1517,12 +1517,12 @@ void MarlinSettings::postprocess() {
       //
       {
         uint8_t mesh_num_x, mesh_num_y;
-        EEPROM_READ(dummy);
+        EEPROM_READ(dummyf);
         EEPROM_READ_ALWAYS(mesh_num_x);
         EEPROM_READ_ALWAYS(mesh_num_y);
 
         #if ENABLED(MESH_BED_LEVELING)
-          if (!validating) mbl.z_offset = dummy;
+          if (!validating) mbl.z_offset = dummyf;
           if (mesh_num_x == GRID_MAX_POINTS_X && mesh_num_y == GRID_MAX_POINTS_Y) {
             // EEPROM data fits the current mesh
             EEPROM_READ(mbl.z_values);
@@ -1530,11 +1530,11 @@ void MarlinSettings::postprocess() {
           else {
             // EEPROM data is stale
             if (!validating) mbl.reset();
-            for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
+            for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummyf);
           }
         #else
           // MBL is disabled - skip the stored data
-          for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
+          for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummyf);
         #endif // MESH_BED_LEVELING
       }
 
@@ -1558,7 +1558,7 @@ void MarlinSettings::postprocess() {
         #if ABL_PLANAR
           EEPROM_READ(planner.bed_level_matrix);
         #else
-          for (uint8_t q = 9; q--;) EEPROM_READ(dummy);
+          for (uint8_t q = 9; q--;) EEPROM_READ(dummyf);
         #endif
       }
 
@@ -1567,8 +1567,8 @@ void MarlinSettings::postprocess() {
       //
       {
         uint8_t grid_max_x, grid_max_y;
-        EEPROM_READ_ALWAYS(grid_max_x);                       // 1 byte
-        EEPROM_READ_ALWAYS(grid_max_y);                       // 1 byte
+        EEPROM_READ_ALWAYS(grid_max_x);                // 1 byte
+        EEPROM_READ_ALWAYS(grid_max_y);                // 1 byte
         #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
           if (grid_max_x == GRID_MAX_POINTS_X && grid_max_y == GRID_MAX_POINTS_Y) {
             if (!validating) set_bed_leveling_enabled(false);
@@ -1583,7 +1583,7 @@ void MarlinSettings::postprocess() {
             xy_pos_t bgs, bs;
             EEPROM_READ(bgs);
             EEPROM_READ(bs);
-            for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummy);
+            for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummyf);
           }
       }
 
@@ -1592,16 +1592,15 @@ void MarlinSettings::postprocess() {
       //
       {
         _FIELD_TEST(planner_leveling_active);
-
         #if ENABLED(AUTO_BED_LEVELING_UBL)
-          EEPROM_READ(planner.leveling_active);
-          EEPROM_READ(ubl.storage_slot);
+          bool &planner_leveling_active = planner.leveling_active;
+          uint8_t &ubl_storage_slot = ubl.storage_slot;
         #else
           bool planner_leveling_active;
           uint8_t ubl_storage_slot;
-          EEPROM_READ(planner_leveling_active);
-          EEPROM_READ(ubl_storage_slot);
         #endif
+        EEPROM_READ(planner_leveling_active);
+        EEPROM_READ(ubl_storage_slot);
       }
 
       //
@@ -1609,7 +1608,6 @@ void MarlinSettings::postprocess() {
       //
       {
         _FIELD_TEST(servo_angles);
-
         #if ENABLED(EDITABLE_SERVO_ANGLES)
           uint16_t (&servo_angles_arr)[EEPROM_NUM_SERVOS][2] = servo_angles;
         #else
@@ -1638,7 +1636,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(bltouch_last_written_mode);
         #if ENABLED(BLTOUCH)
-          const bool &bltouch_last_written_mode = bltouch.last_written_mode;
+          bool &bltouch_last_written_mode = bltouch.last_written_mode;
         #else
           bool bltouch_last_written_mode;
         #endif
@@ -1667,27 +1665,27 @@ void MarlinSettings::postprocess() {
           #if ENABLED(X_DUAL_ENDSTOPS)
             EEPROM_READ(endstops.x2_endstop_adj);  // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
           #if ENABLED(Y_DUAL_ENDSTOPS)
             EEPROM_READ(endstops.y2_endstop_adj);  // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
           #if ENABLED(Z_MULTI_ENDSTOPS)
             EEPROM_READ(endstops.z2_endstop_adj); // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
           #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
             EEPROM_READ(endstops.z3_endstop_adj); // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
           #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
             EEPROM_READ(endstops.z4_endstop_adj); // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
 
         #endif
@@ -1749,11 +1747,11 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(lpq_len);
         #if ENABLED(PID_EXTRUSION_SCALING)
-          EEPROM_READ(thermalManager.lpq_len);
+          int16_t &lpq_len = thermalManager.lpq_len;
         #else
           int16_t lpq_len;
-          EEPROM_READ(lpq_len);
         #endif
+        EEPROM_READ(lpq_len);
       }
 
       //
@@ -1800,13 +1798,12 @@ void MarlinSettings::postprocess() {
       //
       {
         _FIELD_TEST(recovery_enabled);
-
         #if ENABLED(POWER_LOSS_RECOVERY)
-          EEPROM_READ(recovery.enabled);
+          bool &recovery_enabled = recovery.enabled;
         #else
           bool recovery_enabled;
-          EEPROM_READ(recovery_enabled);
         #endif
+        EEPROM_READ(recovery_enabled);
       }
 
       //

From 0ad94d66dd9ed4611cc442f54b3dd675a56b0145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Tue, 3 Mar 2020 10:26:14 +0500
Subject: [PATCH 346/565] Software SPI for 12864 fix #31

---
 Marlin/src/HAL/HAL_LPC1768/include/SPI.h    | 72 ++++++++++++++++++++-
 Marlin/src/inc/Conditionals_post.h          |  1 +
 Marlin/src/lcd/ultralcd.cpp                 |  8 +--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h |  2 +-
 4 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h b/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
index 1d4c1db0ec87..7e24c1ecdd80 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
@@ -37,6 +37,76 @@ class SPISettings {
 };
 
 #ifdef NEED_SPI_TEMPLATE_CLASS
+
+#if ENABLED(LPC_SOFTWARE_SPI)
+
+  #include <SoftwareSPI.h>
+
+template<int NT_SCK_PIN = SCK_PIN, int NT_MISO_PIN = MISO_PIN, int NT_MOSI_PIN = MOSI_PIN>
+class SPIClass {
+  public:
+    uint8_t SPI_speed;
+
+    static void spiBegin() {
+      swSpiBegin(NT_SCK_PIN, NT_MISO_PIN, NT_MOSI_PIN);
+    }
+
+    void spiInit(uint8_t spiRate) {
+      SPI_speed = swSpiInit(spiRate, NT_SCK_PIN, NT_MOSI_PIN);
+    }
+
+    uint8_t spiTransfer(uint8_t b) {
+      return swSpiTransfer(b, SPI_speed, NT_SCK_PIN, NT_MISO_PIN, NT_MOSI_PIN);
+    }
+
+    uint8_t spiRec() { return spiTransfer(0xFF); }
+
+    void spiRead(uint8_t*buf, uint16_t nbyte) {
+      for (int i = 0; i < nbyte; i++)
+        buf[i] = spiTransfer(0xFF);
+    }
+
+    void spiSend(uint8_t b) { (void)spiTransfer(b); }
+
+    void spiSend(const uint8_t* buf, size_t nbyte) {
+      for (uint16_t i = 0; i < nbyte; i++)
+        (void)spiTransfer(buf[i]);
+    }
+
+    void spiSendBlock(uint8_t token, const uint8_t* buf) {
+      (void)spiTransfer(token);
+      for (uint16_t i = 0; i < 512; i++)
+        (void)spiTransfer(buf[i]);
+    }
+
+  public:
+    void begin() { spiBegin(); }
+    void beginTransaction(SPISettings cfg) {
+      uint8_t spiRate;
+      switch (cfg.spiRate()) {
+        case 8000000: spiRate = 0; break;
+        case 4000000: spiRate = 1; break;
+        case 2000000: spiRate = 2; break;
+        case 1000000: spiRate = 3; break;
+        case  500000: spiRate = 4; break;
+        case  250000: spiRate = 5; break;
+        case  125000: spiRate = 6; break;
+        default: spiRate = 2; break;
+      }
+      spiInit(spiRate);
+    }
+    void endTransaction() {}
+    uint8_t transfer(uint8_t B)  { return spiTransfer(B); }
+    uint16_t transfer16(uint16_t data) {
+      return (transfer((data >> 8) & 0xFF) << 8)
+       | (transfer(data & 0xFF) & 0xFF);
+    }
+};
+
+SPIClass<> SPI_LCD;
+SPIClass<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB;
+#else
+
 // decide which HW SPI device to use
 #ifndef LPC_HW_SPI_DEV
   #if (SCK_PIN == P0_07 && MISO_PIN == P0_08 && MOSI_PIN == P0_09)
@@ -173,9 +243,9 @@ class SPIClass {
        | (transfer(data & 0xFF) & 0xFF);
     }
 };
-
 SPIClass<> SPI_LCD;
 SPIClass<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB;
+#endif
 
 #else
 class SPIClass {
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 708947daceb8..eae569c341f9 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2086,6 +2086,7 @@
   #endif
   #if SD_CONNECTION_IS(LCD_AND_ONBOARD) && DISABLED(NO_SD_HOST_DRIVE)
     #define SHARED_SD_CARD
+    #define INIT_SDCARD_ON_BOOT
   #endif
   #if DISABLED(SHARED_SD_CARD)
     #define INIT_SDCARD_ON_BOOT
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 17653d6c0a4b..a682605f32b7 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -350,11 +350,7 @@ void MarlinUI::init() {
       SET_INPUT_PULLUP(SD_DETECT_PIN_OB);
     #endif
     #if ENABLED(INIT_SDCARD_ON_BOOT)
-      #ifdef SD_DETECT_PIN_OB
-        lcd_sd_status = 2; // if only internal sd card on boot up, do not mount it
-      #else
-        lcd_sd_status = 255; // UNKNOWN
-      #endif
+      lcd_sd_status = 255; // UNKNOWN
     #endif
   #endif
 
@@ -886,7 +882,7 @@ void MarlinUI::update() {
       uint8_t old_sd_status = lcd_sd_status; // prevent re-entry to this block!
       lcd_sd_status = sd_status;
 
-      if (sd_status) {
+      if (sd_status & 1) {
         safe_delay(500); // Some boards need a delay to get settled
         card.mount();
         if (old_sd_status == 255)
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 586bdc489fba..bd0ad468de0b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -283,7 +283,7 @@
 
       #define LCD_BACKLIGHT_PIN -1
 
-      //#define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
+      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
       #define LCD_RESET_PIN EXPA1_06_PIN   // Must be high or open for LCD to operate normally.

From 39399dc6e0c0de5b169ec1af567652fbb9844f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Tue, 3 Mar 2020 10:32:09 +0500
Subject: [PATCH 347/565] fix #1

---
 Marlin/Configuration.h     | 16 +++++-----------
 Marlin/Configuration_adv.h |  2 --
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9e1c7d97ef3f..e2b1b1c9ed05 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1825,9 +1825,7 @@
 //
 // Note: Usually sold with a white PCB.
 //
-#if (GITHUB_USER!=URSOFT)
-#define REPRAP_DISCOUNT_SMART_CONTROLLER
-#endif
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
 // http://doku.radds.org/dokumentation/lcd-display/
@@ -2036,10 +2034,8 @@
 //#define FYSETC_MINI_12864_X_X    // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2    // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0    // Type A/B. Discreet RGB Backlight
-#if (GITHUB_USER==URSOFT)
- #define FYSETC_MINI_12864_2_1    // Type A/B. Neopixel RGB Backlight
- #define LCD_CONTRAST_MIN 190
-#endif
+#define FYSETC_MINI_12864_2_1    // Type A/B. Neopixel RGB Backlight
+#define LCD_CONTRAST_MIN 190
 //#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
 
 //
@@ -2262,10 +2258,8 @@
 #endif
 
 // Support for Adafruit Neopixel LED driver
-#if (GITHUB_USER==URSOFT)
- #define NEOPIXEL_LED
- #define NEOPIXEL_EEPROM_STORE_HACK // store user color to EERPOM (unused area) // https://github.com/ursoft/Marlin/issues/33
-#endif
+#define NEOPIXEL_LED
+#define NEOPIXEL_EEPROM_STORE_HACK // store user color to EERPOM (unused area) // https://github.com/ursoft/Marlin/issues/33
 #if ENABLED(NEOPIXEL_LED)
   #define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
   //#define NEOPIXEL_PIN     4       // LED driving pin
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7a06fa71d396..9d38c5054f44 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -962,9 +962,7 @@
    * LED Control Menu
    * Add LED Control to the LCD menu
    */
-#if (GITHUB_USER==URSOFT)
   #define LED_CONTROL_MENU
-#endif
   #if ENABLED(LED_CONTROL_MENU)
     #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
     #if ENABLED(LED_COLOR_PRESETS) // UlTi color:

From c083728e4cf426b9d1c5da8881ea562afa7de5a3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 17:43:37 -0600
Subject: [PATCH 348/565] General code cleanup

---
 Marlin/src/gcode/feature/advance/M900.cpp | 10 +++-------
 Marlin/src/lcd/ultralcd.cpp               |  2 +-
 buildroot/share/tests/mega2560-tests      |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index bbba4f246e99..5a029cbf0162 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -59,16 +59,12 @@ void GcodeSuite::M900() {
     }
   #endif
 
-  float &kref = planner.extruder_advance_K[tool_index];
+  float &kref = planner.extruder_advance_K[tool_index], newK = kref;
+  const float oldK = newK;
 
   #if ENABLED(EXTRA_LIN_ADVANCE_K)
-    float &lref = other_extruder_advance_K[tool_index];
-  #endif
-
-  const float oldK = kref;
-  float newK = oldK;
 
-  #if ENABLED(EXTRA_LIN_ADVANCE_K)
+    float &lref = other_extruder_advance_K[tool_index];
 
     const bool old_slot = TEST(lin_adv_slot, tool_index), // The tool's current slot (0 or 1)
                new_slot = parser.boolval('S', old_slot);  // The passed slot (default = current)
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 47cd8df80ef6..b67ec0ab4ee8 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1245,7 +1245,7 @@ void MarlinUI::update() {
         }
       #endif
 
-      #if HAS_SHIFT_ENCODER      
+      #if HAS_SHIFT_ENCODER
         /**
          * Set up Rotary Encoder bit values (for two pin encoders to indicate movement).
          * These values are independent of which pins are used for EN_A / EN_B indications.
diff --git a/buildroot/share/tests/mega2560-tests b/buildroot/share/tests/mega2560-tests
index b0b9b4224289..f120cdd6ea4f 100755
--- a/buildroot/share/tests/mega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -45,7 +45,7 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TE
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
-          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
 

From 83a60f15ff1e5fe37e076e4e3e7a62c28de8add8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 3 Mar 2020 14:18:31 -0600
Subject: [PATCH 349/565] Fix EEPROM compile errors

---
 Marlin/src/module/configuration_store.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index d44f63c680bf..3f44963ac314 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1593,8 +1593,8 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(planner_leveling_active);
         #if ENABLED(AUTO_BED_LEVELING_UBL)
-          bool &planner_leveling_active = planner.leveling_active;
-          uint8_t &ubl_storage_slot = ubl.storage_slot;
+          const bool &planner_leveling_active = planner.leveling_active;
+          const uint8_t &ubl_storage_slot = ubl.storage_slot;
         #else
           bool planner_leveling_active;
           uint8_t ubl_storage_slot;
@@ -1636,7 +1636,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(bltouch_last_written_mode);
         #if ENABLED(BLTOUCH)
-          bool &bltouch_last_written_mode = bltouch.last_written_mode;
+          const bool &bltouch_last_written_mode = bltouch.last_written_mode;
         #else
           bool bltouch_last_written_mode;
         #endif
@@ -1747,7 +1747,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(lpq_len);
         #if ENABLED(PID_EXTRUSION_SCALING)
-          int16_t &lpq_len = thermalManager.lpq_len;
+          const int16_t &lpq_len = thermalManager.lpq_len;
         #else
           int16_t lpq_len;
         #endif
@@ -1799,7 +1799,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(recovery_enabled);
         #if ENABLED(POWER_LOSS_RECOVERY)
-          bool &recovery_enabled = recovery.enabled;
+          const bool &recovery_enabled = recovery.enabled;
         #else
           bool recovery_enabled;
         #endif

From fd1af0189e76d94cffe93446da2c9333d5ee8dcc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Mar 2020 18:32:01 -0600
Subject: [PATCH 350/565] mftest: Set machine name

---
 buildroot/share/git/mftest | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index b2d7cddfe51f..62186a5f8206 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -215,6 +215,9 @@ echo "$OUT" | {
   done
 }
 
+# Make clear it's a TEST
+opt_set CUSTOM_MACHINE_NAME "\"$TESTENV-tests ($CHOICE)\""
+
 # Get a -y parameter the lazy way
 [[ "$2" == "-y" || "$3" == "-y" ]] && BUILD_YES='Y'
 

From efc739a880accd0341fe66ca7bc21b6caf13c470 Mon Sep 17 00:00:00 2001
From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 3 Mar 2020 12:22:28 -0800
Subject: [PATCH 351/565] Use BED_MAXTEMP for PTC_MAX_BED_TEMP (#17061)

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 10403073550b..4a216fc455bd 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1584,7 +1584,7 @@
   #if ENABLED(PROBE_TEMP_COMPENSATION)
     // Max temperature that can be reached by heated bed.
     // This is required only for the calibration process.
-    #define PTC_MAX_BED_TEMP 110
+    #define PTC_MAX_BED_TEMP BED_MAXTEMP
 
     // Park position to wait for probe cooldown
     #define PTC_PARK_POS_X 0.0F

From a698bfdc2abb69d191540a5cf8eddebed0da535c Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Wed, 4 Mar 2020 04:30:09 +0800
Subject: [PATCH 352/565] Update FYSETC S6 pins/variants (#17056)

---
 Marlin/src/pins/stm32/pins_FYSETC_S6.h                  | 4 ++++
 buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
index 16f176a376f7..5bda7b1c97be 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
@@ -41,6 +41,9 @@
 // EEPROM Emulation
 //
 #define FLASH_EEPROM_EMULATION
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_LEVELING
+#endif
 //#define SRAM_EEPROM_EMULATION
 //#define I2C_EEPROM
 #ifdef I2C_EEPROM
@@ -65,6 +68,7 @@
 
 //
 // Filament Sensor
+// share with X_MAX_PIN
 //
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN   PA1
diff --git a/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h b/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
index be04ef6b86c3..de34697fb36c 100644
--- a/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
+++ b/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
@@ -115,7 +115,7 @@ extern "C" {
 #define NUM_ANALOG_FIRST        80
 
 // PWM resolution
-#define PWM_RESOLUTION          8
+#define PWM_RESOLUTION          12
 #define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
 #define PWM_MAX_DUTY_CYCLE      255
 

From 72b63e952029346875fface77e55d00e695d2bb1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 3 Mar 2020 14:52:10 -0600
Subject: [PATCH 353/565] Fix TEMP_PROBE_PIN for SKR 1.4

Co-Authored-By: Anthrix <anthrix@users.noreply.github.com>
---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index fc08a60b91d6..e84d3de2b1e3 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -58,8 +58,9 @@
 #ifndef TEMP_BED_PIN
   #define TEMP_BED_PIN     P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
+
 #if HOTENDS == 1 && TEMP_SENSOR_PROBE
-  #define TEMP_PROBE_PIN   P0_25_A2   // TEMP_1_PIN
+  #define TEMP_PROBE_PIN   TEMP_1_PIN
 #endif
 
 //

From 57cbec3d3b057bad8556ca6df4242733c51f56d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Wed, 4 Mar 2020 03:34:04 +0500
Subject: [PATCH 354/565] fix #36

---
 Marlin/src/lcd/menu/menu_advanced.cpp | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index a88c4527f88e..bf977d209f67 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -200,6 +200,17 @@ void menu_cancelobject();
 #if ENABLED(PID_EDIT_MENU)
 
   float raw_Ki, raw_Kd; // place-holders for Ki and Kd edits
+  #if ENABLED(PIDTEMPBED)
+   float raw_Ki_bed, raw_Kd_bed; // place-holders for Ki and Kd edits
+   // Helpers for editing PID Ki & Kd values
+   // grab the PID value out of the temp variable; scale it; then update the PID driver
+   void copy_and_scalePIDBED_i() {
+    Temperature::temp_bed.pid.Ki = scalePID_i(raw_Ki_bed);
+   }
+   void copy_and_scalePIDBED_d() {
+    Temperature::temp_bed.pid.Kd = scalePID_d(raw_Kd_bed);
+   }
+  #endif
 
   // Helpers for editing PID Ki & Kd values
   // grab the PID value out of the temp variable; scale it; then update the PID driver
@@ -296,9 +307,21 @@ void menu_cancelobject();
         #define _PID_EDIT_MENU_ITEMS(N) _PID_BASE_MENU_ITEMS(N)
       #endif
 
+      #if ENABLED(PIDTEMPBED)
+        #define _PIDBED_EDIT_MENU_ITEMS \
+          raw_Ki_bed = unscalePID_i(Temperature::temp_bed.pid.Ki); \
+          raw_Kd_bed = unscalePID_d(Temperature::temp_bed.pid.Kd); \
+          EDIT_ITEM_P(float52sign, PSTR("BED PID-P"), &Temperature::temp_bed.pid.Kp, 1, 9990); \
+          EDIT_ITEM_P(float52sign, PSTR("BED PID-I"), &raw_Ki_bed, 0.01f, 9990, []{ copy_and_scalePIDBED_i(); }); \
+          EDIT_ITEM_P(float52sign, PSTR("BED PID-D"), &raw_Kd_bed, 1, 9990, []{ copy_and_scalePIDBED_d(); })
+      #else
+        #define _PIDBED_EDIT_MENU_ITEMS NOOP
+      #endif
+
     #else
 
       #define _PID_EDIT_MENU_ITEMS(N) NOOP
+      #define _PIDBED_EDIT_MENU_ITEMS NOOP
 
     #endif
 
@@ -315,6 +338,13 @@ void menu_cancelobject();
       REPEAT_S(1, HOTENDS, PID_EDIT_MENU_ITEMS)
     #endif
 
+    #if ENABLED(PID_AUTOTUNE_MENU)
+     _PIDBED_EDIT_MENU_ITEMS;
+     #if ENABLED(PIDTEMPBED)
+      EDIT_ITEM_FAST_P(int3, PSTR("PID Autotune BED"), &autotune_temp_bed, 40, BED_MAXTEMP - 10, []{ _lcd_autotune(-1); });
+     #endif
+    #endif
+
     END_MENU();
   }
 

From ab1863ac48d98ef904c2b767569aba7dec620b2f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Mar 2020 00:04:06 +0000
Subject: [PATCH 355/565] [cron] Bump distribution date (2020-03-04)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 52dbedc79135..a8fd9c7549b7 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-03"
+  #define STRING_DISTRIBUTION_DATE "2020-03-04"
 #endif
 
 /**

From df6e7acaf53af4a05e374e59125e0763bd3edbb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Wed, 4 Mar 2020 11:00:52 +0500
Subject: [PATCH 356/565] =?UTF-8?q?fix=20#35=20=D0=B2=20=D0=BE=D1=81=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=B7=D0=B0=20=D1=81=D1=87?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BA=D0=B5=D1=88=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h               | 13 +++++-----
 Marlin/src/HAL/HAL_LPC1768/include/SPI.h | 15 +++--------
 Marlin/src/lcd/menu/menu_media.cpp       | 14 ++++++----
 Marlin/src/sd/Sd2Card.cpp                | 13 ++++++++--
 Marlin/src/sd/Sd2Card.h                  |  2 +-
 Marlin/src/sd/cardreader.cpp             | 33 ++++++++++++++----------
 6 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9d38c5054f44..a9ff33a87a96 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1080,16 +1080,17 @@
    *  - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
    *  - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
    */
-  //#define SDCARD_SORT_ALPHA
+  #define SDCARD_SORT_ALPHA
 
   // SD Card Sorting options
   #if ENABLED(SDCARD_SORT_ALPHA)
     #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
-    #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
-    #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
+    #define SDSORT_GCODE       true   // Allow turning sorting on/off with LCD and M34 g-code.
+    #define SDSORT_GCODE_DEFAULT_SORT_ALPHA false // do not really sort unil cmd
+    #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
-    #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
+    #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
     #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
                                       // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
@@ -1102,7 +1103,7 @@
   #endif
  
   // Enable this option to scroll long filenames in the SD card menu
-  #define SCROLL_LONG_FILENAMES
+  //#define SCROLL_LONG_FILENAMES
 
   // Leave the heaters on after Stop Print (not recommended!)
   //#define SD_ABORT_NO_COOLDOWN
@@ -1191,7 +1192,7 @@
    *
    * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE', 'LCD_AND_ONBOARD' ]
    */
-  #define SDCARD_CONNECTION LCD_AND_ONBOARD //_AND_ONBOARD
+  #define SDCARD_CONNECTION LCD_AND_ONBOARD
 
 #endif // SDSUPPORT
 
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h b/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
index 7e24c1ecdd80..2ce88911a7c8 100644
--- a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
+++ b/Marlin/src/HAL/HAL_LPC1768/include/SPI.h
@@ -38,12 +38,10 @@ class SPISettings {
 
 #ifdef NEED_SPI_TEMPLATE_CLASS
 
-#if ENABLED(LPC_SOFTWARE_SPI)
-
-  #include <SoftwareSPI.h>
+#include <SoftwareSPI.h>
 
 template<int NT_SCK_PIN = SCK_PIN, int NT_MISO_PIN = MISO_PIN, int NT_MOSI_PIN = MOSI_PIN>
-class SPIClass {
+class SoftwareSPI {
   public:
     uint8_t SPI_speed;
 
@@ -103,10 +101,6 @@ class SPIClass {
     }
 };
 
-SPIClass<> SPI_LCD;
-SPIClass<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB;
-#else
-
 // decide which HW SPI device to use
 #ifndef LPC_HW_SPI_DEV
   #if (SCK_PIN == P0_07 && MISO_PIN == P0_08 && MOSI_PIN == P0_09)
@@ -132,7 +126,7 @@ SPIClass<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB;
 #include <lpc17xx_clkpwr.h>
 
 template<int NT_SCK_PIN = SCK_PIN, int NT_MISO_PIN = MISO_PIN, int NT_MOSI_PIN = MOSI_PIN, int NT_LPC_HW_SPI_DEV = _LPC_HW_SPI_DEV>
-class SPIClass {
+class HardwareSPI {
   public:
     static void spiBegin() {  // setup SCK, MOSI & MISO pins for SSP0
       PINSEL_CFG_Type PinCfg;  // data structure to hold init values
@@ -243,9 +237,6 @@ class SPIClass {
        | (transfer(data & 0xFF) & 0xFF);
     }
 };
-SPIClass<> SPI_LCD;
-SPIClass<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB;
-#endif
 
 #else
 class SPIClass {
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 91ad43edfc04..13fab4781598 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -128,12 +128,16 @@ class MenuItem_sdfolder : public MenuItem_sdbase {
 void menu_media() {
   ui.encoder_direction_menus();
 
-  #if HAS_GRAPHICAL_LCD
-    static uint16_t fileCnt;
-    if (ui.first_page) fileCnt = card.get_num_Files();
-  #else
+  //#if HAS_GRAPHICAL_LCD
+  //  static uint16_t fileCnt;
+  //  if (ui.first_page) fileCnt = card.get_num_Files();
+  //#else
     const uint16_t fileCnt = card.get_num_Files();
-  #endif
+    if(encoderTopLine >= fileCnt) {
+      encoderTopLine = 0;
+      ui.encoderPosition = 0;
+    }
+  //#endif
 
   START_MENU();
   #if ENABLED(SD_MENU_MEDIA_SHOW_LAST_PRINT_DURATION)
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index 3d929cdf250a..af8844dd90ba 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -37,6 +37,14 @@
 #if ENABLED(SDSUPPORT) && NONE(USB_FLASH_DRIVE_SUPPORT, SDIO_SUPPORT)
 
 #if SD_CONNECTION_IS(LCD_AND_ONBOARD)
+ #if ENABLED(LPC_SOFTWARE_SPI)
+   SoftwareSPI<> SPI_LCD; //slow, but no conflicts with Fysetc Display
+ #else
+   HardwareSPI<> SPI_LCD;
+ #endif
+  SoftwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB;
+  //HardwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB; //much slower!!?
+
  #define spiSend(P) (isOnBoard() ? SPI_OB.spiSend(P) : SPI_LCD.spiSend(P))
  #define spiRead(P1, P2) (isOnBoard() ? SPI_OB.spiRead(P1, P2) : SPI_LCD.spiRead(P1, P2))
  #define spiInit(P) (isOnBoard() ? SPI_OB.spiInit(P) : SPI_LCD.spiInit(P))
@@ -236,15 +244,16 @@ bool Sd2Card::eraseSingleBlockEnable() {
  *
  * \param[in] sckRateID SPI clock rate selector. See setSckRate().
  * \param[in] chipSelectPin SD chip select pin number.
+ * \param[in] timeout in ms.
  *
  * \return true for success, false for failure.
  * The reason for failure can be determined by calling errorCode() and errorData().
  */
-bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
+bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin, const uint16_t timeout /*= SD_INIT_TIMEOUT*/) {
   errorCode_ = type_ = 0;
   chipSelectPin_ = chipSelectPin;
   // 16-bit init start time allows over a minute
-  const millis_t init_timeout = millis() + SD_INIT_TIMEOUT;
+  const millis_t init_timeout = millis() + timeout;
   uint32_t arg;
 
   watchdog_refresh(); // In case init takes too long
diff --git a/Marlin/src/sd/Sd2Card.h b/Marlin/src/sd/Sd2Card.h
index 27992d988ee8..881bd3d277e4 100644
--- a/Marlin/src/sd/Sd2Card.h
+++ b/Marlin/src/sd/Sd2Card.h
@@ -119,7 +119,7 @@ class Sd2Card {
    *
    * \return true for success or false for failure.
    */
-  bool init(const uint8_t sckRateID, const pin_t chipSelectPin);
+  bool init(const uint8_t sckRateID, const pin_t chipSelectPin, const uint16_t timeout = SD_INIT_TIMEOUT);
 
   bool readBlock(uint32_t block, uint8_t* dst);
 
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index f4415519f641..caa8c95f14d3 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -118,7 +118,7 @@ CardReader::CardReader() {
   #if ENABLED(SDCARD_SORT_ALPHA)
     sort_count = 0;
     #if ENABLED(SDSORT_GCODE)
-      sort_alpha = true;
+      sort_alpha = SDSORT_GCODE_DEFAULT_SORT_ALPHA;
       sort_folders = FOLDER_SORTING;
       //sort_reverse = false;
     #endif
@@ -176,6 +176,7 @@ bool CardReader::is_dir_or_gcode(const dir_t &p) {
 // Get the number of (compliant) items in the folder
 //
 int CardReader::countItems(SdFile dir) {
+  //uint32_t start_t = millis();
   dir_t p;
   int c = 0;
   while (dir.readDir(&p, longFilename) > 0)
@@ -185,6 +186,7 @@ int CardReader::countItems(SdFile dir) {
     nrFiles = c;
   #endif
 
+  //SERIAL_ECHOLNPAIR("cI: ", millis() - start_t);
   return c;
 }
 
@@ -366,14 +368,15 @@ void CardReader::mount() {
   flag.mounted = false;
   if (root.isOpen()) root.close();
 
-  if (!sd2card.init(SPI_SPEED, SDSS)
-    #if defined(SS_PIN_OB) && (SS_PIN_OB != SDSS)
-      && !sd2card.init(SPI_SPEED, SS_PIN_OB)
-    #endif
-    #if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
-      && !sd2card.init(SPI_SPEED, LCD_SDSS)
-    #endif
-  ) SERIAL_ECHO_MSG(STR_SD_INIT_FAIL);
+  int inserted = IS_SD_INSERTED();
+  int pin = SDSS;
+  #if SD_CONNECTION_IS(LCD_AND_ONBOARD)
+    if((inserted & 1) == 0) {
+      pin = SS_PIN_OB;
+    }
+  #endif
+
+  if (!inserted || !sd2card.init(SPI_SPEED, pin)) SERIAL_ECHO_MSG(STR_SD_INIT_FAIL);
   else if (!volume.init(&sd2card))
     SERIAL_ERROR_MSG(STR_SD_VOL_INIT_FAIL);
   else if (!root.openRoot(&volume))
@@ -910,11 +913,6 @@ void CardReader::cdroot() {
     // Throw away old sort index
     flush_presort();
 
-    // Sorting may be turned off
-    #if ENABLED(SDSORT_GCODE)
-      if (!sort_alpha) return;
-    #endif
-
     // If there are files, sort up to the limit
     uint16_t fileCnt = countFilesInWorkDir();
     if (fileCnt > 0) {
@@ -986,6 +984,13 @@ void CardReader::cdroot() {
         }
 
         // Bubble Sort
+      // Sorting may be turned off
+      #if ENABLED(SDSORT_GCODE)
+        if (!sort_alpha) {
+          for (uint16_t i = 0; i < fileCnt; i++)
+            sort_order[i] = i;
+        } else
+      #endif
         for (uint16_t i = fileCnt; --i;) {
           bool didSwap = false;
           uint8_t o1 = sort_order[0];

From 7709261ea9f73d60006b5ab1ae488086908d0e79 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 4 Mar 2020 12:50:43 -0600
Subject: [PATCH 357/565] Move shared code to wait_for_bed_heating

---
 Marlin/src/module/motion.cpp      | 12 ++----------
 Marlin/src/module/probe.cpp       | 12 +-----------
 Marlin/src/module/probe.h         |  3 ---
 Marlin/src/module/temperature.cpp |  9 +++++++++
 Marlin/src/module/temperature.h   |  2 ++
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 1ce225cae582..2e7a574b39b6 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1312,16 +1312,8 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
 
   #if HOMING_Z_WITH_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
     // Wait for bed to heat back up between probing points
-    if (axis == Z_AXIS && distance < 0 && thermalManager.isHeatingBed()) {
-      serialprintPGM(probe.msg_wait_for_bed_heating);
-      #if HAS_DISPLAY
-        LCD_MESSAGEPGM(MSG_BED_HEATING);
-      #endif
-      thermalManager.wait_for_bed();
-      #if HAS_DISPLAY
-        ui.reset_status();
-      #endif
-    }
+    if (axis == Z_AXIS && distance < 0)
+      thermalManager.wait_for_bed_heating();
   #endif
 
   // Only do some things when moving towards an endstop
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 67c1655374b8..63008170bd43 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -455,10 +455,6 @@ bool Probe::set_deployed(const bool deploy) {
  * @return true to indicate an error
  */
 
-#if HAS_BED_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-  const char Probe::msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
-#endif
-
 /**
  * @brief Move down until the probe triggers or the low limit is reached
  *
@@ -473,13 +469,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
   if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::probe_down_to_z", current_position);
 
   #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-    // Wait for bed to heat back up between probing points
-    if (thermalManager.isHeatingBed()) {
-      serialprintPGM(msg_wait_for_bed_heating);
-      LCD_MESSAGEPGM(MSG_BED_HEATING);
-      thermalManager.wait_for_bed();
-      ui.reset_status();
-    }
+    thermalManager.wait_for_bed_heating();
   #endif
 
   #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index c457fad48053..4632c7c929c2 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -87,9 +87,6 @@ class Probe {
     static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true) {
       return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative, sanity_check);
     }
-    #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-      static const char msg_wait_for_bed_heating[25];
-    #endif
 
   #else
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 73a91049dadd..75f25f7f7e24 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3361,6 +3361,15 @@ void Temperature::tick() {
       return wait_for_heatup;
     }
 
+    void Temperature::wait_for_bed_heating() {
+      if (isHeatingBed()) {
+        SERIAL_ECHOLNPGM("Wait for bed heating...");
+        LCD_MESSAGEPGM(MSG_BED_HEATING);
+        wait_for_bed();
+        ui.reset_status();
+      }
+    }
+
   #endif // HAS_HEATED_BED
 
   #if HAS_HEATED_CHAMBER
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 66d6bd56e154..655de8d6f312 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -701,6 +701,8 @@ class Temperature {
         #endif
       );
 
+      static void wait_for_bed_heating();
+
     #endif // HAS_HEATED_BED
 
     #if HAS_TEMP_PROBE

From 70863fbd55a588688d90cd674c4fe3cdc6818aa9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 3 Mar 2020 15:48:23 -0600
Subject: [PATCH 358/565] Avoid name conflict with 'UART'

---
 Marlin/src/core/drivers.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 52019f4dfed7..2c89d001f965 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -133,6 +133,8 @@
 #define AXIS_HAS_UART(A) (    AXIS_DRIVER_TYPE(A,TMC2208) \
                            || AXIS_DRIVER_TYPE(A,TMC2209) )
 
+#define AXIS_HAS_RXTX AXIS_HAS_UART
+
 #define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
 
 #define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
@@ -172,7 +174,7 @@
 #define HAS_STALLGUARD     ANY_AXIS_HAS(STALLGUARD)
 #define HAS_SG_RESULT      ANY_AXIS_HAS(SG_RESULT)
 #define HAS_COOLSTEP       ANY_AXIS_HAS(COOLSTEP)
-#define HAS_TMC_UART       ANY_AXIS_HAS(UART)
+#define HAS_TMC_UART       ANY_AXIS_HAS(RXTX)
 #define HAS_TMC_SPI        ANY_AXIS_HAS(SPI)
 #define HAS_TMC_SW_SERIAL  ANY_AXIS_HAS(SW_SERIAL)
 

From d4ac78535cfab35fdc15cc47d746363d298520fc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Mar 2020 13:12:48 -0600
Subject: [PATCH 359/565] Allow Z_STOP_PIN override on SKR 1.4 (#17063)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 316049d6b127..3fb66aa156c7 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -79,14 +79,20 @@
     #define Z_MIN_PIN      P1_00   // PWRDET
   #endif
 #else
-  #define Z_STOP_PIN       P1_27   // Z-STOP
+  #ifndef Z_STOP_PIN
+    #define Z_STOP_PIN     P1_27   // Z-STOP
+  #endif
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P0_10
+  #if Z_STOP_PIN != P1_27
+    #define Z_MIN_PROBE_PIN P1_27
+  #else
+    #define Z_MIN_PROBE_PIN P0_10
+  #endif
 #endif
 
 //

From 631addbbb4d03151520f935a00c00a501f097e07 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Mar 2020 13:15:32 -0600
Subject: [PATCH 360/565] SAMD51 SoftwareSerial (#17041)

---
 Marlin/src/HAL/HAL_SAMD51/fastio.h          |  2 +-
 Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h | 12 ++++--------
 Marlin/src/HAL/HAL_SAMD51/timers.cpp        |  8 ++++----
 Marlin/src/HAL/HAL_SAMD51/timers.h          | 12 ++++++------
 platformio.ini                              | 16 ++++++++--------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/HAL_SAMD51/fastio.h
index e00fa77a7c1f..f6a2675de055 100644
--- a/Marlin/src/HAL/HAL_SAMD51/fastio.h
+++ b/Marlin/src/HAL/HAL_SAMD51/fastio.h
@@ -37,7 +37,7 @@
 /**
  * Magic I/O routines
  *
- * Now you can simply SET_OUTPUT(STEP); WRITE(STEP, HIGH); WRITE(STEP, LOW);
+ * Now you can simply SET_OUTPUT(IO); WRITE(IO, HIGH); WRITE(IO, LOW);
  */
 
 // Read a pin
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
index ddea64f2d01f..04c137c344ae 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
@@ -23,6 +23,10 @@
  * Test SAMD51 specific configuration values for errors at compile-time.
  */
 
+#if ENABLED(EEPROM_SETTINGS) && NONE(SPI_EEPROM, I2C_EEPROM)
+  #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
+#endif
+
 #if defined(ADAFRUIT_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -42,11 +46,3 @@
 #if ENABLED(FAST_PWM_FAN)
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
-
-#if ENABLED(EEPROM_SETTINGS) && NONE(SPI_EEPROM, I2C_EEPROM)
-  #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
-#endif
-
-#if HAS_TMC_SW_SERIAL
-  #error "TMC220x Software Serial is not supported on this platform."
-#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.cpp b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
index 99839cd48a10..3eb021c25bfd 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
@@ -42,7 +42,7 @@ const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS+1] = {
   { {.pTc=TC1},  TC1_IRQn, TC_PRIORITY(1) },  // 1 - stepper (needed by 32 bit timers)
   { {.pTc=TC2},  TC2_IRQn, TC_PRIORITY(2) },  // 2 - tone (framework)
   { {.pTc=TC3},  TC3_IRQn, TC_PRIORITY(3) },  // 3 - servo
-  { {.pTc=TC4},  TC4_IRQn, TC_PRIORITY(4) },
+  { {.pTc=TC4},  TC4_IRQn, TC_PRIORITY(4) },  // 4 - software serial
   { {.pTc=TC5},  TC5_IRQn, TC_PRIORITY(5) },
   { {.pTc=TC6},  TC6_IRQn, TC_PRIORITY(6) },
   { {.pTc=TC7},  TC7_IRQn, TC_PRIORITY(7) },
@@ -145,12 +145,12 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 }
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
   NVIC_EnableIRQ(irq);
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
   Disable_Irq(irq);
 }
 
@@ -160,7 +160,7 @@ static bool NVIC_GetEnabledIRQ(IRQn_Type IRQn) {
 }
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
   return NVIC_GetEnabledIRQ(irq);
 }
 
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/HAL_SAMD51/timers.h
index 073239c4311e..4b21e4716262 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.h
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.h
@@ -57,16 +57,16 @@ typedef uint32_t hal_timer_t;
                                : (t == TEMP_TIMER_NUM) ? 6                        \
                                : 7
 
-#define _TC_HANDLER(t)        void TC##t##_Handler()
-#define TC_HANDLER(t)         _TC_HANDLER(t)
-#define HAL_STEP_TIMER_ISR()  TC_HANDLER(STEP_TIMER_NUM)
+#define _TC_HANDLER(t)            void TC##t##_Handler()
+#define TC_HANDLER(t)             _TC_HANDLER(t)
+#define HAL_STEP_TIMER_ISR()      TC_HANDLER(STEP_TIMER_NUM)
 #if STEP_TIMER_NUM != PULSE_TIMER_NUM
-  #define HAL_PULSE_TIMER_ISR()  TC_HANDLER(PULSE_TIMER_NUM)
+  #define HAL_PULSE_TIMER_ISR()   TC_HANDLER(PULSE_TIMER_NUM)
 #endif
 #if TEMP_TIMER_NUM == RTC_TIMER_NUM
-  #define HAL_TEMP_TIMER_ISR()  void RTC_Handler()
+  #define HAL_TEMP_TIMER_ISR()    void RTC_Handler()
 #else
-  #define HAL_TEMP_TIMER_ISR()  TC_HANDLER(TEMP_TIMER_NUM)
+  #define HAL_TEMP_TIMER_ISR()    TC_HANDLER(TEMP_TIMER_NUM)
 #endif
 
 // --------------------------------------------------------------------------
diff --git a/platformio.ini b/platformio.ini
index 89afb91235ff..c57c1818bd85 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -771,20 +771,20 @@ src_build_flags = -Wall -IMarlin/src/HAL/HAL_LINUX/include
 build_unflags   = -Wall
 lib_ldf_mode    = off
 lib_deps        =
-extra_scripts   =
 src_filter      = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
 
 #
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
 #
 [env:SAMD51_grandcentral_m4]
-platform      = atmelsam
-board         = adafruit_grandcentral_m4
-build_flags   = ${common.build_flags} -std=gnu++17
-extra_scripts = ${common.extra_scripts}
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
-debug_tool    = jlink
+platform       = atmelsam
+board          = adafruit_grandcentral_m4
+build_flags    = ${common.build_flags} -std=gnu++17 -Wno-register
+build_unflags  = -std=gnu++11
+src_filter     = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
+lib_deps       = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+debug_tool     = jlink
 
 #
 # RUMBA32

From 7e58739a1fe0a0d8f0a118ac25bb03d58e460470 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 5 Mar 2020 00:04:13 +0000
Subject: [PATCH 361/565] [cron] Bump distribution date (2020-03-05)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a8fd9c7549b7..596cdfccb3d7 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-04"
+  #define STRING_DISTRIBUTION_DATE "2020-03-05"
 #endif
 
 /**

From 0578e9b16e7b043935460839a860d6c20496d278 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 11:03:35 -0600
Subject: [PATCH 362/565] Move SENSORLESS_PROBING to the probes section

Fixes a bug with HAS_BED_PROBE not being set before use.
---
 Marlin/Configuration.h     | 8 ++++++++
 Marlin/Configuration_adv.h | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5679aa3093f7..5bbaeba74151 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -925,6 +925,14 @@
   #define SMART_EFFECTOR_MOD_PIN  -1  // Connect a GPIO pin to the Smart Effector MOD pin
 #endif
 
+/**
+ * Use StallGuard2 to probe the bed with the nozzle.
+ * Requires stallGuard-capable Trinamic stepper drivers.
+ * CAUTION: This can damage machines with Z lead screws.
+ *          Take extreme care when setting up this feature.
+ */
+//#define SENSORLESS_PROBING
+
 //
 // For Z_PROBE_ALLEN_KEY see the Delta example configurations.
 //
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4a216fc455bd..dda07274120b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2308,14 +2308,6 @@
    */
   //#define SENSORLESS_HOMING // StallGuard capable drivers only
 
-  /**
-   * Use StallGuard2 to probe the bed with the nozzle.
-   *
-   * CAUTION: This could cause damage to machines that use a lead screw or threaded rod
-   *          to move the Z axis. Take extreme care when attempting to enable this feature.
-   */
-  //#define SENSORLESS_PROBING // StallGuard capable drivers only
-
   #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
     // TMC2209: 0...255. TMC2130: -64...63
     #define X_STALL_SENSITIVITY  8

From e3da86fb452c1f8239033224976033d43853f4e3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 13:36:57 -0600
Subject: [PATCH 363/565] Fix SKR test for ONBOARD SD

---
 Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
index 8222bbe14392..bdee26a51a80 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
@@ -190,7 +190,7 @@
 // Onboard SD card
 //   NOT compatible with LCD
 //
-#if SDCARD_CONNECTION == ONBOARD && !defined(HAS_SPI_LCD)
+#if SDCARD_CONNECTION == ONBOARD && !HAS_SPI_LCD
   #define SOFTWARE_SPI            // Use soft SPI for onboard SD
   #define SDSS             PA4
   #define SCK_PIN          PA5

From 5a6daa7c54f6e1a7fa99720de33676469b11bab9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 15:07:25 -0600
Subject: [PATCH 364/565] Fix CI test for SENSORLESS_PROBING

---
 buildroot/share/tests/LPC1769-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/tests/LPC1769-tests b/buildroot/share/tests/LPC1769-tests
index 0cdb2f313b55..1dda5ec417db 100755
--- a/buildroot/share/tests/LPC1769-tests
+++ b/buildroot/share/tests/LPC1769-tests
@@ -50,7 +50,7 @@ opt_set Z_DRIVER_TYPE TMC2130
 opt_enable AUTO_BED_LEVELING_BILINEAR EEPROM_SETTINGS EEPROM_CHITCHAT \
            TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z HYBRID_THRESHOLD \
            SENSORLESS_PROBING Z_SAFE_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY TMC_DEBUG
-opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN PSU_CONTROL
+opt_disable PSU_CONTROL
 exec_test $1 $2 "Cohesion3D Remix DELTA + ABL Bilinear + EEPROM + SENSORLESS_PROBING"
 
 # clean up

From c0801e900d1eb53d573e369373f0049239d9b86b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 15:10:27 -0600
Subject: [PATCH 365/565] Define Z_MIN_PROBE_PIN for Cohesion 3D Remix

---
 Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index ea40c01c08f0..58bf0d6e71c9 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -46,6 +46,13 @@
 #define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
 #define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
 
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  P1_29
+#endif
+
 //
 // Steppers
 //

From f0248c9ed9fe1c25e7a5758e4798fd98bc831dbb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 5 Mar 2020 15:37:02 -0600
Subject: [PATCH 366/565] Update Turkish language (#17070)

---
 Marlin/src/lcd/language/language_tr.h | 207 +++++++++++++++++++++++---
 1 file changed, 189 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 57d2911af93d..0edade037497 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -42,9 +42,18 @@ namespace Language_tr {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Turkish");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" hazır.");
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
+  PROGMEM Language_Str MSG_YES                             = _UxGT("EVET");
+  PROGMEM Language_Str MSG_NO                              = _UxGT("HAYIR");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Geri");
+  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Durduruluyor...");
   PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("SD K. Yerleştirildi.");
   PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("SD Kart Çıkarıldı.");
+  PROGMEM Language_Str MSG_MEDIA_RELEASED                  = _UxGT("SD Kart Serbest");
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("SD Kart Bekleniyor");
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Kart Okuma Hatası");
+  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB Çıkarıldı");
+  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB Başlat. Hatası");
   PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Enstops"); // Max length 8 characters
   PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Yazılımsal Endstops");
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Ana");
@@ -64,8 +73,8 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Sonraki Nokta");
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Hizalama Tamam!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Kaçınma Yüksekliği");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Offset Ayarla");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset Tamam");
+  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ofset Ayarla");
+  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofset Tamam");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Sıfır Belirle");
   PROGMEM Language_Str MSG_PREHEAT_1                       = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
   PROGMEM Language_Str MSG_PREHEAT_1_H                     = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
@@ -82,7 +91,16 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY               = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla");
   PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS              = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar");
   PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Özel Ön Isınma");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Soğut");
+  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Soğut/(Durdur)");
+  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Lazer Kontrolü");
+  PROGMEM Language_Str MSG_LASER_OFF                       = _UxGT("Lazeri Kapat");
+  PROGMEM Language_Str MSG_LASER_ON                        = _UxGT("Lazeri Aç");
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Lazer Gücü");
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Spindle Kontrolü");
+  PROGMEM Language_Str MSG_SPINDLE_OFF                     = _UxGT("Spindle Kapat");
+  PROGMEM Language_Str MSG_SPINDLE_ON                      = _UxGT("Spindle Aç");
+  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Spindle Gücü");
+  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spindle Ters Yön");
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Gücü Aç");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Gücü Kapat");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Ekstrüzyon");
@@ -92,13 +110,19 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Tabla Hizası");
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Hizalama Köşeleri");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Sonraki Köşe");
+  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Mesh Editörü");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Mesh Düzenle");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Mesh Düzenleme Durdu");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Prop Noktası");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("İndeks X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("İndeks Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Değeri");
   PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("Özel Komutlar");
+  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Prob Testi");
+  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Nokta");
+  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Sapma");
   PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX Modu");
+  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Takım Ofsetleri");
   PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Oto-Park");
   PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Kopyala");
   PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Yansıtılmış kopya");
@@ -109,6 +133,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("G29 Çalışıyor");
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL Araçları");
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("UBL Yatak Hizalama");
+  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Eğim Noktası");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Elle Mesh Oluştur");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Altlık & Ölçü Ver");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Ölçü");
@@ -135,6 +160,13 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1            = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")");
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2            = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")");
   PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Özel Mesh Doğrulama");
+  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Isıtma Tablası");
+  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Isıtma Memesi");
+  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Manuel çalışma...");
+  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Birincil Sabit Uzunluk");
+  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Çalışma Tamamlandı");
+  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 İptal edildi");
+  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Çıkış G26");
   PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Tabla Mesh Devam et");
   PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Mesh Hizalama");
   PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-Nokta Hizalama");
@@ -164,6 +196,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Depolama Yok");
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Hata: UBL Kayıt");
   PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Hata: UBL Yenileme");
+  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Ofset: ");
   PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Ofset Durduruldu");
   PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Adım Adım UBL");
   PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Soğuk Mesh Oluştur");
@@ -175,8 +208,8 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Yatak Mesh Kayıt Et");
 
   PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED Kontrolü");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Işıklar");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Işık Hazır Ayarları");
+  PROGMEM Language_Str MSG_LEDS                            = _UxGT("LEDler");
+  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("LED Hazır Ayarları");
   PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Kırmızı");
   PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Turuncu");
   PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Sarı");
@@ -192,6 +225,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Mavi Şiddeti");
   PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Beyaz Şiddeti");
   PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Parlaklık");
+
   PROGMEM Language_Str MSG_MOVING                          = _UxGT("Hareket Ediyor..");
   PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Durdur XY");
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("X Hareketi");
@@ -209,8 +243,10 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozul");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozul ~");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Tabla");
+  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Çevirme");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fan Hızı");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fan Hızı ~");
+  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Depolanan Fan ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Ekstra Fan Hızı");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Ekstra Fan Hızı ~");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Akış");
@@ -222,9 +258,22 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Oto. Sıcaklık");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Açık");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Kapalı");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Kalibrasyon");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Kalibrasyon *");
+  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
+  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
+  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
+  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
+  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
+  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
+  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
+  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
+  PROGMEM Language_Str MSG_PID_F                           = _UxGT("PID-F");
+  PROGMEM Language_Str MSG_PID_F_E                         = _UxGT("PID-F *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Seç");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seç *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("İvme");
+
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Sarsım");
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Sarsım");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Sarsım");
@@ -268,15 +317,31 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Hafızadan Yükle");
   PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Fabrika Ayarları");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROM'u başlat");
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Hata: EEPROM CRC");
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Hata: EEPROM Indeks");
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Hata: EEPROM Versiyonu");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("SD Güncellemesi");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Yazıcıyı Resetle");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Yenile");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Bilgi Ekranı");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Hazırlık");
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("Ayar");
+  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Yaz. Başlat");
+  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("İleri");
+  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("İçinde");
+  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Durdur");
+  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Yazdır");
+  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Resetle");
+  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("İptal");
+  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Tamamlandı");
+  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Geri");
+  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Devam ediyor");
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Duraklat");
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Sürdür");
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Durdur");
+  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Yazdırma Nesnesi");
+  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Nesneyi İptal Et");
+  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Nesneyi İptal Et =");
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Kesinti Kurtarma");
   PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("SD Karttan Yazdır");
   PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("SD Kart Yok!");
@@ -298,10 +363,12 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Oto. Geri Çekme");
   PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("G.Çekme Boyu");
+  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Tasfiye uzunluğu");
   PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Takım Değişimi");
   PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z Yükselt");
   PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD          = _UxGT("Birincil Hız");
   PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD        = _UxGT("Geri Çekme Hızı");
+  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Nozul Beklemede");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Filaman Değiştir");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Filaman Değiştir *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Filaman Yükle");
@@ -311,29 +378,52 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Tümünü Çıkart");
   PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("SD Kart Başlatılıyor");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("SD Kart Değiştir");
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("SD Kart Çıkart");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Prob Açık. Tabla");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Çarpıklık Faktörü");
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Sıfırla BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("BLTouch Aç");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("BLTouch Kapat");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Prob Aç");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Sensör Kapat");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Sıfırla %s%s%s Önce");
+  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch K. Test");
+  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Cmd: Reset");
+  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Cmd: Kapat");
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Cmd: Aç");
+  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Cmd: SW-Modu");
+  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Cmd: 5V-Modu");
+  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Cmd: OD-Modu");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Cmd: Mode-Store");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("BLTouch 5V Ayarla");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("BLTouch OD Ayarla");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Drenaj Raporu");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("TEHLIKE: Kötü ayarlar hasara neden olabilir! Yine de devam edilsin mi?");
+  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Init TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z Ofset Testi");
+  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Kaydet");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("TouchMI Aç");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Probe Aç");
+  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Probe Kapat");
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Önce %s%s%s Sıfırla");
+  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Prob Ofsetleri");
+  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X Prob Ofset");
+  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y Prob Ofset");
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z Prob Ofset");
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Miniadım X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Miniadım Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Miniadım Z");
+  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Toplam");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Endstop iptal");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Isınma başarısız");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD_BED          = _UxGT("Yatak Isınma Başrsız");
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD_CHAMBER      = _UxGT("Oda Isıtma Hatası");
   PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Hata: Sıcaklık Aşımı");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TERMAL PROBLEM");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TABLA TERMAL PROBLEM");
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ODA TERMAL PROBLEM");
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Hata: MAX.SICAKLIK");
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Hata: MIN.SICAKLIK");
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("Hata: MAX.SIC. TABLA");
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Hata: MIN.SIC. TABLA");
+  PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Hata: MAX.SIC ODA");
+  PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Hata: MIN.SIC ODA");
   PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Önce XY Sıfırla");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("YAZICI DURDURULDU");
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Lütfen Resetleyin");
@@ -344,6 +434,8 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Soğuyor...");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Tabla Isınıyor...");
   PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Tabla Soğuyor...");
+  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Oda Isınıyor...");
+  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Oda Soğuyor...");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibrasyonu");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Ayarla X");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Ayarla Y");
@@ -371,7 +463,6 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Aydınlatmayı Aç");
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Aydınlatma Parlaklğı");
-
   PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Yanlış Yazıcı");
 
   #if LCD_WIDTH >= 20
@@ -387,6 +478,7 @@ namespace Language_tr {
     PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("En Uzun");
     PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Filaman");
   #endif
+
   PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Sıc.");
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Sıc.");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Güç Kaynağı");
@@ -395,7 +487,9 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Sürücü %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Sürücü %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Sürücü %");
+  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC BAĞLANTI HATASI");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Yaz");
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("FILAMAN DEGISTIR");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("BASKI DURAKLATILDI");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("FILAMAN YüKLE");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("FILAMAN ÇIKART");
@@ -404,15 +498,69 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Baskıyı sürdür");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Nozul: ");
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout Sensörü");
+  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Aşınma Farkı mm");
   PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Sıfırlama Başarısız");
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Başarısız");
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Çok Soğuk");
+
+  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("FILAMAN SEÇ");
+  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
+  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("MMU Yaz. Güncelle!");
+  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Dikkat Gerektirir.");
+  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Yaz. Devam Et");
+  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Sürdürülüyor...");
+  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Filaman Yükle");
+  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Tümünü Yükle");
+  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Nozula Yükle");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Filaman Çıkart");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Filaman Çıkart ~");
+  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Filamenti Boşalt");
+  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Fil. Yükleniyor %i...");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Fil Çıkartılıyor. ...");
+  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Fil. Boşaltılıyor....");
+  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Tümü");
+  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filaman ~");
+  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("MMU Resetle");
+  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU Resetleniyot...");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Kaldır, tıkla");
+
+  PROGMEM Language_Str MSG_MIX                             = _UxGT("Karışım");
+  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Bileşen =");
+  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Karıştırıcı");
+  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradyan");
+  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Tam Gradyan");
+  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Karışım Geçişi");
+  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Döngü Karışımı");
+  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradyan Karışımı");
+  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Ters Gradyan");
+  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Aktif V-tool");
+  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Başlat V-tool");
+  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  Bitir V-tool");
+  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-tool");
+  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Reset V-tools");
+  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("V-tool Karışıö Yap");
+  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools Resetlendi");
+  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Başlat Z:");
+  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  Bitir Z:");
+
+  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Oyunlar");
+  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Brickout");
+  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Invaders");
+  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
+  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
+
+  #define MSG_1_LINE(A)     A "\0"   "\0"
+  #define MSG_2_LINE(A,B)   A "\0" B "\0"
+  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
+
   //
-  // Filament Değiştirme ekranları, 4 satırlı bir ekranda 3 satıra kadar gösterilir
+  // Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
   //                        ...veya 3 satırlı ekranda 2 satıra kadar
+  //
   #if LCD_HEIGHT >= 4
-    // Up to 3 lines allowed
+
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Baskıya devam etmek", "için Butona bas"));
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("Park Ediliyor..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Filaman değişimi", "için başlama", "bekleniyor"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Filamanı yükle", "ve devam için", "tuşa bas..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Nozulü Isıtmak için", "Butona Bas."));
@@ -422,9 +570,9 @@ namespace Language_tr {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "için bekle"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "bitirmek için tıkla"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Baskının devam ", "etmesi için bekle"));
-  #else // LCD_HEIGHT < 4
-    // Up to 2 lines allowed
+  #else
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Sürdürmek İçin Tıkla"));
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("Park Ediliyor..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Lütfen bekleyiniz..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Yükle ve bas"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Isıtmak için Tıkla"));
@@ -434,5 +582,28 @@ namespace Language_tr {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Temizleniyor..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Bitirmek için Tıkla"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Sürdürülüyor..."));
-  #endif // LCD_HEIGHT < 4
+  #endif
+  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC Sürücüleri");
+  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Sürücü Akımı");
+  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hibrit Eşiği");
+  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensörsüz Sıfırlama");
+  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Adım Modu");
+  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop Aktif");
+  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Resetle");
+  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" içinde:");
+  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Ters Tepki");
+  PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
+  PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
+  PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
+  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Düzeltme");
+  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Yumuşatma");
 }
+
+#if FAN_COUNT == 1
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif
+ 

From 3a72b0fd419c225121a414319142b51c54d22142 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 5 Mar 2020 15:39:49 -0600
Subject: [PATCH 367/565] Update Chinese (TW) language (#17071)

---
 Marlin/src/lcd/language/language_zh_TW.h | 277 ++++++++++++++++++++---
 1 file changed, 247 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index d0871f0e4604..06b19440f281 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -35,11 +35,23 @@ namespace Language_zh_TW {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Traditional Chinese");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就緒.");     //" ready."
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // ”Back“
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
+  PROGMEM Language_Str MSG_YES                             = _UxGT("是");  //"YES"
+  PROGMEM Language_Str MSG_NO                              = _UxGT("否");  //"NO"
+  PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // "Back"
+  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("正在中止...");   //"Aborting..."
   PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("記憶卡已插入");     //"Card inserted"
   PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("記憶卡被拔出");     //"Card removed"
+  PROGMEM Language_Str MSG_MEDIA_RELEASED                  = _UxGT("記憶卡被釋放");   //"Media Released"
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待記憶卡");    //"Waiting for media"
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("記憶卡讀取錯誤"); //"Media read error"
+  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB裝置已移除");   //"USB device removed"
+  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB啟動失敗");  //"USB start failed"
   PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("擋塊");     //"Endstops" // Max length 8 characters
+  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("軟體擋塊");    //"Soft Endstops"
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("主選單");     //"Main"
+  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("進階設置");   //"Advanced Settings"
+  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("設置");    //Configuration
   PROGMEM Language_Str MSG_AUTOSTART                       = _UxGT("自動開始");     //"Autostart"
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     //"Disable steppers"
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("除錯選單");     // "Debug Menu"
@@ -48,6 +60,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("回X原點");     //"Home X"
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("回Y原點");     //"Home Y"
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("回Z原點");     //"Home Z"
+  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("自動Z對齊");   //"Auto Z-Align"
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("平台調平XYZ歸原點");     //"Homing XYZ"
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("單擊開始熱床調平");     //"Click to Begin"
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("下個熱床調平點");     //"Next Point"
@@ -70,7 +83,17 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_PREHEAT_2_ALL                   = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部");     //MSG_PREHEAT_2 " All"
   PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY               = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床");     //MSG_PREHEAT_2 " Bed"
   PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS              = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置");     //MSG_PREHEAT_2 " conf"
+  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("自定預熱");   //"Preheat Custom"
   PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降溫");     //"Cooldown"
+  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");    //"Laser Control"
+  PROGMEM Language_Str MSG_LASER_OFF                       = _UxGT("激光 關");    //"Laser Off"
+  PROGMEM Language_Str MSG_LASER_ON                        = _UxGT("激光 開");   //"Laser On"
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光電源");    //"Laser Power"
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    //"Spindle Control"
+  PROGMEM Language_Str MSG_SPINDLE_OFF                     = _UxGT("主軸 關");    //"Spindle Off"
+  PROGMEM Language_Str MSG_SPINDLE_ON                      = _UxGT("主軸 開");   //"Spindle On"
+  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主軸電源");    //"Spindle Power"
+  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主軸反轉");  //"Spindle Reverse"
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("電源打開");     //"Switch power on"
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("電源關閉");     //"Switch power off"
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("擠出");     //"Extrude"
@@ -79,15 +102,31 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     //"Bed leveling"
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     //"Level bed"
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("調平邊角");     // "Level corners"
-
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下個邊角");     // "Next corner"
+  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("網格編輯器");    //"Mesh Editor"
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("編輯網格");     // "Edit Mesh"
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("網格編輯已停止");     // "Mesh Editing Stopped"
-  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("客制命令");     // "Custom Commands"
-
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("探測點");   //"Probing Point"
+  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引 X");    //"Index X"
+  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引 Y");    //"Index Y"
+  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");    //"Z Value"
+  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("自定命令");     // "Custom Commands"
+  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 探測測試");   //"M48 Probe Test"
+  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 探測點");    //"M48 Point"
+  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("偏差");    //"Deviation"
+  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX Mode");
+  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Tool Offsets");
+  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Park");
+  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplication");
+  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Mirrored Copy");
+  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Full Control");
+  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2nd Nozzle X");
+  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2nd Nozzle Y");
+  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2nd Nozzle Z");
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("執行G29");     // "Doing G29"
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL工具");     // "UBL Tools"
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
+  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("傾斜點");  //"Tilting Point"
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("手工建網");     // "Manually Build Mesh"
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("放置墊片並測量");     // "Place shim & measure"
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("測量");     // "Measure"
@@ -95,8 +134,10 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("移動到下一個");     // "Moving to next"
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("啟動UBL");     // "Activate UBL"
   PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("關閉UBL");     // "Deactivate UBL"
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("設置熱床溫度");     // "Bed Temp"
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("熱端溫度");     // "Hotend Temp"
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("置設熱床溫度");     // "Bed Temp"
+  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("置設熱床溫度");    //"Bed Temp")
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("置設噴嘴溫度");     // "Hotend Temp"
+  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("熱端溫度");    //"Hotend Temp"
   PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("網格編輯");     // "Mesh Edit"
   PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("編輯客戶網格");     // "Edit Custom Mesh"
   PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("細調網格");     // "Fine Tuning Mesh"
@@ -112,6 +153,13 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1            = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格");     // "Validate PREHEAT_1_LABEL Mesh"
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2            = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格");     // "Validate PREHEAT_2_LABEL Mesh"
   PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("批准客戶網格");     // "Validate Custom Mesh"
+  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 加熱熱床");    //"G26 Heating Bed"
+  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle"
+  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("手動填裝");  //"Manual priming..."
+  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("固定距離填裝");   //"Fixed Length Prime"
+  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("完成填裝");   //"Done Priming"
+  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26已取消");   //"G26 Canceled"
+  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("離開 G26");  //"Leaving G26"
   PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("繼續熱床網格");     // "Continue Bed Mesh"
   PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("網格調平");     // "Mesh Leveling"
   PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("三點調平");     // "3-Point Leveling"
@@ -141,6 +189,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("沒有存儲");     // "No storage"
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("錯誤: UBL保存");     // "Err: UBL Save"
   PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("錯誤: UBL還原");     // "Err: UBL Restore"
+  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-偏移:");   //"Z-Offset: "
   PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z偏移已停止");     // "Z-Offset Stopped"
   PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("一步步UBL");     // "Step-By-Step UBL"
   PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. 創設冷網格");
@@ -162,7 +211,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("青");     // "Indigo")
   PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("紫");     // "Violet")
   PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("白");     // "White")
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("缺省");     // "Default")
+  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("復歸");     // "Default")
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("定制燈");     // "Custom Lights")
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("紅飽和度");     // "Red Intensity")
   PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("綠飽和度");     // "Green Intensity")
@@ -176,7 +225,8 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("移動Y");     //"Move Y"
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("移動Z");     //"Move Z"
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("擠出機");     //"Extruder"
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");       //"Extruder *"
+  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");  //"Hotend too cold"
   PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("移動 %s mm");     //"Move 0.025mm"
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移動 0.1 mm");     //"Move 0.1mm"
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移動 1 mm");     //"Move 1mm"
@@ -186,10 +236,12 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     //"Nozzle" 噴嘴
   PROGMEM Language_Str MSG_NOZZLE_N                        = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴 ~");
   PROGMEM Language_Str MSG_BED                             = " " LCD_STR_THERMOMETER _UxGT(" 熱床");     //"Bed"
+  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Enclosure");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("風扇速率");     //"Fan speed"
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("風扇速率 ~");
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("風扇速率 =");
+  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan =");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("額外風扇速率");     // "Extra fan speed"
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("額外風扇速率 ~");
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("額外風扇速率 =");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("擠出速率");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("擠出速率 ~");     //"Flow"
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     //"Control"
@@ -197,8 +249,20 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" 最大");     //" " LCD_STR_THERMOMETER " Max"
   PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 系數");     //" " LCD_STR_THERMOMETER " Fact"
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自動控溫");     //"Autotemp"
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開");     //"On"
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關");     //"Off"
+  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開 ");     //"On"
+  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關 ");     //"Off"
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autotune");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
+  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");     //"PID-P"
+  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
+  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");     //"PID-I"
+  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
+  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");     //"PID-D"
+  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
+  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");     //"PID-C"
+  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
+  PROGMEM Language_Str MSG_PID_F                           = _UxGT("PID-F");    //"PID-F"
+  PROGMEM Language_Str MSG_PID_F_E                         = _UxGT("PID-F *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     //"Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("選擇 *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
@@ -207,6 +271,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("軸抖動速率") LCD_STR_B;     //"Vb-jerk"
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("軸抖動速率") LCD_STR_C;     //"Vc-jerk"
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("擠出機抖動速率");     //"Ve-jerk"
+  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("速度");     // "Velocity"
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("最大進料速率") LCD_STR_A;     //"Vmax " max_feedrate_mm_s
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("最大進料速率") LCD_STR_B;
@@ -237,23 +302,45 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("絲料直徑 *");
   PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("卸載 mm");     // "Unload mm"
   PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("装載 mm");     // "Load mm"
+  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advance K");
+  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advance K *");
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD對比度");     //"LCD contrast"
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存設置");     //"Store memory"
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("載入設置");     //"Load memory"
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     //"Restore Defaults"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     //"Restore failsafe"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化設置");     // "Initialize EEPROM"
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("刷新");     //"Refresh"
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("錯誤: EEPROM CRC");    //"Err: EEPROM CRC"
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("錯誤: EEPROM Index");    //"Err: EEPROM Index"
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("錯誤: EEPROM Version");    //"EEPROM Version"
+  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("媒體更新");    //"Media Update"
+  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("重置打印機");    //"Reset Printer
+  PROGMEM Language_Str MSG_REFRESH                         = _UxGT("刷新");     //"Refresh"
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("資訊界面");     //"Info screen"
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("準備");     //"Prepare"
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("調整");     //"Tune"
+  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("開始列印");   //"Start Print"
+  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("下一個");   //"Next"
+  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("初始  ");   //"Init"
+  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("停止  ");   //"Stop"
+  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("列印  ");   //"Print"
+  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("復歸  ");   //"Reset"
+  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("放棄  ");   //"Cancel"
+  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("確認  ");   //"Done"
+  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回  ");   //"Back"
+  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("繼續  ");   //"Proceed"
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("暫停列印");     //"Pause print"
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("恢復列印");     //"Resume print"
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("停止列印");     //"Stop print"
+  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("列印物件");   //"Printing Object"
+  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("中止物件");   //"Cancel Object"
+  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("中止物件 =");   //"Cancel Object ="
+  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中斷恢復");   //"Outage Recovery"
   PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("從記憶卡上列印");     //"Print from SD"
   PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("無記憶卡");     //"No SD card"
   PROGMEM Language_Str MSG_DWELL                           = _UxGT("休眠 ...");     //"Sleep..."
   PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("點擊繼續 ...");     //"Click to resume..."
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("列印已暫停");     // "Print paused"
+  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("列印中 ...");   //"Printing..."
   PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消列印");     //"Print aborted"
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("無移動");     //"No move."
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("已砍掉");     //"KILLED. "
@@ -267,6 +354,13 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     //"UnRet V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");     // "S UnRet V"
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自動回縮");     //"AutoRetr." autoretract_enabled,
+  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交換長度");    //"Swap Length"
+  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清除長度");   //"Purge Length"
+  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("交換工具"); //"Tool Change"
+  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z軸提昇");    //"Z Raise"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD          = _UxGT("最高速度");    //"Prime Speed"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD        = _UxGT("收回速度");  //"Retract Speed"
+  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("噴嘴待機"); //"Nozzle Standby"
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更換絲料");     //"Change filament"
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更換絲料 *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("裝載絲料");     // "Load filament"
@@ -274,28 +368,55 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("卸載絲料");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("卸載絲料 *");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("卸載全部");     // "Unload All"
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("初始化記憶卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("初始化記憶卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("連接記憶卡");     //"Attach Media
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更換記憶卡");     //"Change SD card"
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("釋放媒體");   //"Release Media"
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探針在熱床之外");     //"Z probe out. bed" Z probe is not within the physical limits
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("偏斜因數");     // "Skew Factor"
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");     // "BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch 自檢");     // "BLTouch Self-Test"
   PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("重置BLTouch");     // "Reset BLTouch"
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("裝載BLTouch");     // "Stow BLTouch"
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
+  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Cmd: SW-Mode");
+  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Cmd: 5V-Mode");
+  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Cmd: OD-Mode");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Cmd: Mode-Store");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Set BLTouch to 5V");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Set BLTouch to OD");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Report Drain");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("DANGER: Bad settings can cause damage! Proceed anyway?");
+  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Init TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z Offset Test");
+  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Save");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Deploy TouchMI");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Deploy Z-Probe");
+  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Stow Z-Probe");
   PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     //"Home ... first"
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z偏移");     //"Z Offset"
+  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("探針偏移");   //Probe Offsets
+  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("探針X偏移量");   //Probe X Offset
+  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("探針Y偏移量");   //Probe Y Offset
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探針Z偏移量");   //Probe Z Offset
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("微量調整X軸");     //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("微量調整Y軸");     //"Babystep Y"
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("微量調整Z軸");     //"Babystep Z"
+  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("總計");    //"Total"
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("擋塊終止");     //"Endstop abort"
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("加熱失敗");     //"Heating failed"
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("錯誤：REDUNDANT TEMP");     //"Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("溫控失控");     //"THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD_BED          = _UxGT("熱床加熱失敗");   //"Bed Heating Failed"
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD_CHAMBER      = _UxGT("機箱加熱失敗");   //"Chamber Heating Fail"
+  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("錯誤：冗餘溫度");     //"Err: REDUNDANT TEMP"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("溫度失控");    //"THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("熱床溫度失控");    //"BED THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("機箱溫度失控");   //"CHAMBER T. RUNAWAY"
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("錯誤：最高溫度");     //"Err: MAXTEMP"
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("錯誤：最低溫度");     //"Err: MINTEMP"
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("錯誤：最高熱床溫度");     //"Err: MAXTEMP BED"
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("錯誤：最低熱床溫度");     //"Err: MINTEMP BED"
+  PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("錯誤：最高機箱溫度");   //"Err: MAXTEMP CHAMBER"
+  PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("錯誤：最低機箱溫度");   //"Err: MINTEMP CHAMBER"
   PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("歸位 XY 先");     //"Home XY First"
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("印表機停機");     //"PRINTER HALTED"
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     //"Please reset"
@@ -303,7 +424,11 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("時");     //"h" // One character only
   PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("分");     //"m" // One character only
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("加熱中 ...");     //"Heating..."
+  PROGMEM Language_Str MSG_COOLING                         = _UxGT("冷卻中 ...");   //"Cooling..."
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加熱熱床中 ...");     //"Bed Heating..."
+  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("熱床冷卻中 ...");   //"Bed Cooling..."
+  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("機箱加熱中 ..");   //"Chamber Heating..."
+  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("機箱冷卻中 ...");   //Chamber Cooling...
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("⊿校準");     //"Delta Calibration"
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("⊿校準X");     //"Calibrate X"
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("⊿校準Y");     //"Calibrate Y"
@@ -312,6 +437,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("⊿設置");     // "Delta Settings"
   PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("⊿自動校準");     // "Auto Calibration"
   PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("設置⊿高度");     // "Set Delta Height"
+  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Z偏移");
   PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("⊿斜柱");     // "Diag Rod"
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("⊿高度");     // "Height"
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("⊿半徑");     // "Radius"
@@ -319,18 +445,20 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("印表機訊息");     //"Printer Info"
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("三點調平");     // "3-Point Leveling"
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("線性調平");     // "Linear Leveling"
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("雙線性調平");     // "Bilinear Leveling"
+  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("      雙線性調平");     // "Bilinear Leveling"
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("網格調平");     // "Mesh Leveling"
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("印表機統計");     //"Printer Stats"
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("主板訊息");     //"Board Info"
   PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("溫度計");     //"Thermistors"
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("擠出機");     //"Extruders"
+  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("      擠出機");     //"Extruders"
   PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("傳輸率");     //"Baud"
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("協議");     //"Protocol"
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("監測溫度失控:關");   //"Runaway Watch: OFF"
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("監測溫度失控:開");    //"Runaway Watch: ON"
+
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("外殼燈");     // "Case light"
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("燈亮度");     // "Light BRIGHTNESS"
-
   PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("打印機不正確");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
@@ -351,11 +479,14 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高溫度");     //"Max Temp"
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("電源供應");     //"Power Supply"
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("驅動力度");     // "Drive Strength"
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X 驅動 %");     // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y 驅動 %");     // "Y Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z 驅動 %");     // "Z Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驅動 %");     // "E Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT                     = _UxGT("驅動 %");     // "Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X 驅動 %");    //X Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y 驅動 %");    //Y Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z 驅動 %");    //Z Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驅動 %");    //E Driver %
+  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC連接錯誤");   //"TMC CONNECTION ERROR"
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("保存驅動設置");     // "DAC EEPROM Write"
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("更換絲料");   //"FILAMENT CHANGE"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("列印已暫停");     // "PRINT PAUSED"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("裝載絲料");     // "LOAD FILAMENT"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("卸載絲料");     // "UNLOAD FILAMENT"
@@ -363,26 +494,112 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("清除更多");     // "Purge more"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢復列印");     //"Resume print"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  噴嘴: ");     // "  Nozzle: "
+  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("斷絲偵測");    //"Runout Sensor"
+  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("絲距離mm");   //"Runout Dist mm"
   PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("歸原位失敗");     // "Homing failed"
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探針探測失敗");     // "Probing failed"
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: 太冷");     // "M600: Too cold"
 
+  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOOSE FILAMENT");
+  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
+  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Update MMU Firmware!");
+  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Needs Attention.");
+  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Resume Print");
+  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Resuming...");
+  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Load Filament");
+  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Load All");
+  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Load to Nozzle");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Eject Filament");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Eject Filament ~");
+  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Unload Filament");
+  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Loading Fil. %i...");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Ejecting Fil. ...");
+  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Unloading Fil....");
+  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("All");
+  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
+  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Reset MMU");
+  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Resetting MMU...");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Remove, click");
+
+  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mix");
+  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Component =");
+  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mixer");
+  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradient");
+  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Full Gradient");
+  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Toggle Mix");
+  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Cycle Mix");
+  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradient Mix");
+  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Reverse Gradient");
+  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Active V-tool");
+  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Start V-tool");
+  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  End V-tool");
+  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-tool");
+  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Reset V-tools");
+  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Commit V-tool Mix");
+  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools Were Reset");
+  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Start Z:");
+  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  End Z:");
+
+  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Games");
+  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Brickout");
+  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Invaders");
+  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
+  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
+
+  #define MSG_1_LINE(A)     A "\0"   "\0"
+  #define MSG_2_LINE(A,B)   A "\0" B "\0"
+  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
+
+  //
+  // Filament Change screens show up to 3 lines on a 4-line display
+  //                        ...or up to 2 lines on a 3-line display
+  //
   #if LCD_HEIGHT >= 4
+    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("按下按鈕", "恢復列印")); //"Press Button to resume print"
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("停車中 ..."));   //"Parking..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("等待開始", "絲料", "變更"));     //"Wait for start of the filament change"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("等待", "卸下絲料"));     //"Wait for filament unload"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("插入絲料", "並按鍵", "繼續 ..."));     //"Insert filament and press button to continue..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("按下按鈕來", "加熱噴嘴."));     // "Press button to heat nozzle."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("按下按鈕", "加熱噴嘴."));     // "Press button to heat nozzle."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("加熱噴嘴", "請等待 ..."));     // "Heating nozzle Please wait..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("等待", "進料"));     //"Wait for filament load"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("等待", "絲料清除"));     // "Wait for filament purge"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("按下完成","絲料清除")); //"Press button to filament purge"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("等待列印", "恢復"));     //"Wait for print to resume"
   #else // LCD_HEIGHT < 4
+    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下繼續.."));   //"Click to continue"
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("停車中 ..."));     //"Parking..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     //"Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     //"Ejecting..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     //"Insert and Click"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加熱中 ..."));     // "Heating..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加熱.."));     //"Click to heat"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加熱中 ..."));     //"Heating..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     //"Ejecting..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("載入中 ..."));     //"Loading..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     // "Purging..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     //"Purging..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成.."));     //"Click to finish"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢復中 ..."));     //"Resuming..."
   #endif // LCD_HEIGHT < 4
+
+  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC Drivers");
+  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Driver Current");
+  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hybrid Threshold");
+  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensorless Homing");
+  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Stepping Mode");
+  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop Enabled");
+  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Reset");
+  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" in:");
+  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Backlash");
+  PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
+  PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
+  PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
+  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
+  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
 }
+
+#if FAN_COUNT == 1
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif

From 459a0dae295cfe2afb9f548b629e7d098bd0e8f2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 6 Mar 2020 00:04:16 +0000
Subject: [PATCH 368/565] [cron] Bump distribution date (2020-03-06)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 596cdfccb3d7..e7649e474d71 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-05"
+  #define STRING_DISTRIBUTION_DATE "2020-03-06"
 #endif
 
 /**

From 6d18f715e470d3d57d8633afc74f4522ff809fbc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 20:47:16 -0600
Subject: [PATCH 369/565] Fix M0/M1 message string

---
 Marlin/src/gcode/lcd/M0_M1.cpp | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 2b35ddf3ff53..ac02c1892e0a 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -50,32 +50,20 @@
  * M1: Conditional stop   - Wait for user button press on LCD
  */
 void GcodeSuite::M0_M1() {
-  const char * const args = parser.string_arg;
-
   millis_t ms = 0;
-  bool hasP = false, hasS = false;
-  if (parser.seenval('P')) {
-    ms = parser.value_millis(); // milliseconds to wait
-    hasP = ms > 0;
-  }
-  if (parser.seenval('S')) {
-    ms = parser.value_millis_from_seconds(); // seconds to wait
-    hasS = ms > 0;
-  }
-
-  const bool has_message = !hasP && !hasS && args && *args;
+  if (parser.seenval('P')) ms = parser.value_millis();              // Milliseconds to wait
+  if (parser.seenval('S')) ms = parser.value_millis_from_seconds(); // Seconds to wait
 
   planner.synchronize();
 
   #if HAS_LEDS_OFF_FLAG
-    if (parser.seen('Q'))
-      printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
+    if (parser.seen('Q')) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
   #endif
 
   #if HAS_LCD_MENU
 
-    if (has_message)
-      ui.set_status(args, true);
+    if (parser.string_arg)
+      ui.set_status(parser.string_arg, true);
     else {
       LCD_MESSAGEPGM(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
@@ -85,16 +73,16 @@ void GcodeSuite::M0_M1() {
 
   #elif ENABLED(EXTENSIBLE_UI)
 
-    if (has_message)
-      ExtUI::onUserConfirmRequired(args); // Can this take an SRAM string??
+    if (parser.string_arg)
+      ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
     else
       ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
 
   #else
 
-    if (has_message) {
+    if (parser.string_arg) {
       SERIAL_ECHO_START();
-      SERIAL_ECHOLN(args);
+      SERIAL_ECHOLN(parser.string_arg);
     }
 
   #endif

From 6cd99e6a772ddbba50f83ce627d157b8b9022682 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 16:27:28 -0600
Subject: [PATCH 370/565] Add pins to the pins debug list

---
 Marlin/src/pins/pinsDebug_list.h | 85 ++++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index dae4bde450f0..c2eb771f8d4a 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -168,6 +168,18 @@
 #if defined(BTN_UP) && BTN_UP >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
 #endif
+#if PIN_EXISTS(JOY_X)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_X_PIN)
+#endif
+#if PIN_EXISTS(JOY_Y)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_Y_PIN)
+#endif
+#if PIN_EXISTS(JOY_Z)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_Z_PIN)
+#endif
+#if PIN_EXISTS(JOY_EN)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_EN_PIN)
+#endif
 #if PIN_EXISTS(CASE_LIGHT)
   REPORT_NAME_DIGITAL(__LINE__, CASE_LIGHT_PIN)
 #endif
@@ -547,6 +559,18 @@
 #if PIN_EXISTS(FAN7)
   REPORT_NAME_DIGITAL(__LINE__, FAN7_PIN)
 #endif
+#if PIN_EXISTS(FAN_MUX0)
+  REPORT_NAME_DIGITAL(__LINE__, FAN_MUX0_PIN)
+#endif
+#if PIN_EXISTS(FAN_MUX1)
+  REPORT_NAME_DIGITAL(__LINE__, FAN_MUX1_PIN)
+#endif
+#if PIN_EXISTS(FAN_MUX2)
+  REPORT_NAME_DIGITAL(__LINE__, FAN_MUX2_PIN)
+#endif
+#if PIN_EXISTS(POWER_LOSS)
+  REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
+#endif
 #if PIN_EXISTS(FIL_RUNOUT)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
@@ -565,6 +589,12 @@
 #if PIN_EXISTS(FIL_RUNOUT6)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT6_PIN)
 #endif
+#if PIN_EXISTS(FIL_RUNOUT7)
+  REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT7_PIN)
+#endif
+#if PIN_EXISTS(FIL_RUNOUT8)
+  REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT8_PIN)
+#endif
 #if PIN_EXISTS(HEATER_0)
   REPORT_NAME_DIGITAL(__LINE__, HEATER_0_PIN)
 #endif
@@ -592,6 +622,9 @@
 #if PIN_EXISTS(HEATER_BED)
   REPORT_NAME_DIGITAL(__LINE__, HEATER_BED_PIN)
 #endif
+#if PIN_EXISTS(HEATER_CHAMBER)
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_CHAMBER_PIN)
+#endif
 #if PIN_EXISTS(HOME)
   REPORT_NAME_DIGITAL(__LINE__, HOME_PIN)
 #endif
@@ -637,9 +670,6 @@
 #if PIN_EXISTS(LED_RED)
   REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
-#if PIN_EXISTS(MAX)
-  REPORT_NAME_DIGITAL(__LINE__, MAX_PIN)
-#endif
 #if PIN_EXISTS(MAX6675_DO)
   REPORT_NAME_DIGITAL(__LINE__, MAX6675_DO_PIN)
 #endif
@@ -652,6 +682,16 @@
 #if PIN_EXISTS(MAX6675_SS2)
   REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS2_PIN)
 #endif
+#if PIN_EXISTS(MAX7219_CLK)
+  REPORT_NAME_DIGITAL(__LINE__, MAX7219_CLK_PIN)
+#endif
+#if PIN_EXISTS(MAX7219_DIN)
+  REPORT_NAME_DIGITAL(__LINE__, MAX7219_DIN_PIN)
+#endif
+#if PIN_EXISTS(MAX7219_LOAD)
+  REPORT_NAME_DIGITAL(__LINE__, MAX7219_LOAD_PIN)
+#endif
+
 // #if defined(MISO) && MISO >= 0
 //   REPORT_NAME_DIGITAL(__LINE__, MISO)
 // #endif
@@ -727,6 +767,9 @@
 #if PIN_EXISTS(PHOTOGRAPH)
   REPORT_NAME_DIGITAL(__LINE__, PHOTOGRAPH_PIN)
 #endif
+#if PIN_EXISTS(CHDK)
+  REPORT_NAME_DIGITAL(__LINE__, CHDK_PIN)
+#endif
 #if PIN_EXISTS(PS_ON)
   REPORT_NAME_DIGITAL(__LINE__, PS_ON_PIN)
 #endif
@@ -748,6 +791,12 @@
 #if PIN_EXISTS(RAMPS_D9)
   REPORT_NAME_DIGITAL(__LINE__, RAMPS_D9_PIN)
 #endif
+#if PIN_EXISTS(NEOPIXEL)
+  REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL_PIN)
+#endif
+#if PIN_EXISTS(NEOPIXEL2)
+  REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL2_PIN)
+#endif
 #if PIN_EXISTS(RGB_LED_R)
   REPORT_NAME_DIGITAL(__LINE__, RGB_LED_R_PIN)
 #endif
@@ -838,6 +887,12 @@
 #if PIN_EXISTS(SOL5)
   REPORT_NAME_DIGITAL(__LINE__, SOL5_PIN)
 #endif
+#if PIN_EXISTS(SOL6)
+  REPORT_NAME_DIGITAL(__LINE__, SOL6_PIN)
+#endif
+#if PIN_EXISTS(SOL7)
+  REPORT_NAME_DIGITAL(__LINE__, SOL7_PIN)
+#endif
 #if defined(SPARE_IO) && SPARE_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
@@ -988,6 +1043,9 @@
 #if PIN_EXISTS(X_STOP)
   REPORT_NAME_DIGITAL(__LINE__, X_STOP_PIN)
 #endif
+#if PIN_EXISTS(X2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, X2_CS_PIN)
+#endif
 #if PIN_EXISTS(X2_DIR)
   REPORT_NAME_DIGITAL(__LINE__, X2_DIR_PIN)
 #endif
@@ -1048,6 +1106,9 @@
 #if PIN_EXISTS(Y_STOP)
   REPORT_NAME_DIGITAL(__LINE__, Y_STOP_PIN)
 #endif
+#if PIN_EXISTS(Y2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_CS_PIN)
+#endif
 #if PIN_EXISTS(Y2_DIR)
   REPORT_NAME_DIGITAL(__LINE__, Y2_DIR_PIN)
 #endif
@@ -1351,6 +1412,24 @@
 #if PIN_EXISTS(TOUCH_INT)
   REPORT_NAME_DIGITAL(__LINE__, TOUCH_INT_PIN)
 #endif
+#if PIN_EXISTS(USB_CS)
+  REPORT_NAME_DIGITAL(__LINE__, USB_CS_PIN)
+#endif
+#if PIN_EXISTS(USB_INTR)
+  REPORT_NAME_DIGITAL(__LINE__, USB_INTR_PIN)
+#endif
+#if PIN_EXISTS(MMU2_RST)
+  REPORT_NAME_DIGITAL(__LINE__, MMU2_RST_PIN)
+#endif
+#if PIN_EXISTS(CALIBRATION)
+  REPORT_NAME_DIGITAL(__LINE__, CALIBRATION_PIN)
+#endif
 #if PIN_EXISTS(SMART_EFFECTOR_MOD)
   REPORT_NAME_DIGITAL(__LINE__, SMART_EFFECTOR_MOD_PIN)
 #endif
+#if PIN_EXISTS(CLOSED_LOOP_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, CLOSED_LOOP_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(CLOSED_LOOP_MOVE_COMPLETE)
+  REPORT_NAME_DIGITAL(__LINE__, CLOSED_LOOP_MOVE_COMPLETE_PIN)
+#endif

From ca4423ed2a8188bcd671ef59c25765e44e67fbcf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Mar 2020 17:56:17 -0600
Subject: [PATCH 371/565] Clean up pins debugging

---
 Marlin/src/gcode/config/M43.cpp |  4 +-
 Marlin/src/pins/pins.h          | 40 ++++++++++++++++++++
 Marlin/src/pins/pinsDebug.h     | 67 ++++++++++++++-------------------
 3 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 0dd0013e05ea..39da37394439 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -61,12 +61,12 @@ inline void toggle_pins() {
     pin_t pin = GET_PIN_MAP_PIN_M43(i);
     if (!VALID_PIN(pin)) continue;
     if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) {
-      report_pin_state_extended(pin, ignore_protection, true, "Untouched ");
+      report_pin_state_extended(pin, ignore_protection, true, PSTR("Untouched "));
       SERIAL_EOL();
     }
     else {
       watchdog_refresh();
-      report_pin_state_extended(pin, ignore_protection, true, "Pulsing   ");
+      report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing   "));
       #if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO
         if (pin == TEENSY_E2) {
           SET_OUTPUT(TEENSY_E2);
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4f1483d55fa5..a3b14e22aaad 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -862,6 +862,43 @@
   #define E7_ENABLE_PIN -1
 #endif
 
+//
+// Destroy unused CS pins
+//
+#if !AXIS_HAS_SPI(X)
+  #undef X_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(Y)
+  #undef Y_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(Z)
+  #undef Z_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E0)
+  #undef E0_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E1)
+  #undef E1_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E2)
+  #undef E2_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E3)
+  #undef E3_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E4)
+  #undef E4_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E5)
+  #undef E5_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E6)
+  #undef E6_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(E7)
+  #undef E7_CS_PIN
+#endif
+
 #ifndef X_CS_PIN
   #define X_CS_PIN -1
 #endif
@@ -1170,6 +1207,9 @@
 
 #if HAS_FILAMENT_SENSOR
   #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
+#else
+  #undef FIL_RUNOUT_PIN
+  #undef FIL_RUNOUT1_PIN
 #endif
 
 #ifndef LCD_PINS_D4
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index f247c7cacf7a..7fb9e808beae 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -207,17 +207,32 @@ static void print_input_or_output(const bool isout) {
 }
 
 // pretty report with PWM info
-inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = false, const char *start_string = "") {
+inline void report_pin_state_extended(const pin_t pin, const bool ignore, const bool extended=false, PGM_P const start_string=nullptr) {
   char buffer[MAX_NAME_LENGTH + 1];   // for the sprintf statements
   bool found = false, multi_name_pin = false;
 
+  auto alt_pin_echo = [](const pin_t &pin) {
+    #if AVR_AT90USB1286_FAMILY
+      // Use FastIO for pins Teensy doesn't expose
+      if (pin == 46) {
+        print_input_or_output(IS_OUTPUT(46));
+        SERIAL_CHAR('0' + READ(46));
+        return false;
+      }
+      else if (pin == 47) {
+        print_input_or_output(IS_OUTPUT(47));
+        SERIAL_CHAR('0' + READ(47));
+        return false;
+      }
+    #endif
+    return true;
+  };
+
   for (uint8_t x = 0; x < COUNT(pin_array); x++)  {    // scan entire array and report all instances of this pin
     if (GET_ARRAY_PIN(x) == pin) {
-      if (found) multi_name_pin = true;
-      found = true;
-      if (!multi_name_pin) {    // report digital and analog pin number only on the first time through
-        sprintf_P(buffer, PSTR("%sPIN: "), start_string);     // digital pin number
-        SERIAL_ECHO(buffer);
+      if (!found) {    // report digital and analog pin number only on the first time through
+        if (start_string) serialprintPGM(start_string);
+        serialprintPGM(PSTR("PIN: "));
         PRINT_PIN(pin);
         PRINT_PORT(pin);
         if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
@@ -228,27 +243,14 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
       }
       else {
         SERIAL_CHAR('.');
-        SERIAL_ECHO_SP(MULTI_NAME_PAD + strlen(start_string));  // add padding if not the first instance found
+        SERIAL_ECHO_SP(MULTI_NAME_PAD + (start_string ? strlen_P(start_string) : 0));  // add padding if not the first instance found
       }
       PRINT_ARRAY_NAME(x);
       if (extended) {
         if (pin_is_protected(pin) && !ignore)
           SERIAL_ECHOPGM("protected ");
         else {
-          #if AVR_AT90USB1286_FAMILY //Teensy IDEs don't know about these pins so must use FASTIO
-            if (pin == 46 || pin == 47) {
-              if (pin == 46) {
-                print_input_or_output(IS_OUTPUT(46));
-                SERIAL_CHAR('0' + READ(46));
-              }
-              else if (pin == 47) {
-                print_input_or_output(IS_OUTPUT(47));
-                SERIAL_CHAR('0' + READ(47));
-              }
-            }
-            else
-          #endif
-          {
+          if (alt_pin_echo(pin)) {
             if (!GET_ARRAY_IS_DIGITAL(x)) {
               sprintf_P(buffer, PSTR("Analog in = %5ld"), (long)analogRead(DIGITAL_PIN_TO_ANALOG_PIN(pin)));
               SERIAL_ECHO(buffer);
@@ -274,12 +276,14 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
         }
       }
       SERIAL_EOL();
+      multi_name_pin = found;
+      found = true;
     }  // end of IF
   } // end of for loop
 
   if (!found) {
-    sprintf_P(buffer, PSTR("%sPIN: "), start_string);
-    SERIAL_ECHO(buffer);
+    if (start_string) serialprintPGM(start_string);
+    serialprintPGM(PSTR("PIN: "));
     PRINT_PIN(pin);
     PRINT_PORT(pin);
     if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
@@ -290,21 +294,8 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
       SERIAL_ECHO_SP(8);   // add padding if not an analog pin
     SERIAL_ECHOPGM("<unused/unknown>");
     if (extended) {
-      #if AVR_AT90USB1286_FAMILY  //Teensy IDEs don't know about these pins so must use FASTIO
-        if (pin == 46 || pin == 47) {
-          SERIAL_ECHO_SP(12);
-          if (pin == 46) {
-            print_input_or_output(IS_OUTPUT(46));
-            SERIAL_CHAR('0' + READ(46));
-          }
-          else {
-            print_input_or_output(IS_OUTPUT(47));
-            SERIAL_CHAR('0' + READ(47));
-          }
-        }
-        else
-      #endif
-      {
+
+      if (alt_pin_echo(pin)) {
         if (pwm_status(pin)) {
           // do nothing
         }

From 1da49d0ac583e8293f9bef4fbc2a4e445152cb55 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 6 Mar 2020 13:16:30 -0600
Subject: [PATCH 372/565] Non-blocking Max7219 test pattern

---
 Marlin/src/feature/Max7219_Debug_LEDs.cpp | 115 +++++++++++++++-------
 Marlin/src/feature/Max7219_Debug_LEDs.h   |   8 +-
 2 files changed, 82 insertions(+), 41 deletions(-)

diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
index 2b329db3b333..dd7268ecc1b6 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
@@ -453,35 +453,83 @@ void Max7219::register_setup() {
 }
 
 #ifdef MAX7219_INIT_TEST
-#if MAX7219_INIT_TEST == 2
-
-  #define MAX7219_LEDS (MAX7219_X_LEDS * MAX7219_Y_LEDS)
-
-  void Max7219::spiral(const bool on, const uint16_t del) {
-    constexpr int8_t way[][2] = { { 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 } };
-    int8_t px = 0, py = 0, dir = 0;
-    for (IF<(MAX7219_LEDS > 255), uint16_t, uint8_t>::type i = MAX7219_LEDS; i--;) {
-      led_set(px, py, on);
-      delay(del);
-      const int8_t x = px + way[dir][0], y = py + way[dir][1];
-      if (!WITHIN(x, 0, MAX7219_X_LEDS - 1) || !WITHIN(y, 0, MAX7219_Y_LEDS - 1) || BIT_7219(x, y) == on)
-        dir = (dir + 1) & 0x3;
-      px += way[dir][0];
-      py += way[dir][1];
+
+  uint8_t test_mode = 0;
+  millis_t next_patt_ms;
+  bool patt_on;
+
+  #if MAX7219_INIT_TEST == 2
+
+    #define MAX7219_LEDS (MAX7219_X_LEDS * MAX7219_Y_LEDS)
+
+    constexpr millis_t pattern_delay = 4;
+
+    int8_t spiralx, spiraly, spiral_dir;
+    IF<(MAX7219_LEDS > 255), uint16_t, uint8_t>::type spiral_count;
+
+    void Max7219::test_pattern() {
+      constexpr int8_t way[][2] = { { 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 } };
+      led_set(spiralx, spiraly, patt_on);
+      const int8_t x = spiralx + way[spiral_dir][0], y = spiraly + way[spiral_dir][1];
+      if (!WITHIN(x, 0, MAX7219_X_LEDS - 1) || !WITHIN(y, 0, MAX7219_Y_LEDS - 1) || BIT_7219(x, y) == patt_on)
+        spiral_dir = (spiral_dir + 1) & 0x3;
+      spiralx += way[spiral_dir][0];
+      spiraly += way[spiral_dir][1];
+      if (!spiral_count--) {
+        if (!patt_on)
+          test_mode = 0;
+        else {
+          spiral_count = MAX7219_LEDS;
+          spiralx = spiraly = spiral_dir = 0;
+          patt_on = false;
+        }
+      }
     }
-  }
 
-#else
+  #else
 
-  void Max7219::sweep(const int8_t dir, const uint16_t ms, const bool on) {
-    uint8_t x = dir > 0 ? 0 : MAX7219_X_LEDS - 1;
-    for (uint8_t i = MAX7219_X_LEDS; i--; x += dir) {
-      set_column(x, on ? 0xFFFFFFFF : 0x00000000);
-      delay(ms);
+    constexpr millis_t pattern_delay = 20;
+    int8_t sweep_count, sweepx, sweep_dir;
+
+    void Max7219::test_pattern() {
+      set_column(sweepx, patt_on ? 0xFFFFFFFF : 0x00000000);
+      sweepx += sweep_dir;
+      if (!WITHIN(sweepx, 0, MAX7219_X_LEDS - 1)) {
+        if (!patt_on) {
+          sweep_dir *= -1;
+          sweepx += sweep_dir;
+        }
+        else
+          sweepx -= MAX7219_X_LEDS * sweep_dir;
+        patt_on ^= true;
+        next_patt_ms += 100;
+        if (++test_mode > 4) test_mode = 0;
+      }
     }
+
+  #endif
+
+  void Max7219::run_test_pattern() {
+    const millis_t ms = millis();
+    if (PENDING(ms, next_patt_ms)) return;
+    next_patt_ms = ms + pattern_delay;
+    test_pattern();
+  }
+
+  void Max7219::start_test_pattern() {
+    clear();
+    test_mode = 1;
+    patt_on = true;
+    #if MAX7219_INIT_TEST == 2
+      spiralx = spiraly = spiral_dir = 0;
+      spiral_count = MAX7219_LEDS;
+    #else
+      sweep_dir = 1;
+      sweepx = 0;
+      sweep_count = MAX7219_X_LEDS;
+    #endif
   }
 
-#endif
 #endif // MAX7219_INIT_TEST
 
 void Max7219::init() {
@@ -499,19 +547,7 @@ void Max7219::init() {
   }
 
   #ifdef MAX7219_INIT_TEST
-    #if MAX7219_INIT_TEST == 2
-      spiral(true, 8);
-      delay(150);
-      spiral(false, 8);
-    #else
-      // Do an aesthetically-pleasing pattern to fully test the Max7219 module and LEDs.
-      // Light up and turn off columns, both forward and backward.
-      sweep(1, 20, true);
-      sweep(1, 20, false);
-      delay(150);
-      sweep(-1, 20, true);
-      sweep(-1, 20, false);
-    #endif
+    start_test_pattern();
   #endif
 }
 
@@ -604,6 +640,13 @@ void Max7219::idle_tasks() {
     register_setup();
   }
 
+  #ifdef MAX7219_INIT_TEST
+    if (test_mode) {
+      run_test_pattern();
+      return;
+    }
+  #endif
+
   #if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
     if (do_blink) {
       led_toggle(MAX7219_X_LEDS - 1, MAX7219_Y_LEDS - 1);
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/Max7219_Debug_LEDs.h
index d0b242454450..40dae6f6855d 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.h
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.h
@@ -136,11 +136,9 @@ class Max7219 {
   static void quantity16(const uint8_t y, const uint8_t ov, const uint8_t nv);
 
   #ifdef MAX7219_INIT_TEST
-  #if MAX7219_INIT_TEST == 2
-    static void spiral(const bool on, const uint16_t del);
-  #else
-    static void sweep(const int8_t dir, const uint16_t ms, const bool on);
-  #endif
+    static void test_pattern();
+    static void run_test_pattern();
+    static void start_test_pattern();
   #endif
 };
 

From 913de024a991b41038858cf65b88165fcfb43f2b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 6 Mar 2020 13:55:00 -0600
Subject: [PATCH 373/565] Change PID dummy value to NAN

Fixes #17078
---
 Marlin/src/module/configuration_store.cpp | 10 +++++-----
 Marlin/src/module/temperature.h           |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 3f44963ac314..9d1bbaab219f 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -851,8 +851,8 @@ void MarlinSettings::postprocess() {
       HOTEND_LOOP() {
         PIDCF_t pidcf = {
           #if DISABLED(PIDTEMP)
-            DUMMY_PID_VALUE, DUMMY_PID_VALUE, DUMMY_PID_VALUE,
-            DUMMY_PID_VALUE, DUMMY_PID_VALUE
+            NAN, NAN, NAN,
+            NAN, NAN
           #else
                          PID_PARAM(Kp, e),
             unscalePID_i(PID_PARAM(Ki, e)),
@@ -881,7 +881,7 @@ void MarlinSettings::postprocess() {
 
       const PID_t bed_pid = {
         #if DISABLED(PIDTEMPBED)
-          DUMMY_PID_VALUE, DUMMY_PID_VALUE, DUMMY_PID_VALUE
+          NAN, NAN, NAN
         #else
           // Store the unscaled PID values
           thermalManager.temp_bed.pid.Kp,
@@ -1725,7 +1725,7 @@ void MarlinSettings::postprocess() {
           PIDCF_t pidcf;
           EEPROM_READ(pidcf);
           #if ENABLED(PIDTEMP)
-            if (!validating && pidcf.Kp != DUMMY_PID_VALUE) {
+            if (!validating && !isnan(pidcf.Kp)) {
               // Scale PID values since EEPROM values are unscaled
               PID_PARAM(Kp, e) = pidcf.Kp;
               PID_PARAM(Ki, e) = scalePID_i(pidcf.Ki);
@@ -1761,7 +1761,7 @@ void MarlinSettings::postprocess() {
         PID_t pid;
         EEPROM_READ(pid);
         #if ENABLED(PIDTEMPBED)
-          if (!validating && pid.Kp != DUMMY_PID_VALUE) {
+          if (!validating && !isnan(pid.Kp)) {
             // Scale PID values since EEPROM values are unscaled
             thermalManager.temp_bed.pid.Kp = pid.Kp;
             thermalManager.temp_bed.pid.Ki = scalePID_i(pid.Ki);
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 655de8d6f312..24e005449667 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -74,8 +74,6 @@ hotend_pid_t;
   typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
 #endif
 
-#define DUMMY_PID_VALUE 3000.0f
-
 #if ENABLED(PIDTEMP)
   #define _PID_Kp(H) Temperature::temp_hotend[H].pid.Kp
   #define _PID_Ki(H) Temperature::temp_hotend[H].pid.Ki
@@ -92,9 +90,9 @@ hotend_pid_t;
     #define _PID_Kf(H) 0
   #endif
 #else
-  #define _PID_Kp(H) DUMMY_PID_VALUE
-  #define _PID_Ki(H) DUMMY_PID_VALUE
-  #define _PID_Kd(H) DUMMY_PID_VALUE
+  #define _PID_Kp(H) NAN
+  #define _PID_Ki(H) NAN
+  #define _PID_Kd(H) NAN
   #define _PID_Kc(H) 1
 #endif
 

From 3b141589797de1e1cb7071c272cae7d80c93e9bb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 7 Mar 2020 00:04:33 +0000
Subject: [PATCH 374/565] [cron] Bump distribution date (2020-03-07)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e7649e474d71..fbf809e3d87d 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-06"
+  #define STRING_DISTRIBUTION_DATE "2020-03-07"
 #endif
 
 /**

From e9f451bffece18ac90b7c34e3b06e3cdace57911 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 6 Mar 2020 21:59:11 -0600
Subject: [PATCH 375/565] Pins debug followup

---
 Marlin/src/pins/pinsDebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 7fb9e808beae..a2f2cd455f1a 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -207,7 +207,7 @@ static void print_input_or_output(const bool isout) {
 }
 
 // pretty report with PWM info
-inline void report_pin_state_extended(const pin_t pin, const bool ignore, const bool extended=false, PGM_P const start_string=nullptr) {
+inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool extended=false, PGM_P const start_string=nullptr) {
   char buffer[MAX_NAME_LENGTH + 1];   // for the sprintf statements
   bool found = false, multi_name_pin = false;
 

From 8ff25a9566dd5573f577e42f07003d98ba50ce0e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 Mar 2020 00:16:33 -0600
Subject: [PATCH 376/565] Max7219 init last

---
 Marlin/src/MarlinCore.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index dec731532de1..85320e332cd8 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -874,6 +874,7 @@ void stop() {
  *    • Digipot I2C
  *    • Z probe sled
  *    • status LEDs
+ *    • Max7219
  */
 void setup() {
 
@@ -887,10 +888,6 @@ void setup() {
     OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW);   // Put Smart Effector into NORMAL mode
   #endif
 
-  #if ENABLED(MAX7219_DEBUG)
-    max7219.init();
-  #endif
-
   #if ENABLED(DISABLE_DEBUG)
     // Disable any hardware debug to free up pins for IO
     #ifdef JTAGSWD_DISABLE
@@ -1173,6 +1170,10 @@ void setup() {
   #if HAS_SERVICE_INTERVALS
     ui.reset_status(true);  // Show service messages or keep current status
   #endif
+
+  #if ENABLED(MAX7219_DEBUG)
+    max7219.init();
+  #endif
 }
 
 /**

From c99773bae04c9ba1c8ac090e2df10c3b6e6eec65 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 Mar 2020 00:52:58 -0600
Subject: [PATCH 377/565] Max7219 suspend/resume

---
 Marlin/src/feature/Max7219_Debug_LEDs.cpp | 21 ++++++++++++++++-----
 Marlin/src/feature/Max7219_Debug_LEDs.h   |  7 +++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
index dd7268ecc1b6..e81116aee9aa 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
@@ -73,6 +73,7 @@
 Max7219 max7219;
 
 uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
+uint8_t Max7219::suspended; // = 0;
 
 #define LINE_REG(Q)     (max7219_reg_digit0 + ((Q) & 0x7))
 
@@ -212,6 +213,7 @@ void Max7219::send(const uint8_t reg, const uint8_t data) {
 
 // Send out a single native row of bits to just one unit
 void Max7219::refresh_unit_line(const uint8_t line) {
+  if (suspended) return;
   #if MAX7219_NUMBER_UNITS == 1
     send(LINE_REG(line), led_line[line]);
   #else
@@ -223,6 +225,7 @@ void Max7219::refresh_unit_line(const uint8_t line) {
 
 // Send out a single native row of bits to all units
 void Max7219::refresh_line(const uint8_t line) {
+  if (suspended) return;
   #if MAX7219_NUMBER_UNITS == 1
     refresh_unit_line(line);
   #else
@@ -241,9 +244,9 @@ void Max7219::set(const uint8_t line, const uint8_t bits) {
 
   // Draw an integer with optional leading zeros and optional decimal point
   void Max7219::print(const uint8_t start, int16_t value, uint8_t size, const bool leadzero=false, bool dec=false) {
+    if (suspended) return;
     constexpr uint8_t led_numeral[10] = { 0x7E, 0x60, 0x6D, 0x79, 0x63, 0x5B, 0x5F, 0x70, 0x7F, 0x7A },
                       led_decimal = 0x80, led_minus = 0x01;
-
     bool blank = false, neg = value < 0;
     if (neg) value *= -1;
     while (size--) {
@@ -295,6 +298,7 @@ void Max7219::led_toggle(const uint8_t x, const uint8_t y) {
 }
 
 void Max7219::send_row(const uint8_t row) {
+  if (suspended) return;
   #if _ROT == 0 || _ROT == 180            // Native Lines are horizontal too
     #if MAX7219_X_LEDS <= 8
       refresh_unit_line(LED_IND(0, row)); // A single unit line
@@ -308,6 +312,7 @@ void Max7219::send_row(const uint8_t row) {
 }
 
 void Max7219::send_column(const uint8_t col) {
+  if (suspended) return;
   #if _ROT == 90 || _ROT == 270           // Native Lines are vertical too
     #if MAX7219_Y_LEDS <= 8
       refresh_unit_line(LED_IND(col, 0)); // A single unit line
@@ -344,8 +349,8 @@ void Max7219::clear_column(const uint8_t col) {
 
 /**
  * Plot the low order bits of val to the specified row of the matrix.
- * With 4 Max7219 units in the chain, it's possible to set 32 bits at once with
- * one call to the function (if rotated 90° or 180°).
+ * With 4 Max7219 units in the chain, it's possible to set 32 bits at
+ * once with a single call to the function (if rotated 90° or 270°).
  */
 void Max7219::set_row(const uint8_t row, const uint32_t val) {
   if (row >= MAX7219_Y_LEDS) return error(PSTR("set_row"), row);
@@ -359,8 +364,8 @@ void Max7219::set_row(const uint8_t row, const uint32_t val) {
 
 /**
  * Plot the low order bits of val to the specified column of the matrix.
- * With 4 Max7219 units in the chain, it's possible to set 32 bits at once with
- * one call to the function (if rotated 90° or 180°).
+ * With 4 Max7219 units in the chain, it's possible to set 32 bits at
+ * once with a single call to the function (if rotated 0° or 180°).
  */
 void Max7219::set_column(const uint8_t col, const uint32_t val) {
   if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
@@ -692,6 +697,12 @@ void Max7219::idle_tasks() {
       last_depth = current_depth;
     }
   #endif
+
+  // After resume() automatically do a refresh()
+  if (suspended == 0x80) {
+    suspended = 0;
+    refresh();
+  }
 }
 
 #endif // MAX7219_DEBUG
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/Max7219_Debug_LEDs.h
index 40dae6f6855d..19170b2d5906 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.h
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.h
@@ -88,6 +88,12 @@ class Max7219 {
   // Refresh all units
   static inline void refresh() { for (uint8_t i = 0; i < 8; i++) refresh_line(i); }
 
+  // Suspend / resume updates to the LED unit
+  // Use these methods to speed up multiple changes
+  // or to apply updates from interrupt context.
+  static inline void suspend() { suspended++; }
+  static inline void resume() { suspended--; suspended |= 0x80; }
+
   // Update a single native line on all units
   static void refresh_line(const uint8_t line);
 
@@ -126,6 +132,7 @@ class Max7219 {
   static void idle_tasks();
 
 private:
+  static uint8_t suspended;
   static void error(const char * const func, const int32_t v1, const int32_t v2=-1);
   static void noop();
   static void set(const uint8_t line, const uint8_t bits);

From 7b9eb233cbc3c6e74b2674d868af31dcb4791970 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 Mar 2020 02:14:50 -0600
Subject: [PATCH 378/565] Emergency Parser dumb terminal compatibility

---
 Marlin/src/feature/emergency_parser.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/emergency_parser.h
index 787c82407fc5..dc97c437f802 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/emergency_parser.h
@@ -164,11 +164,11 @@ class EmergencyParser {
       #endif
 
       case EP_IGNORE:
-        if (c == '\n') state = EP_RESET;
+        if (c == '\n' || c == '\r') state = EP_RESET;
         break;
 
       default:
-        if (c == '\n') {
+        if (c == '\n' || c == '\r') {
           if (enabled) switch (state) {
             case EP_M108: wait_for_user = wait_for_heatup = false; break;
             case EP_M112: killed_by_M112 = true; break;

From 3db784f3c74eebbf5393dde4bdf573c8032e5a7a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 6 Mar 2020 14:36:34 -0600
Subject: [PATCH 379/565] More pins debugging cleanup

---
 Marlin/src/pins/pinsDebug_list.h | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index c2eb771f8d4a..28478973fbcb 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -740,30 +740,6 @@
 #if PIN_EXISTS(MOTOR_FAULT)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_FAULT_PIN)
 #endif
-#if PIN_EXISTS(ORIG_E0_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E0_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E1_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E1_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E2_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E2_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E3_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E3_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E4_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E4_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E5_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E5_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E6_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E6_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E7_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E7_AUTO_FAN_PIN)
-#endif
 #if PIN_EXISTS(PHOTOGRAPH)
   REPORT_NAME_DIGITAL(__LINE__, PHOTOGRAPH_PIN)
 #endif

From 20f93404a7b7fca91176508fa6d304dc61e8dddb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Mar 2020 21:08:01 -0600
Subject: [PATCH 380/565] Add / correct comments

---
 Marlin/Configuration_adv.h            | 2 +-
 Marlin/src/gcode/queue.cpp            | 4 ++++
 Marlin/src/pins/mega/pins_GT2560_V3.h | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index dda07274120b..c3cb6c1caa93 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2989,7 +2989,7 @@
   #define MAX7219_LOAD_PIN  44
 
   //#define MAX7219_GCODE          // Add the M7219 G-code to control the LED matrix
-  #define MAX7219_INIT_TEST    2   // Do a test pattern at initialization (Set to 2 for spiral)
+  #define MAX7219_INIT_TEST    2   // Test pattern at startup: 0=none, 1=sweep, 2=spiral
   #define MAX7219_NUMBER_UNITS 1   // Number of Max7219 units in chain.
   #define MAX7219_ROTATE       0   // Rotate the display clockwise (in multiples of +/- 90°)
                                    // connector at:  right=0   bottom=-90  top=90  left=180
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 7d17ca602b6f..0a5dfd037868 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -361,6 +361,10 @@ inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD
     sis = PS_EOL;               // Skip the rest on overflow
 }
 
+/**
+ * Handle a line being completed. For an empty line
+ * keep sensor readings going and watchdog alive.
+ */
 inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
   sis = PS_NORMAL;
   buff[ind] = 0;
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index b6aa61aa004b..566e88705dd7 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * GT3560 RevB + GT2560 V3.0 + GT2560 V3.1 + GT2560 V4.0 pin assignment
+ * GT2560 RevB + GT2560 V3.0 + GT2560 V3.1 + GT2560 V4.0 pin assignment
  */
 
 #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)

From 5eb6fb1c2f798edaab76eca98fd2089fbf3e4f1d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 8 Mar 2020 00:04:21 +0000
Subject: [PATCH 381/565] [cron] Bump distribution date (2020-03-08)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fbf809e3d87d..639f5d7fe626 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-07"
+  #define STRING_DISTRIBUTION_DATE "2020-03-08"
 #endif
 
 /**

From 64d092935b27ff89955f0430eef5815b15e5a92d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 7 Mar 2020 22:20:41 -0600
Subject: [PATCH 382/565] More useful ENABLED / DISABLED macros (#17054)

---
 Marlin/Configuration_adv.h                   |   2 +-
 Marlin/src/HAL/HAL_AVR/MarlinSerial.h        |  18 +-
 Marlin/src/HAL/HAL_DUE/MarlinSerial.h        |  16 +-
 Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h |  14 +-
 Marlin/src/HAL/shared/MarlinSerial.h         |  67 ----
 Marlin/src/MarlinCore.cpp                    |  48 +--
 Marlin/src/core/drivers.h                    | 134 ++++----
 Marlin/src/core/macros.h                     |  28 +-
 Marlin/src/core/utility.cpp                  |  85 ++----
 Marlin/src/feature/Max7219_Debug_LEDs.cpp    |  22 +-
 Marlin/src/feature/babystep.cpp              |   9 +-
 Marlin/src/feature/bltouch.cpp               |  12 +-
 Marlin/src/feature/power_loss_recovery.h     |   6 +-
 Marlin/src/gcode/calibrate/G28.cpp           |  58 +---
 Marlin/src/gcode/calibrate/G425.cpp          |   8 +-
 Marlin/src/gcode/host/M115.cpp               | 109 ++-----
 Marlin/src/inc/Conditionals_LCD.h            | 124 +++++---
 Marlin/src/inc/Conditionals_adv.h            |  56 +++-
 Marlin/src/inc/Conditionals_post.h           | 305 ++++++++++++-------
 Marlin/src/inc/SanityCheck.h                 |  33 +-
 Marlin/src/lcd/ultralcd.h                    |  16 +-
 Marlin/src/module/configuration_store.cpp    | 192 ++++--------
 Marlin/src/module/motion.cpp                 |  24 +-
 Marlin/src/module/motion.h                   |  10 +-
 Marlin/src/module/probe.h                    |   2 +-
 Marlin/src/sd/cardreader.h                   |   6 +-
 26 files changed, 637 insertions(+), 767 deletions(-)
 delete mode 100644 Marlin/src/HAL/shared/MarlinSerial.h

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c3cb6c1caa93..856a7f028d4d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1047,7 +1047,7 @@
    */
   //#define POWER_LOSS_RECOVERY
   #if ENABLED(POWER_LOSS_RECOVERY)
-    //#define PLR_ENABLED_DEFAULT  true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
+    #define PLR_ENABLED_DEFAULT   false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
     //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
     //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
     //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h b/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
index 33870e2ca657..cd7aad90a997 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
@@ -31,10 +31,10 @@
  * Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
  */
 
-#include "../shared/MarlinSerial.h"
-
 #include <WString.h>
 
+#include "../../inc/MarlinConfigPre.h"
+
 #ifndef SERIAL_PORT
   #define SERIAL_PORT 0
 #endif
@@ -261,12 +261,12 @@
     static constexpr int PORT               = serial;
     static constexpr unsigned int RX_SIZE   = RX_BUFFER_SIZE;
     static constexpr unsigned int TX_SIZE   = TX_BUFFER_SIZE;
-    static constexpr bool XONOFF            = bSERIAL_XON_XOFF;
-    static constexpr bool EMERGENCYPARSER   = bEMERGENCY_PARSER;
-    static constexpr bool DROPPED_RX        = bSERIAL_STATS_DROPPED_RX;
-    static constexpr bool RX_OVERRUNS       = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
-    static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
-    static constexpr bool MAX_RX_QUEUED     = bSERIAL_STATS_MAX_RX_QUEUED;
+    static constexpr bool XONOFF            = ENABLED(SERIAL_XON_XOFF);
+    static constexpr bool EMERGENCYPARSER   = ENABLED(EMERGENCY_PARSER);
+    static constexpr bool DROPPED_RX        = ENABLED(SERIAL_STATS_DROPPED_RX);
+    static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
+    static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
+    static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
   };
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
 
@@ -304,7 +304,7 @@
     static constexpr bool XONOFF            = false;
     static constexpr bool EMERGENCYPARSER   = false;
     static constexpr bool DROPPED_RX        = false;
-    static constexpr bool RX_OVERRUNS       = bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS;
+    static constexpr bool RX_OVERRUNS       = HAS_DGUS_LCD && ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS);
     static constexpr bool RX_FRAMING_ERRORS = false;
     static constexpr bool MAX_RX_QUEUED     = false;
   };
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h b/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
index af7d2b7adeef..eb26a5644dd9 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
@@ -27,10 +27,10 @@
  * Based on MarlinSerial for AVR, copyright (c) 2006 Nicholas Zambetti.  All right reserved.
  */
 
-#include "../shared/MarlinSerial.h"
-
 #include <WString.h>
 
+#include "../../inc/MarlinConfigPre.h"
+
 #define DEC 10
 #define HEX 16
 #define OCT 8
@@ -163,12 +163,12 @@ struct MarlinSerialCfg {
   static constexpr int PORT               = serial;
   static constexpr unsigned int RX_SIZE   = RX_BUFFER_SIZE;
   static constexpr unsigned int TX_SIZE   = TX_BUFFER_SIZE;
-  static constexpr bool XONOFF            = bSERIAL_XON_XOFF;
-  static constexpr bool EMERGENCYPARSER   = bEMERGENCY_PARSER;
-  static constexpr bool DROPPED_RX        = bSERIAL_STATS_DROPPED_RX;
-  static constexpr bool RX_OVERRUNS       = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
-  static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
-  static constexpr bool MAX_RX_QUEUED     = bSERIAL_STATS_MAX_RX_QUEUED;
+  static constexpr bool XONOFF            = ENABLED(SERIAL_XON_XOFF);
+  static constexpr bool EMERGENCYPARSER   = ENABLED(EMERGENCY_PARSER);
+  static constexpr bool DROPPED_RX        = ENABLED(SERIAL_STATS_DROPPED_RX);
+  static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
+  static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
+  static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
 };
 
 #if SERIAL_PORT >= 0
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
index f301f0219bcd..949c7f489991 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
@@ -57,9 +57,7 @@
  * Because PWM hardware channels all share the same frequency, along with the
  * fallback software channels, FAST_PWM_FAN is incompatible with Servos.
  */
-#if NUM_SERVOS > 0 && ENABLED(FAST_PWM_FAN)
-  #error "BLTOUCH and Servos are incompatible with FAST_PWM_FAN on LPC176x boards."
-#endif
+static_assert(!(NUM_SERVOS && ENABLED(FAST_PWM_FAN)), "BLTOUCH and Servos are incompatible with FAST_PWM_FAN on LPC176x boards.");
 
 /**
  * Test LPC176x-specific configuration values for errors at compile-time.
@@ -69,13 +67,13 @@
 //  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 //#endif
 
-#if IS_RE_ARM_BOARD && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
-  #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 require TMC_USE_SW_SPI"
+#if MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
+    #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 requires TMC_USE_SW_SPI."
+  #endif
 #endif
 
-#if ENABLED(BAUD_RATE_GCODE)
-  #error "BAUD_RATE_GCODE is not yet supported on LPC176x."
-#endif
+static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported on LPC176x.");
 
 /**
  * Flag any serial port conflicts
diff --git a/Marlin/src/HAL/shared/MarlinSerial.h b/Marlin/src/HAL/shared/MarlinSerial.h
deleted file mode 100644
index 3770f61b3c26..000000000000
--- a/Marlin/src/HAL/shared/MarlinSerial.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * HAL/shared/MarlinSerial.h
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-constexpr bool
-  #if HAS_DGUS_LCD
-    bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS = (false
-      #if ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS)
-        || true
-      #endif
-    ),
-  #endif
-  bSERIAL_XON_XOFF = (false
-    #if ENABLED(SERIAL_XON_XOFF)
-      || true
-    #endif
-  ),
-  bEMERGENCY_PARSER = (false
-    #if ENABLED(EMERGENCY_PARSER)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_DROPPED_RX = (false
-    #if ENABLED(SERIAL_STATS_DROPPED_RX)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_RX_BUFFER_OVERRUNS = (false
-    #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_RX_FRAMING_ERRORS = (false
-    #if ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_MAX_RX_QUEUED = (false
-    #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
-      || true
-    #endif
-  );
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 85320e332cd8..39287d42331a 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -241,11 +241,8 @@ void setup_powerhold() {
     OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
   #endif
   #if ENABLED(PSU_CONTROL)
-    #if ENABLED(PSU_DEFAULT_OFF)
-      powersupply_on = true;  PSU_OFF();
-    #else
-      powersupply_on = false; PSU_ON();
-    #endif
+    powersupply_on = ENABLED(PSU_DEFAULT_OFF);
+    if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
   #endif
 }
 
@@ -425,14 +422,8 @@ void startOrResumeJob() {
     switch (card.sdprinting_done_state) {
 
       #if HAS_RESUME_CONTINUE                   // Display "Click to Continue..."
-        case 1:
-          did_state = queue.enqueue_P(PSTR("M0Q1S"
-            #if HAS_LCD_MENU
-              "1800"                            // ...for 30 minutes with LCD
-            #else
-              "60"                              // ...for 1 minute with no LCD
-            #endif
-          ));
+        case 1:                                 // 30 min timeout with LCD, 1 min without
+          did_state = queue.enqueue_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
           break;
       #endif
 
@@ -501,31 +492,19 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
   }
 
   // Prevent steppers timing-out in the middle of M600
-  #if BOTH(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_NO_STEPPER_TIMEOUT)
-    #define MOVE_AWAY_TEST !did_pause_print
-  #else
-    #define MOVE_AWAY_TEST true
-  #endif
+  #define STAY_TEST (BOTH(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_NO_STEPPER_TIMEOUT) && did_pause_print)
 
   if (stepper_inactive_time) {
     static bool already_shutdown_steppers; // = false
     if (planner.has_blocks_queued())
       gcode.reset_stepper_timeout();
-    else if (MOVE_AWAY_TEST && !ignore_stepper_queue && ELAPSED(ms, gcode.previous_move_ms + stepper_inactive_time)) {
+    else if (!STAY_TEST && !ignore_stepper_queue && ELAPSED(ms, gcode.previous_move_ms + stepper_inactive_time)) {
       if (!already_shutdown_steppers) {
         already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
-        #if ENABLED(DISABLE_INACTIVE_X)
-          DISABLE_AXIS_X();
-        #endif
-        #if ENABLED(DISABLE_INACTIVE_Y)
-          DISABLE_AXIS_Y();
-        #endif
-        #if ENABLED(DISABLE_INACTIVE_Z)
-          DISABLE_AXIS_Z();
-        #endif
-        #if ENABLED(DISABLE_INACTIVE_E)
-          disable_e_steppers();
-        #endif
+        if (ENABLED(DISABLE_INACTIVE_X)) DISABLE_AXIS_X();
+        if (ENABLED(DISABLE_INACTIVE_Y)) DISABLE_AXIS_Y();
+        if (ENABLED(DISABLE_INACTIVE_Z)) DISABLE_AXIS_Z();
+        if (ENABLED(DISABLE_INACTIVE_E)) disable_e_steppers();
         #if HAS_LCD_MENU && ENABLED(AUTO_BED_LEVELING_UBL)
           if (ubl.lcd_map_control) {
             ubl.lcd_map_control = false;
@@ -1191,7 +1170,6 @@ void setup() {
  */
 void loop() {
   do {
-
     idle();
 
     #if ENABLED(SDSUPPORT)
@@ -1204,9 +1182,5 @@ void loop() {
 
     endstops.event_handler();
 
-  } while (false        // Return to caller for best compatibility
-    #ifdef __AVR__
-      || true           // Loop forever on slower (AVR) boards
-    #endif
-  );
+  } while (ENABLED(__AVR__)); // Loop forever on slower (AVR) boards
 }
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 2c89d001f965..833899bdcbc1 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -82,101 +82,97 @@
 #define _OR_ADTE(N,T)   || AXIS_DRIVER_TYPE_E(N,T)
 #define HAS_E_DRIVER(T) (0 RREPEAT2(E_STEPPERS, _OR_ADTE, T))
 
-#define HAS_DRIVER(T) (    AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_X2(T) \
-                        || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Y2(T) \
-                        || AXIS_DRIVER_TYPE_Z(T)  || AXIS_DRIVER_TYPE_Z2(T) \
-                        || AXIS_DRIVER_TYPE_Z3(T) || AXIS_DRIVER_TYPE_Z4(T) \
-                        || HAS_E_DRIVER(T) )
+#define HAS_DRIVER(T) (  AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Z(T)  \
+                      || AXIS_DRIVER_TYPE_X2(T) || AXIS_DRIVER_TYPE_Y2(T) || AXIS_DRIVER_TYPE_Z2(T) \
+                      || AXIS_DRIVER_TYPE_Z3(T) || AXIS_DRIVER_TYPE_Z4(T) || HAS_E_DRIVER(T) )
 
 // Test for supported TMC drivers that require advanced configuration
 // Does not match standalone configurations
-#define HAS_TRINAMIC_CONFIG (    HAS_DRIVER(TMC2130) \
-                              || HAS_DRIVER(TMC2160) \
-                              || HAS_DRIVER(TMC2208) \
-                              || HAS_DRIVER(TMC2209) \
-                              || HAS_DRIVER(TMC2660) \
-                              || HAS_DRIVER(TMC5130) \
-                              || HAS_DRIVER(TMC5160) )
+#if (    HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) \
+      || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209) \
+      || HAS_DRIVER(TMC2660) \
+      || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160) )
+  #define HAS_TRINAMIC_CONFIG 1
+#endif
 
 #define HAS_TRINAMIC HAS_TRINAMIC_CONFIG
 
-#define HAS_TRINAMIC_STANDALONE (    HAS_DRIVER(TMC2130_STANDALONE) \
-                                  || HAS_DRIVER(TMC2208_STANDALONE) \
-                                  || HAS_DRIVER(TMC2209_STANDALONE) \
-                                  || HAS_DRIVER(TMC26X_STANDALONE)  \
-                                  || HAS_DRIVER(TMC2660_STANDALONE) \
-                                  || HAS_DRIVER(TMC5130_STANDALONE) \
-                                  || HAS_DRIVER(TMC5160_STANDALONE) \
-                                  || HAS_DRIVER(TMC2160_STANDALONE) )
+#if (    HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2160_STANDALONE) \
+      || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC2209_STANDALONE) \
+      || HAS_DRIVER(TMC26X_STANDALONE)  || HAS_DRIVER(TMC2660_STANDALONE) \
+      || HAS_DRIVER(TMC5130_STANDALONE) || HAS_DRIVER(TMC5160_STANDALONE) )
+  #define HAS_TRINAMIC_STANDALONE 1
+#endif
 
-#define HAS_TMCX1X0 (    HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) \
-                      || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160))
+#if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160)
+  #define HAS_TMCX1X0 1
+#endif
 
-#define HAS_TMC220x (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209))
+#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
+  #define HAS_TMC220x 1
+#endif
 
-#define AXIS_IS_TMC(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                           || AXIS_DRIVER_TYPE(A,TMC2160) \
-                           || AXIS_DRIVER_TYPE(A,TMC2208) \
-                           || AXIS_DRIVER_TYPE(A,TMC2209) \
+#define AXIS_IS_TMC(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+                           || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
                            || AXIS_DRIVER_TYPE(A,TMC2660) \
-                           || AXIS_DRIVER_TYPE(A,TMC5130) \
-                           || AXIS_DRIVER_TYPE(A,TMC5160) )
+                           || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
 // Test for a driver that uses SPI - this allows checking whether a _CS_ pin
 // is considered sensitive
-#define AXIS_HAS_SPI(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                           || AXIS_DRIVER_TYPE(A,TMC2160) \
+#define AXIS_HAS_SPI(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
                            || AXIS_DRIVER_TYPE(A,TMC2660) \
-                           || AXIS_DRIVER_TYPE(A,TMC5130) \
-                           || AXIS_DRIVER_TYPE(A,TMC5160) )
+                           || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
-#define AXIS_HAS_UART(A) (    AXIS_DRIVER_TYPE(A,TMC2208) \
-                           || AXIS_DRIVER_TYPE(A,TMC2209) )
+#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
 
 #define AXIS_HAS_RXTX AXIS_HAS_UART
 
-#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
+#define AXIS_HAS_SW_SERIAL(A) ( AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL) )
 
-#define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
+#define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
                                    || AXIS_DRIVER_TYPE(A,TMC2209) \
                                    || AXIS_DRIVER_TYPE(A,TMC2660) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
-#define AXIS_HAS_STEALTHCHOP(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2208) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2209) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+#define AXIS_HAS_STEALTHCHOP(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
-#define AXIS_HAS_SG_RESULT(A)    (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2208) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2209) )
+#define AXIS_HAS_SG_RESULT(A)    (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
 
 #define AXIS_HAS_COOLSTEP(A)     (    AXIS_DRIVER_TYPE(A,TMC2130) \
                                    || AXIS_DRIVER_TYPE(A,TMC2209) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
 #define _OR_EAH(N,T)    || AXIS_HAS_##T(E##N)
 #define E_AXIS_HAS(T)   (0 _OR_EAH(0,T) _OR_EAH(1,T) _OR_EAH(2,T) _OR_EAH(3,T) _OR_EAH(4,T) _OR_EAH(5,T) _OR_EAH(6,T) _OR_EAH(7,T))
 
-#define ANY_AXIS_HAS(T) (    AXIS_HAS_##T(X)  || AXIS_HAS_##T(X2) \
-                          || AXIS_HAS_##T(Y)  || AXIS_HAS_##T(Y2) \
-                          || AXIS_HAS_##T(Z)  || AXIS_HAS_##T(Z2) \
-                          || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) \
-                          || E_AXIS_HAS(T) )
-
-#define HAS_STEALTHCHOP    ANY_AXIS_HAS(STEALTHCHOP)
-#define HAS_STALLGUARD     ANY_AXIS_HAS(STALLGUARD)
-#define HAS_SG_RESULT      ANY_AXIS_HAS(SG_RESULT)
-#define HAS_COOLSTEP       ANY_AXIS_HAS(COOLSTEP)
-#define HAS_TMC_UART       ANY_AXIS_HAS(RXTX)
-#define HAS_TMC_SPI        ANY_AXIS_HAS(SPI)
-#define HAS_TMC_SW_SERIAL  ANY_AXIS_HAS(SW_SERIAL)
+#define ANY_AXIS_HAS(T) (    AXIS_HAS_##T(X)  || AXIS_HAS_##T(Y)  || AXIS_HAS_##T(Z)  \
+                          || AXIS_HAS_##T(X2) || AXIS_HAS_##T(Y2) || AXIS_HAS_##T(Z2) \
+                          || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) || E_AXIS_HAS(T) )
+
+#if ANY_AXIS_HAS(STEALTHCHOP)
+  #define HAS_STEALTHCHOP 1
+#endif
+#if ANY_AXIS_HAS(STALLGUARD)
+  #define HAS_STALLGUARD 1
+#endif
+#if ANY_AXIS_HAS(SG_RESULT)
+  #define HAS_SG_RESULT 1
+#endif
+#if ANY_AXIS_HAS(COOLSTEP)
+  #define HAS_COOLSTEP 1
+#endif
+#if ANY_AXIS_HAS(RXTX)
+  #define HAS_TMC_UART 1
+#endif
+#if ANY_AXIS_HAS(SPI)
+  #define HAS_TMC_SPI 1
+#endif
+
+// Defines that can't be evaluated now
+#define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)
 
 //
 // Stretching 'drivers.h' to include LPC/SAMD51 SD options
@@ -187,7 +183,11 @@
 #define _SDCARD_ID(V) _CAT(_SDCARD_, V)
 #define SD_CONNECTION_IS(V) (_SDCARD_ID(SDCARD_CONNECTION) == _SDCARD_ID(V))
 
-#define HAS_L64XX (HAS_DRIVER(L6470) || HAS_DRIVER(L6474) || HAS_DRIVER(L6480) || HAS_DRIVER(POWERSTEP01))
-#define HAS_L64XX_NOT_L6474 (HAS_L64XX && !HAS_DRIVER(L6474))
+#if HAS_DRIVER(L6470) || HAS_DRIVER(L6474) || HAS_DRIVER(L6480) || HAS_DRIVER(POWERSTEP01)
+  #define HAS_L64XX 1
+#endif
+#if HAS_L64XX && !HAS_DRIVER(L6474)
+  #define HAS_L64XX_NOT_L6474 1
+#endif
 
 #define AXIS_IS_L64XX(A) (AXIS_DRIVER_TYPE_##A(L6470) || AXIS_DRIVER_TYPE_##A(L6474) ||  AXIS_DRIVER_TYPE_##A(L6480) || AXIS_DRIVER_TYPE_##A(POWERSTEP01))
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 557234208cd0..32f8e549009c 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -177,18 +177,23 @@
 // Macros to support option testing
 #define _CAT(a,V...) a##V
 #define CAT(a,V...) _CAT(a,V)
-#define SWITCH_ENABLED_false 0
-#define SWITCH_ENABLED_true  1
-#define SWITCH_ENABLED_0     0
-#define SWITCH_ENABLED_1     1
-#define SWITCH_ENABLED_0x0   0
-#define SWITCH_ENABLED_0x1   1
-#define SWITCH_ENABLED_      1
-#define _ENA_1(O)           _CAT(SWITCH_ENABLED_, O)
-#define _DIS_1(O)           !_ENA_1(O)
+
+#define _ISENA_     ~,1
+#define _ISENA_1    ~,1
+#define _ISENA_0x1  ~,1
+#define _ISENA_true ~,1
+#define _ISENA(V...)        IS_PROBE(V)
+
+#define _ENA_1(O)           _ISENA(CAT(_IS,CAT(ENA_, O)))
+#define _DIS_1(O)           NOT(_ENA_1(O))
 #define ENABLED(V...)       DO(ENA,&&,V)
 #define DISABLED(V...)      DO(DIS,&&,V)
 
+#define TERN(O,A,B)         _TERN(_ENA_1(O),B,A)    // OPTION converted to to '0' or '1'
+#define _TERN(E,V...)       __TERN(_CAT(T_,E),V)    // Prepend 'T_' to get 'T_0' or 'T_1'
+#define __TERN(T,V...)      ___TERN(_CAT(_NO,T),V)  // Prepend '_NO' to get '_NOT_0' or '_NOT_1'
+#define ___TERN(P,V...)     THIRD(P,V)              // If first argument has a comma, A. Else B.
+
 #define ANY(V...)          !DISABLED(V)
 #define NONE(V...)          DISABLED(V)
 #define ALL(V...)           ENABLED(V)
@@ -390,8 +395,9 @@
 //
 // Primitives supporting precompiler REPEAT
 //
-#define FIRST(a,...)    a
-#define SECOND(a,b,...) b
+#define FIRST(a,...)     a
+#define SECOND(a,b,...)  b
+#define THIRD(a,b,c,...) c
 
 // Defer expansion
 #define EMPTY()
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index d2e3459d18f3..19247ff69fc2 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -57,39 +57,23 @@ void safe_delay(millis_t ms) {
 
   void log_machine_info() {
     SERIAL_ECHOLNPGM("Machine Type: "
-      #if ENABLED(DELTA)
-        "Delta"
-      #elif IS_SCARA
-        "SCARA"
-      #elif IS_CORE
-        "Core"
-      #else
-        "Cartesian"
-      #endif
+      TERN(DELTA, "Delta", "")
+      TERN(IS_SCARA, "SCARA", "")
+      TERN(IS_CORE, "Core", "")
+      TERN(IS_CARTESIAN, "Cartesian", "")
     );
 
     SERIAL_ECHOLNPGM("Probe: "
-      #if ENABLED(PROBE_MANUALLY)
-        "PROBE_MANUALLY"
-      #elif ENABLED(NOZZLE_AS_PROBE)
-        "NOZZLE_AS_PROBE"
-      #elif ENABLED(FIX_MOUNTED_PROBE)
-        "FIX_MOUNTED_PROBE"
-      #elif ENABLED(BLTOUCH)
-        "BLTOUCH"
-      #elif HAS_Z_SERVO_PROBE
-        "SERVO PROBE"
-      #elif ENABLED(TOUCH_MI_PROBE)
-        "TOUCH_MI_PROBE"
-      #elif ENABLED(Z_PROBE_SLED)
-        "Z_PROBE_SLED"
-      #elif ENABLED(Z_PROBE_ALLEN_KEY)
-        "Z_PROBE_ALLEN_KEY"
-      #elif ENABLED(SOLENOID_PROBE)
-        "SOLENOID_PROBE"
-      #else
-        "NONE"
-      #endif
+      TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
+      TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
+      TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
+      TERN(BLTOUCH, "BLTOUCH", "")
+      TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
+      TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
+      TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")
+      TERN(Z_PROBE_ALLEN_KEY, "Z_PROBE_ALLEN_KEY", "")
+      TERN(SOLENOID_PROBE, "SOLENOID_PROBE", "")
+      TERN(PROBE_SELECTED, "", "NONE")
     );
 
     #if HAS_BED_PROBE
@@ -107,20 +91,10 @@ void safe_delay(millis_t ms) {
         else
           SERIAL_ECHOPGM(" (Aligned With");
 
-        if (probe.offset_xy.y > 0) {
-          #if IS_SCARA
-            SERIAL_ECHOPGM("-Distal");
-          #else
-            SERIAL_ECHOPGM("-Back");
-          #endif
-        }
-        else if (probe.offset_xy.y < 0) {
-          #if IS_SCARA
-            SERIAL_ECHOPGM("-Proximal");
-          #else
-            SERIAL_ECHOPGM("-Front");
-          #endif
-        }
+        if (probe.offset_xy.y > 0)
+          serialprintPGM(ENABLED(IS_SCARA) ? PSTR("-Distal") : PSTR("-Back"));
+        else if (probe.offset_xy.y < 0)
+          serialprintPGM(ENABLED(IS_SCARA) ? PSTR("-Proximal") : PSTR("-Front"));
         else if (probe.offset_xy.x != 0)
           SERIAL_ECHOPGM("-Center");
 
@@ -128,27 +102,18 @@ void safe_delay(millis_t ms) {
 
       #endif
 
-      if (probe.offset.z < 0)
-        SERIAL_ECHOPGM("Below");
-      else if (probe.offset.z > 0)
-        SERIAL_ECHOPGM("Above");
-      else
-        SERIAL_ECHOPGM("Same Z as");
+      serialprintPGM(probe.offset.z < 0 ? PSTR("Below") : probe.offset.z > 0 ? PSTR("Above") : PSTR("Same Z as"));
       SERIAL_ECHOLNPGM(" Nozzle)");
 
     #endif
 
     #if HAS_ABL_OR_UBL
-      SERIAL_ECHOPGM("Auto Bed Leveling: ");
-      #if ENABLED(AUTO_BED_LEVELING_LINEAR)
-        SERIAL_ECHOLNPGM("LINEAR");
-      #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        SERIAL_ECHOLNPGM("BILINEAR");
-      #elif ENABLED(AUTO_BED_LEVELING_3POINT)
-        SERIAL_ECHOLNPGM("3POINT");
-      #elif ENABLED(AUTO_BED_LEVELING_UBL)
-        SERIAL_ECHOLNPGM("UBL");
-      #endif
+      SERIAL_ECHOPGM("Auto Bed Leveling: "
+        TERN(AUTO_BED_LEVELING_LINEAR, "LINEAR", "")
+        TERN(AUTO_BED_LEVELING_BILINEAR, "BILINEAR", "")
+        TERN(AUTO_BED_LEVELING_3POINT, "3POINT", "")
+        TERN(AUTO_BED_LEVELING_UBL, "UBL", "")
+      );
 
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
index e81116aee9aa..e9ed522e8857 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/Max7219_Debug_LEDs.cpp
@@ -48,24 +48,16 @@
 #include "../MarlinCore.h"
 #include "../HAL/shared/Delay.h"
 
-#define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)
+#if ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1
+  #define HAS_SIDE_BY_SIDE 1
+#endif
 
 #if _ROT == 0 || _ROT == 180
-  #if HAS_SIDE_BY_SIDE
-    #define MAX7219_X_LEDS  8
-    #define MAX7219_Y_LEDS  MAX7219_LINES
-  #else
-    #define MAX7219_Y_LEDS  8
-    #define MAX7219_X_LEDS  MAX7219_LINES
-  #endif
+  #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
+  #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
 #elif _ROT == 90 || _ROT == 270
-  #if HAS_SIDE_BY_SIDE
-    #define MAX7219_Y_LEDS  8
-    #define MAX7219_X_LEDS  MAX7219_LINES
-  #else
-    #define MAX7219_X_LEDS  8
-    #define MAX7219_Y_LEDS  MAX7219_LINES
-  #endif
+  #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
+  #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
 #else
   #error "MAX7219_ROTATE must be a multiple of +/- 90°."
 #endif
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index bf9e9a78b551..5d2dc47bee95 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -55,14 +55,7 @@ void Babystep::add_mm(const AxisEnum axis, const float &mm) {
 
 void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
 
-  #if ENABLED(BABYSTEP_WITHOUT_HOMING)
-    #define CAN_BABYSTEP(AXIS) true
-  #else
-    extern uint8_t axis_known_position;
-    #define CAN_BABYSTEP(AXIS) TEST(axis_known_position, AXIS)
-  #endif
-
-  if (!CAN_BABYSTEP(axis)) return;
+  if (DISABLED(BABYSTEP_WITHOUT_HOMING) && !TEST(axis_known_position, axis)) return;
 
   accum += distance; // Count up babysteps for the UI
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 77d85c4195f4..efe575ec634e 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -73,20 +73,12 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
       );
     }
 
-    const bool should_set = last_written_mode != (false
-      #if ENABLED(BLTOUCH_SET_5V_MODE)
-        || true
-      #endif
-    );
+    const bool should_set = last_written_mode != ENABLED(BLTOUCH_SET_5V_MODE);
 
   #endif
 
   if (should_set && set_voltage)
-    mode_conv_proc((false
-      #if ENABLED(BLTOUCH_SET_5V_MODE)
-        || true
-      #endif
-    ));
+    mode_conv_proc(ENABLED(BLTOUCH_SET_5V_MODE));
 }
 
 void BLTouch::clear() {
diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/power_loss_recovery.h
index 6c4b5d5c3fbc..049656078501 100644
--- a/Marlin/src/feature/power_loss_recovery.h
+++ b/Marlin/src/feature/power_loss_recovery.h
@@ -159,11 +159,7 @@ class PrintJobRecovery {
     static inline void cancel() { purge(); card.autostart_index = 0; }
 
     static void load();
-    static void save(const bool force=false
-      #if ENABLED(SAVE_EACH_CMD_MODE)
-        || true
-      #endif
-    );
+    static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE));
 
   #if PIN_EXISTS(POWER_LOSS)
     static inline void outage() {
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index f75462fb9746..63c74640574f 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -62,13 +62,7 @@
     current_position.set(0.0, 0.0);
     sync_plan_position();
 
-    const int x_axis_home_dir =
-      #if ENABLED(DUAL_X_CARRIAGE)
-        x_home_dir(active_extruder)
-      #else
-        home_dir(X_AXIS)
-      #endif
-    ;
+    const int x_axis_home_dir = x_home_dir(active_extruder);
 
     const float mlx = max_length(X_AXIS),
                 mly = max_length(Y_AXIS),
@@ -310,6 +304,8 @@ void GcodeSuite::G28() {
 
   #if ENABLED(DELTA)
 
+    constexpr bool doZ = true; // for NANODLP_Z_SYNC if your DLP is on a DELTA
+
     home_delta();
 
     #if ENABLED(IMPROVE_HOMING_RELIABILITY)
@@ -330,12 +326,10 @@ void GcodeSuite::G28() {
 
     #endif
 
-    const float z_homing_height = (
-      #if ENABLED(UNKNOWN_Z_NO_RAISE)
-        !TEST(axis_known_position, Z_AXIS) ? 0 :
-      #endif
-          (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
-    );
+    const float z_homing_height =
+      (DISABLED(UNKNOWN_Z_NO_RAISE) || TEST(axis_known_position, Z_AXIS))
+        ? (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
+        : 0;
 
     if (z_homing_height && (doX || doY)) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
@@ -355,20 +349,13 @@ void GcodeSuite::G28() {
     // Home Y (before X)
     #if ENABLED(HOME_Y_BEFORE_X)
 
-      if (doY
-        #if ENABLED(CODEPENDENT_XY_HOMING)
-          || doX
-        #endif
-      ) homeaxis(Y_AXIS);
+      if (doY || (doX && ENABLED(CODEPENDENT_XY_HOMING)))
+        homeaxis(Y_AXIS);
 
     #endif
 
     // Home X
-    if (doX
-      #if ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X)
-        || doY
-      #endif
-    ) {
+    if (doX || (doY && ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X))) {
 
       #if ENABLED(DUAL_X_CARRIAGE)
 
@@ -396,9 +383,8 @@ void GcodeSuite::G28() {
     }
 
     // Home Y (after X)
-    #if DISABLED(HOME_Y_BEFORE_X)
-      if (doY) homeaxis(Y_AXIS);
-    #endif
+    if (DISABLED(HOME_Y_BEFORE_X) && doY)
+      homeaxis(Y_AXIS);
 
     #if ENABLED(IMPROVE_HOMING_RELIABILITY)
       end_slow_homing(slow_homing);
@@ -487,7 +473,7 @@ void GcodeSuite::G28() {
     do_blocking_move_to_z(delta_clip_start_height);
   #endif
 
-  #if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G28)
+  #if ENABLED(RESTORE_LEVELING_AFTER_G28)
     set_bed_leveling_enabled(leveling_was_active);
   #endif
 
@@ -495,12 +481,7 @@ void GcodeSuite::G28() {
 
   // Restore the active tool after homing
   #if HOTENDS > 1 && (DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE))
-    #if EITHER(PARKING_EXTRUDER, DUAL_X_CARRIAGE)
-      #define NO_FETCH false // fetch the previous toolhead
-    #else
-      #define NO_FETCH true
-    #endif
-    tool_change(old_tool_index, NO_FETCH);
+    tool_change(old_tool_index, NONE(PARKING_EXTRUDER, DUAL_X_CARRIAGE));   // Do move if one of these
   #endif
 
   #if HAS_HOMING_CURRENT
@@ -523,15 +504,8 @@ void GcodeSuite::G28() {
 
   report_current_position();
 
-  #if ENABLED(NANODLP_Z_SYNC)
-    #if ENABLED(NANODLP_ALL_AXIS)
-      #define _HOME_SYNC true       // For any axis, output sync text.
-    #else
-      #define _HOME_SYNC doZ        // Only for Z-axis
-    #endif
-    if (_HOME_SYNC)
-      SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
-  #endif
+  if (ENABLED(NANODLP_Z_SYNC) && (doZ || ENABLED(NANODLP_ALL_AXIS)))
+    SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
 
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G28");
 
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index d2db4ce30869..4cf0f62a05a9 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -56,8 +56,12 @@
   #define CALIBRATION_MEASUREMENT_CERTAIN   0.5 // mm
 #endif
 
-#define HAS_X_CENTER BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
-#define HAS_Y_CENTER BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+#if BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
+  #define HAS_X_CENTER 1
+#endif
+#if BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+  #define HAS_Y_CENTER 1
+#endif
 
 enum side_t : uint8_t { TOP, RIGHT, FRONT, LEFT, BACK, NUM_SIDES };
 
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 4d2c5d5d6996..d74f909c4782 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -54,39 +54,19 @@ void GcodeSuite::M115() {
     #endif
 
     // SERIAL_XON_XOFF
-    cap_line(PSTR("SERIAL_XON_XOFF")
-      #if ENABLED(SERIAL_XON_XOFF)
-        , true
-      #endif
-    );
+    cap_line(PSTR("SERIAL_XON_XOFF"), ENABLED(SERIAL_XON_XOFF));
 
     // BINARY_FILE_TRANSFER (M28 B1)
-    cap_line(PSTR("BINARY_FILE_TRANSFER")
-      #if ENABLED(BINARY_FILE_TRANSFER)
-        , true
-      #endif
-    );
+    cap_line(PSTR("BINARY_FILE_TRANSFER"), ENABLED(BINARY_FILE_TRANSFER));
 
     // EEPROM (M500, M501)
-    cap_line(PSTR("EEPROM")
-      #if ENABLED(EEPROM_SETTINGS)
-        , true
-      #endif
-    );
+    cap_line(PSTR("EEPROM"), ENABLED(EEPROM_SETTINGS));
 
     // Volumetric Extrusion (M200)
-    cap_line(PSTR("VOLUMETRIC")
-      #if DISABLED(NO_VOLUMETRICS)
-        , true
-      #endif
-    );
+    cap_line(PSTR("VOLUMETRIC"), DISABLED(NO_VOLUMETRICS));
 
     // AUTOREPORT_TEMP (M155)
-    cap_line(PSTR("AUTOREPORT_TEMP")
-      #if ENABLED(AUTO_REPORT_TEMPERATURES)
-        , true
-      #endif
-    );
+    cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES));
 
     // PROGRESS (M530 S L, M531 <file>, M532 X L)
     cap_line(PSTR("PROGRESS"));
@@ -95,93 +75,42 @@ void GcodeSuite::M115() {
     cap_line(PSTR("PRINT_JOB"), true);
 
     // AUTOLEVEL (G29)
-    cap_line(PSTR("AUTOLEVEL")
-      #if HAS_AUTOLEVEL
-        , true
-      #endif
-    );
+    cap_line(PSTR("AUTOLEVEL"), ENABLED(HAS_AUTOLEVEL));
 
     // Z_PROBE (G30)
-    cap_line(PSTR("Z_PROBE")
-      #if HAS_BED_PROBE
-        , true
-      #endif
-    );
+    cap_line(PSTR("Z_PROBE"), ENABLED(HAS_BED_PROBE));
 
     // MESH_REPORT (M420 V)
-    cap_line(PSTR("LEVELING_DATA")
-      #if HAS_LEVELING
-        , true
-      #endif
-    );
+    cap_line(PSTR("LEVELING_DATA"), ENABLED(HAS_LEVELING));
 
     // BUILD_PERCENT (M73)
-    cap_line(PSTR("BUILD_PERCENT")
-      #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-        , true
-      #endif
-    );
+    cap_line(PSTR("BUILD_PERCENT"), ENABLED(LCD_SET_PROGRESS_MANUALLY));
 
     // SOFTWARE_POWER (M80, M81)
-    cap_line(PSTR("SOFTWARE_POWER")
-      #if ENABLED(PSU_CONTROL)
-        , true
-      #endif
-    );
+    cap_line(PSTR("SOFTWARE_POWER"), ENABLED(PSU_CONTROL));
 
     // CASE LIGHTS (M355)
-    cap_line(PSTR("TOGGLE_LIGHTS")
-      #if HAS_CASE_LIGHT
-        , true
-      #endif
-    );
-    cap_line(PSTR("CASE_LIGHT_BRIGHTNESS")
-      #if HAS_CASE_LIGHT
-        , PWM_PIN(CASE_LIGHT_PIN)
-      #endif
-    );
+    cap_line(PSTR("TOGGLE_LIGHTS"), ENABLED(HAS_CASE_LIGHT));
+
+    cap_line(PSTR("CASE_LIGHT_BRIGHTNESS"), TERN(HAS_CASE_LIGHT, PWM_PIN(CASE_LIGHT_PIN), 0));
 
     // EMERGENCY_PARSER (M108, M112, M410, M876)
-    cap_line(PSTR("EMERGENCY_PARSER")
-      #if ENABLED(EMERGENCY_PARSER)
-        , true
-      #endif
-    );
+    cap_line(PSTR("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
 
     // PROMPT SUPPORT (M876)
-    cap_line(PSTR("PROMPT_SUPPORT")
-      #if ENABLED(HOST_PROMPT_SUPPORT)
-        , true
-      #endif
-    );
+    cap_line(PSTR("PROMPT_SUPPORT"), ENABLED(HOST_PROMPT_SUPPORT));
 
     // AUTOREPORT_SD_STATUS (M27 extension)
-    cap_line(PSTR("AUTOREPORT_SD_STATUS")
-      #if ENABLED(AUTO_REPORT_SD_STATUS)
-        , true
-      #endif
-    );
+    cap_line(PSTR("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS));
 
     // THERMAL_PROTECTION
-    cap_line(PSTR("THERMAL_PROTECTION")
-      #if (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) && (ENABLED(THERMAL_PROTECTION_BED) || !HAS_HEATED_BED) && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER)
-        , true
-      #endif
-    );
+    cap_line(PSTR("THERMAL_PROTECTION"), ENABLED(THERMALLY_SAFE));
 
     // MOTION_MODES (M80-M89)
-    cap_line(PSTR("MOTION_MODES")
-      #if ENABLED(GCODE_MOTION_MODES)
-        , true
-      #endif
-    );
+    cap_line(PSTR("MOTION_MODES"), ENABLED(GCODE_MOTION_MODES));
 
     // CHAMBER_TEMPERATURE (M141, M191)
-    cap_line(PSTR("CHAMBER_TEMPERATURE")
-      #if HAS_HEATED_CHAMBER
-        , true
-      #endif
-    );
+    cap_line(PSTR("CHAMBER_TEMPERATURE"), ENABLED(HAS_HEATED_CHAMBER));
 
   #endif // EXTENDED_CAPABILITIES_REPORT
 }
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index b4da3439bb8a..7011e02ca6f1 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -26,6 +26,15 @@
  * Conditionals that need to be set before Configuration_adv.h or pins.h
  */
 
+#if ENABLED(MORGAN_SCARA)
+  #define IS_SCARA 1
+  #define IS_KINEMATIC 1
+#elif ENABLED(DELTA)
+  #define IS_KINEMATIC 1
+#else
+  #define IS_CARTESIAN 1
+#endif
+
 #if ENABLED(CARTESIO_UI)
 
   #define DOGLCD
@@ -193,7 +202,9 @@
 #endif
 
 // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
-#define HAS_SSD1306_OLED_I2C ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
+#if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
+  #define HAS_SSD1306_OLED_I2C 1
+#endif
 #if HAS_SSD1306_OLED_I2C
   #define IS_ULTRA_LCD
   #define DOGLCD
@@ -347,19 +358,34 @@
 #endif
 
 // Extensible UI serial touch screens. (See src/lcd/extensible_ui)
-#if ANY(MALYAN_LCD, DGUS_LCD, TOUCH_UI_FTDI_EVE)
+#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+  #define HAS_DGUS_LCD 1
+#endif
+
+#if ANY(HAS_DGUS_LCD, MALYAN_LCD, TOUCH_UI_FTDI_EVE)
   #define IS_EXTUI
   #define EXTENSIBLE_UI
 #endif
 
 // Aliases for LCD features
-#define HAS_SPI_LCD          ENABLED(ULTRA_LCD)
-#define HAS_DISPLAY         (HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI))
-#define HAS_GRAPHICAL_LCD    ENABLED(DOGLCD)
-#define HAS_CHARACTER_LCD   (HAS_SPI_LCD && !HAS_GRAPHICAL_LCD)
-#define HAS_LCD_MENU        (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS))
-#define HAS_ADC_BUTTONS      ENABLED(ADC_KEYPAD)
-#define HAS_DGUS_LCD         ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
+  #define HAS_DISPLAY 1
+  #if ENABLED(ULTRA_LCD)
+    #define HAS_SPI_LCD 1
+    #if ENABLED(DOGLCD)
+      #define HAS_GRAPHICAL_LCD 1
+    #else
+      #define HAS_CHARACTER_LCD 1
+    #endif
+  #endif
+#endif
+
+#if ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS)
+  #define HAS_LCD_MENU 1
+#endif
+#if ENABLED(ADC_KEYPAD)
+  #define HAS_ADC_BUTTONS 1
+#endif
 
 #if HAS_GRAPHICAL_LCD
   #ifndef LCD_PIXEL_WIDTH
@@ -447,12 +473,17 @@
 #define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
 #define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1, v1, v1)
 
-#define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
-#define SWITCHING_NOZZLE_TWO_SERVOS defined(SWITCHING_NOZZLE_E1_SERVO_NR)
+#if ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
+  #define DO_SWITCH_EXTRUDER 1
+#endif
 
-#define HAS_DUPLICATION_MODE EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
+#ifdef SWITCHING_NOZZLE_E1_SERVO_NR
+  #define SWITCHING_NOZZLE_TWO_SERVOS 1
+#endif
 
-#define HAS_HOTEND_OFFSET (HOTENDS > 1)
+#if HOTENDS > 1
+  #define HAS_HOTEND_OFFSET 1
+#endif
 
 /**
  * Default hotend offsets, if not defined
@@ -509,6 +540,10 @@
   #endif
 #endif
 
+#ifndef NUM_SERVOS
+  #define NUM_SERVOS 0
+#endif
+
 #ifndef PREHEAT_1_LABEL
   #define PREHEAT_1_LABEL "PLA"
 #endif
@@ -520,8 +555,12 @@
 /**
  * Set a flag for a servo probe (or BLTouch)
  */
-#define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
-#define HAS_SERVO_ANGLES (HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE))
+#if defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0
+  #define HAS_Z_SERVO_PROBE 1
+#endif
+#if HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
+  #define HAS_SERVO_ANGLES 1
+#endif
 #if !HAS_SERVO_ANGLES
   #undef EDITABLE_SERVO_ANGLES
 #endif
@@ -529,20 +568,31 @@
 /**
  * Set flags for enabled probes
  */
-#define HAS_BED_PROBE (HAS_Z_SERVO_PROBE || ANY(FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE))
-#define PROBE_SELECTED (HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING))
+#if ANY(HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE)
+  #define HAS_BED_PROBE 1
+#endif
+
+#if HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)
+  #define PROBE_SELECTED 1
+#endif
 
 #if HAS_BED_PROBE
-  #define HAS_PROBE_XY_OFFSET   DISABLED(NOZZLE_AS_PROBE)
-  #define HAS_CUSTOM_PROBE_PIN  DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-  #define HOMING_Z_WITH_PROBE   (Z_HOME_DIR < 0 && !HAS_CUSTOM_PROBE_PIN)
+  #if DISABLED(NOZZLE_AS_PROBE)
+    #define HAS_PROBE_XY_OFFSET 1
+  #endif
+  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+    #define HAS_CUSTOM_PROBE_PIN 1
+  #endif
+  #if Z_HOME_DIR < 0 && !HAS_CUSTOM_PROBE_PIN
+    #define HOMING_Z_WITH_PROBE 1
+  #endif
   #ifndef Z_PROBE_LOW_POINT
     #define Z_PROBE_LOW_POINT -5
   #endif
   #if ENABLED(Z_PROBE_ALLEN_KEY)
-    #define PROBE_TRIGGERED_WHEN_STOWED_TEST // Extra test for Allen Key Probe
+    #define PROBE_TRIGGERED_WHEN_STOWED_TEST 1 // Extra test for Allen Key Probe
   #endif
-  #ifdef MULTIPLE_PROBING
+  #if MULTIPLE_PROBING > 1
     #if EXTRA_PROBING
       #define TOTAL_PROBING (MULTIPLE_PROBING + EXTRA_PROBING)
     #else
@@ -558,23 +608,6 @@
   #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
 #endif
 
-#define HAS_EXTRA_ENDSTOPS           ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
-#define HAS_SOFTWARE_ENDSTOPS        EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
-#define HAS_RESUME_CONTINUE          ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
-#define HAS_COLOR_LEDS               ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
-#define HAS_LEDS_OFF_FLAG            (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
-#define HAS_PRINT_PROGRESS           EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-#define HAS_PRINT_PROGRESS_PERMYRIAD (HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME))
-#define HAS_SERVICE_INTERVALS        (ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0))
-#define HAS_FILAMENT_SENSOR          ENABLED(FILAMENT_RUNOUT_SENSOR)
-
-#define HAS_GAMES     ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
-#define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
-
-#define IS_SCARA     ENABLED(MORGAN_SCARA)
-#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
-#define IS_CARTESIAN !IS_KINEMATIC
-
 #ifndef INVERT_X_DIR
   #define INVERT_X_DIR false
 #endif
@@ -592,16 +625,15 @@
   #define BOOT_MARLIN_LOGO_SMALL
 #endif
 
-#define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
-
-// Linear advance uses Jerk since E is an isolated axis
-#define HAS_LINEAR_E_JERK  (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
-
 // This flag indicates some kind of jerk storage is needed
-#define HAS_CLASSIC_JERK   (ENABLED(CLASSIC_JERK) || IS_KINEMATIC)
+#if ENABLED(CLASSIC_JERK) || IS_KINEMATIC
+  #define HAS_CLASSIC_JERK 1
+#endif
 
 // E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
-#define HAS_CLASSIC_E_JERK (ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE)))
+#if ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE))
+  #define HAS_CLASSIC_E_JERK 1
+#endif
 
 #ifndef SPI_SPEED
   #define SPI_SPEED SPI_FULL_SPEED
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index ea2578c460ab..8c286e64d633 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -56,6 +56,50 @@
   #undef SHOW_TEMP_ADC_VALUES
 #endif
 
+#if EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
+  #define HAS_DUPLICATION_MODE 1
+#endif
+
+#if ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0)
+  #define HAS_SERVICE_INTERVALS 1
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #define HAS_FILAMENT_SENSOR 1
+#endif
+
+#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
+  #define HAS_PRINT_PROGRESS 1
+#endif
+
+#if HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME)
+  #define HAS_PRINT_PROGRESS_PERMYRIAD 1
+#endif
+
+#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
+  #define HAS_GAMES 1
+  #if (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
+    #define HAS_GAME_MENU 1
+  #endif
+#endif
+
+#if ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
+  #define HAS_EXTRA_ENDSTOPS 1
+#endif
+#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
+  #define HAS_SOFTWARE_ENDSTOPS 1
+#endif
+#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
+  #define HAS_RESUME_CONTINUE 1
+#endif
+
+#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
+  #define HAS_COLOR_LEDS 1
+#endif
+#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
+  #define HAS_LEDS_OFF_FLAG 1
+#endif
+
 #if !NUM_SERIAL
   #undef BAUD_RATE_GCODE
 #endif
@@ -65,10 +109,6 @@
   #define NUM_Z_STEPPER_DRIVERS 1
 #endif
 
-#ifndef PLR_ENABLED_DEFAULT
-  #define PLR_ENABLED_DEFAULT true
-#endif
-
 #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
   #undef Z_STEPPER_ALIGN_AMP
 #endif
@@ -171,10 +211,14 @@
 #endif
 
 // If platform requires early initialization of watchdog to properly boot
-#define EARLY_WATCHDOG (ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM))
+#if ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM)
+  #define EARLY_WATCHDOG 1
+#endif
 
 // Extensible UI pin mapping for RepRapDiscount
-#define TOUCH_UI_ULTIPANEL ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
+#if ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
+  #define TOUCH_UI_ULTIPANEL 1
+#endif
 
 // Poll-based jogging for joystick and other devices
 #if ENABLED(JOYSTICK)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 32243afc3754..0a7d7aa52d3b 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -30,6 +30,11 @@
   // Extras for CI testing
 #endif
 
+// Linear advance uses Jerk since E is an isolated axis
+#if DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE)
+  #define HAS_LINEAR_E_JERK 1
+#endif
+
 #ifdef TEENSYDUINO
   #undef max
   #define max(a,b) ((a)>(b)?(a):(b))
@@ -63,13 +68,8 @@
 // Define center values for future use
 #define _X_HALF_BED ((X_BED_SIZE) / 2)
 #define _Y_HALF_BED ((Y_BED_SIZE) / 2)
-#if ENABLED(BED_CENTER_AT_0_0)
-  #define X_CENTER 0
-  #define Y_CENTER 0
-#else
-  #define X_CENTER _X_HALF_BED
-  #define Y_CENTER _Y_HALF_BED
-#endif
+#define X_CENTER TERN(BED_CENTER_AT_0_0, 0, _X_HALF_BED)
+#define Y_CENTER TERN(BED_CENTER_AT_0_0, 0, _Y_HALF_BED)
 
 // Get the linear boundaries of the bed
 #define X_MIN_BED (X_CENTER - _X_HALF_BED)
@@ -92,10 +92,18 @@
 /**
  * CoreXY, CoreXZ, and CoreYZ - and their reverse
  */
-#define CORE_IS_XY EITHER(COREXY, COREYX)
-#define CORE_IS_XZ EITHER(COREXZ, COREZX)
-#define CORE_IS_YZ EITHER(COREYZ, COREZY)
-#define IS_CORE (CORE_IS_XY || CORE_IS_XZ || CORE_IS_YZ)
+#if EITHER(COREXY, COREYX)
+  #define CORE_IS_XY 1
+#endif
+#if EITHER(COREXZ, COREZX)
+  #define CORE_IS_XZ 1
+#endif
+#if EITHER(COREYZ, COREZY)
+  #define CORE_IS_YZ 1
+#endif
+#if CORE_IS_XY || CORE_IS_XZ || CORE_IS_YZ
+  #define IS_CORE 1
+#endif
 #if IS_CORE
   #if CORE_IS_XY
     #define CORE_AXIS_1 A_AXIS
@@ -110,11 +118,7 @@
     #define CORE_AXIS_1 B_AXIS
     #define CORE_AXIS_2 C_AXIS
   #endif
-  #if ANY(COREYX, COREZX, COREZY)
-    #define CORESIGN(n) (-(n))
-  #else
-    #define CORESIGN(n) (n)
-  #endif
+  #define CORESIGN(n) (ANY(COREYX, COREZX, COREZY) ? (-(n)) : (n))
 #endif
 
 /**
@@ -139,33 +143,23 @@
  */
 #ifdef MANUAL_X_HOME_POS
   #define X_HOME_POS MANUAL_X_HOME_POS
-#elif ENABLED(BED_CENTER_AT_0_0)
-  #if ENABLED(DELTA)
-    #define X_HOME_POS 0
-  #else
-    #define X_HOME_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
-  #endif
 #else
-  #if ENABLED(DELTA)
-    #define X_HOME_POS (X_MIN_POS + (X_BED_SIZE) * 0.5)
+  #define X_END_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+  #if ENABLED(BED_CENTER_AT_0_0)
+    #define X_HOME_POS TERN(DELTA, 0, X_END_POS)
   #else
-    #define X_HOME_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+    #define X_HOME_POS TERN(DELTA, X_MIN_POS + (X_BED_SIZE) * 0.5, X_END_POS)
   #endif
 #endif
 
 #ifdef MANUAL_Y_HOME_POS
   #define Y_HOME_POS MANUAL_Y_HOME_POS
-#elif ENABLED(BED_CENTER_AT_0_0)
-  #if ENABLED(DELTA)
-    #define Y_HOME_POS 0
-  #else
-    #define Y_HOME_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
-  #endif
 #else
-  #if ENABLED(DELTA)
-    #define Y_HOME_POS (Y_MIN_POS + (Y_BED_SIZE) * 0.5)
+  #define Y_END_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+  #if ENABLED(BED_CENTER_AT_0_0)
+    #define Y_HOME_POS TERN(DELTA, 0, Y_END_POS)
   #else
-    #define Y_HOME_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+    #define Y_HOME_POS TERN(DELTA, Y_MIN_POS + (Y_BED_SIZE) * 0.5, Y_END_POS)
   #endif
 #endif
 
@@ -268,7 +262,10 @@
   #define _LCD_CONTRAST_INIT  17
 #endif
 
-#define HAS_LCD_CONTRAST defined(_LCD_CONTRAST_INIT)
+#ifdef _LCD_CONTRAST_INIT
+  #define HAS_LCD_CONTRAST 1
+#endif
+
 #if HAS_LCD_CONTRAST
   #ifndef LCD_CONTRAST_MIN
     #ifdef _LCD_CONTRAST_MIN
@@ -1291,20 +1288,40 @@
 
 // Trinamic Stepper Drivers
 #if HAS_TRINAMIC_CONFIG
-  #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
-  #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+  #if ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
+    #define STEALTHCHOP_ENABLED 1
+  #endif
+  #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+    #define USE_SENSORLESS 1
+  #endif
   // Disable Z axis sensorless homing if a probe is used to home the Z axis
   #if HOMING_Z_WITH_PROBE
     #undef Z_STALL_SENSITIVITY
   #endif
-  #define X_SENSORLESS  (AXIS_HAS_STALLGUARD(X)  && defined(X_STALL_SENSITIVITY))
-  #define X2_SENSORLESS (AXIS_HAS_STALLGUARD(X2) && defined(X2_STALL_SENSITIVITY))
-  #define Y_SENSORLESS  (AXIS_HAS_STALLGUARD(Y)  && defined(Y_STALL_SENSITIVITY))
-  #define Y2_SENSORLESS (AXIS_HAS_STALLGUARD(Y2) && defined(Y2_STALL_SENSITIVITY))
-  #define Z_SENSORLESS  (AXIS_HAS_STALLGUARD(Z)  && defined(Z_STALL_SENSITIVITY))
-  #define Z2_SENSORLESS (AXIS_HAS_STALLGUARD(Z2) && defined(Z2_STALL_SENSITIVITY))
-  #define Z3_SENSORLESS (AXIS_HAS_STALLGUARD(Z3) && defined(Z3_STALL_SENSITIVITY))
-  #define Z4_SENSORLESS (AXIS_HAS_STALLGUARD(Z4) && defined(Z4_STALL_SENSITIVITY))
+  #if defined(X_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(X)
+    #define X_SENSORLESS 1
+  #endif
+  #if defined(X2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X2)
+    #define X2_SENSORLESS 1
+  #endif
+  #if defined(Y_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(Y)
+    #define Y_SENSORLESS 1
+  #endif
+  #if defined(Y2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y2)
+    #define Y2_SENSORLESS 1
+  #endif
+  #if defined(Z_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(Z)
+    #define Z_SENSORLESS 1
+  #endif
+  #if defined(Z2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z2)
+    #define Z2_SENSORLESS 1
+  #endif
+  #if defined(Z3_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z3)
+    #define Z3_SENSORLESS 1
+  #endif
+  #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
+    #define Z4_SENSORLESS 1
+  #endif
   #if ENABLED(SPI_ENDSTOPS)
     #define X_SPI_SENSORLESS X_SENSORLESS
     #define Y_SPI_SENSORLESS Y_SENSORLESS
@@ -1388,23 +1405,48 @@
 #define HAS_HEATER_BED  (PIN_EXISTS(HEATER_BED))
 
 // Shorthand for common combinations
-#define HAS_HEATED_BED (HAS_TEMP_BED && HAS_HEATER_BED)
-#define BED_OR_CHAMBER (HAS_HEATED_BED || HAS_TEMP_CHAMBER)
-#define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE)
-#define HAS_HEATED_CHAMBER (HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER))
+#if HAS_TEMP_BED && HAS_HEATER_BED
+  #define HAS_HEATED_BED 1
+#endif
+#if HAS_HEATED_BED || HAS_TEMP_CHAMBER
+  #define BED_OR_CHAMBER 1
+#endif
+#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE
+  #define HAS_TEMP_SENSOR 1
+#endif
+#if HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER)
+  #define HAS_HEATED_CHAMBER 1
+#endif
 
 // PID heating
 #if !HAS_HEATED_BED
   #undef PIDTEMPBED
 #endif
-#define HAS_PID_HEATING EITHER(PIDTEMP, PIDTEMPBED)
-#define HAS_PID_FOR_BOTH BOTH(PIDTEMP, PIDTEMPBED)
+#if EITHER(PIDTEMP, PIDTEMPBED)
+  #define HAS_PID_HEATING 1
+#endif
+#if BOTH(PIDTEMP, PIDTEMPBED)
+  #define HAS_PID_FOR_BOTH 1
+#endif
 
 // Thermal protection
-#define HAS_THERMALLY_PROTECTED_BED (HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED))
-#define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
-#define WATCH_BED (HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0)
-#define WATCH_CHAMBER (HAS_HEATED_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0)
+#if HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED)
+  #define HAS_THERMALLY_PROTECTED_BED 1
+#endif
+#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
+  #define WATCH_HOTENDS 1
+#endif
+#if HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0
+  #define WATCH_BED 1
+#endif
+#if HAS_HEATED_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0
+  #define WATCH_CHAMBER 1
+#endif
+#if  (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) \
+  && (ENABLED(THERMAL_PROTECTION_BED)     || !HAS_HEATED_BED) \
+  && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER)
+  #define THERMALLY_SAFE 1
+#endif
 
 // Auto fans
 #define HAS_AUTO_FAN_0 (HOTENDS > 0 && PIN_EXISTS(E0_AUTO_FAN))
@@ -1455,22 +1497,48 @@
 #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
 
 // User Interface
-#define HAS_HOME        (PIN_EXISTS(HOME))
-#define HAS_KILL        (PIN_EXISTS(KILL))
-#define HAS_SUICIDE     (PIN_EXISTS(SUICIDE))
-#define HAS_PHOTOGRAPH  (PIN_EXISTS(PHOTOGRAPH))
-#define HAS_BUZZER      (PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER))
-#define USE_BEEPER      (HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER))
-#define HAS_CASE_LIGHT  (PIN_EXISTS(CASE_LIGHT) && ENABLED(CASE_LIGHT_ENABLE))
+#if PIN_EXISTS(HOME)
+  #define HAS_HOME 1
+#endif
+#if PIN_EXISTS(KILL)
+  #define HAS_KILL 1
+#endif
+#if PIN_EXISTS(SUICIDE)
+  #define HAS_SUICIDE 1
+#endif
+#if PIN_EXISTS(PHOTOGRAPH)
+  #define HAS_PHOTOGRAPH 1
+#endif
+#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+  #define HAS_BUZZER 1
+#endif
+#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+  #define USE_BEEPER 1
+#endif
+#if PIN_EXISTS(CASE_LIGHT) && ENABLED(CASE_LIGHT_ENABLE)
+  #define HAS_CASE_LIGHT 1
+#endif
 
 // Digital control
-#define HAS_STEPPER_RESET     (PIN_EXISTS(STEPPER_RESET))
-#define HAS_DIGIPOTSS         (PIN_EXISTS(DIGIPOTSS))
-#define HAS_MOTOR_CURRENT_PWM ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
+#if PIN_EXISTS(STEPPER_RESET)
+  #define HAS_STEPPER_RESET 1
+#endif
+#if PIN_EXISTS(DIGIPOTSS)
+  #define HAS_DIGIPOTSS 1
+#endif
+#if  ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
+  #define HAS_MOTOR_CURRENT_PWM 1
+#endif
 
-#define HAS_SOME_Z_MICROSTEPS (HAS_Z_MICROSTEPS || HAS_Z2_MICROSTEPS || HAS_Z3_MICROSTEPS || HAS_Z4_MICROSTEPS)
-#define HAS_SOME_E_MICROSTEPS (HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS || HAS_E5_MICROSTEPS || HAS_E6_MICROSTEPS || HAS_E7_MICROSTEPS)
-#define HAS_MICROSTEPS (HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Y2_MICROSTEPS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MICROSTEPS)
+#if HAS_Z_MICROSTEPS || HAS_Z2_MICROSTEPS || HAS_Z3_MICROSTEPS || HAS_Z4_MICROSTEPS
+  #define HAS_SOME_Z_MICROSTEPS 1
+#endif
+#if HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS || HAS_E5_MICROSTEPS || HAS_E6_MICROSTEPS || HAS_E7_MICROSTEPS
+  #define HAS_SOME_E_MICROSTEPS 1
+#endif
+#if HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Y2_MICROSTEPS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MICROSTEPS
+  #define HAS_MICROSTEPS 1
+#endif
 
 #if HAS_MICROSTEPS
 
@@ -1764,21 +1832,48 @@
 /**
  * Set granular options based on the specific type of leveling
  */
-#define UBL_SEGMENTED   BOTH(AUTO_BED_LEVELING_UBL, DELTA)
-#define ABL_PLANAR      EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
-#define ABL_GRID        EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
-#define HAS_ABL_NOT_UBL (ABL_PLANAR || ABL_GRID)
-#define HAS_ABL_OR_UBL  (HAS_ABL_NOT_UBL || ENABLED(AUTO_BED_LEVELING_UBL))
-#define HAS_LEVELING    (HAS_ABL_OR_UBL || ENABLED(MESH_BED_LEVELING))
-#define HAS_AUTOLEVEL   (HAS_ABL_OR_UBL && DISABLED(PROBE_MANUALLY))
-#define HAS_MESH        ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
-#define PLANNER_LEVELING      (HAS_LEVELING && DISABLED(AUTO_BED_LEVELING_UBL))
-#define HAS_PROBING_PROCEDURE (HAS_ABL_OR_UBL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
-#define HAS_POSITION_MODIFIERS (ENABLED(FWRETRACT) || HAS_LEVELING || ENABLED(SKEW_CORRECTION))
-#define NEEDS_THREE_PROBE_POINTS EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
-
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #undef LCD_BED_LEVELING
+  #if ENABLED(DELTA)
+    #define UBL_SEGMENTED 1
+  #endif
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+  #define ABL_PLANAR 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+  #define ABL_GRID 1
+#endif
+#if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
+  #define HAS_ABL_NOT_UBL 1
+#endif
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
+  #define HAS_MESH 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
+  #define NEEDS_THREE_PROBE_POINTS 1
+#endif
+#if EITHER(HAS_ABL_NOT_UBL, AUTO_BED_LEVELING_UBL)
+  #define HAS_ABL_OR_UBL 1
+  #if DISABLED(PROBE_MANUALLY)
+    #define HAS_AUTOLEVEL 1
+  #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, MESH_BED_LEVELING)
+  #define HAS_LEVELING 1
+  #if DISABLED(AUTO_BED_LEVELING_UBL)
+    #define PLANNER_LEVELING 1
+  #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, Z_MIN_PROBE_REPEATABILITY_TEST)
+  #define HAS_PROBING_PROCEDURE 1
+#endif
+#if ANY(FWRETRACT, HAS_LEVELING, SKEW_CORRECTION)
+  #define HAS_POSITION_MODIFIERS 1
+#endif
+
+#if !HAS_LEVELING
+  #undef RESTORE_LEVELING_AFTER_G28
 #endif
 
 /**
@@ -1905,8 +2000,8 @@
   #undef MESH_MAX_Y
 #endif
 
-#if (defined(PROBE_PT_1_X) && defined(PROBE_PT_2_X) && defined(PROBE_PT_3_X) && defined(PROBE_PT_1_Y) && defined(PROBE_PT_2_Y) && defined(PROBE_PT_3_Y))
-  #define HAS_FIXED_3POINT
+#if defined(PROBE_PT_1_X) && defined(PROBE_PT_2_X) && defined(PROBE_PT_3_X) && defined(PROBE_PT_1_Y) && defined(PROBE_PT_2_Y) && defined(PROBE_PT_3_Y)
+  #define HAS_FIXED_3POINT 1
 #endif
 
 /**
@@ -1944,10 +2039,10 @@
  * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
  */
 #ifndef Z_HOMING_HEIGHT
-  #ifndef Z_CLEARANCE_BETWEEN_PROBES
-    #define Z_HOMING_HEIGHT 0
-  #else
+  #ifdef Z_CLEARANCE_BETWEEN_PROBES
     #define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
+  #else
+    #define Z_HOMING_HEIGHT 0
   #endif
 #endif
 
@@ -1975,15 +2070,16 @@
 #endif
 
 // Updated G92 behavior shifts the workspace
-#define HAS_POSITION_SHIFT DISABLED(NO_WORKSPACE_OFFSETS)
-// The home offset also shifts the coordinate space
-#define HAS_HOME_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && IS_CARTESIAN)
-// The SCARA home offset applies only on G28
-#define HAS_SCARA_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && IS_SCARA)
-// Cumulative offset to workspace to save some calculation
-#define HAS_WORKSPACE_OFFSET (HAS_POSITION_SHIFT && HAS_HOME_OFFSET)
-// M206 sets the home offset for Cartesian machines
-#define HAS_M206_COMMAND (HAS_HOME_OFFSET && !IS_SCARA)
+#if DISABLED(NO_WORKSPACE_OFFSETS)
+  #define HAS_POSITION_SHIFT 1
+  #if IS_CARTESIAN
+    #define HAS_HOME_OFFSET 1       // The home offset also shifts the coordinate space
+    #define HAS_WORKSPACE_OFFSET 1  // Cumulative offset to workspace to save some calculation
+    #define HAS_M206_COMMAND 1      // M206 sets the home offset for Cartesian machines
+  #elif IS_SCARA
+    #define HAS_SCARA_OFFSET 1      // The SCARA home offset applies only on G28
+  #endif
+#endif
 
 // LCD timeout to status screen default is 15s
 #ifndef LCD_TIMEOUT_TO_STATUS
@@ -2006,11 +2102,7 @@
 #endif
 
 // Number of VFAT entries used. Each entry has 13 UTF-16 characters
-#if ENABLED(SCROLL_LONG_FILENAMES)
-  #define MAX_VFAT_ENTRIES (5)
-#else
-  #define MAX_VFAT_ENTRIES (2)
-#endif
+#define MAX_VFAT_ENTRIES TERN(SCROLL_LONG_FILENAMES, 5, 2)
 
 // Nozzle park for Delta
 #if BOTH(NOZZLE_PARK_FEATURE, DELTA)
@@ -2022,9 +2114,8 @@
 // on boards where SD card and LCD display share the same SPI bus
 // because of a bug in the shared SPI implementation. (See #8122)
 #if defined(TARGET_LPC1768) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && (SCK_PIN == LCD_PINS_D4)
-  #define SDCARD_SORT_ALPHA         // Keeps one directory level in RAM. Changing
-                                    // directory levels still glitches the screen,
-                                    // but the following LCD update cleans it up.
+  #define SDCARD_SORT_ALPHA         // Keep one directory level in RAM. Changing directory levels
+                                    // may still glitch the screen, but LCD updates clean it up.
   #undef SDSORT_LIMIT
   #undef SDSORT_USES_RAM
   #undef SDSORT_USES_STACK
@@ -2057,19 +2148,15 @@
   #ifndef LCD_WIDTH
     #if HAS_GRAPHICAL_LCD
       #define LCD_WIDTH 21
-    #elif ENABLED(ULTIPANEL)
-      #define LCD_WIDTH 20
     #else
-      #define LCD_WIDTH 16
+      #define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
     #endif
   #endif
   #ifndef LCD_HEIGHT
     #if HAS_GRAPHICAL_LCD
       #define LCD_HEIGHT 5
-    #elif ENABLED(ULTIPANEL)
-      #define LCD_HEIGHT 4
     #else
-      #define LCD_HEIGHT 2
+      #define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
     #endif
   #endif
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 885158afe757..4c9af7c79017 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -34,6 +34,37 @@
   #error "Marlin requires C++11 support (gcc >= 4.7, Arduino IDE >= 1.6.8). Please upgrade your toolchain."
 #endif
 
+// Make sure macros aren't borked
+#define TEST1
+#define TEST2 1
+#define TEST3 0
+#define TEST4 true
+#if ENABLED(TEST0)
+  #error "ENABLED is borked!"
+#endif
+#if DISABLED(TEST1)
+  #error "DISABLED is borked!"
+#endif
+#if !ENABLED(TEST2)
+  #error "ENABLED is borked!"
+#endif
+#if ENABLED(TEST3)
+  #error "ENABLED is borked!"
+#endif
+#if DISABLED(TEST4)
+  #error "DISABLED is borked!"
+#endif
+#if !ANY(TEST1, TEST2, TEST3, TEST4) || ANY(TEST0, TEST3)
+  #error "ANY is borked!"
+#endif
+#if DISABLED(TEST0, TEST1, TEST2, TEST4)
+  #error "DISABLED is borked!"
+#endif
+#undef TEST1
+#undef TEST2
+#undef TEST3
+#undef TEST4
+
 /**
  * We try our best to include sanity checks for all changed configuration
  * directives because users have a tendency to use outdated config files with
@@ -1237,7 +1268,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
    * Require some kind of probe for bed leveling and probe testing
    */
   #if HAS_ABL_NOT_UBL && !PROBE_SELECTED
-    #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
+    #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index f614e2009b82..a16103ba412f 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -27,10 +27,18 @@
   #include "../libs/buzzer.h"
 #endif
 
-#define HAS_ENCODER_ACTION (HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY))
-#define HAS_ENCODER_WHEEL  ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2))
-#define HAS_DIGITAL_BUTTONS (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT))
-#define HAS_SHIFT_ENCODER   (!HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL))))
+#if HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY)
+  #define HAS_ENCODER_ACTION 1
+#endif
+#if (!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2)
+  #define HAS_ENCODER_WHEEL 1
+#endif
+#if HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)
+  #define HAS_DIGITAL_BUTTONS 1
+#endif
+#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL)))
+  #define HAS_SHIFT_ENCODER 1
+#endif
 
 // I2C buttons must be read in the main thread
 #define HAS_SLOW_BUTTONS EITHER(LCD_I2C_VIKI, LCD_I2C_PANELOLU2)
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 9d1bbaab219f..16e88b7bfd5b 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -181,11 +181,8 @@ typedef struct SettingsDataStruct {
   //
   float mbl_z_offset;                                   // mbl.z_offset
   uint8_t mesh_num_x, mesh_num_y;                       // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
-  #if ENABLED(MESH_BED_LEVELING)
-    float mbl_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; // mbl.z_values
-  #else
-    float mbl_z_values[3][3];
-  #endif
+  float mbl_z_values[TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3)]   // mbl.z_values
+                    [TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3)];
 
   //
   // HAS_BED_PROBE
@@ -533,11 +530,10 @@ void MarlinSettings::postprocess() {
     EEPROM_START();
 
     eeprom_error = false;
-    #if ENABLED(FLASH_EEPROM_EMULATION)
-      EEPROM_SKIP(ver);   // Flash doesn't allow rewriting without erase
-    #else
-      EEPROM_WRITE(ver);  // invalidate data first
-    #endif
+
+    // Write or Skip version. (Flash doesn't allow rewrite without erase.)
+    TERN(FLASH_EEPROM_EMULATION, EEPROM_SKIP, EEPROM_WRITE)(ver);
+
     EEPROM_SKIP(working_crc); // Skip the checksum slot
 
     working_crc = 0; // clear before first "real data"
@@ -564,12 +560,10 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(planner_max_jerk);
       #endif
 
-      #if DISABLED(CLASSIC_JERK)
-        EEPROM_WRITE(planner.junction_deviation_mm);
-      #else
+      #if ENABLED(CLASSIC_JERK)
         dummyf = 0.02f;
-        EEPROM_WRITE(dummyf);
       #endif
+      EEPROM_WRITE(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
     }
 
     //
@@ -617,13 +611,7 @@ void MarlinSettings::postprocess() {
     // Global Leveling
     //
     {
-      const float zfh = (
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-          planner.z_fade_height
-        #else
-          10.0
-        #endif
-      );
+      const float zfh = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.z_fade_height, 10.0f);
       EEPROM_WRITE(zfh);
     }
 
@@ -632,22 +620,24 @@ void MarlinSettings::postprocess() {
     //
     {
       #if ENABLED(MESH_BED_LEVELING)
-        // Compile time test that sizeof(mbl.z_values) is as expected
         static_assert(
           sizeof(mbl.z_values) == (GRID_MAX_POINTS) * sizeof(mbl.z_values[0][0]),
           "MBL Z array is the wrong size."
         );
-        const uint8_t mesh_num_x = GRID_MAX_POINTS_X, mesh_num_y = GRID_MAX_POINTS_Y;
-        EEPROM_WRITE(mbl.z_offset);
-        EEPROM_WRITE(mesh_num_x);
-        EEPROM_WRITE(mesh_num_y);
-        EEPROM_WRITE(mbl.z_values);
-      #else // For disabled MBL write a default mesh
+      #else
         dummyf = 0;
-        const uint8_t mesh_num_x = 3, mesh_num_y = 3;
-        EEPROM_WRITE(dummyf); // z_offset
-        EEPROM_WRITE(mesh_num_x);
-        EEPROM_WRITE(mesh_num_y);
+      #endif
+
+      const uint8_t mesh_num_x = TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3),
+                    mesh_num_y = TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3);
+
+      EEPROM_WRITE(TERN(MESH_BED_LEVELING, mbl.z_offset, dummyf));
+      EEPROM_WRITE(mesh_num_x);
+      EEPROM_WRITE(mesh_num_y);
+
+      #if ENABLED(MESH_BED_LEVELING)
+        EEPROM_WRITE(mbl.z_values);
+      #else
         for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
@@ -682,26 +672,25 @@ void MarlinSettings::postprocess() {
     //
     {
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        // Compile time test that sizeof(z_values) is as expected
         static_assert(
           sizeof(z_values) == (GRID_MAX_POINTS) * sizeof(z_values[0][0]),
           "Bilinear Z array is the wrong size."
         );
-        const uint8_t grid_max_x = GRID_MAX_POINTS_X, grid_max_y = GRID_MAX_POINTS_Y;
-        EEPROM_WRITE(grid_max_x);            // 1 byte
-        EEPROM_WRITE(grid_max_y);            // 1 byte
-        EEPROM_WRITE(bilinear_grid_spacing); // 2 ints
-        EEPROM_WRITE(bilinear_start);        // 2 ints
-        EEPROM_WRITE(z_values);              // 9-256 floats
       #else
-        // For disabled Bilinear Grid write an empty 3x3 grid
-        const uint8_t grid_max_x = 3, grid_max_y = 3;
         const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
+      #endif
+
+      const uint8_t grid_max_x = TERN(AUTO_BED_LEVELING_BILINEAR, GRID_MAX_POINTS_X, 3),
+                    grid_max_y = TERN(AUTO_BED_LEVELING_BILINEAR, GRID_MAX_POINTS_Y, 3);
+      EEPROM_WRITE(grid_max_x);
+      EEPROM_WRITE(grid_max_y);
+      EEPROM_WRITE(bilinear_grid_spacing);
+      EEPROM_WRITE(bilinear_start);
+
+      #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+        EEPROM_WRITE(z_values);              // 9-256 floats
+      #else
         dummyf = 0;
-        EEPROM_WRITE(grid_max_x);
-        EEPROM_WRITE(grid_max_y);
-        EEPROM_WRITE(bilinear_grid_spacing);
-        EEPROM_WRITE(bilinear_start);
         for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
@@ -711,16 +700,10 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(planner_leveling_active);
-
-      #if ENABLED(AUTO_BED_LEVELING_UBL)
-        EEPROM_WRITE(planner.leveling_active);
-        EEPROM_WRITE(ubl.storage_slot);
-      #else
-        const bool ubl_active = false;
-        const int8_t storage_slot = -1;
-        EEPROM_WRITE(ubl_active);
-        EEPROM_WRITE(storage_slot);
-      #endif // AUTO_BED_LEVELING_UBL
+      const bool ubl_active = TERN(AUTO_BED_LEVELING_UBL, planner.leveling_active, false);
+      const int8_t storage_slot = TERN(AUTO_BED_LEVELING_UBL, ubl.storage_slot, -1);
+      EEPROM_WRITE(ubl_active);
+      EEPROM_WRITE(storage_slot);
     }
 
     //
@@ -728,7 +711,6 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(servo_angles);
-
       #if !HAS_SERVO_ANGLES
         uint16_t servo_angles[EEPROM_NUM_SERVOS][2] = { { 0, 0 } };
       #endif
@@ -753,11 +735,7 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(bltouch_last_written_mode);
-      #if ENABLED(BLTOUCH)
-        const bool &bltouch_last_written_mode = bltouch.last_written_mode;
-      #else
-        constexpr bool bltouch_last_written_mode = false;
-      #endif
+      const bool bltouch_last_written_mode = TERN(BLTOUCH, bltouch.last_written_mode, false);
       EEPROM_WRITE(bltouch_last_written_mode);
     }
 
@@ -782,23 +760,9 @@ void MarlinSettings::postprocess() {
 
         // Write dual endstops in X, Y, Z order. Unused = 0.0
         dummyf = 0;
-        #if ENABLED(X_DUAL_ENDSTOPS)
-          EEPROM_WRITE(endstops.x2_endstop_adj);   // 1 float
-        #else
-          EEPROM_WRITE(dummyf);
-        #endif
-
-        #if ENABLED(Y_DUAL_ENDSTOPS)
-          EEPROM_WRITE(endstops.y2_endstop_adj);   // 1 float
-        #else
-          EEPROM_WRITE(dummyf);
-        #endif
-
-        #if ENABLED(Z_MULTI_ENDSTOPS)
-          EEPROM_WRITE(endstops.z2_endstop_adj);   // 1 float
-        #else
-          EEPROM_WRITE(dummyf);
-        #endif
+        EEPROM_WRITE(TERN(X_DUAL_ENDSTOPS, endstops.x2_endstop_adj, dummyf));   // 1 float
+        EEPROM_WRITE(TERN(Y_DUAL_ENDSTOPS, endstops.y2_endstop_adj, dummyf));   // 1 float
+        EEPROM_WRITE(TERN(Z_MULTI_ENDSTOPS, endstops.z2_endstop_adj, dummyf));  // 1 float
 
         #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
           EEPROM_WRITE(endstops.z3_endstop_adj);   // 1 float
@@ -865,12 +829,10 @@ void MarlinSettings::postprocess() {
       }
 
       _FIELD_TEST(lpq_len);
-      #if ENABLED(PID_EXTRUSION_SCALING)
-        EEPROM_WRITE(thermalManager.lpq_len);
-      #else
+      #if DISABLED(PID_EXTRUSION_SCALING)
         const int16_t lpq_len = 20;
-        EEPROM_WRITE(lpq_len);
       #endif
+      EEPROM_WRITE(TERN(PID_EXTRUSION_SCALING, thermalManager.lpq_len, lpq_len));
     }
 
     //
@@ -911,8 +873,6 @@ void MarlinSettings::postprocess() {
       const int16_t lcd_contrast =
         #if HAS_LCD_CONTRAST
           ui.contrast
-        #elif defined(DEFAULT_LCD_CONTRAST)
-          DEFAULT_LCD_CONTRAST
         #else
           127
         #endif
@@ -925,14 +885,7 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(recovery_enabled);
-
-      const bool recovery_enabled =
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          recovery.enabled
-        #else
-          PLR_ENABLED_DEFAULT
-        #endif
-      ;
+      const bool recovery_enabled = TERN(POWER_LOSS_RECOVERY, recovery.enabled, ENABLED(PLR_ENABLED_DEFAULT));
       EEPROM_WRITE(recovery_enabled);
     }
 
@@ -941,19 +894,15 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(fwretract_settings);
-
-      #if ENABLED(FWRETRACT)
-        EEPROM_WRITE(fwretract.settings);
-      #else
+      #if DISABLED(FWRETRACT)
         const fwretract_settings_t autoretract_defaults = { 3, 45, 0, 0, 0, 13, 0, 8 };
-        EEPROM_WRITE(autoretract_defaults);
       #endif
-      #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
-        EEPROM_WRITE(fwretract.autoretract_enabled);
-      #else
+      EEPROM_WRITE(TERN(FWRETRACT, fwretract.settings, autoretract_defaults));
+
+      #if DISABLED(FWRETRACT_AUTORETRACT)
         const bool autoretract_enabled = false;
-        EEPROM_WRITE(autoretract_enabled);
       #endif
+      EEPROM_WRITE(TERN(FWRETRACT_AUTORETRACT, fwretract.autoretract_enabled, autoretract_enabled));
     }
 
     //
@@ -1270,12 +1219,10 @@ void MarlinSettings::postprocess() {
 
     _FIELD_TEST(coordinate_system);
 
-    #if ENABLED(CNC_COORDINATE_SYSTEMS)
-      EEPROM_WRITE(gcode.coordinate_system);
-    #else
+    #if DISABLED(CNC_COORDINATE_SYSTEMS)
       const xyz_pos_t coordinate_system[MAX_COORDINATE_SYSTEMS] = { { 0 } };
-      EEPROM_WRITE(coordinate_system);
     #endif
+    EEPROM_WRITE(TERN(CNC_COORDINATE_SYSTEMS, gcode.coordinate_system, coordinate_system));
 
     //
     // Skew correction factors
@@ -1448,11 +1395,7 @@ void MarlinSettings::postprocess() {
           for (uint8_t q = 4; q--;) EEPROM_READ(dummyf);
         #endif
 
-        #if DISABLED(CLASSIC_JERK)
-          EEPROM_READ(planner.junction_deviation_mm);
-        #else
-          EEPROM_READ(dummyf);
-        #endif
+        EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
       }
 
       //
@@ -1504,13 +1447,7 @@ void MarlinSettings::postprocess() {
       //
       // Global Leveling
       //
-      {
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-          EEPROM_READ(new_z_fade_height);
-        #else
-          EEPROM_READ(dummyf);
-        #endif
-      }
+      EEPROM_READ(TERN(ENABLE_LEVELING_FADE_HEIGHT, new_z_fade_height, dummyf));
 
       //
       // Mesh (Manual) Bed Leveling
@@ -1662,21 +1599,10 @@ void MarlinSettings::postprocess() {
 
           _FIELD_TEST(x2_endstop_adj);
 
-          #if ENABLED(X_DUAL_ENDSTOPS)
-            EEPROM_READ(endstops.x2_endstop_adj);  // 1 float
-          #else
-            EEPROM_READ(dummyf);
-          #endif
-          #if ENABLED(Y_DUAL_ENDSTOPS)
-            EEPROM_READ(endstops.y2_endstop_adj);  // 1 float
-          #else
-            EEPROM_READ(dummyf);
-          #endif
-          #if ENABLED(Z_MULTI_ENDSTOPS)
-            EEPROM_READ(endstops.z2_endstop_adj); // 1 float
-          #else
-            EEPROM_READ(dummyf);
-          #endif
+          EEPROM_READ(TERN(X_DUAL_ENDSTOPS, endstops.x2_endstop_adj, dummyf));  // 1 float
+          EEPROM_READ(TERN(Y_DUAL_ENDSTOPS, endstops.y2_endstop_adj, dummyf));  // 1 float
+          EEPROM_READ(TERN(Z_MULTI_ENDSTOPS, endstops.z2_endstop_adj, dummyf)); // 1 float
+
           #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
             EEPROM_READ(endstops.z3_endstop_adj); // 1 float
           #else
@@ -2667,7 +2593,7 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    recovery.enable(PLR_ENABLED_DEFAULT);
+    recovery.enable(ENABLED(PLR_ENABLED_DEFAULT));
   #endif
 
   //
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 2e7a574b39b6..b1c0f3790962 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1208,15 +1208,9 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
 
     #if ENABLED(SPI_ENDSTOPS)
       switch (axis) {
-        #if X_SPI_SENSORLESS
-          case X_AXIS: endstops.tmc_spi_homing.x = true; break;
-        #endif
-        #if Y_SPI_SENSORLESS
-          case Y_AXIS: endstops.tmc_spi_homing.y = true; break;
-        #endif
-        #if Z_SPI_SENSORLESS
-          case Z_AXIS: endstops.tmc_spi_homing.z = true; break;
-        #endif
+        case X_AXIS: if (ENABLED(X_SPI_SENSORLESS)) endstops.tmc_spi_homing.x = true; break;
+        case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = true; break;
+        case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = true; break;
         default: break;
       }
     #endif
@@ -1280,15 +1274,9 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
 
     #if ENABLED(SPI_ENDSTOPS)
       switch (axis) {
-        #if X_SPI_SENSORLESS
-          case X_AXIS: endstops.tmc_spi_homing.x = false; break;
-        #endif
-        #if Y_SPI_SENSORLESS
-          case Y_AXIS: endstops.tmc_spi_homing.y = false; break;
-        #endif
-        #if Z_SPI_SENSORLESS
-          case Z_AXIS: endstops.tmc_spi_homing.z = false; break;
-        #endif
+        case X_AXIS: if (ENABLED(X_SPI_SENSORLESS)) endstops.tmc_spi_homing.x = false; break;
+        case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = false; break;
+        case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = false; break;
         default: break;
       }
     #endif
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 055c6eeecde2..4dfbe629dd11 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -375,11 +375,13 @@ void homeaxis(const AxisEnum axis);
 
   FORCE_INLINE int x_home_dir(const uint8_t extruder) { return extruder ? X2_HOME_DIR : X_HOME_DIR; }
 
-#elif ENABLED(MULTI_NOZZLE_DUPLICATION)
+#else
 
-  enum DualXMode : char {
-    DXC_DUPLICATION_MODE = 2
-  };
+  #if ENABLED(MULTI_NOZZLE_DUPLICATION)
+    enum DualXMode : char { DXC_DUPLICATION_MODE = 2 };
+  #endif
+
+  FORCE_INLINE int x_home_dir(const uint8_t) { return home_dir(X_AXIS); }
 
 #endif
 
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 4632c7c929c2..083867ab48f9 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -177,7 +177,7 @@ class Probe {
       // Retrieve three points to probe the bed. Any type exposing set(X,Y) may be used.
       template <typename T>
       static inline void get_three_points(T points[3]) {
-        #if ENABLED(HAS_FIXED_3POINT)
+        #if HAS_FIXED_3POINT
           points[0].set(PROBE_PT_1_X, PROBE_PT_1_Y);
           points[1].set(PROBE_PT_2_X, PROBE_PT_2_Y);
           points[2].set(PROBE_PT_3_X, PROBE_PT_3_Y);
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index be700401eed4..aee9ae58042c 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -276,11 +276,7 @@ class CardReader {
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
   #define IS_SD_INSERTED() Sd2Card::isInserted()
 #elif PIN_EXISTS(SD_DETECT)
-  #if ENABLED(SD_DETECT_INVERTED)
-    #define IS_SD_INSERTED()  READ(SD_DETECT_PIN)
-  #else
-    #define IS_SD_INSERTED() !READ(SD_DETECT_PIN)
-  #endif
+  #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) != ENABLED(SD_DETECT_INVERTED))
 #else
   // No card detect line? Assume the card is inserted.
   #define IS_SD_INSERTED() true

From 2a71e4f336e66d93983ca15714137085090a73b8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 Mar 2020 23:10:47 -0600
Subject: [PATCH 383/565] Revert that wack backoff

---
 Marlin/src/gcode/calibrate/G28.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 63c74640574f..4603c769673a 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -100,8 +100,6 @@
       #if AXIS_HAS_STALLGUARD(Y2)
         tmc_disable_stallguard(stepperY2, stealth_states.y2);
       #endif
-      do_blocking_move_to_xy(-0.5 * x_axis_home_dir, -0.5 * home_dir(Y_AXIS), fr_mm_s / 2);
-      safe_delay(100);
     #endif
   }
 

From b21edce943f16439162febbcc7571e1a0ed4492b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 8 Mar 2020 14:47:04 -0500
Subject: [PATCH 384/565] More general SD_DETECT_INVERTED override

---
 Marlin/src/inc/Conditionals_post.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 0a7d7aa52d3b..e2c7093bb167 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -294,7 +294,7 @@
 /**
  * Override here because this is set in Configuration_adv.h
  */
-#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && !(defined(ARDUINO_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(ONBOARD))
+#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
   #undef SD_DETECT_INVERTED
 #endif
 

From 57f488738bd1cf3830910758e4332c39ce819b46 Mon Sep 17 00:00:00 2001
From: MangaValk <patrickvalkmanga@hotmail.com>
Date: Sun, 8 Mar 2020 22:13:41 +0100
Subject: [PATCH 385/565] [ToolChanger] Lock the current tool at power-up
 (#17093)

---
 Marlin/src/MarlinCore.cpp         |  6 +++++-
 Marlin/src/module/tool_change.cpp | 13 +++++++++----
 Marlin/src/module/tool_change.h   |  4 ++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 39287d42331a..73a6cfc6b97d 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -165,7 +165,7 @@
   #include "feature/fanmux.h"
 #endif
 
-#if DO_SWITCH_EXTRUDER || ANY(SWITCHING_NOZZLE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+#if DO_SWITCH_EXTRUDER || ANY(SWITCHING_NOZZLE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, ELECTROMAGNETIC_SWITCHING_TOOLHEAD, SWITCHING_TOOLHEAD)
   #include "module/tool_change.h"
 #endif
 
@@ -1110,6 +1110,10 @@ void setup() {
     pe_solenoid_init();
   #endif
 
+  #if ENABLED(SWITCHING_TOOLHEAD)
+    swt_init();
+  #endif
+
   #if ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
     est_init();
   #endif
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 021878c1eaf8..2a8fd42198e2 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -368,11 +368,16 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
 
 #if ENABLED(SWITCHING_TOOLHEAD)
 
+  inline void swt_lock(const bool locked=true) {
+    const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
+    MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, swt_angles[locked ? 0 : 1]);
+  }
+
+  void swt_init() { swt_lock(); }
+
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     if (no_move) return;
 
-    constexpr uint16_t angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
-
     constexpr float toolheadposx[] = SWITCHING_TOOLHEAD_X_POS;
     const float placexpos = toolheadposx[active_extruder],
                 grabxpos = toolheadposx[new_tool];
@@ -406,7 +411,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
 
     planner.synchronize();
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("(2) Unlock and Place Toolhead");
-    MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, angles[1]);
+    swt_lock(false);
     safe_delay(500);
 
     current_position.y = SWITCHING_TOOLHEAD_Y_POS;
@@ -451,7 +456,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
     // Wait for move to finish, pause 0.2s, move servo, pause 0.5s
     planner.synchronize();
     safe_delay(200);
-    MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, angles[0]);
+    swt_lock();
     safe_delay(500);
 
     current_position.y -= SWITCHING_TOOLHEAD_Y_CLEAR;
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 025d2997d1cc..17c173d0527d 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -97,6 +97,10 @@
   void est_init();
 #endif
 
+#if ENABLED(SWITCHING_TOOLHEAD)
+  void swt_init();
+#endif
+
 /**
  * Perform a tool-change, which may result in moving the
  * previous tool out of the way and the new tool into place.

From 982197b162fe8574d19f526695dc7ffe87efda1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 8 Mar 2020 16:31:37 -0500
Subject: [PATCH 386/565] Fixes for Z4 axis, CS pins (#17097)

---
 Marlin/src/inc/SanityCheck.h | 39 ++++++++++++++++++------------------
 Marlin/src/pins/pins.h       | 16 +++++++--------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4c9af7c79017..ab36dd231c70 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2088,6 +2088,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "An SPI driven TMC driver on Z2 requires Z2_CS_PIN."
 #elif INVALID_TMC_SPI(Z3)
   #error "An SPI driven TMC driver on Z3 requires Z3_CS_PIN."
+#elif INVALID_TMC_SPI(Z4)
+  #error "An SPI driven TMC driver on Z4 requires Z4_CS_PIN."
 #elif INVALID_TMC_SPI(E0)
   #error "An SPI driven TMC driver on E0 requires E0_CS_PIN."
 #elif INVALID_TMC_SPI(E1)
@@ -2125,6 +2127,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TMC2208 or TMC2209 on Z2 requires Z2_HARDWARE_SERIAL or Z2_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(Z3)
   #error "TMC2208 or TMC2209 on Z3 requires Z3_HARDWARE_SERIAL or Z3_SERIAL_(RX|TX)_PIN."
+#elif INVALID_TMC_UART(Z4)
+  #error "TMC2208 or TMC2209 on Z4 requires Z4_HARDWARE_SERIAL or Z4_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(E0)
   #error "TMC2208 or TMC2209 on E0 requires E0_HARDWARE_SERIAL or E0_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(E1)
@@ -2162,6 +2166,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   INVALID_TMC_ADDRESS(Z2);
 #elif AXIS_DRIVER_TYPE_Z3(TMC2209)
   INVALID_TMC_ADDRESS(Z3);
+#elif AXIS_DRIVER_TYPE_Z4(TMC2209)
+  INVALID_TMC_ADDRESS(Z4);
 #elif AXIS_DRIVER_TYPE_E0(TMC2209)
   INVALID_TMC_ADDRESS(E0);
 #elif AXIS_DRIVER_TYPE_E1(TMC2209)
@@ -2328,17 +2334,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "STEALTHCHOP requires TMC2130, TMC2160, TMC2208, TMC2209, or TMC5160 stepper drivers."
 #endif
 
+/**
+ * TMC SPI Chaining
+ */
 #define IN_CHAIN(A) ((A##_CHAIN_POS > 0) && !HAS_L64XX)
-// TMC SPI Chaining
-#if IN_CHAIN(X) || IN_CHAIN(Y) || IN_CHAIN(Z) || IN_CHAIN(X2) || IN_CHAIN(Y2) || IN_CHAIN(Z2) || IN_CHAIN(Z3) || IN_CHAIN(E0) || IN_CHAIN(E1) || IN_CHAIN(E2) || IN_CHAIN(E3) || IN_CHAIN(E4) || IN_CHAIN(E5)
-  #if  (IN_CHAIN(X)  && !PIN_EXISTS(X_CS) ) || (IN_CHAIN(Y)  && !PIN_EXISTS(Y_CS) ) \
-    || (IN_CHAIN(Z)  && !PIN_EXISTS(Z_CS) ) || (IN_CHAIN(X2) && !PIN_EXISTS(X2_CS)) \
-    || (IN_CHAIN(Y2) && !PIN_EXISTS(Y2_CS)) || (IN_CHAIN(Z2) && !PIN_EXISTS(Z2_CS)) \
-    || (IN_CHAIN(Z3) && !PIN_EXISTS(Z3_CS)) || (IN_CHAIN(E0) && !PIN_EXISTS(E0_CS)) \
-    || (IN_CHAIN(E1) && !PIN_EXISTS(E1_CS)) || (IN_CHAIN(E2) && !PIN_EXISTS(E2_CS)) \
-    || (IN_CHAIN(E3) && !PIN_EXISTS(E3_CS)) || (IN_CHAIN(E4) && !PIN_EXISTS(E4_CS)) \
-    || (IN_CHAIN(E5) && !PIN_EXISTS(E5_CS)) || (IN_CHAIN(E6) && !PIN_EXISTS(E6_CS)) \
-    || (IN_CHAIN(E7) && !PIN_EXISTS(E7_CS))
+#if  IN_CHAIN(X ) || IN_CHAIN(Y ) || IN_CHAIN(Z ) || IN_CHAIN(X2) || IN_CHAIN(Y2) || IN_CHAIN(Z2) || IN_CHAIN(Z3) || IN_CHAIN(Z4) \
+  || IN_CHAIN(E0) || IN_CHAIN(E1) || IN_CHAIN(E2) || IN_CHAIN(E3) || IN_CHAIN(E4) || IN_CHAIN(E5) || IN_CHAIN(E6) || IN_CHAIN(E7)
+  #define BAD_CHAIN(A) (IN_CHAIN(A) && !PIN_EXISTS(A##_CS))
+  #if  BAD_CHAIN(X ) || BAD_CHAIN(Y ) || BAD_CHAIN(Z ) || BAD_CHAIN(X2) || BAD_CHAIN(Y2) || BAD_CHAIN(Z2) || BAD_CHAIN(Z3) || BAD_CHAIN(Z4) \
+    || BAD_CHAIN(E0) || BAD_CHAIN(E1) || BAD_CHAIN(E2) || BAD_CHAIN(E3) || BAD_CHAIN(E4) || BAD_CHAIN(E5) || BAD_CHAIN(E6) || BAD_CHAIN(E7)
     #error "All chained TMC drivers need a CS pin."
   #else
     #if IN_CHAIN(X)
@@ -2372,18 +2376,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #elif IN_CHAIN(E7)
       #define CS_COMPARE E7_CS_PIN
     #endif
-    #if  (IN_CHAIN(X)  && X_CS_PIN  != CS_COMPARE) || (IN_CHAIN(Y)  && Y_CS_PIN  != CS_COMPARE) \
-      || (IN_CHAIN(Z)  && Z_CS_PIN  != CS_COMPARE) || (IN_CHAIN(X2) && X2_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(Y2) && Y2_CS_PIN != CS_COMPARE) || (IN_CHAIN(Z2) && Z2_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(Z3) && Z3_CS_PIN != CS_COMPARE) || (IN_CHAIN(E0) && E0_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E1) && E1_CS_PIN != CS_COMPARE) || (IN_CHAIN(E2) && E2_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E3) && E3_CS_PIN != CS_COMPARE) || (IN_CHAIN(E4) && E4_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E5) && E5_CS_PIN != CS_COMPARE) || (IN_CHAIN(E6) && E6_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E7) && E7_CS_PIN != CS_COMPARE)
+    #define BAD_CS_PIN(A) (IN_CHAIN(A) && A##_CS_PIN != CS_COMPARE)
+    #if  BAD_CS_PIN(X ) || BAD_CS_PIN(Y ) || BAD_CS_PIN(Z ) || BAD_CS_PIN(X2) || BAD_CS_PIN(Y2) || BAD_CS_PIN(Z2) || BAD_CS_PIN(Z3) || BAD_CS_PIN(Z4) \
+      || BAD_CS_PIN(E0) || BAD_CS_PIN(E1) || BAD_CS_PIN(E2) || BAD_CS_PIN(E3) || BAD_CS_PIN(E4) || BAD_CS_PIN(E5) || BAD_CS_PIN(E6) || BAD_CS_PIN(E7)
       #error "All chained TMC drivers must use the same CS pin."
     #endif
+    #undef BAD_CS_PIN
+    #undef CS_COMPARE
   #endif
-  #undef CS_COMPARE
+  #undef BAD_CHAIN
 #endif
 #undef IN_CHAIN
 
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a3b14e22aaad..64b9e85ba8de 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -874,28 +874,28 @@
 #if !AXIS_HAS_SPI(Z)
   #undef Z_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E0)
+#if E_STEPPERS && !AXIS_HAS_SPI(E0)
   #undef E0_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E1)
+#if E_STEPPERS > 1 && !AXIS_HAS_SPI(E1)
   #undef E1_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E2)
+#if E_STEPPERS > 2 && !AXIS_HAS_SPI(E2)
   #undef E2_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E3)
+#if E_STEPPERS > 3 && !AXIS_HAS_SPI(E3)
   #undef E3_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E4)
+#if E_STEPPERS > 4 && !AXIS_HAS_SPI(E4)
   #undef E4_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E5)
+#if E_STEPPERS > 5 && !AXIS_HAS_SPI(E5)
   #undef E5_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E6)
+#if E_STEPPERS > 6 && !AXIS_HAS_SPI(E6)
   #undef E6_CS_PIN
 #endif
-#if !AXIS_HAS_SPI(E7)
+#if E_STEPPERS > 7 && !AXIS_HAS_SPI(E7)
   #undef E7_CS_PIN
 #endif
 

From 7f490c08da41c53a79c771259612c4be221b584a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 9 Mar 2020 00:04:03 +0000
Subject: [PATCH 387/565] [cron] Bump distribution date (2020-03-09)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 639f5d7fe626..6a4495b44475 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-08"
+  #define STRING_DISTRIBUTION_DATE "2020-03-09"
 #endif
 
 /**

From 1d944a75aacf5720b0314ba152b34439aa880e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 9 Mar 2020 13:43:14 +0500
Subject: [PATCH 388/565] fix #37

---
 Marlin/Configuration_adv.h            |   2 +-
 Marlin/src/lcd/dogm/dogm_Bootscreen.h | 534 +++++++++++++-------------
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp |  12 +-
 3 files changed, 279 insertions(+), 269 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a9ff33a87a96..8edc3855d9fa 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -970,7 +970,7 @@
       #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
       #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
       #define LED_USER_PRESET_WHITE        0  // User defined WHITE value
-      #define LED_USER_PRESET_BRIGHTNESS  32  // User defined intensity - very low, you my use EEPROM to improve it
+      #define LED_USER_PRESET_BRIGHTNESS  64  // User defined intensity - very low, you my use EEPROM to improve it
       #define LED_USER_PRESET_STARTUP         // Have the printer display the user preset color on startup
     #endif
   #endif
diff --git a/Marlin/src/lcd/dogm/dogm_Bootscreen.h b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
index f4bf5f5f692b..61b3843e9d4b 100644
--- a/Marlin/src/lcd/dogm/dogm_Bootscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
@@ -210,292 +210,292 @@
   #define START_BMPWIDTH      112
 
   const unsigned char start_bmp[] PROGMEM = {
-    B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-    B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-    B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-    B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-    B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-    B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-    B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-    B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00111111,B11111111,
-    B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00011000,B00000000,B00011111,B11111111,
-    B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00001111,B11111111,
-    B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000111,B11111111,
-    B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000011,B11111111,
-    B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000001,B11111111,
-    B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,B11111111,
-    B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000011,B11100000,B01111000,B00111100,B00000011,B11110000,B01111111,
-    B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00001111,B11111000,B01111000,B00111100,B00000111,B11111100,B00111111,
-    B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00011111,B11111100,B01111000,B00111100,B00001111,B11111110,B00011111,
-    B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00111111,B11111110,B01111000,B00111100,B00011111,B11111110,B00001111,
-    B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00111111,B00111110,B01111000,B00111100,B00111111,B00111111,B00000111,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B01111100,B00011111,B01111000,B00111100,B00111110,B00011111,B00000111,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B01111100,B00001111,B01111000,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B01111000,B00001111,B01111000,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B01111000,B00000000,B01111100,B00111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B11111000,B00000000,B01111111,B10111100,B00111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B11111000,B00000000,B00111111,B10111111,B11111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B11111000,B00000000,B00011111,B10111111,B11111100,B00001111,B00000011,
-    B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B11111000,B00000000,B00001111,B10111111,B11111100,B00001111,B00000011,
-    B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-    B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-    B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-    B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-    B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-    B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-    B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+    B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+    B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+    B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11111111,B11000000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11100000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11100000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11100000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11100000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11111111,B11000000,
+    B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000000,B01111111,B00000000,
+    B00011111,B11111111,B11110001,B11111111,B11100000,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000000,B00000000,B00000000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11100000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11100001,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11111111,B11111111,B00000000,B11111111,B11110000,B00000001,B11111111,B11111111,B11000000,B00000001,B11111111,B11100000,
+    B00000011,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000001,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000000,B11111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000000,B01111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000000,B00111111,B11111111,B11110000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000000,B00001111,B11111111,B11100000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+    B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+    B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+    B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
   };
 
   #if ENABLED(BOOT_MARLIN_LOGO_ANIMATED)
 
     const unsigned char start_bmp1[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11000001,B11000000,
+      B00010000,B00000000,B00010001,B00000000,B00100010,B00000000,B00010001,B00000000,B00000000,B00000000,B00000000,B01000011,B00000000,B01100000,
+      B00010000,B00000000,B00010001,B00000000,B00100010,B00000000,B00010001,B00000000,B00000000,B00000000,B00000000,B01000010,B00000000,B00100000,
+      B00010000,B00000000,B00010001,B00000000,B00100010,B00000000,B00010001,B00000000,B00000000,B00000000,B00000000,B01000010,B00000000,B00100000,
+      B00010000,B00000000,B00010001,B00000000,B00100010,B00000000,B00010001,B00000000,B00000000,B00000000,B00000000,B01000011,B00000000,B01100000,
+      B00010000,B00000000,B00010001,B00000000,B00100010,B00000000,B00010001,B00000000,B00000000,B00000000,B00000000,B01000001,B11000001,B11000000,
+      B00010000,B00000000,B00010001,B00000000,B00100011,B10000000,B00010001,B00000000,B00000000,B00000000,B00000000,B01000000,B01111111,B00000000,
+      B00011100,B00000000,B01110001,B10000001,B11100000,B10000000,B00010001,B00001111,B11100000,B00000011,B11111000,B01000000,B00000000,B00000000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010001,B00001000,B00100000,B00000010,B00001000,B01000000,B00000000,B00000000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010001,B00001000,B00100000,B00000010,B00001000,B01000111,B11111111,B11100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010001,B00001000,B00100000,B00000010,B00001000,B01000100,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010001,B00001000,B00100000,B00000010,B00001000,B01000100,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010001,B11111000,B00100000,B00000010,B00001111,B11000100,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000100,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000100,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000111,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000100,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000110,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000010,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000010,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000010,B00000000,B01000000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000010,B00000000,B01100000,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000010,B00000000,B00100001,B10000001,B00000000,B10000000,B00010000,B00000000,B00100000,B00000010,B00000000,B00000001,B00000000,B00100000,
+      B00000010,B00000000,B00111111,B00000011,B00000000,B10000000,B00010000,B00000001,B11100000,B00000011,B11000000,B00000001,B00000000,B00100000,
+      B00000011,B00000000,B00000000,B00000010,B00000011,B10000000,B00011100,B00000001,B00000000,B00000000,B01000000,B00000111,B00000000,B00111000,
+      B00000001,B10000000,B00000000,B00000110,B00000010,B00000000,B00000100,B00000001,B00000000,B00000000,B01000000,B00000100,B00000000,B00001000,
+      B00000000,B11000000,B00000000,B00000100,B00000010,B00000000,B00000100,B00000001,B00000000,B00000000,B01000000,B00000100,B00000000,B00001000,
+      B00000000,B01100000,B00000000,B00011100,B00000010,B00000000,B00000100,B00000001,B00000000,B00000000,B01000000,B00000100,B00000000,B00001000,
+      B00000000,B00111000,B00000000,B00110000,B00000010,B00000000,B00000100,B00000001,B00000000,B00000000,B01000000,B00000100,B00000000,B00001000,
+      B00000000,B00001111,B00000001,B11100000,B00000010,B00000000,B00000100,B00000001,B00000000,B00000000,B01000000,B00000100,B00000000,B00001000,
+      B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
     };
 
     const unsigned char start_bmp2[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,
-      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,
-      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,
-      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,
-      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,
-      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11010001,B11000000,
+      B00011000,B00101000,B00110001,B00101000,B00100010,B00101000,B00110001,B00101000,B00101000,B00101000,B00101000,B01000011,B00101000,B01100000,
+      B00010100,B01000100,B01010001,B01000100,B01100010,B01000100,B01010001,B01000100,B01000100,B01000100,B01000100,B01000010,B01000100,B01100000,
+      B00010010,B10000010,B10010001,B10000010,B10100010,B10000010,B10010001,B10000010,B10000010,B10000010,B10000010,B11000010,B10000010,B10100000,
+      B00010001,B00000001,B00010001,B00000001,B00100011,B00000001,B00010001,B00000001,B00000001,B00000001,B00000001,B01000011,B00000001,B01100000,
+      B00010010,B10000010,B10010001,B10000010,B10100010,B10000010,B10010001,B10000010,B10000010,B10000010,B10000010,B11000001,B11000011,B11000000,
+      B00010100,B01000100,B01010001,B01000100,B01100011,B11000100,B01010001,B01000100,B01000100,B01000100,B01000100,B01000000,B01111111,B00000000,
+      B00011100,B00101000,B01110001,B10101001,B11100000,B10101000,B00110001,B00101111,B11101000,B00101011,B11111000,B01000000,B00000000,B00000000,
+      B00000100,B00010000,B01000000,B10010001,B00000000,B10010000,B00010001,B00011000,B00110000,B00010010,B00001000,B01000000,B00000000,B00000000,
+      B00000100,B00101000,B01000000,B10101001,B00000000,B10101000,B00110001,B00101000,B00101000,B00101010,B00001000,B01000111,B11111111,B11100000,
+      B00000100,B01000100,B01000000,B11000101,B00000000,B11000100,B01010001,B01001000,B00100100,B01000110,B00001100,B01000100,B01000100,B01100000,
+      B00000110,B10000010,B11000000,B10000011,B00000000,B10000010,B10010001,B10001000,B00100010,B10000010,B00001010,B11000110,B10000010,B10100000,
+      B00000101,B00000001,B01000000,B10000001,B00000000,B10000001,B00010001,B11111000,B00100001,B00000010,B00001111,B11000101,B00000001,B00100000,
+      B00000110,B10000010,B11000000,B10000011,B00000000,B10000010,B10010000,B00000000,B00100010,B10000010,B00000000,B00000110,B10000010,B10100000,
+      B00000100,B01000100,B01000000,B11000101,B00000000,B11000100,B01010000,B00000000,B00100100,B01000110,B00000000,B00000100,B01000100,B01100000,
+      B00000100,B00101000,B01000000,B10101001,B00000000,B10101000,B00110000,B00000000,B00101000,B00101010,B00000000,B00000111,B00101000,B00100000,
+      B00000100,B00010000,B01000000,B10010001,B00000000,B10010000,B00010000,B00000000,B00110000,B00010010,B00000000,B00000001,B00010000,B00100000,
+      B00000100,B00101000,B01000000,B10101001,B00000000,B10101000,B00110000,B00000000,B00101000,B00101010,B00000000,B00000001,B00101000,B00100000,
+      B00000110,B01000100,B01000000,B11000101,B00000000,B11000100,B01010000,B00000000,B00100100,B01000110,B00000000,B00000001,B01000100,B01100000,
+      B00000010,B10000010,B11000000,B10000011,B00000000,B10000010,B10010000,B00000000,B00100010,B10000010,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B00000001,B01000000,B10000001,B00000000,B10000001,B00010000,B00000000,B00100001,B00000010,B00000000,B00000001,B00000001,B00100000,
+      B00000010,B10000010,B11000000,B10000011,B00000000,B10000010,B10010000,B00000000,B00100010,B10000010,B00000000,B00000001,B10000010,B10100000,
+      B00000010,B01000100,B01100000,B11000101,B00000000,B11000100,B01010000,B00000000,B00100100,B01000110,B00000000,B00000001,B01000100,B01100000,
+      B00000010,B00101000,B00100001,B10101001,B00000000,B10101000,B00110000,B00000000,B00101000,B00101010,B00000000,B00000001,B00101000,B00100000,
+      B00000010,B00010000,B00111111,B00010011,B00000000,B10010000,B00010000,B00000001,B11110000,B00010011,B11000000,B00000001,B00010000,B00100000,
+      B00000011,B00101000,B00101000,B00101010,B00000011,B10101000,B00111100,B00000001,B00101000,B00101000,B01000000,B00000111,B00101000,B00111000,
+      B00000001,B11000100,B01000100,B01000110,B00000010,B01000100,B01000100,B00000001,B01000100,B01000100,B01000000,B00000100,B01000100,B01001000,
+      B00000000,B11000010,B10000010,B10000100,B00000010,B10000010,B10000100,B00000001,B10000010,B10000010,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B01100001,B00000001,B00011100,B00000011,B00000001,B00000100,B00000001,B00000001,B00000001,B01000000,B00000101,B00000001,B00001000,
+      B00000000,B00111010,B10000010,B10110000,B00000010,B10000010,B10000100,B00000001,B10000010,B10000010,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B00001111,B01000101,B11100000,B00000010,B01000100,B01000100,B00000001,B01000100,B01000100,B01000000,B00000100,B01000100,B01001000,
+      B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
     };
 
     const unsigned char start_bmp3[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,
-      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,
-      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,
-      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,
-      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,
-      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11010001,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100010,B00101000,B00110001,B00101000,B00101000,B00101000,B00101000,B01000011,B00101000,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100010,B01000100,B01010001,B01000100,B01000100,B01000100,B01000100,B01000010,B01000100,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100010,B10000010,B10010001,B10000010,B10000010,B10000010,B10000010,B11000010,B10000010,B10100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B00000001,B00010001,B00000001,B00000001,B00000001,B00000001,B01000011,B00000001,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100010,B10000010,B10010001,B10000010,B10000010,B10000010,B10000010,B11000001,B11000011,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11000100,B01010001,B01000100,B01000100,B01000100,B01000100,B01000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100000,B10101000,B00110001,B00101111,B11101000,B00101011,B11111000,B01000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10010000,B00010001,B00011000,B00110000,B00010010,B00001000,B01000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10101000,B00110001,B00101000,B00101000,B00101010,B00001000,B01000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11000100,B01010001,B01001000,B00100100,B01000110,B00001100,B01000100,B01000100,B01100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10000010,B10010001,B10001000,B00100010,B10000010,B00001010,B11000110,B10000010,B10100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10000001,B00010001,B11111000,B00100001,B00000010,B00001111,B11000101,B00000001,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10000010,B10010000,B00000000,B00100010,B10000010,B00000000,B00000110,B10000010,B10100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11000100,B01010000,B00000000,B00100100,B01000110,B00000000,B00000100,B01000100,B01100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10101000,B00110000,B00000000,B00101000,B00101010,B00000000,B00000111,B00101000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10010000,B00010000,B00000000,B00110000,B00010010,B00000000,B00000001,B00010000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B10101000,B00110000,B00000000,B00101000,B00101010,B00000000,B00000001,B00101000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11000100,B01010000,B00000000,B00100100,B01000110,B00000000,B00000001,B01000100,B01100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B10000010,B10010000,B00000000,B00100010,B10000010,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B10000001,B00010000,B00000000,B00100001,B00000010,B00000000,B00000001,B00000001,B00100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B10000010,B10010000,B00000000,B00100010,B10000010,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B11111111,B11100000,B11111111,B00000000,B11000100,B01010000,B00000000,B00100100,B01000110,B00000000,B00000001,B01000100,B01100000,
+      B00000011,B11111111,B11100001,B11111111,B00000000,B10101000,B00110000,B00000000,B00101000,B00101010,B00000000,B00000001,B00101000,B00100000,
+      B00000011,B11111111,B11111111,B11111111,B00000000,B10010000,B00010000,B00000001,B11110000,B00010011,B11000000,B00000001,B00010000,B00100000,
+      B00000011,B11111111,B11111111,B11111110,B00000011,B10101000,B00111100,B00000001,B00101000,B00101000,B01000000,B00000111,B00101000,B00111000,
+      B00000001,B11111111,B11111111,B11111110,B00000010,B01000100,B01000100,B00000001,B01000100,B01000100,B01000000,B00000100,B01000100,B01001000,
+      B00000000,B11111111,B11111111,B11111100,B00000010,B10000010,B10000100,B00000001,B10000010,B10000010,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B01111111,B11111111,B11111100,B00000011,B00000001,B00000100,B00000001,B00000001,B00000001,B01000000,B00000101,B00000001,B00001000,
+      B00000000,B00111111,B11111111,B11110000,B00000010,B10000010,B10000100,B00000001,B10000010,B10000010,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B00001111,B11111111,B11100000,B00000010,B01000100,B01000100,B00000001,B01000100,B01000100,B01000000,B00000100,B01000100,B01001000,
+      B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
     };
 
     const unsigned char start_bmp4[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,
-      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,
-      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,
-      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,
-      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,
-      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B01111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00001111,B11111000,B00000000,B00000000,B00000000,B00000000,B00111111,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00011111,B11111100,B00000000,B00000000,B00000000,B00000000,B00011111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00001111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00111111,B00111110,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B01111100,B00011111,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B01111100,B00001111,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B01111000,B00001111,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B01111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B01111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11010001,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B00101000,B00101000,B00101000,B00101000,B01000011,B00101000,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B01000100,B01000100,B01000100,B01000100,B01000010,B01000100,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B10000010,B10000010,B10000010,B10000010,B11000010,B10000010,B10100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B00000001,B00000001,B00000001,B00000001,B01000011,B00000001,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B10000010,B10000010,B10000010,B10000010,B11000001,B11000011,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B01000100,B01000100,B01000100,B01000100,B01000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100000,B11111111,B11110001,B00101111,B11101000,B00101011,B11111000,B01000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B00011000,B00110000,B00010010,B00001000,B01000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B00101000,B00101000,B00101010,B00001000,B01000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B01001000,B00100100,B01000110,B00001100,B01000100,B01000100,B01100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B10001000,B00100010,B10000010,B00001010,B11000110,B10000010,B10100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00100001,B00000010,B00001111,B11000101,B00000001,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100010,B10000010,B00000000,B00000110,B10000010,B10100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100100,B01000110,B00000000,B00000100,B01000100,B01100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00101000,B00101010,B00000000,B00000111,B00101000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00110000,B00010010,B00000000,B00000001,B00010000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00101000,B00101010,B00000000,B00000001,B00101000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100100,B01000110,B00000000,B00000001,B01000100,B01100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100010,B10000010,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100001,B00000010,B00000000,B00000001,B00000001,B00100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100010,B10000010,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B11111111,B11100000,B11111111,B00000000,B11111111,B11110000,B00000000,B00100100,B01000110,B00000000,B00000001,B01000100,B01100000,
+      B00000011,B11111111,B11100001,B11111111,B00000000,B11111111,B11110000,B00000000,B00101000,B00101010,B00000000,B00000001,B00101000,B00100000,
+      B00000011,B11111111,B11111111,B11111111,B00000000,B11111111,B11110000,B00000001,B11110000,B00010011,B11000000,B00000001,B00010000,B00100000,
+      B00000011,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B00101000,B00101000,B01000000,B00000111,B00101000,B00111000,
+      B00000001,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B01000100,B01000100,B01000000,B00000100,B01000100,B01001000,
+      B00000000,B11111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B10000010,B10000010,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B01111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B00000001,B00000001,B01000000,B00000101,B00000001,B00001000,
+      B00000000,B00111111,B11111111,B11110000,B00000011,B11111111,B11111100,B00000001,B10000010,B10000010,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B00001111,B11111111,B11100000,B00000011,B11111111,B11111100,B00000001,B01000100,B01000100,B01000000,B00000100,B01000100,B01001000,
+      B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
     };
 
     const unsigned char start_bmp5[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00011111,B11111111,
-      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00001111,B11111111,
-      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000111,B11111111,
-      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000011,B11111111,
-      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000001,B11111111,
-      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,B11111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000011,B11100000,B01111000,B00000000,B00000000,B00000000,B01111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00001111,B11111000,B01111000,B00000000,B00000000,B00000000,B00111111,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00011111,B11111100,B01111000,B00000000,B00000000,B00000000,B00011111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00111111,B11111110,B01111000,B00000000,B00000000,B00000000,B00001111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00111111,B00111110,B01111000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B01111100,B00011111,B01111000,B00000000,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B01111100,B00001111,B01111000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B01111000,B00001111,B01111000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B01111000,B00000000,B01111000,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B01111000,B00000000,B01111100,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B11111000,B00000000,B01111111,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B11111000,B00000000,B00111111,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B11111000,B00000000,B00011111,B00000000,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B11111000,B00000000,B00001111,B00000000,B00000000,B00000000,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11010001,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B00101000,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000010,B01000100,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000010,B10000010,B10100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B00000001,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11000011,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100000,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000100,B01000100,B01100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000110,B10000010,B10100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000101,B00000001,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000110,B10000010,B10100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000100,B01000100,B01100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B00101000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B00010000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B00101000,B00100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B01000100,B01100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B00000001,B00100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B10000010,B10100000,
+      B00000011,B11111111,B11100000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B01000100,B01100000,
+      B00000011,B11111111,B11100001,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B00101000,B00100000,
+      B00000011,B11111111,B11111111,B11111111,B00000000,B11111111,B11110000,B00000001,B11111111,B11111111,B11000000,B00000001,B00010000,B00100000,
+      B00000011,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B00101000,B00111000,
+      B00000001,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000100,B01000100,B01001000,
+      B00000000,B11111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B01111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000101,B00000001,B00001000,
+      B00000000,B00111111,B11111111,B11110000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000110,B10000010,B10001000,
+      B00000000,B00001111,B11111111,B11100000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000100,B01000100,B01001000,
+      B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
     };
 
     const unsigned char start_bmp6[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00011000,B00000000,B00011111,B11111111,
-      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00001111,B11111111,
-      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000111,B11111111,
-      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000011,B11111111,
-      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000001,B11111111,
-      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,B11111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000011,B11100000,B01111000,B00111100,B00000000,B00000000,B01111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00001111,B11111000,B01111000,B00111100,B00000000,B00000000,B00111111,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00011111,B11111100,B01111000,B00111100,B00000000,B00000000,B00011111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00111111,B11111110,B01111000,B00111100,B00000000,B00000000,B00001111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00111111,B00111110,B01111000,B00111100,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B01111100,B00011111,B01111000,B00111100,B00000000,B00000000,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B01111100,B00001111,B01111000,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B01111000,B00001111,B01111000,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B01111000,B00000000,B01111100,B00111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B11111000,B00000000,B01111111,B10111100,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B11111000,B00000000,B00111111,B10111111,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B11111000,B00000000,B00011111,B10111111,B00000000,B00000000,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B11111000,B00000000,B00001111,B10111111,B00000000,B00000000,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11010001,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B00101000,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000010,B01000100,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000010,B10000010,B10100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000011,B00000001,B01100000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000001,B11000011,B11000000,
+      B00011111,B11111111,B11110001,B11111111,B11100011,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000000,B01111111,B00000000,
+      B00011111,B11111111,B11110001,B11111111,B11100000,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000000,B00000000,B00000000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110001,B11111000,B00111111,B11111110,B00001111,B11000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000111,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000111,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11000000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11100000,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11100001,B11111111,B00000000,B11111111,B11110000,B00000000,B00111111,B11111110,B00000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11111111,B11111111,B00000000,B11111111,B11110000,B00000001,B11111111,B11111111,B11000000,B00000001,B11111111,B11100000,
+      B00000011,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000001,B11111111,B11111111,B11111110,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B11111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B01111111,B11111111,B11111100,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00111111,B11111111,B11110000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00001111,B11111111,B11100000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000001,B11111111,B00000000,B00000011,B11111111,B11111100,B00000001,B11111111,B11111111,B11000000,B00000111,B11111111,B11111000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+      B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
     };
 
   #endif
@@ -504,7 +504,7 @@
 
 #if ENABLED(BOOT_MARLIN_LOGO_ANIMATED)
   #ifndef MARLIN_BOOTSCREEN_FRAME_TIME
-    #define MARLIN_BOOTSCREEN_FRAME_TIME 100 // (ms)
+    #define MARLIN_BOOTSCREEN_FRAME_TIME 200 // (ms)
   #endif
   const unsigned char * const marlin_bootscreen_animation[] PROGMEM = {
     start_bmp1, start_bmp2, start_bmp3, start_bmp4, start_bmp5, start_bmp6, start_bmp
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 4bfa3c71b38e..ffc3199b981c 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -63,6 +63,10 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
+#if ENABLED(NEOPIXEL_LED)
+  #include "../../feature/leds/neopixel.h"
+#endif
+
 /**
  * Include all needed font files
  * (See http://marlinfw.org/docs/development/fonts.html)
@@ -212,6 +216,10 @@ bool MarlinUI::detected() { return true; }
       constexpr millis_t d = MARLIN_BOOTSCREEN_FRAME_TIME;
       LOOP_L_N(f, COUNT(marlin_bootscreen_animation)) {
         draw_bootscreen_bmp((uint8_t*)pgm_read_ptr(&marlin_bootscreen_animation[f]));
+#if ENABLED(NEOPIXEL_LED)
+        neo.set_brightness(LED_USER_PRESET_BRIGHTNESS + (f + 1) * (255 - LED_USER_PRESET_BRIGHTNESS) / COUNT(marlin_bootscreen_animation) );
+        neo.show();
+#endif
         if (d) safe_delay(d);
       }
     #endif
@@ -220,13 +228,15 @@ bool MarlinUI::detected() { return true; }
   // Show the Marlin bootscreen, with the u8g loop and delays
   void MarlinUI::show_marlin_bootscreen() {
     #ifndef BOOTSCREEN_TIMEOUT
-      #define BOOTSCREEN_TIMEOUT 2500
+      #define BOOTSCREEN_TIMEOUT 1500
     #endif
     constexpr uint8_t pages = two_part ? 2 : 1;
     for (uint8_t q = pages; q--;) {
       draw_marlin_bootscreen(q == 0);
       safe_delay((BOOTSCREEN_TIMEOUT) / pages);
     }
+    //clear screen to avoid flicker
+    u8g.firstPage(); do {} while(u8g.nextPage());
   }
 
   void MarlinUI::show_bootscreen() {

From b579f5dc998b07c731e44041a0602fea39e15981 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 Mar 2020 22:34:33 -0600
Subject: [PATCH 389/565] Move 'last_pause_state' closer to usage

---
 Marlin/src/module/temperature.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 75f25f7f7e24..c6caa0a2c997 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1030,10 +1030,6 @@ void Temperature::manage_heater() {
     if (!inited) return watchdog_refresh();
   #endif
 
-  #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
-    static bool last_pause_state;
-  #endif
-
   #if ENABLED(EMERGENCY_PARSER)
     if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
   #endif
@@ -1125,16 +1121,21 @@ void Temperature::manage_heater() {
       }
     #endif // WATCH_BED
 
+    #define PAUSE_CHANGE_REQD BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+    #if PAUSE_CHANGE_REQD
+      static bool last_pause_state;
+    #endif
+
     do {
 
       #if DISABLED(PIDTEMPBED)
         if (PENDING(ms, next_bed_check_ms)
-          #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+          #if PAUSE_CHANGE_REQD
             && paused == last_pause_state
           #endif
         ) break;
         next_bed_check_ms = ms + BED_CHECK_INTERVAL;
-        #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+        #if PAUSE_CHANGE_REQD
           last_pause_state = paused;
         #endif
       #endif

From 7674befa471485423a659f92134d78439fdeeee6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 Mar 2020 15:02:40 -0500
Subject: [PATCH 390/565] DOGM SPI delay is less common

---
 Marlin/Configuration_adv.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 856a7f028d4d..f70e4cead213 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1227,10 +1227,6 @@
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_SMALL_INFOFONT
 
-  // Enable this option and reduce the value to optimize screen updates.
-  // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
-  //#define DOGM_SPI_DELAY_US 5
-
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
@@ -1247,6 +1243,10 @@
    * This will prevent position updates from being displayed.
    */
   #if ENABLED(U8GLIB_ST7920)
+    // Enable this option and reduce the value to optimize screen updates.
+    // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
+    //#define DOGM_SPI_DELAY_US 5
+
     //#define LIGHTWEIGHT_UI
     #if ENABLED(LIGHTWEIGHT_UI)
       #define STATUS_EXPIRE_SECONDS 20

From 0f39386d9b7458ac10e3186521d398a4cb88f988 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 Mar 2020 15:03:57 -0500
Subject: [PATCH 391/565] Make BOOTSCREEN_TIMEOUT generally available

---
 Marlin/Configuration_adv.h            | 5 ++++-
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp | 3 ---
 Marlin/src/lcd/ultralcd.h             | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f70e4cead213..e38c13cf013b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -992,6 +992,10 @@
 // Show the E position (filament used) during printing
 //#define LCD_SHOW_E_TOTAL
 
+#if ENABLED(SHOW_BOOTSCREEN)
+  #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
+#endif
+
 #if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
@@ -1292,7 +1296,6 @@
   //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
 
   #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
-  #define BOOTSCREEN_TIMEOUT      3000    // (ms) Duration to display the boot screen
 
   #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
     #define DGUS_PRINT_FILENAME           // Display the filename during printing
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 4bfa3c71b38e..3d777f6da1e0 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -219,9 +219,6 @@ bool MarlinUI::detected() { return true; }
 
   // Show the Marlin bootscreen, with the u8g loop and delays
   void MarlinUI::show_marlin_bootscreen() {
-    #ifndef BOOTSCREEN_TIMEOUT
-      #define BOOTSCREEN_TIMEOUT 2500
-    #endif
     constexpr uint8_t pages = two_part ? 2 : 1;
     for (uint8_t q = pages; q--;) {
       draw_marlin_bootscreen(q == 0);
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index a16103ba412f..1bcf9956feee 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -345,6 +345,9 @@ class MarlinUI {
       #endif
 
       #if ENABLED(SHOW_BOOTSCREEN)
+        #ifndef BOOTSCREEN_TIMEOUT
+          #define BOOTSCREEN_TIMEOUT 2500
+        #endif
         static void draw_marlin_bootscreen(const bool line2=false);
         static void show_marlin_bootscreen();
         static void show_bootscreen();

From 13118dbd8d9142d7698ca113cb05d1feae3b1bd3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 8 Mar 2020 19:42:18 -0500
Subject: [PATCH 392/565] Additional numtostr functions

---
 Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp | 16 +++----
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp  | 12 ++---
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp       |  4 +-
 Marlin/src/lcd/menu/menu.cpp                | 22 ++++-----
 Marlin/src/lcd/menu/menu.h                  | 48 +++++++++++---------
 Marlin/src/libs/numtostr.cpp                | 50 ++++++++++++++++-----
 Marlin/src/libs/numtostr.h                  | 26 ++++++-----
 7 files changed, 105 insertions(+), 73 deletions(-)

diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index d79a7ccf61e3..a032450add74 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -530,7 +530,7 @@ FORCE_INLINE void _draw_heater_status(const heater_ind_t heater, const char pref
 
   if (prefix >= 0) lcd_put_wchar(prefix);
 
-  lcd_put_u8str(i16tostr3(t1 + 0.5));
+  lcd_put_u8str(i16tostr3rj(t1 + 0.5));
   lcd_put_wchar('/');
 
   #if !HEATER_IDLE_HANDLER
@@ -582,7 +582,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
       #endif
     ));
     if (progress)
-      lcd_put_u8str(ui8tostr3(progress));
+      lcd_put_u8str(ui8tostr3rj(progress));
     else
       lcd_put_u8str_P(PSTR("---"));
     lcd_put_wchar('%');
@@ -631,7 +631,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str_P(PSTR("Dia "));
       lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
       lcd_put_u8str_P(PSTR(" V"));
-      lcd_put_u8str(i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
+      lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
       lcd_put_wchar('%');
       return;
     }
@@ -863,7 +863,7 @@ void MarlinUI::draw_status_screen() {
     #if LCD_HEIGHT > 3
 
       lcd_put_wchar(0, 2, LCD_STR_FEEDRATE[0]);
-      lcd_put_u8str(i16tostr3(feedrate_percentage));
+      lcd_put_u8str(i16tostr3rj(feedrate_percentage));
       lcd_put_wchar('%');
 
       char buffer[14];
@@ -902,7 +902,7 @@ void MarlinUI::draw_status_screen() {
               #endif
             }
           lcd_put_wchar(c);
-          lcd_put_u8str(i16tostr3(per));
+          lcd_put_u8str(i16tostr3rj(per));
           lcd_put_wchar('%');
         #endif
       #endif
@@ -941,7 +941,7 @@ void MarlinUI::draw_status_screen() {
     #endif
 
     lcd_put_wchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
-    lcd_put_u8str(i16tostr3(feedrate_percentage));
+    lcd_put_u8str(i16tostr3rj(feedrate_percentage));
     lcd_put_wchar('%');
 
     // ========== Line 3 ==========
@@ -1415,9 +1415,9 @@ void MarlinUI::draw_status_screen() {
        * Print plot position
        */
       lcd_put_wchar(_LCD_W_POS, 0, '(');
-      lcd_put_u8str(ui8tostr3(x_plot));
+      lcd_put_u8str(ui8tostr3rj(x_plot));
       lcd_put_wchar(',');
-      lcd_put_u8str(ui8tostr3(y_plot));
+      lcd_put_u8str(ui8tostr3rj(y_plot));
       lcd_put_wchar(')');
 
       #if LCD_HEIGHT <= 3   // 16x2 or 20x2 display
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 908dfdf8f2b7..6d76b8ce70e3 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -107,7 +107,7 @@
 #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
 
 FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, const uint8_t ty) {
-  const char *str = i16tostr3(temp);
+  const char *str = i16tostr3rj(temp);
   const uint8_t len = str[0] != ' ' ? 3 : str[1] != ' ' ? 2 : 1;
   lcd_put_u8str(tx - len * (INFO_FONT_WIDTH) / 2 + 1, ty, &str[3-len]);
   lcd_put_wchar(LCD_STR_DEGREE[0]);
@@ -406,7 +406,7 @@ void MarlinUI::draw_status_screen() {
 
     #if ENABLED(FILAMENT_LCD_DISPLAY)
       strcpy(wstring, ftostr12ns(filwidth.measured_mm));
-      strcpy(mstring, i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
+      strcpy(mstring, i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
     #endif
 
     // Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw
@@ -438,7 +438,7 @@ void MarlinUI::draw_status_screen() {
               #if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
                 permyriadtostr4(progress)
               #else
-                ui8tostr3(progress / (PROGRESS_SCALE))
+                ui8tostr3rj(progress / (PROGRESS_SCALE))
               #endif
             ));
           }
@@ -571,7 +571,7 @@ void MarlinUI::draw_status_screen() {
     // Laser / Spindle
     #if DO_DRAW_CUTTER
       if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
-        lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3(cutter.powerPercent(cutter.power)));
+        lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3rj(cutter.powerPercent(cutter.power)));
         lcd_put_wchar('%');
       }
     #endif
@@ -598,7 +598,7 @@ void MarlinUI::draw_status_screen() {
               c = '*';
             }
           #endif
-          lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3(thermalManager.fanPercent(spd)));
+          lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3rj(thermalManager.fanPercent(spd)));
           lcd_put_wchar(c);
         }
       }
@@ -768,7 +768,7 @@ void MarlinUI::draw_status_screen() {
     lcd_put_wchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]);
 
     set_font(FONT_STATUSMENU);
-    lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3(feedrate_percentage));
+    lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
     lcd_put_wchar('%');
 
     //
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 3d777f6da1e0..fc7656f1cd7e 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -324,11 +324,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), row_y2, 'E');
       lcd_put_wchar((char)('1' + extruder));
       lcd_put_wchar(' ');
-      lcd_put_u8str(i16tostr3(thermalManager.degHotend(extruder)));
+      lcd_put_u8str(i16tostr3rj(thermalManager.degHotend(extruder)));
       lcd_put_wchar('/');
 
       if (get_blink() || !thermalManager.hotend_idle[extruder].timed_out)
-        lcd_put_u8str(i16tostr3(thermalManager.degTargetHotend(extruder)));
+        lcd_put_u8str(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
     }
 
   #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index f1bcb970d413..959c1c416049 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -127,7 +127,7 @@ void MenuItem_gcode::action(PGM_P const, PGM_P const pgcode) { queue.inject_P(pg
  *
  * The prerequisite is that in the header the type was already declared:
  *
- *   DEFINE_MENU_EDIT_ITEM_TYPE(int16_t, int3, i16tostr3, 1)
+ *   DEFINE_MENU_EDIT_ITEM_TYPE(int3, int16_t, i16tostr3rj, 1)
  *
  * For example, DEFINE_MENU_EDIT_ITEM(int3) expands into:
  *
@@ -396,11 +396,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
   void lcd_babystep_zoffset() {
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
     ui.defer_status_screen();
-    #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
-      const bool do_probe = (active_extruder == 0);
-    #else
-      constexpr bool do_probe = true;
-    #endif
+    const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
     if (ui.encoderPosition) {
       const int16_t babystep_increment = int16_t(ui.encoderPosition) * (BABYSTEP_MULTIPLICATOR_Z);
       ui.encoderPosition = 0;
@@ -429,14 +425,14 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
     if (ui.should_draw()) {
       #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
         if (!do_probe)
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), LCD_Z_OFFSET_FUNC(hotend_offset[active_extruder].z));
-        else
-      #endif
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), LCD_Z_OFFSET_FUNC(probe.offset.z));
-
-      #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
-        if (do_probe) _lcd_zoffset_overlay_gfx(probe.offset.z);
+          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
       #endif
+      if (do_probe) {
+        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), ftostr52sign(probe.offset.z));
+        #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
+          _lcd_zoffset_overlay_gfx(probe.offset.z);
+        #endif
+      }
     }
   }
 
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 0e8d1e27ca75..4ba618e5ca02 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -48,9 +48,11 @@ typedef void (*selectFunc_t)();
 #endif
 
 #if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+  // Only values from -9.999 to 9.999
   #define LCD_Z_OFFSET_FUNC(N) ftostr54sign(N)
   #define LCD_Z_OFFSET_TYPE float43
 #else
+  // Values from -99.99 to 99.99
   #define LCD_Z_OFFSET_FUNC(N) ftostr52sign(N)
   #define LCD_Z_OFFSET_TYPE float52
 #endif
@@ -266,35 +268,37 @@ class TMenuEditItem : MenuEditItemBase {
 // Provide a set of Edit Item Types which encompass a primitive
 // type, a string function, and a scale factor for edit and display.
 // These items call the Edit Item draw method passing the prepared string.
-#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, FIX, STRFUNC, SCALE, V...) \
+#define __DOFIXfloat PROBE()
+#define _DOFIX(TYPE,V) TYPE(TERN(IS_PROBE(__DOFIX##TYPE),FIXFLOAT(V),(V)))
+#define DEFINE_MENU_EDIT_ITEM_TYPE(NAME, TYPE, STRFUNC, SCALE, V...) \
   struct MenuEditItemInfo_##NAME { \
     typedef TYPE type_t; \
     static inline float scale(const float value)   { return value * (SCALE) + (V+0); } \
     static inline float unscale(const float value) { return value / (SCALE) + (V+0); } \
-    static inline const char* strfunc(const float value) { return STRFUNC((TYPE)(FIX ? FIXFLOAT(value) : value)); } \
+    static inline const char* strfunc(const float value) { return STRFUNC(_DOFIX(TYPE,value)); } \
   }; \
   typedef TMenuEditItem<MenuEditItemInfo_##NAME> MenuItem_##NAME
 
-//                         TYPE      NAME         STRFUNC       SCALE
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  percent,     0, ui8tostr4pct, 100.0/255, 0.5);  // 100%   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int3,        0, i16tostr3,       1     );   // 123, -12   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int4,        0, i16tostr4sign,   1     );   // 1234, -123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int8_t,   int8,        0, i8tostr3,        1     );   // 123, -12   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  uint8,       0, ui8tostr3,       1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_3,    0, ui16tostr3,      1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_4,    0, ui16tostr4,      0.1   );   // 1234       right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_5,    0, ui16tostr5,      0.01  );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float3,      1, ftostr3,         1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52,     1, ftostr42_52,   100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float43,     1, ftostr43sign, 1000     );   // 1.234
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5,      1, ftostr5rj,       1     );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5_25,   1, ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51,     1, ftostr51rj,     10     );   // 1234.5     right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float41sign, 1, ftostr41sign,   10     );   // +123.4
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51sign, 1, ftostr51sign,   10     );   // +1234.5
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52sign, 1, ftostr52sign,  100     );   // +123.45
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5,       0, ftostr5rj,       0.01f );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5_25,    0, ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
+//                         NAME         TYPE      STRFUNC          SCALE         +ROUND
+DEFINE_MENU_EDIT_ITEM_TYPE(percent     ,uint8_t  ,ui8tostr4pctrj  , 100.f/255.f, 0.5f);  // 100%   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int3        ,int16_t  ,i16tostr3rj     ,   1     );   // 123, -12   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int4        ,int16_t  ,i16tostr4signrj ,   1     );   // 1234, -123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int8        ,int8_t   ,i8tostr3rj      ,   1     );   // 123, -12   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint8       ,uint8_t  ,ui8tostr3rj     ,   1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_3    ,uint16_t ,ui16tostr3rj    ,   1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_4    ,uint16_t ,ui16tostr4rj    ,   0.1f  );   // 1234       right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_5    ,uint16_t ,ui16tostr5rj    ,   0.01f );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float3      ,float    ,ftostr3         ,   1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float52     ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );   // -1.234, _1.234, +1.234
+DEFINE_MENU_EDIT_ITEM_TYPE(float5      ,float    ,ftostr5rj       ,   1     );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float5_25   ,float    ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
+DEFINE_MENU_EDIT_ITEM_TYPE(float51     ,float    ,ftostr51rj      ,  10     );   // 1234.5     right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float    ,ftostr41sign    ,  10     );   // +123.4
+DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float    ,ftostr51sign    ,  10     );   // +1234.5
+DEFINE_MENU_EDIT_ITEM_TYPE(float52sign ,float    ,ftostr52sign    , 100     );   // +123.45
+DEFINE_MENU_EDIT_ITEM_TYPE(long5       ,uint32_t ,ftostr5rj       ,   0.01f );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(long5_25    ,uint32_t ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
 
 class MenuItem_bool : public MenuEditItemBase {
   public:
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index e5ddc147489b..3b641e0dd384 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -33,7 +33,7 @@ char conv[8] = { 0 };
 #define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
 
 // Convert a full-range unsigned 8bit int to a percentage
-const char* ui8tostr4pct(const uint8_t i) {
+const char* ui8tostr4pctrj(const uint8_t i) {
   const uint8_t n = ui8_to_percent(i);
   conv[3] = RJDIGIT(n, 100);
   conv[4] = RJDIGIT(n, 10);
@@ -43,7 +43,7 @@ const char* ui8tostr4pct(const uint8_t i) {
 }
 
 // Convert unsigned 8bit int to string 123 format
-const char* ui8tostr3(const uint8_t i) {
+const char* ui8tostr3rj(const uint8_t i) {
   conv[4] = RJDIGIT(i, 100);
   conv[5] = RJDIGIT(i, 10);
   conv[6] = DIGIMOD(i, 1);
@@ -51,7 +51,7 @@ const char* ui8tostr3(const uint8_t i) {
 }
 
 // Convert signed 8bit int to rj string with 123 or -12 format
-const char* i8tostr3(const int8_t x) {
+const char* i8tostr3rj(const int8_t x) {
   int xx = x;
   conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
   conv[5] = RJDIGIT(xx, 10);
@@ -88,7 +88,7 @@ const char* i8tostr3(const int8_t x) {
 #endif
 
 // Convert unsigned 16bit int to string 12345 format
-const char* ui16tostr5(const uint16_t xx) {
+const char* ui16tostr5rj(const uint16_t xx) {
   conv[2] = RJDIGIT(xx, 10000);
   conv[3] = RJDIGIT(xx, 1000);
   conv[4] = RJDIGIT(xx, 100);
@@ -98,7 +98,7 @@ const char* ui16tostr5(const uint16_t xx) {
 }
 
 // Convert unsigned 16bit int to string 1234 format
-const char* ui16tostr4(const uint16_t xx) {
+const char* ui16tostr4rj(const uint16_t xx) {
   conv[3] = RJDIGIT(xx, 1000);
   conv[4] = RJDIGIT(xx, 100);
   conv[5] = RJDIGIT(xx, 10);
@@ -107,7 +107,7 @@ const char* ui16tostr4(const uint16_t xx) {
 }
 
 // Convert unsigned 16bit int to string 123 format
-const char* ui16tostr3(const uint16_t xx) {
+const char* ui16tostr3rj(const uint16_t xx) {
   conv[4] = RJDIGIT(xx, 100);
   conv[5] = RJDIGIT(xx, 10);
   conv[6] = DIGIMOD(xx, 1);
@@ -115,7 +115,7 @@ const char* ui16tostr3(const uint16_t xx) {
 }
 
 // Convert signed 16bit int to rj string with 123 or -12 format
-const char* i16tostr3(const int16_t x) {
+const char* i16tostr3rj(const int16_t x) {
   int xx = x;
   conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
   conv[5] = RJDIGIT(xx, 10);
@@ -136,7 +136,7 @@ const char* i16tostr3left(const int16_t i) {
 }
 
 // Convert signed 16bit int to rj string with 1234, _123, -123, _-12, or __-1 format
-const char* i16tostr4sign(const int16_t i) {
+const char* i16tostr4signrj(const int16_t i) {
   const bool neg = i < 0;
   const int ii = neg ? -i : i;
   if (i >= 1000) {
@@ -174,7 +174,7 @@ const char* ftostr12ns(const float &f) {
   return &conv[3];
 }
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 format or 123.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
 const char* ftostr42_52(const float &f) {
   if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
@@ -198,12 +198,38 @@ const char* ftostr52(const float &f) {
   return &conv[1];
 }
 
+// Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
+const char* ftostr43_53(const float &f) {
+  if (f <= -10 || f >= 100) return ftostr53(f); // need more digits
+  long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+  conv[1] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000));
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return &conv[1];
+}
+
+// Convert signed float to fixed-length string with 023.456 / -23.456 format
+const char* ftostr53(const float &f) {
+  long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+  conv[0] = MINUSOR(i, DIGIMOD(i, 100000));
+  conv[1] = DIGIMOD(i, 10000);
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return &conv[0];
+}
+
 #if ENABLED(LCD_DECIMAL_SMALL_XY)
 
   // Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
   const char* ftostr4sign(const float &f) {
     const int i = (f * 100 + (f < 0 ? -5: 5)) / 10;
-    if (!WITHIN(i, -99, 999)) return i16tostr4sign((int)f);
+    if (!WITHIN(i, -99, 999)) return i16tostr4signrj((int)f);
     const bool neg = i < 0;
     const int ii = neg ? -i : i;
     conv[3] = neg ? '-' : (ii >= 100 ? DIGIMOD(ii, 100) : ' ');
@@ -255,7 +281,7 @@ const char* ftostr54sign(const float &f, char plus/*=' '*/) {
 // Convert unsigned float to rj string with 12345 format
 const char* ftostr5rj(const float &f) {
   const long i = ((f < 0 ? -f : f) * 10 + 5) / 10;
-  return ui16tostr5(i);
+  return ui16tostr5rj(i);
 }
 
 // Convert signed float to string with +1234.5 format
@@ -284,7 +310,7 @@ const char* ftostr52sign(const float &f) {
   return conv;
 }
 
-// Convert unsigned float to string with 1234.5 format omitting trailing zeros
+// Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
 const char* ftostr51rj(const float &f) {
   const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;
   conv[0] = ' ';
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index ee29b26ab08e..d5453e817629 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -24,13 +24,13 @@
 #include <stdint.h>
 
 // Convert a full-range unsigned 8bit int to a percentage
-const char* ui8tostr4pct(const uint8_t i);
+const char* ui8tostr4pctrj(const uint8_t i);
 
 // Convert uint8_t to string with 123 format
-const char* ui8tostr3(const uint8_t i);
+const char* ui8tostr3rj(const uint8_t i);
 
 // Convert int8_t to string with 123 format
-const char* i8tostr3(const int8_t x);
+const char* i8tostr3rj(const int8_t x);
 
 #if HAS_PRINT_PROGRESS_PERMYRIAD
   // Convert 16-bit unsigned permyriad value to percent: 100 / 23 / 23.4 / 3.45
@@ -38,22 +38,22 @@ const char* i8tostr3(const int8_t x);
 #endif
 
 // Convert uint16_t to string with 12345 format
-const char* ui16tostr5(const uint16_t x);
+const char* ui16tostr5rj(const uint16_t x);
 
 // Convert uint16_t to string with 1234 format
-const char* ui16tostr4(const uint16_t x);
+const char* ui16tostr4rj(const uint16_t x);
 
 // Convert uint16_t to string with 123 format
-const char* ui16tostr3(const uint16_t x);
+const char* ui16tostr3rj(const uint16_t x);
 
 // Convert int16_t to string with 123 format
-const char* i16tostr3(const int16_t x);
+const char* i16tostr3rj(const int16_t x);
 
 // Convert unsigned int to lj string with 123 format
 const char* i16tostr3left(const int16_t xx);
 
 // Convert signed int to rj string with _123, -123, _-12, or __-1 format
-const char* i16tostr4sign(const int16_t x);
+const char* i16tostr4signrj(const int16_t x);
 
 // Convert unsigned float to string with 1.23 format
 const char* ftostr12ns(const float &x);
@@ -64,6 +64,12 @@ const char* ftostr42_52(const float &x);
 // Convert signed float to fixed-length string with 023.45 / -23.45 format
 const char* ftostr52(const float &x);
 
+// Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
+const char* ftostr43_53(const float &x);
+
+// Convert signed float to fixed-length string with 023.456 / -23.456 format
+const char* ftostr53(const float &x);
+
 // Convert float to fixed-length string with +123.4 / -123.4 format
 const char* ftostr41sign(const float &x);
 
@@ -91,7 +97,7 @@ const char* ftostr51rj(const float &x);
 #include "../core/macros.h"
 
 // Convert float to rj string with 123 or -12 format
-FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
+FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
 
 #include "../inc/MarlinConfigPre.h"
 
@@ -100,5 +106,5 @@ FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x +
   const char* ftostr4sign(const float &fx);
 #else
   // Convert float to rj string with 1234, _123, -123, __12, _-12, ___1, or __-1 format
-  FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
+  FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4signrj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
 #endif

From b5530775c9a2fb489d5766ea4c01df5dfdbda793 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 Mar 2020 22:33:38 -0600
Subject: [PATCH 393/565] Add debug logging for setup()

---
 Marlin/src/MarlinCore.cpp | 109 +++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 43 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 73a6cfc6b97d..df93f89c1189 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -959,48 +959,69 @@ void setup() {
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
 
+  #if ENABLED(MARLIN_DEV_MODE)
+    auto log_current_ms = [&](PGM_P const msg) {
+      SERIAL_ECHO_START();
+      SERIAL_CHAR('['); SERIAL_ECHO(millis()); SERIAL_ECHO("] ");
+      serialprintPGM(msg);
+      SERIAL_EOL();
+    };
+    #define SETUP_LOG(M) log_current_ms(PSTR(M))
+  #else
+    #define SETUP_LOG(...) NOOP
+  #endif
+  #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
+
   // Set up LEDs early
   #if HAS_COLOR_LEDS
-    leds.setup();
+    SETUP_RUN(leds.setup());
   #endif
 
-  ui.init();
+  SETUP_RUN(ui.init());
+
   #if HAS_SPI_LCD && ENABLED(SHOW_BOOTSCREEN)
-    ui.show_bootscreen();
+    SETUP_RUN(ui.show_bootscreen());
   #endif
 
-  ui.reset_status();        // Load welcome message early. (Retained if no errors exist.)
+  #if !HAS_SERVICE_INTERVALS
+    SETUP_RUN(ui.reset_status());     // Load welcome message early. (Retained if no errors exist.)
+  #endif
 
   #if ENABLED(SDSUPPORT)
-    card.mount();           // Mount the SD card before settings.first_load
+    SETUP_RUN(card.mount());          // Mount the SD card before settings.first_load
+  #endif
+
+  SETUP_RUN(settings.first_load());   // Load data from EEPROM if available (or use defaults)
+                                      // This also updates variables in the planner, elsewhere
+
+  #if HAS_SERVICE_INTERVALS
+    SETUP_RUN(ui.reset_status(true)); // Show service messages or keep current status
   #endif
-                            // Load data from EEPROM if available (or use defaults)
-  settings.first_load();    // This also updates variables in the planner, elsewhere
 
   #if ENABLED(TOUCH_BUTTONS)
-    touch.init();
+    SETUP_RUN(touch.init());
   #endif
 
-  #if HAS_M206_COMMAND      // Initialize current position based on home_offset
-    current_position += home_offset;
+  #if HAS_M206_COMMAND
+    current_position += home_offset;  // Init current position based on home_offset
   #endif
 
-  sync_plan_position();     // Vital to init stepper/planner equivalent for current_position
+  sync_plan_position();               // Vital to init stepper/planner equivalent for current_position
 
-  thermalManager.init();    // Initialize temperature loop
+  SETUP_RUN(thermalManager.init());   // Initialize temperature loop
 
-  print_job_timer.init();   // Initial setup of print job timer
+  SETUP_RUN(print_job_timer.init());  // Initial setup of print job timer
 
-  endstops.init();          // Init endstops and pullups
+  SETUP_RUN(endstops.init());         // Init endstops and pullups
 
-  stepper.init();           // Init stepper. This enables interrupts!
+  SETUP_RUN(stepper.init());          // Init stepper. This enables interrupts!
 
   #if HAS_SERVOS
-    servo_init();
+    SETUP_RUN(servo_init());
   #endif
 
   #if HAS_Z_SERVO_PROBE
-    probe.servo_probe_init();
+    SETUP_RUN(probe.servo_probe_init());
   #endif
 
   #if HAS_PHOTOGRAPH
@@ -1008,7 +1029,7 @@ void setup() {
   #endif
 
   #if HAS_CUTTER
-    cutter.init();
+    SETUP_RUN(cutter.init());
   #endif
 
   #if ENABLED(COOLANT_MIST)
@@ -1019,7 +1040,7 @@ void setup() {
   #endif
 
   #if HAS_BED_PROBE
-    endstops.enable_z_probe(false);
+    SETUP_RUN(endstops.enable_z_probe(false));
   #endif
 
   #if ENABLED(USE_CONTROLLER_FAN)
@@ -1027,15 +1048,15 @@ void setup() {
   #endif
 
   #if HAS_STEPPER_RESET
-    enableStepperDrivers();
+    SETUP_RUN(enableStepperDrivers());
   #endif
 
   #if ENABLED(DIGIPOT_I2C)
-    digipot_i2c_init();
+    SETUP_RUN(digipot_i2c_init());
   #endif
 
   #if ENABLED(DAC_STEPPER_CURRENT)
-    dac_init();
+    SETUP_RUN(dac_init());
   #endif
 
   #if EITHER(Z_PROBE_SLED, SOLENOID_PROBE) && HAS_SOLENOID_1
@@ -1058,41 +1079,44 @@ void setup() {
     #if DISABLED(CASE_LIGHT_USE_NEOPIXEL)
       if (PWM_PIN(CASE_LIGHT_PIN)) SET_PWM(CASE_LIGHT_PIN); else SET_OUTPUT(CASE_LIGHT_PIN);
     #endif
-    update_case_light();
+    SETUP_RUN(update_case_light());
   #endif
 
   #if ENABLED(MK2_MULTIPLEXER)
+    SETUP_LOG("MK2_MULTIPLEXER");
     SET_OUTPUT(E_MUX0_PIN);
     SET_OUTPUT(E_MUX1_PIN);
     SET_OUTPUT(E_MUX2_PIN);
   #endif
 
   #if HAS_FANMUX
-    fanmux_init();
+    SETUP_RUN(fanmux_init());
   #endif
 
   #if ENABLED(MIXING_EXTRUDER)
-    mixer.init();
+    SETUP_RUN(mixer.init());
   #endif
 
   #if ENABLED(BLTOUCH)
-    bltouch.init(/*set_voltage=*/true);
+    SETUP_RUN(bltouch.init(/*set_voltage=*/true));
   #endif
 
   #if ENABLED(I2C_POSITION_ENCODERS)
-    I2CPEM.init();
+    SETUP_RUN(I2CPEM.init());
   #endif
 
   #if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0
+    SETUP_LOG("i2c...");
     i2c.onReceive(i2c_on_receive);
     i2c.onRequest(i2c_on_request);
   #endif
 
   #if DO_SWITCH_EXTRUDER
-    move_extruder_servo(0);   // Initialize extruder servo
+    SETUP_RUN(move_extruder_servo(0));  // Initialize extruder servo
   #endif
 
   #if ENABLED(SWITCHING_NOZZLE)
+    SETUP_LOG("SWITCHING_NOZZLE");
     // Initialize nozzle servo(s)
     #if SWITCHING_NOZZLE_TWO_SERVOS
       lower_nozzle(0);
@@ -1103,11 +1127,11 @@ void setup() {
   #endif
 
   #if ENABLED(MAGNETIC_PARKING_EXTRUDER)
-    mpe_settings_init();
+    SETUP_RUN(mpe_settings_init());
   #endif
 
   #if ENABLED(PARKING_EXTRUDER)
-    pe_solenoid_init();
+    SETUP_RUN(pe_solenoid_init());
   #endif
 
   #if ENABLED(SWITCHING_TOOLHEAD)
@@ -1115,48 +1139,47 @@ void setup() {
   #endif
 
   #if ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
-    est_init();
+    SETUP_RUN(est_init());
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    recovery.check();
+    SETUP_RUN(recovery.check());
   #endif
 
   #if ENABLED(USE_WATCHDOG)
-    watchdog_init();          // Reinit watchdog after HAL_get_reset_source call
+    SETUP_RUN(watchdog_init());       // Reinit watchdog after HAL_get_reset_source call
   #endif
 
   #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
-    init_closedloop();
+    SETUP_RUN(init_closedloop());
   #endif
 
   #ifdef STARTUP_COMMANDS
+    SETUP_LOG("STARTUP_COMMANDS");
     queue.inject_P(PSTR(STARTUP_COMMANDS));
   #endif
 
   #if ENABLED(INIT_SDCARD_ON_BOOT) && !HAS_SPI_LCD
-    card.beginautostart();
+    SETUP_RUN(card.beginautostart());
   #endif
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_action_prompt_end();
+    SETUP_RUN(host_action_prompt_end());
   #endif
 
   #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
-    test_tmc_connection(true, true, true, true);
+    SETUP_RUN(test_tmc_connection(true, true, true, true));
   #endif
 
   #if ENABLED(PRUSA_MMU2)
-    mmu2.init();
-  #endif
-
-  #if HAS_SERVICE_INTERVALS
-    ui.reset_status(true);  // Show service messages or keep current status
+    SETUP_RUN(mmu2.init());
   #endif
 
   #if ENABLED(MAX7219_DEBUG)
-    max7219.init();
+    SETUP_RUN(max7219.init());
   #endif
+
+  SETUP_LOG("setup() completed.");
 }
 
 /**

From 972d1bf5b43b32f1c9cda63010073da5456fc4fc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 Mar 2020 18:19:37 -0500
Subject: [PATCH 394/565] Ensure welcome message

---
 Marlin/src/MarlinCore.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index df93f89c1189..abae09a6dc6c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -978,15 +978,12 @@ void setup() {
   #endif
 
   SETUP_RUN(ui.init());
+  SETUP_RUN(ui.reset_status());       // Load welcome message early. (Retained if no errors exist.)
 
   #if HAS_SPI_LCD && ENABLED(SHOW_BOOTSCREEN)
     SETUP_RUN(ui.show_bootscreen());
   #endif
 
-  #if !HAS_SERVICE_INTERVALS
-    SETUP_RUN(ui.reset_status());     // Load welcome message early. (Retained if no errors exist.)
-  #endif
-
   #if ENABLED(SDSUPPORT)
     SETUP_RUN(card.mount());          // Mount the SD card before settings.first_load
   #endif

From 8799f8bfdba2a6978655fc84ae7df32cb69ed16a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Mar 2020 00:04:08 +0000
Subject: [PATCH 395/565] [cron] Bump distribution date (2020-03-10)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6a4495b44475..4f2375388a11 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-09"
+  #define STRING_DISTRIBUTION_DATE "2020-03-10"
 #endif
 
 /**

From 8f66dbfcd51aeae4f6168cfce971964bb46c9454 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:43:06 -0500
Subject: [PATCH 396/565] SD_DETECT_INVERTED => SD_DETECT_STATE (#17112)

---
 Marlin/Configuration_adv.h                |  9 +++------
 Marlin/src/inc/Conditionals_LCD.h         |  1 -
 Marlin/src/inc/Conditionals_post.h        | 14 +++++++++++---
 Marlin/src/inc/SanityCheck.h              |  4 +++-
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h |  4 ----
 Marlin/src/sd/cardreader.h                |  2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e38c13cf013b..eed781527f93 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1018,12 +1018,9 @@
 
 #if ENABLED(SDSUPPORT)
 
-  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
-  // around this by connecting a push button or single throw switch to the pin defined
-  // as SD_DETECT_PIN in your board's pins definitions.
-  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
-  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
-  #define SD_DETECT_INVERTED
+  // The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
+  // Enable this option and set to HIGH if your SD cards are incorrectly detected.
+  //#define SD_DETECT_STATE HIGH
 
   #define SD_FINISHED_STEPPERRELEASE true          // Disable steppers when SD Print is finished
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place.
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7011e02ca6f1..9725acffc161 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -74,7 +74,6 @@
     #define U8GLIB_ST7565_64128N
   #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
     #define U8GLIB_LM6059_AF
-    #define SD_DETECT_INVERTED
   #elif ENABLED(AZSMZ_12864)
     #define U8GLIB_ST7565_64128N
   #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index e2c7093bb167..8b2cd0efd124 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -292,10 +292,18 @@
 #endif
 
 /**
- * Override here because this is set in Configuration_adv.h
+ * Override the SD_DETECT_STATE set in Configuration_adv.h
  */
-#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
-  #undef SD_DETECT_INVERTED
+#if ENABLED(SDSUPPORT)
+  #if HAS_LCD_MENU && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+    #undef SD_DETECT_STATE
+    #if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+      #define SD_DETECT_STATE HIGH
+    #endif
+  #endif
+  #ifndef SD_DETECT_STATE
+    #define SD_DETECT_STATE LOW
+  #endif
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ab36dd231c70..bcabbe9dc8a5 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -99,7 +99,9 @@
 #elif defined(X_HOME_RETRACT_MM)
   #error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM."
 #elif defined(SDCARDDETECTINVERTED)
-  #error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration."
+  #error "SDCARDDETECTINVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
+#elif defined(SD_DETECT_INVERTED)
+  #error "SD_DETECT_INVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
 #elif defined(BTENABLED)
   #error "BTENABLED is now BLUETOOTH. Please update your configuration."
 #elif defined(CUSTOM_MENDEL_NAME)
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 475551ad6bc1..c67f8283b71f 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -29,10 +29,6 @@
   #error "Oops! Select 'FYSETC F6' in 'Tools > Board.'"
 #endif
 
-#if ENABLED(SD_DETECT_INVERTED)
-  //#error "SD_DETECT_INVERTED must be disabled for the FYSETC_F6_13 board."
-#endif
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "FYSETC F6 1.3"
 #endif
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index aee9ae58042c..749ece01d30a 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -276,7 +276,7 @@ class CardReader {
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
   #define IS_SD_INSERTED() Sd2Card::isInserted()
 #elif PIN_EXISTS(SD_DETECT)
-  #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) != ENABLED(SD_DETECT_INVERTED))
+  #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) == SD_DETECT_STATE)
 #else
   // No card detect line? Assume the card is inserted.
   #define IS_SD_INSERTED() true

From 8bbcbc528c8d066e261b69eda1e39bedcb25d6e7 Mon Sep 17 00:00:00 2001
From: Vert <vert@vertshobbies.com>
Date: Tue, 10 Mar 2020 16:57:10 -0400
Subject: [PATCH 397/565] Fix Z4 stepper indirection macros (#17107)

---
 Marlin/src/module/stepper/indirection.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 99a224c7276c..0b36a5d0c022 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -185,18 +185,18 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #ifndef Z4_ENABLE_INIT
     #define Z4_ENABLE_INIT() SET_OUTPUT(Z4_ENABLE_PIN)
     #define Z4_ENABLE_WRITE(STATE) WRITE(Z4_ENABLE_PIN,STATE)
-    #define Z4_ENABLE_READ() READ(Z4_ENABLE_PIN)
+    #define Z4_ENABLE_READ() bool(READ(Z4_ENABLE_PIN))
   #endif
   #ifndef Z4_DIR_INIT
     #define Z4_DIR_INIT() SET_OUTPUT(Z4_DIR_PIN)
     #define Z4_DIR_WRITE(STATE) WRITE(Z4_DIR_PIN,STATE)
-    #define Z4_DIR_READ() READ(Z4_DIR_PIN)
+    #define Z4_DIR_READ() bool(READ(Z4_DIR_PIN))
   #endif
-  #define Z4_STEP_INIT SET_OUTPUT(Z4_STEP_PIN)
+  #define Z4_STEP_INIT() SET_OUTPUT(Z4_STEP_PIN)
   #ifndef Z4_STEP_WRITE
     #define Z4_STEP_WRITE(STATE) WRITE(Z4_STEP_PIN,STATE)
   #endif
-  #define Z4_STEP_READ READ(Z4_STEP_PIN)
+  #define Z4_STEP_READ() bool(READ(Z4_STEP_PIN))
 #else
   #define Z4_DIR_WRITE(STATE) NOOP
 #endif

From 9bff67bc747d82c28773b85ddda540f828065c52 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 Mar 2020 19:00:11 -0500
Subject: [PATCH 398/565] Always look for PLR file, but more quickly

---
 Marlin/src/feature/power_loss_recovery.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/power_loss_recovery.cpp
index f331a9f94d68..704700ab8326 100644
--- a/Marlin/src/feature/power_loss_recovery.cpp
+++ b/Marlin/src/feature/power_loss_recovery.cpp
@@ -100,13 +100,11 @@ void PrintJobRecovery::changed() {
  * If a saved state exists send 'M1000 S' to initiate job recovery.
  */
 void PrintJobRecovery::check() {
-  if (enabled) {
-    if (!card.isMounted()) card.mount();
-    if (card.isMounted()) {
-      load();
-      if (!valid()) return purge();
-      queue.inject_P(PSTR("M1000 S"));
-    }
+  //if (!card.isMounted()) card.mount();
+  if (card.isMounted()) {
+    load();
+    if (!valid()) return purge();
+    queue.inject_P(PSTR("M1000 S"));
   }
 }
 

From 4e3a793f1ec29f2e9df5f84818f5fbfa2e832fac Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 10 Mar 2020 18:04:54 -0500
Subject: [PATCH 399/565] Fix broken enqueue_P

---
 Marlin/src/MarlinCore.cpp  |  4 ++--
 Marlin/src/gcode/queue.cpp | 15 +++++++++++++++
 Marlin/src/gcode/queue.h   | 12 ++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index abae09a6dc6c..6ccc1344b002 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -423,14 +423,14 @@ void startOrResumeJob() {
 
       #if HAS_RESUME_CONTINUE                   // Display "Click to Continue..."
         case 1:                                 // 30 min timeout with LCD, 1 min without
-          did_state = queue.enqueue_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
+          did_state = queue.enqueue_one_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
           break;
       #endif
 
       case 2: print_job_timer.stop(); break;
 
       case 3:
-        did_state = print_job_timer.duration() < 60 || queue.enqueue_P(PSTR("M31"));
+        did_state = print_job_timer.duration() < 60 || queue.enqueue_one_P(PSTR("M31"));
         break;
 
       case 4:
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 0a5dfd037868..3a1f3d2d3da9 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -209,6 +209,21 @@ void GCodeQueue::inject_P(PGM_P const pgcode) { injected_commands_P = pgcode; }
  */
 void GCodeQueue::enqueue_one_now(const char* cmd) { while (!enqueue_one(cmd)) idle(); }
 
+/**
+ * Attempt to enqueue a single G-code command
+ * and return 'true' if successful.
+ */
+bool GCodeQueue::enqueue_one_P(PGM_P const pgcode) {
+  size_t i = 0;
+  PGM_P p = pgcode;
+  char c;
+  while ((c = pgm_read_byte(&p[i])) && c != '\n') i++;
+  char cmd[i + 1];
+  memcpy_P(cmd, p, i);
+  cmd[i] = '\0';
+  return _enqueue(cmd);
+}
+
 /**
  * Enqueue from program memory and return only when commands are actually enqueued
  * Never call this from a G-code handler!
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 1ce64590c367..6a87d47ac8c8 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -77,6 +77,12 @@ class GCodeQueue {
    */
   static void enqueue_one_now(const char* cmd);
 
+  /**
+   * Attempt to enqueue a single G-code command
+   * and return 'true' if successful.
+   */
+  static bool enqueue_one_P(PGM_P const pgcode);
+
   /**
    * Enqueue from program memory and return only when commands are actually enqueued
    */
@@ -117,12 +123,6 @@ class GCodeQueue {
    */
   static void flush_and_request_resend();
 
-  /**
-   * Attempt to enqueue a single G-code command
-   * and return 'true' if successful.
-   */
-  FORCE_INLINE static bool enqueue_P(const char* cmd) { return _enqueue(cmd); }
-
 private:
 
   static uint8_t index_w;  // Ring buffer write position

From a31b7339cd30e4c5608b99d14d30d65330d7ac72 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 11 Mar 2020 00:04:19 +0000
Subject: [PATCH 400/565] [cron] Bump distribution date (2020-03-11)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4f2375388a11..2357c2cf93cd 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-10"
+  #define STRING_DISTRIBUTION_DATE "2020-03-11"
 #endif
 
 /**

From e7004550c4bcdf07f5f03db93ed3a6d05ed312d1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Mar 2020 19:42:57 -0500
Subject: [PATCH 401/565] Tweaks to finishSDPrinting (#17082)

---
 Marlin/src/MarlinCore.cpp      | 29 +++++++++++++++++------------
 Marlin/src/gcode/lcd/M0_M1.cpp |  7 +++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 6ccc1344b002..32121ae53a8a 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -418,22 +418,31 @@ void startOrResumeJob() {
   }
 
   inline void finishSDPrinting() {
+
     bool did_state = true;
     switch (card.sdprinting_done_state) {
 
-      #if HAS_RESUME_CONTINUE                   // Display "Click to Continue..."
-        case 1:                                 // 30 min timeout with LCD, 1 min without
-          did_state = queue.enqueue_one_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
-          break;
-      #endif
+      case 1:
+        did_state = print_job_timer.duration() < 60 || queue.enqueue_one_P(PSTR("M31"));
+        break;
 
-      case 2: print_job_timer.stop(); break;
+      case 2:
+        did_state = queue.enqueue_one_P(PSTR("M77"));
+        break;
 
       case 3:
-        did_state = print_job_timer.duration() < 60 || queue.enqueue_one_P(PSTR("M31"));
+        #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+          ui.set_progress_done();
+        #endif
+        break;
+
+      case 4:                                   // Display "Click to Continue..."
+        #if HAS_RESUME_CONTINUE                 // 30 min timeout with LCD, 1 min without
+          did_state = queue.enqueue_one_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
+        #endif
         break;
 
-      case 4:
+      case 5:
         #if ENABLED(POWER_LOSS_RECOVERY)
           recovery.purge();
         #endif
@@ -442,10 +451,6 @@ void startOrResumeJob() {
           planner.finish_and_disable();
         #endif
 
-        #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-          ui.set_progress_done();
-        #endif
-
         #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
           ui.reselect_last_file();
         #endif
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index ac02c1892e0a..ae0cc6049323 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -57,14 +57,17 @@ void GcodeSuite::M0_M1() {
   planner.synchronize();
 
   #if HAS_LEDS_OFF_FLAG
-    if (parser.seen('Q')) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
+    const bool seenQ = parser.seen('Q');
+    if (seenQ) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
+  #else
+    constexpr bool seenQ = false;
   #endif
 
   #if HAS_LCD_MENU
 
     if (parser.string_arg)
       ui.set_status(parser.string_arg, true);
-    else {
+    else if (!seenQ) {
       LCD_MESSAGEPGM(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
         ui.reset_progress_bar_timeout();

From 627aa8db2dcb59584a815095e4a382a556323a9c Mon Sep 17 00:00:00 2001
From: jufimu12 <jufimu12@gmail.com>
Date: Wed, 11 Mar 2020 02:00:26 +0100
Subject: [PATCH 402/565] Fix G34, add HOME_AFTER_G34 option (#17108)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration_adv.h              |  3 ++
 Marlin/src/gcode/calibrate/G34_M422.cpp | 43 +++++++++++++++++--------
 Marlin/src/lcd/menu/menu_motion.cpp     |  6 ++--
 Marlin/src/module/motion.cpp            |  6 ++--
 Marlin/src/module/motion.h              |  2 +-
 5 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index eed781527f93..f405085c95c2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -718,6 +718,9 @@
   #define Z_STEPPER_ALIGN_ITERATIONS 5    // Number of iterations to apply during alignment
   #define Z_STEPPER_ALIGN_ACC        0.02 // Stop iterating early if the accuracy is better than this
   #define RESTORE_LEVELING_AFTER_G34      // Restore leveling after G34 is done?
+  // After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
+  // Re-homing might be more precise in reproducing the actual 'G28 Z' homing height, especially on an uneven bed.
+  #define HOME_AFTER_G34
 #endif
 
 // @section motion
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 5dcad991f15c..087172518f72 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -141,11 +141,11 @@ void GcodeSuite::G34() {
     // iteration this will be re-calculated based on the actual bed position
     float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * (
       #if NUM_Z_STEPPER_DRIVERS == 3
-         SQRT(_MAX(HYPOT2(z_stepper_align.xy[0].x - z_stepper_align.xy[0].y, z_stepper_align.xy[1].x - z_stepper_align.xy[1].y),
-                   HYPOT2(z_stepper_align.xy[1].x - z_stepper_align.xy[1].y, z_stepper_align.xy[2].x - z_stepper_align.xy[2].y),
-                   HYPOT2(z_stepper_align.xy[2].x - z_stepper_align.xy[2].y, z_stepper_align.xy[0].x - z_stepper_align.xy[0].y)))
+         SQRT(_MAX(HYPOT2(z_stepper_align.xy[0].x - z_stepper_align.xy[1].x, z_stepper_align.xy[0].y - z_stepper_align.xy[1].y),
+                   HYPOT2(z_stepper_align.xy[1].x - z_stepper_align.xy[2].x, z_stepper_align.xy[1].y - z_stepper_align.xy[2].y),
+                   HYPOT2(z_stepper_align.xy[2].x - z_stepper_align.xy[0].x, z_stepper_align.xy[2].y - z_stepper_align.xy[0].y)))
       #else
-         HYPOT(z_stepper_align.xy[0].x - z_stepper_align.xy[0].y, z_stepper_align.xy[1].x - z_stepper_align.xy[1].y)
+         HYPOT(z_stepper_align.xy[0].x - z_stepper_align.xy[1].x, z_stepper_align.xy[0].y - z_stepper_align.xy[1].y)
       #endif
     );
 
@@ -156,6 +156,7 @@ void GcodeSuite::G34() {
     current_position.z += z_probe * 0.5f;
     sync_plan_position();
     // Now, the Z origin lies below the build plate. That allows to probe deeper, before run_z_probe throws an error.
+    // This hack is un-done at the end of G34 - either by re-homing, or by using the probed heights of the last iteration.
 
     #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
       float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f);
@@ -166,8 +167,10 @@ void GcodeSuite::G34() {
           z_maxdiff = 0.0f,
           amplification = z_auto_align_amplification;
 
+    // These are needed after the for-loop
     uint8_t iteration;
     bool err_break = false;
+    float z_measured_min;
 
     #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
       bool adjustment_reverse = false;
@@ -181,8 +184,8 @@ void GcodeSuite::G34() {
       SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
 
       // Initialize minimum value
-      float z_measured_min =  100000.0f,
-            z_measured_max = -100000.0f;
+      z_measured_min =  100000.0f;
+      float z_measured_max = -100000.0f;
 
       // Probe all positions (one per Z-Stepper)
       LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
@@ -238,14 +241,14 @@ void GcodeSuite::G34() {
         linear_fit_data lfd;
         incremental_LSF_reset(&lfd);
         LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-          SERIAL_ECHOLNPAIR("PROBEPT_", i + '1', ": ", z_measured[i]);
+          SERIAL_ECHOLNPAIR("PROBEPT_", ('0' + i), ": ", z_measured[i]);
           incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
         }
         finish_incremental_LSF(&lfd);
 
         z_measured_min = 100000.0f;
         LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-          z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y);
+          z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y + lfd.D);
           z_measured_min = _MIN(z_measured_min, z_measured[i]);
         }
 
@@ -345,7 +348,11 @@ void GcodeSuite::G34() {
 
     } // for (iteration)
 
-    if (err_break) { SERIAL_ECHOLNPGM("G34 aborted."); break; }
+    if (err_break) {
+      SERIAL_ECHOLNPGM("G34 aborted.");
+      set_axis_not_trusted(Z_AXIS);  // The Z coordinate is messed up now
+      break;
+    }
 
     SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " iterations of ", int(z_auto_align_iterations));
     SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
@@ -363,15 +370,23 @@ void GcodeSuite::G34() {
       set_bed_leveling_enabled(leveling_was_active);
     #endif
 
-    // After this operation the z position needs correction
-    set_axis_is_not_at_home(Z_AXIS);
-
     // Stow the probe, as the last call to probe.probe_at_point(...) left
     // the probe deployed if it was successful.
     probe.stow();
 
-    // Home Z after the alignment procedure
-    process_subcommands_now_P(PSTR("G28 Z"));
+    #if ENABLED(HOME_AFTER_G34)
+      // After this operation the z position needs correction
+      set_axis_not_trusted(Z_AXIS);
+
+      // Home Z after the alignment procedure
+      process_subcommands_now_P(PSTR("G28Z"));
+    #else
+      // Use the probed height from the last iteration to determine the Z height.
+      // z_measured_min is used, because all steppers are aligned to z_measured_min.
+      // Ideally, this would be equal to the 'z_probe * 0.5f' which was added earlier.
+      current_position.z -= z_measured_min - (float)Z_CLEARANCE_BETWEEN_PROBES;
+      sync_plan_position();
+    #endif
 
   }while(0);
 
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 12cc7a331e2b..3f14e58781c1 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -393,9 +393,9 @@ void menu_motion() {
   //
   GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
   #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28 X"));
-    GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28 Y"));
-    GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28 Z"));
+    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+    GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+    GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
   #endif
 
   //
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index b1c0f3790962..c1d8fceaa07e 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1460,13 +1460,13 @@ void set_axis_is_at_home(const AxisEnum axis) {
 /**
  * Set an axis' to be unhomed.
  */
-void set_axis_is_not_at_home(const AxisEnum axis) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_not_at_home(", axis_codes[axis], ")");
+void set_axis_not_trusted(const AxisEnum axis) {
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_not_trusted(", axis_codes[axis], ")");
 
   CBI(axis_known_position, axis);
   CBI(axis_homed, axis);
 
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_is_not_at_home(", axis_codes[axis], ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_not_trusted(", axis_codes[axis], ")");
 
   #if ENABLED(I2C_POSITION_ENCODERS)
     I2CPEM.unhomed(axis);
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 4dfbe629dd11..f6a75a91a72a 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -244,7 +244,7 @@ bool axis_unhomed_error(uint8_t axis_bits=0x07);
 
 void set_axis_is_at_home(const AxisEnum axis);
 
-void set_axis_is_not_at_home(const AxisEnum axis);
+void set_axis_not_trusted(const AxisEnum axis);
 
 void homeaxis(const AxisEnum axis);
 

From d78fbce827d671be1ceb230fdf932be7e5097032 Mon Sep 17 00:00:00 2001
From: "Daniel Kreuzhofer (@danieldotnet)" <daniel@kreuzhofer.de>
Date: Wed, 11 Mar 2020 02:04:44 +0100
Subject: [PATCH 403/565] Fix pio environments for Anet 1.x (#17109)

---
 Marlin/src/pins/pins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 64b9e85ba8de..49f3170b7c9c 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -314,7 +314,7 @@
 #elif MB(OMCA)
   #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino644p
 #elif MB(ANET_10)
-  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:melzi env:melzi_optiboot
 #elif MB(SETHI)
   #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 

From bd44f041e82ac7aaf83cdba4fbb6d5fe17c46d47 Mon Sep 17 00:00:00 2001
From: Gurmeet Athwal <gurmeet.athwal@gmail.com>
Date: Wed, 11 Mar 2020 06:43:59 +0530
Subject: [PATCH 404/565] M220 print FR percentage (#17101)

---
 Marlin/src/gcode/config/M220.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index e09a5f7534d6..5ea75c09c692 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -29,6 +29,8 @@
  * Parameters
  *   S<percent> : Set the feed rate percentage factor
  *
+ * Report the current speed percentage factor if no parameter is specified
+ * 
  * With PRUSA_MMU2...
  *   B : Flag to back up the current factor
  *   R : Flag to restore the last-saved factor
@@ -43,4 +45,9 @@ void GcodeSuite::M220() {
 
   if (parser.seenval('S')) feedrate_percentage = parser.value_int();
 
+  if (!parser.seen_any()) {
+    SERIAL_ECHOPAIR("FR:", feedrate_percentage);
+    SERIAL_CHAR('%');
+    SERIAL_EOL();
+  }
 }

From 550489cadd7e808e8ccf5811d1921407f9ec2039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Wed, 11 Mar 2020 06:28:41 +0500
Subject: [PATCH 405/565] fix #38

---
 Marlin/Configuration.h              | 49 ++++++++++++++++++++---------
 Marlin/Configuration_adv.h          | 16 +++++++---
 Marlin/Version.h                    |  2 +-
 Marlin/src/feature/bltouch.cpp      |  4 +++
 Marlin/src/inc/Conditionals_LCD.h   |  2 +-
 Marlin/src/lcd/menu/menu_motion.cpp |  2 +-
 Marlin/src/module/endstops.cpp      |  4 +--
 Marlin/src/module/probe.cpp         |  2 +-
 8 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e2b1b1c9ed05..f3331b2bd3f7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -881,7 +881,12 @@
  *
  * Enable this option for a probe connected to the Z Min endstop pin.
  */
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+#if (GITHUB_USER==URSOFT)
+ #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+ #define Z_MIN_PROBE_PIN P1_26
+#else
+ #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+#endif
 
 /**
  * Z_MIN_PROBE_PIN
@@ -937,8 +942,9 @@
 /**
  * The BLTouch probe uses a Hall effect sensor and emulates a servo.
  */
-//#define BLTOUCH
-
+#if (GITHUB_USER==URSOFT)
+ #define BLTOUCH
+#endif
 /**
  * Touch-MI Probe by hotends.fr
  *
@@ -1001,7 +1007,11 @@
  *
  * Specify a Probe position as { X, Y, Z }
  */
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#if (GITHUB_USER==URSOFT)
+ #define NOZZLE_TO_PROBE_OFFSET { 5, 37, 0 }
+#else
+ #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#endif
 
 // Most probes should stay away from the edges of the bed, but
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
@@ -1043,9 +1053,9 @@
  *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
  */
 #define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
-#define Z_CLEARANCE_BETWEEN_PROBES  0 // Z Clearance between probe points
-#define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
-//#define Z_AFTER_PROBING           5 // Z position after probing is done
+#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points
+#define Z_CLEARANCE_MULTI_PROBE    10 // Z Clearance between multiple probes
+#define Z_AFTER_PROBING            10 // Z position after probing is done
 
 #define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
 
@@ -1054,7 +1064,9 @@
 #define Z_PROBE_OFFSET_RANGE_MAX 20
 
 // Enable the M48 repeatability test to test probe accuracy
-//#define Z_MIN_PROBE_REPEATABILITY_TEST
+#if (GITHUB_USER==URSOFT)
+ #define Z_MIN_PROBE_REPEATABILITY_TEST
+#endif
 
 // Before deploy/stow pause for user confirmation
 //#define PAUSE_BEFORE_DEPLOY_STOW
@@ -1166,7 +1178,11 @@
 #if ENABLED(MIN_SOFTWARE_ENDSTOPS)
   #define MIN_SOFTWARE_ENDSTOP_X
   #define MIN_SOFTWARE_ENDSTOP_Y
-  #define MIN_SOFTWARE_ENDSTOP_Z
+  #if (GITHUB_USER==URSOFT)
+   #undef MIN_SOFTWARE_ENDSTOP_Z
+  #else
+   #define MIN_SOFTWARE_ENDSTOP_Z
+  #endif
 #endif
 
 // Max software endstops constrain movement within maximum coordinate bounds
@@ -1255,8 +1271,11 @@
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define AUTO_BED_LEVELING_UBL
-#define MESH_BED_LEVELING
-
+#if (GITHUB_USER==URSOFT)
+ #define AUTO_BED_LEVELING_BILINEAR
+#else
+ #define MESH_BED_LEVELING
+#endif
 /**
  * Normally G28 leaves leveling disabled on completion. Enable
  * this option to have G28 restore the prior leveling state.
@@ -1268,7 +1287,7 @@
  * Turn on with the command 'M111 S32'.
  * NOTE: Requires a lot of PROGMEM!
  */
-//#define DEBUG_LEVELING_FEATURE
+#define DEBUG_LEVELING_FEATURE
 
 #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
   // Gradually reduce leveling correction until a set height is reached,
@@ -1285,11 +1304,11 @@
   /**
    * Enable the G26 Mesh Validation Pattern tool.
    */
-  //#define G26_MESH_VALIDATION
+  #define G26_MESH_VALIDATION
   #if ENABLED(G26_MESH_VALIDATION)
     #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
-    #define MESH_TEST_HOTEND_TEMP  205    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
+    #define MESH_TEST_HOTEND_TEMP  200    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
     #define MESH_TEST_BED_TEMP      60    // (°C) Default bed temperature for the G26 Mesh Validation Tool.
     #define G26_XY_FEEDRATE         20    // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
     #define G26_RETRACT_MULTIPLIER   1.0  // G26 Q (retraction) used by default between mesh test elements.
@@ -1330,7 +1349,7 @@
   //========================= Unified Bed Leveling ============================
   //===========================================================================
 
-  //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
+  #define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
 
   #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 8edc3855d9fa..3d734984f37a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -420,7 +420,11 @@
 #define CHAMBER_AUTO_FAN_PIN -1
 
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
-#define EXTRUDER_AUTO_FAN_SPEED 200   // 255 == full speed
+#if (GITHUB_USER==URSOFT)
+ #define EXTRUDER_AUTO_FAN_SPEED 100
+#else
+ #define EXTRUDER_AUTO_FAN_SPEED 200   // 255 == full speed
+#endif
 #define EXTRUDER_AUTO_FAN_SPEED_CONFIGURABLE
 //#define CHAMBER_AUTO_FAN_TEMPERATURE 30
 //#define CHAMBER_AUTO_FAN_SPEED 255
@@ -1479,11 +1483,13 @@
 
   #define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
 
-  //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
+ #if (GITHUB_USER==URSOFT)
+  #define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets
-    //#define BABYSTEP_ZPROBE_GFX_OVERLAY   // Enable graphical overlay on Z-offset editor
+    #define BABYSTEP_ZPROBE_GFX_OVERLAY   // Enable graphical overlay on Z-offset editor
   #endif
+ #endif
 #endif
 
 // @section extruder
@@ -3150,7 +3156,9 @@
 //
 // M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
 //
-//#define PINS_DEBUGGING
+#if (GITHUB_USER==URSOFT)
+ #define PINS_DEBUGGING
+#endif
 
 // Enable Marlin dev mode which adds some special commands
 //#define MARLIN_DEV_MODE
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 14f42ba712a6..1db508a9fc7b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-#define SHORT_BUILD_VERSION "bf-2.0.x.4" //last is build No
+#define SHORT_BUILD_VERSION "bf-2.0.x.5" //last is build No
 
 /**
  * Verbose version identifier which should contain a reference to the location
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 77d85c4195f4..ea2741f97e44 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -53,8 +53,12 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
   //               This mode will stay active until manual SET_OD_MODE or power cycle
   // BLTOUCH V3.1: SET_5V_MODE or SET_OD_MODE (if enabled).
   //               At power on, the probe will default to the eeprom settings configured by the user
+#if (GITHUB_USER==URSOFT)
+  stow_proc();
+#else
   _reset();
   _stow();
+#endif
 
   #if ENABLED(BLTOUCH_FORCE_MODE_SET)
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 640bae93a8c3..403affad76f5 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -497,7 +497,7 @@
   #undef DEACTIVATE_SERVOS_AFTER_MOVE
   #if NUM_SERVOS == 1
     #undef SERVO_DELAY
-    #define SERVO_DELAY { 50 }
+    #define SERVO_DELAY { 750 }
   #endif
 
   // Always disable probe pin inverting for BLTouch
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 0462bf432328..669b76b7f3af 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -441,7 +441,7 @@ void menu_motion() {
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
-    GCODES_ITEM(MSG_M48_TEST, PSTR("G28\nM48 P10"));
+    GCODES_ITEM(MSG_M48_TEST, PSTR("G28\nM48 P10 X20 Y50"));
   #endif
 
   //
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 0e7dd049f0b8..e3de96c5dbfa 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -820,8 +820,8 @@ void Endstops::update() {
         if (true
           #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
             && z_probe_enabled
-          #elif HAS_CUSTOM_PROBE_PIN
-            && !z_probe_enabled
+          //#elif HAS_CUSTOM_PROBE_PIN /* stop on Zmin also, not only probe */
+          //  && !z_probe_enabled
           #endif
         ) PROCESS_ENDSTOP_Z(MIN);
       #endif
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 67c1655374b8..b9346fa0b9de 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -617,7 +617,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
     {
       // Probe downward slowly to find the bed
       if (probe_down_to_z(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))      // No probe trigger?
-        || (sanity_check && current_position.z > -offset.z + _MAX(Z_CLEARANCE_MULTI_PROBE, 4) / 2)  // Probe triggered too high?
+        || (sanity_check && current_position.z > -offset.z + _MAX(Z_CLEARANCE_MULTI_PROBE, 4) / 2.0)  // Probe triggered too high?
       ) {
         if (DEBUGGING(LEVELING)) {
           DEBUG_ECHOLNPGM("SLOW Probe fail!");

From 868d4acbf7d916eeb6479c7e9b200ca0c0e78a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Wed, 11 Mar 2020 06:49:35 +0500
Subject: [PATCH 406/565] fix #23

---
 Marlin/src/module/configuration_store.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 88d1e60af402..e05fe6c7d8a2 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -716,7 +716,7 @@ void MarlinSettings::postprocess() {
     {
       _FIELD_TEST(planner_leveling_active);
 
-      #if EITHER(AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
+      #if ANY(AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING,AUTO_BED_LEVELING_BILINEAR)
         EEPROM_WRITE(planner.leveling_active);
       #else
         const bool ubl_active = false;
@@ -1610,7 +1610,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(planner_leveling_active);
 
-        #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
+        #if ANY(AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING,AUTO_BED_LEVELING_BILINEAR)
           EEPROM_READ(planner.leveling_active);
         #else
           bool planner_leveling_active;

From eb6c992bfb0d98dd5d659de5b13d770028a1feab Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 10 Mar 2020 22:54:07 -0500
Subject: [PATCH 407/565] Announce SD file open

Requested in #17110
---
 Marlin/src/sd/cardreader.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index b2b0d90e9671..ee3513ab4f3e 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -451,10 +451,12 @@ void openFailed(const char * const fname) {
 
 void announceOpen(const uint8_t doing, const char * const path) {
   if (doing) {
+    PORT_REDIRECT(SERIAL_BOTH);
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Now ");
     serialprintPGM(doing == 1 ? PSTR("doing") : PSTR("fresh"));
     SERIAL_ECHOLNPAIR(" file: ", path);
+    PORT_RESTORE();
   }
 }
 
@@ -511,8 +513,11 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
   if (file.open(curDir, fname, O_READ)) {
     filesize = file.fileSize();
     sdpos = 0;
+
+    PORT_REDIRECT(SERIAL_BOTH);
     SERIAL_ECHOLNPAIR(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
     SERIAL_ECHOLNPGM(STR_SD_FILE_SELECTED);
+    PORT_RESTORE();
 
     selectFileByName(fname);
     ui.set_status(longFilename[0] ? longFilename : fname);

From 23c57011789b32f06756a0ef89dfac04a8eb48c9 Mon Sep 17 00:00:00 2001
From: Jamie <vector76@users.noreply.github.com>
Date: Tue, 10 Mar 2020 22:59:49 -0500
Subject: [PATCH 408/565] Apply soft limits to joystick jogging (#17114)

---
 Marlin/src/feature/joystick.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 70c2812a37aa..f6927effc8ad 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -173,6 +173,7 @@ Joystick joystick;
 
     if (!UNEAR_ZERO(hypot2)) {
       current_position += move_dist;
+      apply_motion_limits(current_position);
       const float length = sqrt(hypot2);
       injecting_now = true;
       planner.buffer_line(current_position, length / seg_time, active_extruder, length);

From 201c991cfa13006553486b47a9925e3fd11ec784 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Wed, 11 Mar 2020 16:40:30 +0800
Subject: [PATCH 409/565] Fix and update DGUS displays (#17072)

---
 Marlin/Configuration_adv.h                    |  2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  3 ++-
 .../extensible_ui/lib/dgus/DGUSDisplay.cpp    | 22 ++++++++++++-------
 .../lcd/extensible_ui/lib/dgus/DGUSDisplay.h  | 10 +++++++--
 .../lib/dgus/DGUSDisplayDefinitionFYSETC.cpp  | 13 ++++++++---
 .../lib/dgus/DGUSDisplayDefinitionFYSETC.h    | 11 +++++-----
 .../lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp |  4 +---
 .../lib/dgus/DGUSDisplayDefinitionOrigin.cpp  |  4 +---
 8 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f405085c95c2..042d188bf0e7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1288,7 +1288,7 @@
 // Additional options for DGUS / DWIN displays
 //
 #if HAS_DGUS_LCD
-  #define DGUS_SERIAL_PORT 2
+  #define DGUS_SERIAL_PORT 3
   #define DGUS_BAUDRATE 115200
 
   #define DGUS_RX_BUFFER_SIZE 128
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9725acffc161..71f422ffd9fc 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -356,11 +356,12 @@
   #endif
 #endif
 
-// Extensible UI serial touch screens. (See src/lcd/extensible_ui)
+// Aliases for LCD features
 #if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
   #define HAS_DGUS_LCD 1
 #endif
 
+// Extensible UI serial touch screens. (See src/lcd/extensible_ui)
 #if ANY(HAS_DGUS_LCD, MALYAN_LCD, TOUCH_UI_FTDI_EVE)
   #define IS_EXTUI
   #define EXTENSIBLE_UI
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
index e62a77ebeea3..951cc827e5d3 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
@@ -179,6 +179,15 @@ void DGUSScreenVariableHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable
   }
 }
 
+// Send the current print progress to the display.
+void DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var) {
+  //DEBUG_ECHOPAIR(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
+  uint16_t tmp = ExtUI::getProgress_percent();
+  //DEBUG_ECHOLNPAIR(" data ", tmp);
+  uint16_t data_to_send = swap16(tmp);
+  dgusdisplay.WriteVariable(var.VP, data_to_send);
+}
+
 // Send the current print time to the display.
 // It is using a hex display for that: It expects BSD coded data in the format xxyyzz
 void DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
@@ -465,7 +474,7 @@ void DGUSScreenVariableHandler::ScreenConfirmedOK(DGUS_VP_Variable &var, void *v
 const uint16_t* DGUSLCD_FindScreenVPMapList(uint8_t screen) {
   const uint16_t *ret;
   const struct VPMapping *map = VPMap;
-  while (ret = (uint16_t*) pgm_read_word(&(map->VPList))) {
+  while (ret = (uint16_t*) pgm_read_ptr(&(map->VPList))) {
     if (pgm_read_byte(&(map->screen)) == screen) return ret;
     map++;
   }
@@ -846,8 +855,8 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable
 void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
 
-  uint16_t value = swap16(*(uint16_t*)val_ptr)/100;
-  ExtUI::setZOffset_mm(value);
+  const float offset = float(swap16(*(uint16_t*)val_ptr)) / 100.0f;
+  ExtUI::setZOffset_mm(offset);
   ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
   return;
 }
@@ -858,7 +867,7 @@ void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var,
 
     int16_t flag = swap16(*(uint16_t*)val_ptr);
     int16_t steps = flag ? -20 : 20;
-    ExtUI::smartAdjustAxis_steps(steps,ExtUI::axis_t::Z,true);
+    ExtUI::smartAdjustAxis_steps(steps, ExtUI::axis_t::Z, true);
     ScreenHandler.ForceCompleteUpdate();
     return;
   }
@@ -1307,11 +1316,8 @@ void DGUSDisplay::ProcessRx() {
           //DEBUG_ECHOPAIR(" vp=", vp, " dlen=", dlen);
           DGUS_VP_Variable ramcopy;
           if (populate_VPVar(vp, &ramcopy)) {
-            if (!(dlen == ramcopy.size || (dlen == 2 && ramcopy.size == 1)))
-              DEBUG_ECHOLNPGM("SIZE MISMATCH");
-            else if (ramcopy.set_by_display_handler) {
+            if (ramcopy.set_by_display_handler)
               ramcopy.set_by_display_handler(ramcopy, &tmp[3]);
-            }
             else
               DEBUG_ECHOLNPGM(" VPVar found, no handler.");
           }
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
index 165aab7ed674..7327f04c7229 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
@@ -26,6 +26,9 @@
 #include "../../../../inc/MarlinConfigPre.h"
 
 #include "../../../../MarlinCore.h"
+#if HAS_BED_PROBE
+  #include "../../../../module/probe.h"
+#endif
 #include "DGUSVPVariable.h"
 
 enum DGUSLCD_Screens : uint8_t;
@@ -140,8 +143,10 @@ class DGUSScreenVariableHandler {
     // Hook for PID autotune
     static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
   #endif
-  // Hook for "Change probe offset z"
-  static void HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr);
+  #if HAS_BED_PROBE
+    // Hook for "Change probe offset z"
+    static void HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
   #if ENABLED(BABYSTEPPING)
     // Hook for live z adjust action
     static void HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr);
@@ -210,6 +215,7 @@ class DGUSScreenVariableHandler {
   static void DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var);
   static void DGUSLCD_SendTemperaturePID(DGUS_VP_Variable &var);
   static void DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var);
+  static void DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var);
   static void DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var);
   #if ENABLED(PRINTCOUNTER)
     static void DGUSLCD_SendPrintAccTimeToDisplay(DGUS_VP_Variable &var);
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
index 6e26e6343479..9f5eed217ae7 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
@@ -213,6 +213,7 @@ const uint16_t VPList_SDPrintTune[] PROGMEM = {
     VP_T_Bed_Is, VP_T_Bed_Set,
   #endif
   VP_Feedrate_Percentage,
+  VP_SD_Print_ProbeOffsetZ,
   0x0000
 };
 
@@ -279,6 +280,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
   0x0000
 };
 
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+  #if HOTENDS >= 1
+    VP_SD_Print_ProbeOffsetZ,
+  #endif
+  0x0000
+};
+
 const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_BOOT, VPList_Boot },
   { DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -297,6 +305,7 @@ const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_WAITING, VPList_PIDTuningWaiting },
   { DGUSLCD_SCREEN_FLC_PREHEAT, VPList_FLCPreheat },
   { DGUSLCD_SCREEN_FLC_PRINTING, VPList_FLCPrinting },
+  { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
   { DGUSLCD_SCREEN_STEPPERMM, VPList_StepPerMM },
   { DGUSLCD_SCREEN_PID_E, VPList_PIDE0 },
   { DGUSLCD_SCREEN_PID_BED, VPList_PIDBED },
@@ -418,9 +427,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
-  #endif
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
index 6eb2369fa1a4..309a23b9b53a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
@@ -43,7 +43,8 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_STEPPERMM           = 212,
   DGUSLCD_SCREEN_PID_E               = 214,
   DGUSLCD_SCREEN_PID_BED             = 218,
-  DGUSLCD_SCREEN_INFOS               =  30,
+  DGUSLCD_SCREEN_Z_OFFSET            = 222,
+  DGUSLCD_SCREEN_INFOS               =  36,
   DGUSLCD_SCREEN_CONFIRM             = 240,
   DGUSLCD_SCREEN_KILL                = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
   DGUSLCD_SCREEN_WAITING             = 251,
@@ -121,8 +122,8 @@ constexpr uint16_t VP_POWER_LOSS_RECOVERY = 0x2180;
 // Fan Control Buttons , switch between "off" and "on"
 constexpr uint16_t VP_FAN0_CONTROL = 0x2200;
 constexpr uint16_t VP_FAN1_CONTROL = 0x2202;
-//constexpr uint16_t VP_FAN2_CONTROL = 0x2204;
-//constexpr uint16_t VP_FAN3_CONTROL = 0x2206;
+constexpr uint16_t VP_FAN2_CONTROL = 0x2204;
+constexpr uint16_t VP_FAN3_CONTROL = 0x2206;
 
 // Heater Control Buttons , triged between "cool down" and "heat PLA" state
 constexpr uint16_t VP_E0_CONTROL = 0x2210;
@@ -240,8 +241,8 @@ constexpr uint16_t VP_SD_Print_Filename = 0x32C0;
 // Fan status
 constexpr uint16_t VP_FAN0_STATUS = 0x3300;
 constexpr uint16_t VP_FAN1_STATUS = 0x3302;
-//constexpr uint16_t VP_FAN2_STATUS = 0x3304;
-//constexpr uint16_t VP_FAN3_STATUS = 0x3306;
+constexpr uint16_t VP_FAN2_STATUS = 0x3304;
+constexpr uint16_t VP_FAN3_STATUS = 0x3306;
 
 // Heater status
 constexpr uint16_t VP_E0_STATUS = 0x3310;
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
index 6ec6cddae469..0b1c5f2ea99b 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
@@ -418,9 +418,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
-  #endif
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
index 51f292421a0d..d05acd5950f9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
@@ -250,9 +250,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
-  #endif
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),

From f29d6f802f7250ad6f1cd0a6f8a9f64f61c65d55 Mon Sep 17 00:00:00 2001
From: "Daniel Kreuzhofer (@danieldotnet)" <daniel@kreuzhofer.de>
Date: Wed, 11 Mar 2020 21:08:47 +0100
Subject: [PATCH 410/565] Revert Anet 1.x envs change (#17120)

---
 Marlin/src/pins/pins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 49f3170b7c9c..64b9e85ba8de 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -314,7 +314,7 @@
 #elif MB(OMCA)
   #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino644p
 #elif MB(ANET_10)
-  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:melzi env:melzi_optiboot
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p
 #elif MB(SETHI)
   #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 

From 924fa6045cc6ccef29cdcdb37f93d44631e5baeb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 11 Mar 2020 15:24:27 -0500
Subject: [PATCH 411/565] Non-const REMEMBER needed for RESTORE

---
 Marlin/src/core/utility.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index c2da0291966c..0c2e91d31fca 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -71,7 +71,7 @@ class restorer {
   inline void restore() { ref_ = val_; }
 };
 
-#define REMEMBER(N,X,V...) const restorer<typeof(X)> restorer_##N(X, ##V)
+#define REMEMBER(N,X,V...) restorer<typeof(X)> restorer_##N(X, ##V)
 #define RESTORE(N) restorer_##N.restore()
 
 // Converts from an uint8_t in the range of 0-255 to an uint8_t

From 112245ee48eff38231ac9732fa0f4d2c5317e0e9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 11 Mar 2020 16:41:18 -0500
Subject: [PATCH 412/565] More explicit EEPROM types (#17127)

---
 Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp    |  4 +--
 .../src/HAL/HAL_DUE/inc/Conditionals_post.h   |  6 ++++
 .../HAL/HAL_DUE/persistent_store_eeprom.cpp   |  4 +--
 .../HAL/HAL_LPC1768/inc/Conditionals_post.h   |  8 +++++
 .../HAL_LPC1768/persistent_store_flash.cpp    |  5 +--
 .../HAL_LPC1768/persistent_store_sdcard.cpp   | 10 ++----
 .../HAL/HAL_SAMD51/inc/Conditionals_post.h    |  6 ++++
 Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h   |  2 +-
 .../HAL_SAMD51/persistent_store_eeprom.cpp    | 34 +++++++++----------
 .../HAL/HAL_STM32/persistent_store_impl.cpp   | 14 ++++----
 .../HAL/HAL_STM32/persistent_store_sdcard.cpp |  6 ++--
 .../HAL_STM32F1/persistent_store_eeprom.cpp   |  4 +--
 .../HAL_STM32F1/persistent_store_sdcard.cpp   |  4 +--
 .../HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp    | 10 ++----
 .../HAL_STM32_F4_F7/inc/Conditionals_post.h   |  8 +++++
 Marlin/src/inc/Conditionals_post.h            | 17 ++++++++++
 Marlin/src/module/printcounter.h              |  4 +--
 Marlin/src/sd/cardreader.cpp                  |  4 +--
 18 files changed, 91 insertions(+), 59 deletions(-)

diff --git a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp b/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
index 926307935863..f1ae224bfcb5 100644
--- a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
+++ b/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
@@ -54,7 +54,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(I2C_EEPROM, SPI_EEPROM)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "../shared/Marduino.h"
 #include "../shared/persistent_store_api.h"
@@ -1016,5 +1016,5 @@ void eeprom_flush() {
   ee_Flush();
 }
 
-#endif // EEPROM_SETTINGS && (!I2C_EEPROM && !SPI_EEPROM)
+#endif // FLASH_EEPROM_EMULATION
 #endif // ARDUINO_ARCH_AVR
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
index 0285c52ee365..223890d79016 100644
--- a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
@@ -20,3 +20,9 @@
  *
  */
 #pragma once
+
+#if USE_EMULATED_EEPROM
+  #undef SRAM_EEPROM_EMULATION
+  #undef SDCARD_EEPROM_EMULATION
+  #define FLASH_EEPROM_EMULATION 1
+#endif
diff --git a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
index 9fdcca7850f1..fbdc760e4548 100644
--- a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
@@ -29,7 +29,7 @@
 #include "../../inc/MarlinConfig.h"
 #include "../shared/persistent_store_api.h"
 
-#if !defined(E2END) && NONE(I2C_EEPROM, SPI_EEPROM)
+#if !defined(E2END) && ENABLED(FLASH_EEPROM_EMULATION)
   #define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
 #endif
 
@@ -38,7 +38,7 @@ extern void eeprom_flush();
 bool PersistentStore::access_start() { return true; }
 
 bool PersistentStore::access_finish() {
-  #if NONE(I2C_EEPROM, SPI_EEPROM)
+  #if ENABLED(FLASH_EEPROM_EMULATION)
     eeprom_flush();
   #endif
   return true;
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
index 0285c52ee365..26371745431a 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
@@ -20,3 +20,11 @@
  *
  */
 #pragma once
+
+#if ENABLED(EEPROM_SETTINGS)
+  #undef USE_REAL_EEPROM
+  #define USE_EMULATED_EEPROM 1
+  #if DISABLED(FLASH_EEPROM_EMULATION)
+    #define SDCARD_EEPROM_EMULATION 1
+  #endif
+#endif
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
index c7cad4d96c53..5525f818a046 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
@@ -38,13 +38,11 @@
  */
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(EEPROM_SETTINGS)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "persistent_store_api.h"
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(FLASH_EEPROM_EMULATION)
-
 extern "C" {
   #include <lpc17xx_iap.h>
 }
@@ -128,5 +126,4 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 size_t PersistentStore::capacity() { return EEPROM_SIZE; }
 
 #endif // FLASH_EEPROM_EMULATION
-#endif // EEPROM_SETTINGS
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
index 50d52fb8607d..aa61938b022b 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
@@ -22,15 +22,12 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../../inc/MarlinConfig.h"
 #include "persistent_store_api.h"
 
-#if DISABLED(FLASH_EEPROM_EMULATION)
-
 #include <chanfs/diskio.h>
 #include <chanfs/ff.h>
 
@@ -178,6 +175,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return 4096; } // 4KiB of Emulated EEPROM
 
-#endif // !FLASH_EEPROM_EMULATION
-#endif // EEPROM_SETTINGS
+#endif // SDCARD_EEPROM_EMULATION
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
index 0285c52ee365..223890d79016 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
@@ -20,3 +20,9 @@
  *
  */
 #pragma once
+
+#if USE_EMULATED_EEPROM
+  #undef SRAM_EEPROM_EMULATION
+  #undef SDCARD_EEPROM_EMULATION
+  #define FLASH_EEPROM_EMULATION 1
+#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
index 04c137c344ae..cc7a10e7a6cf 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
@@ -23,7 +23,7 @@
  * Test SAMD51 specific configuration values for errors at compile-time.
  */
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(FLASH_EEPROM_EMULATION)
   #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
 #endif
 
diff --git a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
index c450599d7b16..6b7326bb25b4 100644
--- a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
@@ -27,7 +27,7 @@
 
 #include "../shared/persistent_store_api.h"
 
-#if NONE(SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(FLASH_EEPROM_EMULATION)
   #define NVMCTRL_CMD(c)    do{                                                 \
                               SYNC(!NVMCTRL->STATUS.bit.READY);                 \
                               NVMCTRL->INTFLAG.bit.DONE = true;                 \
@@ -41,7 +41,7 @@
 #endif
 
 bool PersistentStore::access_start() {
-  #if NONE(SPI_EEPROM, I2C_EEPROM)
+  #if ENABLED(FLASH_EEPROM_EMULATION)
     NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED;  // Buffered mode and segment reallocation active
   #endif
 
@@ -49,7 +49,7 @@ bool PersistentStore::access_start() {
 }
 
 bool PersistentStore::access_finish() {
-  #if NONE(SPI_EEPROM, I2C_EEPROM)
+  #if ENABLED(FLASH_EEPROM_EMULATION)
     NVMCTRL_FLUSH();
     if (!NVMCTRL->SEESTAT.bit.LOCK)
       NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE);    // Lock E2P data write access
@@ -59,14 +59,20 @@ bool PersistentStore::access_finish() {
 }
 
 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
-  #if NONE(SPI_EEPROM, I2C_EEPROM)
+  #if ENABLED(FLASH_EEPROM_EMULATION)
     if (NVMCTRL->SEESTAT.bit.RLOCK)
       NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE);    // Unlock E2P data write access
   #endif
 
   while (size--) {
     const uint8_t v = *value;
-    #if ANY(SPI_EEPROM, I2C_EEPROM)
+    #if ENABLED(FLASH_EEPROM_EMULATION)
+      SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+      if (NVMCTRL->INTFLAG.bit.SEESFULL)
+        NVMCTRL_FLUSH();      // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
+      ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
+      SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
+    #else
       uint8_t * const p = (uint8_t * const)pos;
       if (v != eeprom_read_byte(p)) {
         eeprom_write_byte(p, v);
@@ -76,12 +82,6 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
           return true;
         }
       }
-    #else
-      SYNC(NVMCTRL->SEESTAT.bit.BUSY);
-      if (NVMCTRL->INTFLAG.bit.SEESFULL)
-        NVMCTRL_FLUSH();      // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
-      ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
-      SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
     #endif
     crc16(crc, &v, 1);
     pos++;
@@ -93,11 +93,11 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
   while (size--) {
     uint8_t c;
-    #if ANY(SPI_EEPROM, I2C_EEPROM)
-      c = eeprom_read_byte((uint8_t*)pos);
-    #else
+    #if ENABLED(FLASH_EEPROM_EMULATION)
       SYNC(NVMCTRL->SEESTAT.bit.BUSY);
       c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
+    #else
+      c = eeprom_read_byte((uint8_t*)pos);
     #endif
     if (writing) *value = c;
     crc16(crc, &c, 1);
@@ -108,9 +108,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 }
 
 size_t PersistentStore::capacity() {
-  #if ANY(SPI_EEPROM, I2C_EEPROM)
-    return E2END + 1;
-  #else
+  #if ENABLED(FLASH_EEPROM_EMULATION)
     const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
                   sblk = NVMCTRL->SEESTAT.bit.SBLK;
 
@@ -121,6 +119,8 @@ size_t PersistentStore::capacity() {
     else if (sblk <= 4 || psz == 5) return 16384;
     else if (sblk >= 9 && psz == 7) return 65536;
     else                            return 32768;
+  #else
+    return E2END + 1;
   #endif
 }
 
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
index b4e58a795e28..d9538741dda7 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
@@ -24,7 +24,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && ANY(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if EITHER(USE_REAL_EEPROM, SRAM_EEPROM_EMULATION)
 
 #include "../shared/persistent_store_api.h"
 
@@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     uint8_t v = *value;
 
     // Save to either external EEPROM, program flash or Backup SRAM
-    #if EITHER(SPI_EEPROM, I2C_EEPROM)
+    #if USE_REAL_EEPROM
       // EEPROM has only ~100,000 write cycles,
       // so only write bytes that have changed!
       uint8_t * const p = (uint8_t * const)pos;
@@ -68,7 +68,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
   do {
     // Read from either external EEPROM, program flash or Backup SRAM
     const uint8_t c = (
-      #if EITHER(SPI_EEPROM, I2C_EEPROM)
+      #if USE_REAL_EEPROM
         eeprom_read_byte((uint8_t*)pos)
       #else
         (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
@@ -85,13 +85,13 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() {
   return (
-    #if ENABLED(SRAM_EEPROM_EMULATION)
-      4096 // 4kB
-    #else
+    #if USE_REAL_EEPROM
       E2END + 1
+    #else
+      4096 // 4kB
     #endif
   );
 }
 
-#endif // EEPROM_SETTINGS && (SRAM_EEPROM_EMULATION || SPI_EEPROM || I2C_EEPROM)
+#endif // USE_REAL_EEPROM || SRAM_EEPROM_EMULATION
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
index 2df90d23288e..c5afc557e91f 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
@@ -28,7 +28,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
 
 #include "../shared/persistent_store_api.h"
 
@@ -99,5 +99,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS
-#endif // STM32
+#endif // SDCARD_EEPROM_EMULATION
+#endif // STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
index f2a1cb031a0b..1b3714c56d00 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && EITHER(SPI_EEPROM, I2C_EEPROM)
+#if USE_REAL_EEPROM
 
 #include "../shared/persistent_store_api.h"
 
@@ -73,5 +73,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() { return E2END + 1; }
 
-#endif // EEPROM_SETTINGS && EITHER(SPI_EEPROM, I2C_EEPROM)
+#endif // USE_REAL_EEPROM
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
index 0a0d71271822..8b5d89ad83ec 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
@@ -29,7 +29,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
 
 #include "../shared/persistent_store_api.h"
 
@@ -100,6 +100,6 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS
+#endif // SDCARD_EEPROM_EMULATION
 
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
index 4852234ba455..4e76e9712b77 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
@@ -27,13 +27,7 @@
 // Include configs and pins to get all EEPROM flags
 #include "../../inc/MarlinConfig.h"
 
-#ifdef STM32F7
-  #define HAS_EMULATED_EEPROM 1
-#else
-  #define HAS_EMULATED_EEPROM NONE(I2C_EEPROM, SPI_EEPROM)
-#endif
-
-#if HAS_EMULATED_EEPROM && ENABLED(EEPROM_SETTINGS)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
 // ------------------------
 // Includes
@@ -118,5 +112,5 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n) {
 
 }
 
-#endif // EEPROM_SETTINGS
+#endif // FLASH_EEPROM_EMULATION
 #endif // STM32GENERIC && (STM32F4 || STM32F7)
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
index 0285c52ee365..6e2cf6210163 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
@@ -20,3 +20,11 @@
  *
  */
 #pragma once
+
+#if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
+  #undef USE_REAL_EEPROM
+  #define USE_EMULATED_EEPROM 1
+  #undef SRAM_EEPROM_EMULATION
+  #undef SDCARD_EEPROM_EMULATION
+  #define FLASH_EEPROM_EMULATION 1
+#endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 8b2cd0efd124..e5dc7262a188 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -35,6 +35,23 @@
   #define HAS_LINEAR_E_JERK 1
 #endif
 
+#if ENABLED(EEPROM_SETTINGS)
+  #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM)
+    #define USE_REAL_EEPROM 1
+  #else
+    #define USE_EMULATED_EEPROM 1
+  #endif
+  #if NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+    #define SDCARD_EEPROM_EMULATION 1
+  #endif
+#else
+  #undef I2C_EEPROM
+  #undef SPI_EEPROM
+  #undef SDCARD_EEPROM_EMULATION
+  #undef SRAM_EEPROM_EMULATION
+  #undef FLASH_EEPROM_EMULATION
+#endif
+
 #ifdef TEENSYDUINO
   #undef max
   #define max(a,b) ((a)>(b)?(a):(b))
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index 1630de988dde..261cdf058b59 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -28,7 +28,7 @@
 // Print debug messages with M111 S2
 //#define DEBUG_PRINTCOUNTER
 
-#if EITHER(I2C_EEPROM, SPI_EEPROM)
+#if USE_REAL_EEPROM
   // round up address to next page boundary (assuming 32 byte pages)
   #define STATS_EEPROM_ADDRESS 0x40
 #else
@@ -57,7 +57,7 @@ class PrintCounter: public Stopwatch {
   private:
     typedef Stopwatch super;
 
-    #if EITHER(I2C_EEPROM, SPI_EEPROM) || defined(CPU_32_BIT)
+    #if USE_REAL_EEPROM || defined(CPU_32_BIT)
       typedef uint32_t eeprom_address_t;
     #else
       typedef uint16_t eeprom_address_t;
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index ee3513ab4f3e..5e12aeef2da1 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -370,7 +370,7 @@ void CardReader::mount() {
   else {
     flag.mounted = true;
     SERIAL_ECHO_MSG(STR_SD_CARD_OK);
-    #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+    #if ENABLED(SDCARD_EEPROM_EMULATION)
       settings.first_load();
     #endif
   }
@@ -622,7 +622,7 @@ void CardReader::checkautostart() {
   if (autostart_index < 0 || flag.sdprinting) return;
 
   if (!isMounted()) mount();
-  #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+  #if ENABLED(SDCARD_EEPROM_EMULATION)
     else settings.first_load();
   #endif
 

From 8bad6e11e2efadc5ef0c1b846fcad92cb056b160 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Thu, 12 Mar 2020 05:42:28 +0800
Subject: [PATCH 413/565] Fix STM32 _WRITE macro parameter (#17121)

---
 Marlin/src/HAL/HAL_STM32/fastio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/HAL_STM32/fastio.h b/Marlin/src/HAL/HAL_STM32/fastio.h
index fa94d4703cfe..c17901fa99dd 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.h
+++ b/Marlin/src/HAL/HAL_STM32/fastio.h
@@ -55,7 +55,7 @@ void FastIO_init(); // Must be called before using fast io macros
     else   FastIOPortMap[STM_PORT(digitalPin[IO])]->BRR  = _BV32(STM_PIN(digitalPin[IO])) ; \
   }while(0)
 #else
-  #define _WRITE(IO, V) (FastIOPortMap[STM_PORT(digitalPin[IO])]->BSRR = _BV32(STM_PIN(digitalPin[IO]) + (V ? 0 : 16)))
+  #define _WRITE(IO, V) (FastIOPortMap[STM_PORT(digitalPin[IO])]->BSRR = _BV32(STM_PIN(digitalPin[IO]) + ((V) ? 0 : 16)))
 #endif
 
 #define _READ(IO)               bool(READ_BIT(FastIOPortMap[STM_PORT(digitalPin[IO])]->IDR, _BV32(STM_PIN(digitalPin[IO]))))

From 318a16637bd9dacae046706bcc0f70cdae20a33c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 11 Mar 2020 17:15:33 -0500
Subject: [PATCH 414/565] Fix M810 macro multiple use

Fixes #17125
---
 Marlin/src/gcode/gcode.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index e53a17eeb01e..e58ca5b15be6 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -930,6 +930,7 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
     char * const delim = strchr(gcode, '\n');         // Get address of next newline
     if (delim) *delim = '\0';                         // Replace with nul
     parser.parse(gcode);                              // Parse the current command
+    if (delim) *delim = '\n';                         // Put back the newline
     process_parsed_command(true);                     // Process it
     if (!delim) break;                                // Last command?
     gcode = delim + 1;                                // Get the next command

From 1f55986ed2aeb9db30b2438b125aa8ce64a5f09f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 12 Mar 2020 00:04:11 +0000
Subject: [PATCH 415/565] [cron] Bump distribution date (2020-03-12)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2357c2cf93cd..7abc49f8342e 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-11"
+  #define STRING_DISTRIBUTION_DATE "2020-03-12"
 #endif
 
 /**

From 8c11ecaf7387cf59289604252e87cc46951388fe Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 13 Mar 2020 00:04:16 +0000
Subject: [PATCH 416/565] [cron] Bump distribution date (2020-03-13)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7abc49f8342e..3b725fcb125c 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-12"
+  #define STRING_DISTRIBUTION_DATE "2020-03-13"
 #endif
 
 /**

From 4e96a014a824783829041f551dffb3f52a64078b Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Thu, 12 Mar 2020 17:20:22 -0700
Subject: [PATCH 417/565] Use arduinoststm32 3.x for FYSETC S6 (#17131)

---
 platformio.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index c57c1818bd85..943889c7d561 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -624,7 +624,9 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 [env:FYSETC_S6]
 platform          = ststm32
 board             = fysetc_s6
-platform_packages = tool-stm32duino
+platform_packages =
+   tool-stm32duino
+   framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DTARGET_STM32F4 -std=gnu++14
   -DVECT_TAB_OFFSET=0x10000

From 9c759e5f74ca69a7cb5169ea217dd179d65b1f44 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Thu, 12 Mar 2020 17:26:09 -0700
Subject: [PATCH 418/565] Fix BAUD_RATE_GCODE, etc. (#17135)

---
 Marlin/src/core/macros.h                | 2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp | 4 ++--
 Marlin/src/gcode/lcd/M0_M1.cpp          | 2 +-
 Marlin/src/inc/Conditionals_adv.h       | 4 ----
 Marlin/src/inc/Conditionals_post.h      | 4 ++++
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 32f8e549009c..ba0fc342a0d7 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -189,7 +189,7 @@
 #define ENABLED(V...)       DO(ENA,&&,V)
 #define DISABLED(V...)      DO(DIS,&&,V)
 
-#define TERN(O,A,B)         _TERN(_ENA_1(O),B,A)    // OPTION converted to to '0' or '1'
+#define TERN(O,A,B)         _TERN(_ENA_1(O),B,A)    // OPTION converted to '0' or '1'
 #define _TERN(E,V...)       __TERN(_CAT(T_,E),V)    // Prepend 'T_' to get 'T_0' or 'T_1'
 #define __TERN(T,V...)      ___TERN(_CAT(_NO,T),V)  // Prepend '_NO' to get '_NOT_0' or '_NOT_1'
 #define ___TERN(P,V...)     THIRD(P,V)              // If first argument has a comma, A. Else B.
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 087172518f72..fecbb4be6828 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -411,10 +411,10 @@ void GcodeSuite::M422() {
 
   if (!parser.seen_any()) {
     LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
-      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + '1', SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
+      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), int(i + 1), SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
     #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
       LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
-        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + '1', SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
+        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), int(i + 1), SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
     #endif
     return;
   }
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index ae0cc6049323..f4b913ba2155 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -59,7 +59,7 @@ void GcodeSuite::M0_M1() {
   #if HAS_LEDS_OFF_FLAG
     const bool seenQ = parser.seen('Q');
     if (seenQ) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
-  #else
+  #elif HAS_LCD_MENU
     constexpr bool seenQ = false;
   #endif
 
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 8c286e64d633..675b94146df7 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -100,10 +100,6 @@
   #define HAS_LEDS_OFF_FLAG 1
 #endif
 
-#if !NUM_SERIAL
-  #undef BAUD_RATE_GCODE
-#endif
-
 // Multiple Z steppers
 #ifndef NUM_Z_STEPPER_DRIVERS
   #define NUM_Z_STEPPER_DRIVERS 1
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index e5dc7262a188..3f96fad08330 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2200,3 +2200,7 @@
     #define INIT_SDCARD_ON_BOOT
   #endif
 #endif
+
+#if !NUM_SERIAL
+  #undef BAUD_RATE_GCODE
+#endif

From 59cb1466b7755503c94d6b7496bbc2b204affe65 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 Mar 2020 19:29:32 -0500
Subject: [PATCH 419/565] Fix DUGS / DGUS typo

---
 Marlin/Configuration_adv.h                                  | 4 ++--
 Marlin/src/inc/SanityCheck.h                                | 2 ++
 Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp       | 4 ++--
 Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h         | 2 +-
 .../extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp  | 6 +++---
 .../extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp | 6 +++---
 .../extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp  | 6 +++---
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 042d188bf0e7..5a49c87758f9 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1302,9 +1302,9 @@
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
 
     #if ENABLED(DGUS_LCD_UI_FYSETC)
-      //#define DUGS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
+      //#define DGUS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
     #else
-      #define DUGS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
+      #define DGUS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
     #endif
 
     #define DGUS_FILAMENT_LOADUNLOAD
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index bcabbe9dc8a5..d017dbf2db5b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -483,6 +483,8 @@
   #error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
 #elif defined(Z_QUAD_ENDSTOPS)
   #error "Z_QUAD_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
+#elif defined(DUGS_UI_MOVE_DIS_OPTION)
+  #error "DUGS_UI_MOVE_DIS_OPTION is spelled DGUS_UI_MOVE_DIS_OPTION. Please update Configuration_adv.h."
 #endif
 
 /**
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
index 951cc827e5d3..2bab99cf80f2 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
@@ -603,7 +603,7 @@ void DGUSScreenVariableHandler::HandleManualExtrude(DGUS_VP_Variable &var, void
   skipVP = var.VP;
 }
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandleManualMoveOption");
     *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
@@ -614,7 +614,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
   DEBUG_ECHOLNPGM("HandleManualMove");
 
   int16_t movevalue = swap16(*(uint16_t*)val_ptr);
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     const uint16_t choice = *(uint16_t*)var.memadr;
     movevalue = movevalue > 0 ? choice : -choice;
   #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
index 7327f04c7229..3b44859dd49d 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
@@ -119,7 +119,7 @@ class DGUSScreenVariableHandler {
   static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr);
   // Hook for "Change Flowrate"
   static void HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     // Hook for manual move option
     static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
   #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
index 9f5eed217ae7..531e372a96f6 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
@@ -36,7 +36,7 @@
 #include "../../ui_api.h"
 #include "../../../ultralcd.h"
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
 #endif
 
@@ -331,10 +331,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
 
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
   #endif
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
index 0b1c5f2ea99b..520608442715 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
@@ -36,7 +36,7 @@
 #include "../../ui_api.h"
 #include "../../../ultralcd.h"
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
 #endif
 
@@ -327,10 +327,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
   #endif
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
index d05acd5950f9..cd5ad54400ff 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
@@ -35,7 +35,7 @@
 
 #include "../../../ultralcd.h"
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
 #endif
 
@@ -162,10 +162,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
   #endif
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

From 7070ea0b49bc59dabe24fff7f6a31eccdaee5006 Mon Sep 17 00:00:00 2001
From: nick-diel <35879080+nick-diel@users.noreply.github.com>
Date: Thu, 12 Mar 2020 18:48:33 -0600
Subject: [PATCH 420/565] Add OnPidTuning event to Malyan LCD (#17143)

All ExtUI LCDs need to keep up with ExtUI API changes.
---
 Marlin/src/lcd/extui_malyan_lcd.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index 0d2567a20489..8987723534a6 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -483,6 +483,7 @@ namespace ExtUI {
   void onLoadSettings(const char*) {}
   void onConfigurationStoreWritten(bool) {}
   void onConfigurationStoreRead(bool) {}
+  void OnPidTuning(const result_t) {}
 }
 
 #endif // MALYAN_LCD

From aa32c47fb5716016bae2c9650a8134444b21cae6 Mon Sep 17 00:00:00 2001
From: Erkan Colak <erkanc@gmx.de>
Date: Fri, 13 Mar 2020 18:34:03 +0100
Subject: [PATCH 421/565] Shorten German BLTouch menu item names (#17151)

---
 Marlin/src/lcd/language/language_de.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index ed2f779dd84a..5ac8ee04da52 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -349,17 +349,17 @@ namespace Language_de {
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z-Sonde außerhalb");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Korrekturfaktor");
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Selbsttest");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("BLTouch zurücks.");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("BLTouch ausfahren");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("BLTouch SW-Modus");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("BLTouch 5V-Modus");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("BLTouch OD-Modus");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("BLTouch Mode Store");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("BLTouch auf 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("BLTouch auf OD");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("BLTouch einfahren");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("BLTouch Modus: ");
+  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Selbsttest");
+  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Zurücksetzen");
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Ausfahren");
+  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Modus");
+  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Modus");
+  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Modus");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Mode-Store");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Setze auf 5V");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Setze auf OD");
+  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Einfahren");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Modus: ");
   PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("ACHTUNG: Falsche Einstellung - kann zu Beschädigung führen! Fortfahren?");
   PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
   PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("TouchMI initial.");

From 81b05485183578f7ebc8ced48b2a305b18c0f539 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 Mar 2020 13:06:53 -0500
Subject: [PATCH 422/565] Fix Emergency Parser stuck state

---
 Marlin/src/feature/emergency_parser.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/emergency_parser.h
index dc97c437f802..24540b1d4638 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/emergency_parser.h
@@ -78,7 +78,7 @@ class EmergencyParser {
     switch (state) {
       case EP_RESET:
         switch (c) {
-          case ' ': break;
+          case ' ': case '\n': case '\r': break;
           case 'N': state = EP_N;      break;
           case 'M': state = EP_M;      break;
           default: state  = EP_IGNORE;

From 7ec45f438258a90bab5a60bfee03742fe6b64c3c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 Mar 2020 13:45:32 -0500
Subject: [PATCH 423/565] Fix end of short (auto0.g) prints

---
 Marlin/src/MarlinCore.cpp      | 4 +++-
 Marlin/src/gcode/lcd/M0_M1.cpp | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 32121ae53a8a..19208636b90c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -438,7 +438,9 @@ void startOrResumeJob() {
 
       case 4:                                   // Display "Click to Continue..."
         #if HAS_RESUME_CONTINUE                 // 30 min timeout with LCD, 1 min without
-          did_state = queue.enqueue_one_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
+          did_state = queue.enqueue_one_P(
+            print_job_timer.duration() < 60 ? PSTR("M0Q1P1") : PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60"))
+          );
         #endif
         break;
 
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index f4b913ba2155..c3731fb3a76d 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -56,11 +56,9 @@ void GcodeSuite::M0_M1() {
 
   planner.synchronize();
 
+  const bool seenQ = parser.seen('Q');
   #if HAS_LEDS_OFF_FLAG
-    const bool seenQ = parser.seen('Q');
     if (seenQ) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
-  #elif HAS_LCD_MENU
-    constexpr bool seenQ = false;
   #endif
 
   #if HAS_LCD_MENU

From ad980a72f74a01158858c294fa278589603fb4b0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 Mar 2020 14:42:14 -0500
Subject: [PATCH 424/565] M0 Q preserve status

---
 Marlin/src/gcode/lcd/M0_M1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index c3731fb3a76d..27950a8af1bc 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -103,7 +103,7 @@ void GcodeSuite::M0_M1() {
   #endif
 
   #if HAS_LCD_MENU
-    ui.reset_status();
+    if (!seenQ) ui.reset_status();
   #endif
 
   wait_for_user = false;

From 6bead0c1b04152f6a291d851f6cd4029fe0fc616 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 13 Mar 2020 16:29:29 -0500
Subject: [PATCH 425/565] Shorter paths to HAL, ExtUI (#17156)

---
 Marlin/src/HAL/{HAL_AVR => AVR}/HAL.cpp       |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/HAL.h         |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/HAL_SPI.cpp   |   0
 .../src/HAL/{HAL_AVR => AVR}/MarlinSerial.cpp |   2 +-
 .../src/HAL/{HAL_AVR => AVR}/MarlinSerial.h   |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/Servo.cpp     |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/ServoTimers.h |   0
 .../HAL/{HAL_AVR => AVR}/endstop_interrupts.h |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/fast_pwm.cpp  |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/fastio.cpp    |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/fastio.h      |   0
 .../HAL/{HAL_AVR => AVR}/fastio/fastio_1280.h |   0
 .../HAL/{HAL_AVR => AVR}/fastio/fastio_1281.h |   0
 .../HAL/{HAL_AVR => AVR}/fastio/fastio_168.h  |   0
 .../HAL/{HAL_AVR => AVR}/fastio/fastio_644.h  |   0
 .../{HAL_AVR => AVR}/fastio/fastio_AT90USB.h  |   0
 .../{HAL_AVR => AVR}/inc/Conditionals_LCD.h   |   0
 .../{HAL_AVR => AVR}/inc/Conditionals_adv.h   |   0
 .../{HAL_AVR => AVR}/inc/Conditionals_post.h  |   0
 .../HAL/{HAL_AVR => AVR}/inc/SanityCheck.h    |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/math.h        |   0
 .../persistent_store_eeprom.cpp               |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/pinsDebug.h   |   0
 .../{HAL_AVR => AVR}/pinsDebug_Teensyduino.h  |   0
 .../HAL/{HAL_AVR => AVR}/pinsDebug_plus_70.h  |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/spi_pins.h    |   0
 .../u8g_com_HAL_AVR_sw_spi.cpp                |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/watchdog.cpp  |   0
 Marlin/src/HAL/{HAL_AVR => AVR}/watchdog.h    |   0
 .../src/HAL/{HAL_DUE => DUE}/DebugMonitor.cpp |   0
 .../HAL/{HAL_DUE => DUE}/EepromEmulation.cpp  |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/HAL.cpp       |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/HAL.h         |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/HAL_SPI.cpp   |   0
 .../HAL/{HAL_DUE => DUE}/InterruptVectors.cpp |   0
 .../HAL/{HAL_DUE => DUE}/InterruptVectors.h   |   0
 .../src/HAL/{HAL_DUE => DUE}/MarlinSerial.cpp |   2 +-
 .../src/HAL/{HAL_DUE => DUE}/MarlinSerial.h   |   0
 .../HAL/{HAL_DUE => DUE}/MarlinSerialUSB.cpp  |   2 +-
 .../HAL/{HAL_DUE => DUE}/MarlinSerialUSB.h    |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/Servo.cpp     |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/ServoTimers.h |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/Tone.cpp      |   0
 .../dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp    |   0
 .../dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp    |   0
 .../dogm/u8g_com_HAL_DUE_sw_spi.cpp           |   0
 .../dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp    |   0
 .../dogm/u8g_com_HAL_DUE_sw_spi_shared.h      |   0
 .../HAL/{HAL_DUE => DUE}/endstop_interrupts.h |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/fastio.h      |   0
 .../HAL/{HAL_DUE => DUE}/fastio/G2_PWM.cpp    |   0
 .../src/HAL/{HAL_DUE => DUE}/fastio/G2_PWM.h  |   0
 .../src/HAL/{HAL_DUE => DUE}/fastio/G2_pins.h |   0
 .../{HAL_DUE => DUE}/inc/Conditionals_LCD.h   |   0
 .../{HAL_DUE => DUE}/inc/Conditionals_adv.h   |   0
 .../{HAL_DUE => DUE}/inc/Conditionals_post.h  |   0
 .../HAL/{HAL_DUE => DUE}/inc/SanityCheck.h    |   0
 .../persistent_store_eeprom.cpp               |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/pinsDebug.h   |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/spi_pins.h    |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/timers.cpp    |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/timers.h      |   0
 .../HAL/{HAL_DUE => DUE}/usb/arduino_due_x.h  |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/compiler.h   |   0
 .../HAL/{HAL_DUE => DUE}/usb/conf_access.h    |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/conf_clock.h |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/conf_usb.h   |   0
 .../HAL/{HAL_DUE => DUE}/usb/ctrl_access.c    |   0
 .../HAL/{HAL_DUE => DUE}/usb/ctrl_access.h    |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/genclk.h  |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/mrepeat.h |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/osc.h     |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/pll.h     |   0
 .../HAL/{HAL_DUE => DUE}/usb/preprocessor.h   |   0
 .../HAL/{HAL_DUE => DUE}/usb/sbc_protocol.h   |   0
 .../{HAL_DUE => DUE}/usb/sd_mmc_spi_mem.cpp   |   0
 .../HAL/{HAL_DUE => DUE}/usb/sd_mmc_spi_mem.h |   0
 .../HAL/{HAL_DUE => DUE}/usb/spc_protocol.h   |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/stringz.h |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/sysclk.c  |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/sysclk.h  |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/tpaste.h  |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udc.c     |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udc.h     |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/udc_desc.h   |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udd.h     |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi.h     |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_cdc.c |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_cdc.h |   0
 .../HAL/{HAL_DUE => DUE}/usb/udi_cdc_conf.h   |   0
 .../HAL/{HAL_DUE => DUE}/usb/udi_cdc_desc.c   |   0
 .../{HAL_DUE => DUE}/usb/udi_composite_desc.c |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_msc.c |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_msc.h |   0
 .../{HAL_DUE => DUE}/usb/uotghs_device_due.c  |   0
 .../{HAL_DUE => DUE}/usb/uotghs_device_due.h  |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/uotghs_otg.h |   0
 .../HAL/{HAL_DUE => DUE}/usb/usb_protocol.h   |   0
 .../{HAL_DUE => DUE}/usb/usb_protocol_cdc.h   |   0
 .../{HAL_DUE => DUE}/usb/usb_protocol_msc.h   |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/usb_task.c   |   0
 .../src/HAL/{HAL_DUE => DUE}/usb/usb_task.h   |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/watchdog.cpp  |   0
 Marlin/src/HAL/{HAL_DUE => DUE}/watchdog.h    |   0
 .../FlushableHardwareSerial.cpp               |   0
 .../FlushableHardwareSerial.h                 |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/HAL.cpp   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/HAL.h     |   0
 .../src/HAL/{HAL_ESP32 => ESP32}/HAL_SPI.cpp  |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/Servo.cpp |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/Servo.h   |   0
 .../{HAL_ESP32 => ESP32}/WebSocketSerial.cpp  |   0
 .../{HAL_ESP32 => ESP32}/WebSocketSerial.h    |   0
 .../{HAL_ESP32 => ESP32}/endstop_interrupts.h |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/fastio.h  |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/i2s.cpp   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/i2s.h     |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../{HAL_ESP32 => ESP32}/inc/SanityCheck.h    |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/ota.cpp   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/ota.h     |   0
 .../persistent_store_impl.cpp                 |   0
 .../HAL/{HAL_ESP32 => ESP32}/servotimers.h    |   0
 .../src/HAL/{HAL_ESP32 => ESP32}/spi_pins.h   |   0
 .../src/HAL/{HAL_ESP32 => ESP32}/spiffs.cpp   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/spiffs.h  |   0
 .../src/HAL/{HAL_ESP32 => ESP32}/timers.cpp   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/timers.h  |   0
 .../src/HAL/{HAL_ESP32 => ESP32}/watchdog.cpp |   0
 .../src/HAL/{HAL_ESP32 => ESP32}/watchdog.h   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/web.cpp   |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/web.h     |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/wifi.cpp  |   0
 Marlin/src/HAL/{HAL_ESP32 => ESP32}/wifi.h    |   0
 Marlin/src/HAL/{HAL_LINUX => LINUX}/HAL.cpp   |   0
 Marlin/src/HAL/{HAL_LINUX => LINUX}/HAL.h     |   0
 .../src/HAL/{HAL_LINUX => LINUX}/arduino.cpp  |   0
 Marlin/src/HAL/{HAL_LINUX => LINUX}/fastio.h  |   0
 .../{HAL_LINUX => LINUX}/hardware/Clock.cpp   |   0
 .../HAL/{HAL_LINUX => LINUX}/hardware/Clock.h |   0
 .../{HAL_LINUX => LINUX}/hardware/Gpio.cpp    |   0
 .../HAL/{HAL_LINUX => LINUX}/hardware/Gpio.h  |   0
 .../{HAL_LINUX => LINUX}/hardware/Heater.cpp  |   0
 .../{HAL_LINUX => LINUX}/hardware/Heater.h    |   0
 .../hardware/IOLoggerCSV.cpp                  |   0
 .../hardware/IOLoggerCSV.h                    |   0
 .../hardware/LinearAxis.cpp                   |   0
 .../hardware/LinearAxis.h                     |   0
 .../{HAL_LINUX => LINUX}/hardware/Timer.cpp   |   0
 .../HAL/{HAL_LINUX => LINUX}/hardware/Timer.h |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../{HAL_LINUX => LINUX}/inc/SanityCheck.h    |   0
 .../{HAL_LINUX => LINUX}/include/Arduino.h    |   0
 .../include/pinmapping.cpp                    |   0
 .../{HAL_LINUX => LINUX}/include/pinmapping.h |   0
 .../HAL/{HAL_LINUX => LINUX}/include/serial.h |   2 +-
 Marlin/src/HAL/{HAL_LINUX => LINUX}/main.cpp  |   0
 .../persistent_store_impl.cpp                 |   0
 .../src/HAL/{HAL_LINUX => LINUX}/pinsDebug.h  |   0
 .../HAL/{HAL_LINUX => LINUX}/servo_private.h  |   0
 .../src/HAL/{HAL_LINUX => LINUX}/spi_pins.h   |   0
 .../src/HAL/{HAL_LINUX => LINUX}/timers.cpp   |   0
 Marlin/src/HAL/{HAL_LINUX => LINUX}/timers.h  |   0
 .../src/HAL/{HAL_LINUX => LINUX}/watchdog.cpp |   0
 .../src/HAL/{HAL_LINUX => LINUX}/watchdog.h   |   0
 .../{HAL_LPC1768 => LPC1768}/DebugMonitor.cpp |   0
 .../src/HAL/{HAL_LPC1768 => LPC1768}/HAL.cpp  |   0
 Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/HAL.h |   0
 .../HAL/{HAL_LPC1768 => LPC1768}/HAL_SPI.cpp  |   0
 .../{HAL_LPC1768 => LPC1768}/MarlinSerial.cpp |   0
 .../{HAL_LPC1768 => LPC1768}/MarlinSerial.h   |   2 +-
 .../src/HAL/{HAL_LPC1768 => LPC1768}/Servo.h  |   0
 .../endstop_interrupts.h                      |   0
 .../HAL/{HAL_LPC1768 => LPC1768}/fast_pwm.cpp |   0
 .../src/HAL/{HAL_LPC1768 => LPC1768}/fastio.h |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../inc/SanityCheck.h                         |   0
 .../{HAL_LPC1768 => LPC1768}/include/SPI.h    |   0
 .../include/digipot_mcp4451_I2C_routines.c    |   0
 .../include/digipot_mcp4451_I2C_routines.h    |   0
 .../include/i2c_util.c                        |   0
 .../include/i2c_util.h                        |   0
 .../src/HAL/{HAL_LPC1768 => LPC1768}/main.cpp |   0
 .../persistent_store_api.h                    |   0
 .../persistent_store_flash.cpp                |   0
 .../persistent_store_sdcard.cpp               |   0
 .../HAL/{HAL_LPC1768 => LPC1768}/pinsDebug.h  |   0
 .../HAL/{HAL_LPC1768 => LPC1768}/spi_pins.h   |   0
 .../HAL/{HAL_LPC1768 => LPC1768}/timers.cpp   |   0
 .../src/HAL/{HAL_LPC1768 => LPC1768}/timers.h |   0
 .../u8g/LCD_I2C_routines.cpp                  |   0
 .../u8g/LCD_I2C_routines.h                    |   0
 .../u8g/LCD_defines.h                         |   0
 .../{HAL_LPC1768 => LPC1768}/u8g/LCD_delay.h  |   0
 .../u8g/LCD_pin_routines.c                    |   0
 .../u8g/LCD_pin_routines.h                    |   0
 .../u8g/u8g_com_HAL_LPC1768_hw_spi.cpp        |   0
 .../u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp    |   0
 .../u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp |   0
 .../u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp |   0
 .../u8g/u8g_com_HAL_LPC1768_sw_spi.cpp        |   0
 .../upload_extra_script.py                    |   0
 .../{HAL_LPC1768 => LPC1768}/usb_serial.cpp   |   2 +-
 .../HAL/{HAL_LPC1768 => LPC1768}/watchdog.cpp |   0
 .../HAL/{HAL_LPC1768 => LPC1768}/watchdog.h   |   0
 .../win_usb_driver/lpc176x_usb_driver.inf     |   0
 Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/HAL.cpp |   0
 Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/HAL.h   |   0
 .../HAL/{HAL_SAMD51 => SAMD51}/HAL_SPI.cpp    |   0
 .../MarlinSerial_AGCM4.cpp                    |   0
 .../MarlinSerial_AGCM4.h                      |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/SAMD51.h   |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/Servo.cpp  |   0
 .../HAL/{HAL_SAMD51 => SAMD51}/ServoTimers.h  |   0
 .../endstop_interrupts.h                      |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/fastio.h   |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../{HAL_SAMD51 => SAMD51}/inc/SanityCheck.h  |   0
 .../persistent_store_eeprom.cpp               |   0
 .../HAL/{HAL_SAMD51 => SAMD51}/pinsDebug.h    |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/spi_pins.h |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/timers.cpp |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/timers.h   |   0
 .../HAL/{HAL_SAMD51 => SAMD51}/watchdog.cpp   |   0
 .../src/HAL/{HAL_SAMD51 => SAMD51}/watchdog.h |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/HAL.cpp   |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/HAL.h     |   0
 .../src/HAL/{HAL_STM32 => STM32}/HAL_SPI.cpp  |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/README.md |   0
 .../Sd2Card_sdio_stm32duino.cpp               |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/Servo.cpp |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/Servo.h   |   0
 .../{HAL_STM32 => STM32}/SoftwareSerial.cpp   |   0
 .../HAL/{HAL_STM32 => STM32}/SoftwareSerial.h |   0
 .../{HAL_STM32 => STM32}/endstop_interrupts.h |   0
 .../src/HAL/{HAL_STM32 => STM32}/fastio.cpp   |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/fastio.h  |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../{HAL_STM32 => STM32}/inc/SanityCheck.h    |   0
 .../persistent_store_flash.cpp                |   0
 .../persistent_store_impl.cpp                 |   0
 .../persistent_store_sdcard.cpp               |   0
 .../src/HAL/{HAL_STM32 => STM32}/pinsDebug.h  |   0
 .../pinsDebug_STM32GENERIC.h                  |   4 +-
 .../pinsDebug_STM32duino.h                    |   0
 .../src/HAL/{HAL_STM32 => STM32}/pins_Xref.h  |   0
 .../src/HAL/{HAL_STM32 => STM32}/spi_pins.h   |   0
 .../src/HAL/{HAL_STM32 => STM32}/timers.cpp   |   0
 Marlin/src/HAL/{HAL_STM32 => STM32}/timers.h  |   0
 .../src/HAL/{HAL_STM32 => STM32}/watchdog.cpp |   0
 .../src/HAL/{HAL_STM32 => STM32}/watchdog.h   |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/HAL.cpp  |   0
 Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/HAL.h |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/HAL_SPI.cpp  |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/README.md    |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/SPI.cpp  |   0
 Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/SPI.h |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/Servo.cpp    |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/Servo.h  |   0
 .../SoftwareSerial.cpp                        |   0
 .../{HAL_STM32F1 => STM32F1}/SoftwareSerial.h |   0
 .../{HAL_STM32F1 => STM32F1}/build_flags.py   |   2 +-
 .../dogm/u8g_com_stm32duino_fsmc.cpp          |   0
 .../dogm/u8g_com_stm32duino_swspi.cpp         |   0
 .../endstop_interrupts.h                      |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/fastio.h |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../inc/SanityCheck.h                         |   0
 .../maple_win_usb_driver/maple_serial.inf     |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/msc_sd.cpp   |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/msc_sd.h |   0
 .../{HAL_STM32F1 => STM32F1}/onboard_sd.cpp   |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/onboard_sd.h |   0
 .../persistent_store_eeprom.cpp               |   0
 .../persistent_store_flash.cpp                |   0
 .../persistent_store_sdcard.cpp               |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/pinsDebug.h  |   4 +-
 .../src/HAL/{HAL_STM32F1 => STM32F1}/sdio.cpp |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/sdio.h   |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/spi_pins.h   |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/timers.cpp   |   0
 .../src/HAL/{HAL_STM32F1 => STM32F1}/timers.h |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/watchdog.cpp |   0
 .../HAL/{HAL_STM32F1 => STM32F1}/watchdog.h   |   0
 .../EmulatedEeprom.cpp                        |   0
 .../{HAL_STM32_F4_F7 => STM32_F4_F7}/HAL.cpp  |   0
 .../{HAL_STM32_F4_F7 => STM32_F4_F7}/HAL.h    |   0
 .../HAL_SPI.cpp                               |   0
 .../README.md                                 |   0
 .../STM32F4/README.md                         |   0
 .../STM32F4/timers.cpp                        |   0
 .../STM32F4/timers.h                          |   0
 .../STM32F7/README.md                         |   0
 .../STM32F7/TMC2660.cpp                       |   0
 .../STM32F7/TMC2660.h                         |   0
 .../STM32F7/timers.cpp                        |   0
 .../STM32F7/timers.h                          |   0
 .../Servo.cpp                                 |   0
 .../{HAL_STM32_F4_F7 => STM32_F4_F7}/Servo.h  |   0
 .../eeprom_emul.cpp                           |   0
 .../eeprom_emul.h                             |   0
 .../endstop_interrupts.h                      |   0
 .../{HAL_STM32_F4_F7 => STM32_F4_F7}/fastio.h |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../inc/SanityCheck.h                         |   0
 .../persistent_store_eeprom.cpp               |   0
 .../pinsDebug.h                               |   4 +-
 .../spi_pins.h                                |   0
 .../{HAL_STM32_F4_F7 => STM32_F4_F7}/timers.h |   0
 .../watchdog.cpp                              |   0
 .../watchdog.h                                |   0
 .../{HAL_TEENSY31_32 => TEENSY31_32}/HAL.cpp  |   0
 .../{HAL_TEENSY31_32 => TEENSY31_32}/HAL.h    |   0
 .../HAL_SPI.cpp                               |   0
 .../Servo.cpp                                 |   0
 .../{HAL_TEENSY31_32 => TEENSY31_32}/Servo.h  |   0
 .../endstop_interrupts.h                      |   0
 .../{HAL_TEENSY31_32 => TEENSY31_32}/fastio.h |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../inc/SanityCheck.h                         |   0
 .../persistent_store_impl.cpp                 |   0
 .../pinsDebug.h                               |   0
 .../spi_pins.h                                |   0
 .../timers.cpp                                |   0
 .../{HAL_TEENSY31_32 => TEENSY31_32}/timers.h |   0
 .../watchdog.cpp                              |   0
 .../watchdog.h                                |   0
 .../{HAL_TEENSY35_36 => TEENSY35_36}/HAL.cpp  |   0
 .../{HAL_TEENSY35_36 => TEENSY35_36}/HAL.h    |   0
 .../HAL_SPI.cpp                               |   0
 .../Servo.cpp                                 |   0
 .../{HAL_TEENSY35_36 => TEENSY35_36}/Servo.h  |   0
 .../endstop_interrupts.h                      |   0
 .../{HAL_TEENSY35_36 => TEENSY35_36}/fastio.h |   0
 .../inc/Conditionals_LCD.h                    |   0
 .../inc/Conditionals_adv.h                    |   0
 .../inc/Conditionals_post.h                   |   0
 .../inc/SanityCheck.h                         |   0
 .../persistent_store_eeprom.cpp               |   0
 .../pinsDebug.h                               |   0
 .../spi_pins.h                                |   0
 .../timers.cpp                                |   0
 .../{HAL_TEENSY35_36 => TEENSY35_36}/timers.h |   0
 .../watchdog.cpp                              |   0
 .../watchdog.h                                |   0
 Marlin/src/HAL/platforms.h                    |  28 ++-
 Marlin/src/HAL/shared/HAL_ST7920.h            |   2 +-
 Marlin/src/HAL/shared/servo.h                 |  14 +-
 Marlin/src/HAL/shared/servo_private.h         |   6 +-
 Marlin/src/MarlinCore.cpp                     |   8 +-
 Marlin/src/feature/bedlevel/abl/abl.cpp       |   2 +-
 Marlin/src/feature/bedlevel/bedlevel.cpp      |   2 +-
 .../bedlevel/mbl/mesh_bed_leveling.cpp        |   2 +-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |   2 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |   2 +-
 .../{emergency_parser.cpp => e_parser.cpp}    |   2 +-
 .../{emergency_parser.h => e_parser.h}        |   5 +-
 ...I2CPositionEncoder.cpp => encoder_i2c.cpp} |   2 +-
 .../{I2CPositionEncoder.h => encoder_i2c.h}   |   0
 Marlin/src/feature/joystick.cpp               |   2 +-
 .../{Max7219_Debug_LEDs.cpp => max7219.cpp}   |   2 +-
 .../{Max7219_Debug_LEDs.h => max7219.h}       |   0
 .../src/feature/{prusa_MMU2 => mmu2}/mmu2.cpp |   2 +-
 .../src/feature/{prusa_MMU2 => mmu2}/mmu2.h   |   0
 .../{prusa_MMU2 => mmu2}/serial-protocol.md   |   0
 Marlin/src/feature/pause.cpp                  |   2 +-
 ...{power_loss_recovery.cpp => powerloss.cpp} |   2 +-
 .../{power_loss_recovery.h => powerloss.h}    |   0
 ...p_compensation.cpp => probe_temp_comp.cpp} |   2 +-
 ..._temp_compensation.h => probe_temp_comp.h} |   0
 Marlin/src/feature/runout.cpp                 |   2 +-
 Marlin/src/feature/runout.h                   |   2 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |   2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   4 +-
 Marlin/src/gcode/bedlevel/abl/M421.cpp        |   2 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |   2 +-
 Marlin/src/gcode/bedlevel/ubl/M421.cpp        |   2 +-
 Marlin/src/gcode/calibrate/G76_M871.cpp       |   2 +-
 Marlin/src/gcode/config/M43.cpp               |   2 +-
 Marlin/src/gcode/control/T.cpp                |   2 +-
 Marlin/src/gcode/feature/leds/M7219.cpp       |   2 +-
 Marlin/src/gcode/feature/pause/M125.cpp       |   2 +-
 Marlin/src/gcode/feature/pause/M701_M702.cpp  |   2 +-
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |   4 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp   |   2 +-
 Marlin/src/gcode/feature/prusa_MMU2/M403.cpp  |   2 +-
 Marlin/src/gcode/gcode.cpp                    |   2 +-
 Marlin/src/gcode/gcode.h                      |   2 +-
 Marlin/src/gcode/geometry/G92.cpp             |   2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |   2 +-
 Marlin/src/gcode/queue.cpp                    |  10 +-
 Marlin/src/gcode/{sdcard => sd}/M20.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M21_M22.cpp   |   0
 Marlin/src/gcode/{sdcard => sd}/M23.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M24_M25.cpp   |   2 +-
 Marlin/src/gcode/{sdcard => sd}/M26.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M27.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M28_M29.cpp   |   0
 Marlin/src/gcode/{sdcard => sd}/M30.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M32.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M33.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M34.cpp       |   0
 Marlin/src/gcode/{sdcard => sd}/M524.cpp      |   0
 Marlin/src/gcode/{sdcard => sd}/M928.cpp      |   0
 .../gcode/{temperature => temp}/M104_M109.cpp |   2 +-
 .../src/gcode/{temperature => temp}/M105.cpp  |   0
 .../gcode/{temperature => temp}/M106_M107.cpp |   0
 .../gcode/{temperature => temp}/M140_M190.cpp |   2 +-
 .../gcode/{temperature => temp}/M141_M191.cpp |   2 +-
 .../src/gcode/{temperature => temp}/M155.cpp  |   0
 .../src/gcode/{temperature => temp}/M303.cpp  |   2 +-
 .../lib/dgus/DGUSDisplay.cpp                  |   4 +-
 .../lib/dgus/DGUSDisplay.h                    |   0
 .../lib/dgus/DGUSDisplayDef.h}                |   6 +-
 .../lib/dgus/DGUSVPVariable.h                 |   0
 .../lib/dgus/fysetc/DGUSDisplayDef.cpp}       |  16 +-
 .../lib/dgus/fysetc/DGUSDisplayDef.h}         |   0
 .../lib/dgus/hiprecy/DGUSDisplayDef.cpp}      |  16 +-
 .../lib/dgus/hiprecy/DGUSDisplayDef.h}        |   0
 .../lib/dgus/origin/DGUSDisplayDef.cpp}       |  14 +-
 .../lib/dgus/origin/DGUSDisplayDef.h}         |   0
 .../archim2-flash/flash_storage.cpp           |   0
 .../archim2-flash/flash_storage.h             |   0
 .../archim2-flash/media_file_reader.cpp       |   0
 .../archim2-flash/media_file_reader.h         |   0
 .../lib/ftdi_eve_touch_ui/compat.h            |   0
 .../lib/ftdi_eve_touch_ui/config.h            |   0
 .../ftdi_eve_lib/LICENSE.txt                  |   0
 .../ftdi_eve_touch_ui/ftdi_eve_lib/README.md  |   0
 .../ftdi_eve_lib/basic/boards.h               |   0
 .../ftdi_eve_lib/basic/commands.cpp           |   0
 .../ftdi_eve_lib/basic/commands.h             |   0
 .../ftdi_eve_lib/basic/constants.h            |   0
 .../ftdi_eve_lib/basic/display_list.h         |   0
 .../ftdi_eve_lib/basic/ftdi_basic.h           |   0
 .../ftdi_eve_lib/basic/registers_ft800.h      |   0
 .../ftdi_eve_lib/basic/registers_ft810.h      |   0
 .../ftdi_eve_lib/basic/resolutions.h          |   0
 .../ftdi_eve_lib/basic/spi.cpp                |   0
 .../ftdi_eve_lib/basic/spi.h                  |   0
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   |   0
 .../ftdi_eve_lib/extended/bitmap_info.h       |   0
 .../extended/command_processor.cpp            |   0
 .../ftdi_eve_lib/extended/command_processor.h |   0
 .../ftdi_eve_lib/extended/dl_cache.cpp        |   0
 .../ftdi_eve_lib/extended/dl_cache.h          |   0
 .../ftdi_eve_lib/extended/event_loop.cpp      |   0
 .../ftdi_eve_lib/extended/event_loop.h        |   0
 .../ftdi_eve_lib/extended/ftdi_extended.h     |   0
 .../ftdi_eve_lib/extended/grid_layout.h       |   0
 .../ftdi_eve_lib/extended/polygon.h           |   0
 .../ftdi_eve_lib/extended/rgb_t.h             |   0
 .../ftdi_eve_lib/extended/screen_types.cpp    |   0
 .../ftdi_eve_lib/extended/screen_types.h      |   0
 .../ftdi_eve_lib/extended/sound_list.h        |   0
 .../ftdi_eve_lib/extended/sound_player.cpp    |   0
 .../ftdi_eve_lib/extended/sound_player.h      |   0
 .../ftdi_eve_lib/extended/text_box.cpp        |   0
 .../ftdi_eve_lib/extended/text_box.h          |   0
 .../ftdi_eve_lib/extended/tiny_timer.cpp      |   0
 .../ftdi_eve_lib/extended/tiny_timer.h        |   0
 .../ftdi_eve_lib/extended/unicode/README.txt  |   0
 .../extended/unicode/font_bitmaps.cpp         |   0
 .../extended/unicode/font_bitmaps.h           |   0
 .../unicode/font_bitmaps/romfont_31.pbm       | Bin
 .../western_char_set_bitmap_31.png            | Bin
 .../western_char_set_bitmap_31.svg            |   0
 .../extended/unicode/font_size_t.cpp          |   0
 .../extended/unicode/font_size_t.h            |   0
 .../extended/unicode/standard_char_set.cpp    |   0
 .../extended/unicode/standard_char_set.h      |   0
 .../ftdi_eve_lib/extended/unicode/unicode.cpp |   0
 .../ftdi_eve_lib/extended/unicode/unicode.h   |   0
 .../extended/unicode/western_char_set.cpp     |   0
 .../extended/unicode/western_char_set.h       |   0
 .../unicode/western_char_set_bitmap_31.h      |   0
 .../ftdi_eve_lib/extras/bitmap2cpp.py         |   0
 .../ftdi_eve_lib/extras/circular_progress.h   |   0
 .../ftdi_eve_lib/extras/poly_ui.h             |   0
 .../ftdi_eve_lib/extras/svg2cpp.py            |   0
 .../ftdi_eve_lib/ftdi_eve_lib.h               |   0
 .../ftdi_eve_touch_ui/language/language.cpp   |   0
 .../lib/ftdi_eve_touch_ui/language/language.h |   0
 .../ftdi_eve_touch_ui/language/language_en.h  |   0
 .../lib/ftdi_eve_touch_ui/marlin_events.cpp   |   0
 .../lib/ftdi_eve_touch_ui/pin_mappings.h      |   0
 .../screens/about_screen.cpp                  |   0
 .../screens/advanced_settings_menu.cpp        |   0
 .../screens/alert_dialog_box.cpp              |   0
 .../screens/backlash_compensation_screen.cpp  |   0
 .../base_numeric_adjustment_screen.cpp        |   0
 .../ftdi_eve_touch_ui/screens/base_screen.cpp |   0
 .../screens/bio_advanced_settings.cpp         |   0
 .../screens/bio_confirm_home_e.cpp            |   0
 .../screens/bio_confirm_home_xyz.cpp          |   0
 .../screens/bio_main_menu.cpp                 |   0
 .../screens/bio_printer_ui_landscape.h        |   0
 .../screens/bio_printer_ui_portrait.h         |   0
 .../screens/bio_printing_dialog_box.cpp       |   0
 .../screens/bio_status_screen.cpp             |   0
 .../screens/bio_tune_menu.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/boot_screen.cpp |   0
 .../screens/case_light_screen.cpp             |   0
 .../screens/change_filament_screen.cpp        |   0
 .../confirm_abort_print_dialog_box.cpp        |   0
 .../confirm_auto_calibration_dialog_box.cpp   |   0
 .../confirm_erase_flash_dialog_box.cpp        |   0
 .../confirm_start_print_dialog_box.cpp        |   0
 .../confirm_user_request_alert_box.cpp        |   0
 .../screens/default_acceleration_screen.cpp   |   0
 .../screens/developer_menu.cpp                |   0
 .../screens/dialog_box_base_class.cpp         |   0
 .../screens/display_tuning_screen.cpp         |   0
 .../screens/endstop_state_screen.cpp          |   0
 .../screens/feedrate_percent_screen.cpp       |   0
 .../screens/filament_menu.cpp                 |   0
 .../screens/filament_runout_screen.cpp        |   0
 .../screens/files_screen.cpp                  |   0
 .../screens/interface_settings_screen.cpp     |   0
 .../screens/interface_sounds_screen.cpp       |   0
 .../ftdi_eve_touch_ui/screens/jerk_screen.cpp |   0
 .../screens/junction_deviation_screen.cpp     |   0
 .../ftdi_eve_touch_ui/screens/kill_screen.cpp |   0
 .../screens/language_menu.cpp                 |   0
 .../screens/linear_advance_screen.cpp         |   0
 .../ftdi_eve_touch_ui/screens/lock_screen.cpp |   0
 .../ftdi_eve_touch_ui/screens/main_menu.cpp   |   0
 .../screens/max_acceleration_screen.cpp       |   0
 .../screens/max_velocity_screen.cpp           |   0
 .../screens/media_player_screen.cpp           |   0
 .../screens/move_axis_screen.cpp              |   0
 .../screens/nozzle_offsets_screen.cpp         |   0
 .../screens/nudge_nozzle_screen.cpp           |   0
 .../screens/preheat_timer_screen.cpp          |   0
 .../screens/restore_failsafe_dialog_box.cpp   |   0
 .../screens/save_settings_dialog_box.cpp      |   0
 .../ftdi_eve_touch_ui/screens/screen_data.h   |   0
 .../lib/ftdi_eve_touch_ui/screens/screens.cpp |   0
 .../lib/ftdi_eve_touch_ui/screens/screens.h   |   0
 .../screens/spinner_dialog_box.cpp            |   0
 .../screens/statistics_screen.cpp             |   0
 .../screens/status_screen.cpp                 |   0
 .../stepper_bump_sensitivity_screen.cpp       |   0
 .../screens/stepper_current_screen.cpp        |   0
 .../screens/steps_screen.cpp                  |   0
 .../screens/stress_test_screen.cpp            |   0
 .../screens/string_format.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/string_format.h |   0
 .../screens/temperature_screen.cpp            |   0
 .../screens/touch_calibration_screen.cpp      |   0
 .../screens/touch_registers_screen.cpp        |   0
 .../ftdi_eve_touch_ui/screens/tune_menu.cpp   |   0
 .../screens/widget_demo_screen.cpp            |   0
 .../screens/z_offset_screen.cpp               |   0
 .../lib/ftdi_eve_touch_ui/theme/bitmaps.h     |   0
 .../lib/ftdi_eve_touch_ui/theme/colors.h      |   0
 .../lib/ftdi_eve_touch_ui/theme/fonts.h       |   0
 .../theme/marlin_bootscreen_landscape.h       |   0
 .../theme/marlin_bootscreen_portrait.h        |   0
 .../lib/ftdi_eve_touch_ui/theme/sounds.cpp    |   0
 .../lib/ftdi_eve_touch_ui/theme/sounds.h      |   0
 .../lib/ftdi_eve_touch_ui/theme/theme.h       |   0
 .../lcd/{extensible_ui => extui}/ui_api.cpp   |   2 +-
 .../src/lcd/{extensible_ui => extui}/ui_api.h |   0
 Marlin/src/lcd/extui_dgus_lcd.cpp             |   6 +-
 Marlin/src/lcd/extui_example.cpp              |   2 +-
 Marlin/src/lcd/extui_malyan_lcd.cpp           |   2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |   2 +-
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp  |   2 +-
 Marlin/src/lcd/menu/menu_job_recovery.cpp     |   2 +-
 Marlin/src/lcd/menu/menu_mmu2.cpp             |   2 +-
 Marlin/src/lcd/ultralcd.cpp                   |   2 +-
 Marlin/src/libs/buzzer.cpp                    |   2 +-
 Marlin/src/libs/stopwatch.cpp                 |   2 +-
 Marlin/src/module/configuration_store.cpp     |   6 +-
 Marlin/src/module/planner.cpp                 |   2 +-
 Marlin/src/module/printcounter.cpp            |   2 +-
 Marlin/src/module/probe.cpp                   |   2 +-
 Marlin/src/module/stepper.cpp                 |   2 +-
 Marlin/src/module/stepper/TMC26X.h            |   2 +-
 Marlin/src/module/temperature.cpp             |   4 +-
 Marlin/src/module/tool_change.cpp             |   2 +-
 Marlin/src/sd/cardreader.cpp                  |   4 +-
 platformio.ini                                | 168 +++++++++---------
 600 files changed, 228 insertions(+), 227 deletions(-)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/MarlinSerial.cpp (99%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/MarlinSerial.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/ServoTimers.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fast_pwm.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio/fastio_1280.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio/fastio_1281.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio/fastio_168.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio/fastio_644.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/fastio/fastio_AT90USB.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/math.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/persistent_store_eeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/pinsDebug_Teensyduino.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/pinsDebug_plus_70.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/u8g_com_HAL_AVR_sw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_AVR => AVR}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/DebugMonitor.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/EepromEmulation.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/InterruptVectors.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/InterruptVectors.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/MarlinSerial.cpp (99%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/MarlinSerial.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/MarlinSerialUSB.cpp (99%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/MarlinSerialUSB.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/ServoTimers.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/Tone.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/dogm/u8g_com_HAL_DUE_sw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/dogm/u8g_com_HAL_DUE_sw_spi_shared.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/fastio/G2_PWM.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/fastio/G2_PWM.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/fastio/G2_pins.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/persistent_store_eeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/arduino_due_x.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/compiler.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/conf_access.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/conf_clock.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/conf_usb.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/ctrl_access.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/ctrl_access.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/genclk.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/mrepeat.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/osc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/pll.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/preprocessor.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/sbc_protocol.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/sd_mmc_spi_mem.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/sd_mmc_spi_mem.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/spc_protocol.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/stringz.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/sysclk.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/sysclk.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/tpaste.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udc.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udc_desc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udd.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_cdc.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_cdc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_cdc_conf.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_cdc_desc.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_composite_desc.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_msc.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/udi_msc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/uotghs_device_due.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/uotghs_device_due.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/uotghs_otg.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/usb_protocol.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/usb_protocol_cdc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/usb_protocol_msc.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/usb_task.c (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/usb/usb_task.h (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_DUE => DUE}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/FlushableHardwareSerial.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/FlushableHardwareSerial.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/WebSocketSerial.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/WebSocketSerial.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/i2s.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/i2s.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/ota.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/ota.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/persistent_store_impl.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/servotimers.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/spiffs.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/spiffs.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/web.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/web.h (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/wifi.cpp (100%)
 rename Marlin/src/HAL/{HAL_ESP32 => ESP32}/wifi.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/arduino.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Clock.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Clock.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Gpio.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Gpio.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Heater.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Heater.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/IOLoggerCSV.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/IOLoggerCSV.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/LinearAxis.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/LinearAxis.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Timer.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/hardware/Timer.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/include/Arduino.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/include/pinmapping.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/include/pinmapping.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/include/serial.h (99%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/main.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/persistent_store_impl.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/servo_private.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_LINUX => LINUX}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/DebugMonitor.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/MarlinSerial.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/MarlinSerial.h (97%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/fast_pwm.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/include/SPI.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/include/digipot_mcp4451_I2C_routines.c (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/include/digipot_mcp4451_I2C_routines.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/include/i2c_util.c (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/include/i2c_util.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/main.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/persistent_store_api.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/persistent_store_flash.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/persistent_store_sdcard.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/LCD_I2C_routines.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/LCD_I2C_routines.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/LCD_defines.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/LCD_delay.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/LCD_pin_routines.c (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/LCD_pin_routines.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/upload_extra_script.py (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/usb_serial.cpp (96%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_LPC1768 => LPC1768}/win_usb_driver/lpc176x_usb_driver.inf (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/MarlinSerial_AGCM4.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/MarlinSerial_AGCM4.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/SAMD51.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/ServoTimers.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/persistent_store_eeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_SAMD51 => SAMD51}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/README.md (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/Sd2Card_sdio_stm32duino.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/SoftwareSerial.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/SoftwareSerial.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/fastio.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/persistent_store_flash.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/persistent_store_impl.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/persistent_store_sdcard.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/pinsDebug_STM32GENERIC.h (98%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/pinsDebug_STM32duino.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/pins_Xref.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32 => STM32}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/README.md (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/SPI.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/SoftwareSerial.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/SoftwareSerial.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/build_flags.py (95%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/dogm/u8g_com_stm32duino_fsmc.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/dogm/u8g_com_stm32duino_swspi.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/maple_win_usb_driver/maple_serial.inf (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/msc_sd.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/msc_sd.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/onboard_sd.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/onboard_sd.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/persistent_store_eeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/persistent_store_flash.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/persistent_store_sdcard.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/pinsDebug.h (90%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/sdio.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/sdio.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32F1 => STM32F1}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/EmulatedEeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/README.md (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F4/README.md (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F4/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F4/timers.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F7/README.md (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F7/TMC2660.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F7/TMC2660.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F7/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/STM32F7/timers.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/eeprom_emul.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/eeprom_emul.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/persistent_store_eeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/pinsDebug.h (91%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_STM32_F4_F7 => STM32_F4_F7}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/persistent_store_impl.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY31_32 => TEENSY31_32}/watchdog.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/HAL.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/HAL.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/HAL_SPI.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/Servo.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/Servo.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/endstop_interrupts.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/fastio.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/inc/Conditionals_LCD.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/inc/Conditionals_adv.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/inc/Conditionals_post.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/inc/SanityCheck.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/persistent_store_eeprom.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/pinsDebug.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/spi_pins.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/timers.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/timers.h (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/watchdog.cpp (100%)
 rename Marlin/src/HAL/{HAL_TEENSY35_36 => TEENSY35_36}/watchdog.h (100%)
 rename Marlin/src/feature/{emergency_parser.cpp => e_parser.cpp} (97%)
 rename Marlin/src/feature/{emergency_parser.h => e_parser.h} (97%)
 rename Marlin/src/feature/{I2CPositionEncoder.cpp => encoder_i2c.cpp} (99%)
 rename Marlin/src/feature/{I2CPositionEncoder.h => encoder_i2c.h} (100%)
 rename Marlin/src/feature/{Max7219_Debug_LEDs.cpp => max7219.cpp} (99%)
 rename Marlin/src/feature/{Max7219_Debug_LEDs.h => max7219.h} (100%)
 rename Marlin/src/feature/{prusa_MMU2 => mmu2}/mmu2.cpp (99%)
 rename Marlin/src/feature/{prusa_MMU2 => mmu2}/mmu2.h (100%)
 rename Marlin/src/feature/{prusa_MMU2 => mmu2}/serial-protocol.md (100%)
 rename Marlin/src/feature/{power_loss_recovery.cpp => powerloss.cpp} (99%)
 rename Marlin/src/feature/{power_loss_recovery.h => powerloss.h} (100%)
 rename Marlin/src/feature/{probe_temp_compensation.cpp => probe_temp_comp.cpp} (99%)
 rename Marlin/src/feature/{probe_temp_compensation.h => probe_temp_comp.h} (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M20.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M21_M22.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M23.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M24_M25.cpp (98%)
 rename Marlin/src/gcode/{sdcard => sd}/M26.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M27.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M28_M29.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M30.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M32.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M33.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M34.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M524.cpp (100%)
 rename Marlin/src/gcode/{sdcard => sd}/M928.cpp (100%)
 rename Marlin/src/gcode/{temperature => temp}/M104_M109.cpp (99%)
 rename Marlin/src/gcode/{temperature => temp}/M105.cpp (100%)
 rename Marlin/src/gcode/{temperature => temp}/M106_M107.cpp (100%)
 rename Marlin/src/gcode/{temperature => temp}/M140_M190.cpp (98%)
 rename Marlin/src/gcode/{temperature => temp}/M141_M191.cpp (98%)
 rename Marlin/src/gcode/{temperature => temp}/M155.cpp (100%)
 rename Marlin/src/gcode/{temperature => temp}/M303.cpp (97%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/dgus/DGUSDisplay.cpp (99%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/dgus/DGUSDisplay.h (100%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinition.h => extui/lib/dgus/DGUSDisplayDef.h} (92%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/dgus/DGUSVPVariable.h (100%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp => extui/lib/dgus/fysetc/DGUSDisplayDef.cpp} (98%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h => extui/lib/dgus/fysetc/DGUSDisplayDef.h} (100%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp => extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp} (98%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h => extui/lib/dgus/hiprecy/DGUSDisplayDef.h} (100%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp => extui/lib/dgus/origin/DGUSDisplayDef.cpp} (98%)
 rename Marlin/src/lcd/{extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h => extui/lib/dgus/origin/DGUSDisplayDef.h} (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/compat.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/config.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/language/language.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/language/language.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/language/language_en.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/marlin_events.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/pin_mappings.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/about_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/base_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/files_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/language_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/main_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/screen_data.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/screens.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/screens.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/status_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/string_format.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/string_format.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/bitmaps.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/colors.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/fonts.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/sounds.cpp (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/sounds.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/lib/ftdi_eve_touch_ui/theme/theme.h (100%)
 rename Marlin/src/lcd/{extensible_ui => extui}/ui_api.cpp (99%)
 rename Marlin/src/lcd/{extensible_ui => extui}/ui_api.h (100%)

diff --git a/Marlin/src/HAL/HAL_AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/HAL.cpp
rename to Marlin/src/HAL/AVR/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/HAL.h
rename to Marlin/src/HAL/AVR/HAL.h
diff --git a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
rename to Marlin/src/HAL/AVR/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
rename to Marlin/src/HAL/AVR/MarlinSerial.cpp
index a0c636a9f976..aa453cfee96d 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -55,7 +55,7 @@
   // A SW memory barrier, to ensure GCC does not overoptimize loops
   #define sw_barrier() asm volatile("": : :"memory");
 
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 
   // "Atomically" read the RX head index value without disabling interrupts:
   // This MUST be called with RX interrupts enabled, and CAN'T be called
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/MarlinSerial.h
rename to Marlin/src/HAL/AVR/MarlinSerial.h
diff --git a/Marlin/src/HAL/HAL_AVR/Servo.cpp b/Marlin/src/HAL/AVR/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/Servo.cpp
rename to Marlin/src/HAL/AVR/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/ServoTimers.h b/Marlin/src/HAL/AVR/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/ServoTimers.h
rename to Marlin/src/HAL/AVR/ServoTimers.h
diff --git a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
rename to Marlin/src/HAL/AVR/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
rename to Marlin/src/HAL/AVR/fast_pwm.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio.cpp
rename to Marlin/src/HAL/AVR/fastio.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio.h
rename to Marlin/src/HAL/AVR/fastio.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h b/Marlin/src/HAL/AVR/fastio/fastio_1280.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
rename to Marlin/src/HAL/AVR/fastio/fastio_1280.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h b/Marlin/src/HAL/AVR/fastio/fastio_1281.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
rename to Marlin/src/HAL/AVR/fastio/fastio_1281.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h b/Marlin/src/HAL/AVR/fastio/fastio_168.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
rename to Marlin/src/HAL/AVR/fastio/fastio_168.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h b/Marlin/src/HAL/AVR/fastio/fastio_644.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
rename to Marlin/src/HAL/AVR/fastio/fastio_644.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h b/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
rename to Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h b/Marlin/src/HAL/AVR/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h b/Marlin/src/HAL/AVR/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
rename to Marlin/src/HAL/AVR/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_AVR/math.h b/Marlin/src/HAL/AVR/math.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/math.h
rename to Marlin/src/HAL/AVR/math.h
diff --git a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp b/Marlin/src/HAL/AVR/persistent_store_eeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/AVR/persistent_store_eeprom.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug.h
rename to Marlin/src/HAL/AVR/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
rename to Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
rename to Marlin/src/HAL/AVR/pinsDebug_plus_70.h
diff --git a/Marlin/src/HAL/HAL_AVR/spi_pins.h b/Marlin/src/HAL/AVR/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/spi_pins.h
rename to Marlin/src/HAL/AVR/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
rename to Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.cpp b/Marlin/src/HAL/AVR/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/watchdog.cpp
rename to Marlin/src/HAL/AVR/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.h b/Marlin/src/HAL/AVR/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/watchdog.h
rename to Marlin/src/HAL/AVR/watchdog.h
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp b/Marlin/src/HAL/DUE/DebugMonitor.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
rename to Marlin/src/HAL/DUE/DebugMonitor.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp b/Marlin/src/HAL/DUE/EepromEmulation.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
rename to Marlin/src/HAL/DUE/EepromEmulation.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL.cpp
rename to Marlin/src/HAL/DUE/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL.h
rename to Marlin/src/HAL/DUE/HAL.h
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
rename to Marlin/src/HAL/DUE/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp b/Marlin/src/HAL/DUE/InterruptVectors.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
rename to Marlin/src/HAL/DUE/InterruptVectors.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.h b/Marlin/src/HAL/DUE/InterruptVectors.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors.h
rename to Marlin/src/HAL/DUE/InterruptVectors.h
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
rename to Marlin/src/HAL/DUE/MarlinSerial.cpp
index 3cd6f7d5ed34..d0cb4c956deb 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -45,7 +45,7 @@ template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSeria
 // A SW memory barrier, to ensure GCC does not overoptimize loops
 #define sw_barrier() asm volatile("": : :"memory");
 
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
 
 // (called with RX interrupts disabled)
 template<typename Cfg>
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial.h
rename to Marlin/src/HAL/DUE/MarlinSerial.h
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
rename to Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index 38cdd8f8a15f..43748209ee23 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -34,7 +34,7 @@
 #include "MarlinSerialUSB.h"
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 // Imports from Atmel USB Stack/CDC implementation
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
rename to Marlin/src/HAL/DUE/MarlinSerialUSB.h
diff --git a/Marlin/src/HAL/HAL_DUE/Servo.cpp b/Marlin/src/HAL/DUE/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/Servo.cpp
rename to Marlin/src/HAL/DUE/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/ServoTimers.h b/Marlin/src/HAL/DUE/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/ServoTimers.h
rename to Marlin/src/HAL/DUE/ServoTimers.h
diff --git a/Marlin/src/HAL/HAL_DUE/Tone.cpp b/Marlin/src/HAL/DUE/Tone.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/Tone.cpp
rename to Marlin/src/HAL/DUE/Tone.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
diff --git a/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h b/Marlin/src/HAL/DUE/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
rename to Marlin/src/HAL/DUE/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_DUE/fastio.h b/Marlin/src/HAL/DUE/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/fastio.h
rename to Marlin/src/HAL/DUE/fastio.h
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
rename to Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
rename to Marlin/src/HAL/DUE/fastio/G2_PWM.h
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h b/Marlin/src/HAL/DUE/fastio/G2_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
rename to Marlin/src/HAL/DUE/fastio/G2_pins.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h b/Marlin/src/HAL/DUE/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
rename to Marlin/src/HAL/DUE/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/DUE/persistent_store_eeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/DUE/persistent_store_eeprom.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/pinsDebug.h
rename to Marlin/src/HAL/DUE/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_DUE/spi_pins.h b/Marlin/src/HAL/DUE/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/spi_pins.h
rename to Marlin/src/HAL/DUE/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/timers.cpp
rename to Marlin/src/HAL/DUE/timers.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/timers.h
rename to Marlin/src/HAL/DUE/timers.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h b/Marlin/src/HAL/DUE/usb/arduino_due_x.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h
rename to Marlin/src/HAL/DUE/usb/arduino_due_x.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/compiler.h b/Marlin/src/HAL/DUE/usb/compiler.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/compiler.h
rename to Marlin/src/HAL/DUE/usb/compiler.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_access.h b/Marlin/src/HAL/DUE/usb/conf_access.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_access.h
rename to Marlin/src/HAL/DUE/usb/conf_access.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_clock.h b/Marlin/src/HAL/DUE/usb/conf_clock.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_clock.h
rename to Marlin/src/HAL/DUE/usb/conf_clock.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_usb.h b/Marlin/src/HAL/DUE/usb/conf_usb.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_usb.h
rename to Marlin/src/HAL/DUE/usb/conf_usb.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c b/Marlin/src/HAL/DUE/usb/ctrl_access.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c
rename to Marlin/src/HAL/DUE/usb/ctrl_access.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h b/Marlin/src/HAL/DUE/usb/ctrl_access.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h
rename to Marlin/src/HAL/DUE/usb/ctrl_access.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/genclk.h b/Marlin/src/HAL/DUE/usb/genclk.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/genclk.h
rename to Marlin/src/HAL/DUE/usb/genclk.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/mrepeat.h b/Marlin/src/HAL/DUE/usb/mrepeat.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/mrepeat.h
rename to Marlin/src/HAL/DUE/usb/mrepeat.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/osc.h b/Marlin/src/HAL/DUE/usb/osc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/osc.h
rename to Marlin/src/HAL/DUE/usb/osc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/pll.h b/Marlin/src/HAL/DUE/usb/pll.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/pll.h
rename to Marlin/src/HAL/DUE/usb/pll.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/preprocessor.h b/Marlin/src/HAL/DUE/usb/preprocessor.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/preprocessor.h
rename to Marlin/src/HAL/DUE/usb/preprocessor.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h b/Marlin/src/HAL/DUE/usb/sbc_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h
rename to Marlin/src/HAL/DUE/usb/sbc_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp
rename to Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h
rename to Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h b/Marlin/src/HAL/DUE/usb/spc_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h
rename to Marlin/src/HAL/DUE/usb/spc_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/stringz.h b/Marlin/src/HAL/DUE/usb/stringz.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/stringz.h
rename to Marlin/src/HAL/DUE/usb/stringz.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sysclk.c b/Marlin/src/HAL/DUE/usb/sysclk.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sysclk.c
rename to Marlin/src/HAL/DUE/usb/sysclk.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sysclk.h b/Marlin/src/HAL/DUE/usb/sysclk.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sysclk.h
rename to Marlin/src/HAL/DUE/usb/sysclk.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/tpaste.h b/Marlin/src/HAL/DUE/usb/tpaste.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/tpaste.h
rename to Marlin/src/HAL/DUE/usb/tpaste.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc.c b/Marlin/src/HAL/DUE/usb/udc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc.c
rename to Marlin/src/HAL/DUE/usb/udc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc.h b/Marlin/src/HAL/DUE/usb/udc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc.h
rename to Marlin/src/HAL/DUE/usb/udc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc_desc.h b/Marlin/src/HAL/DUE/usb/udc_desc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc_desc.h
rename to Marlin/src/HAL/DUE/usb/udc_desc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udd.h b/Marlin/src/HAL/DUE/usb/udd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udd.h
rename to Marlin/src/HAL/DUE/usb/udd.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi.h b/Marlin/src/HAL/DUE/usb/udi.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi.h
rename to Marlin/src/HAL/DUE/usb/udi.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c b/Marlin/src/HAL/DUE/usb/udi_cdc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c
rename to Marlin/src/HAL/DUE/usb/udi_cdc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h b/Marlin/src/HAL/DUE/usb/udi_cdc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h
rename to Marlin/src/HAL/DUE/usb/udi_cdc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h b/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h
rename to Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c b/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c
rename to Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c b/Marlin/src/HAL/DUE/usb/udi_composite_desc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c
rename to Marlin/src/HAL/DUE/usb/udi_composite_desc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_msc.c b/Marlin/src/HAL/DUE/usb/udi_msc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_msc.c
rename to Marlin/src/HAL/DUE/usb/udi_msc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_msc.h b/Marlin/src/HAL/DUE/usb/udi_msc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_msc.h
rename to Marlin/src/HAL/DUE/usb/udi_msc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c b/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c
rename to Marlin/src/HAL/DUE/usb/uotghs_device_due.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h b/Marlin/src/HAL/DUE/usb/uotghs_device_due.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h
rename to Marlin/src/HAL/DUE/usb/uotghs_device_due.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h b/Marlin/src/HAL/DUE/usb/uotghs_otg.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h
rename to Marlin/src/HAL/DUE/usb/uotghs_otg.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol.h b/Marlin/src/HAL/DUE/usb/usb_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol_msc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol_msc.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_task.c b/Marlin/src/HAL/DUE/usb/usb_task.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_task.c
rename to Marlin/src/HAL/DUE/usb/usb_task.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_task.h b/Marlin/src/HAL/DUE/usb/usb_task.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_task.h
rename to Marlin/src/HAL/DUE/usb/usb_task.h
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.cpp b/Marlin/src/HAL/DUE/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/watchdog.cpp
rename to Marlin/src/HAL/DUE/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.h b/Marlin/src/HAL/DUE/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/watchdog.h
rename to Marlin/src/HAL/DUE/watchdog.h
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
rename to Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
rename to Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL.cpp
rename to Marlin/src/HAL/ESP32/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL.h
rename to Marlin/src/HAL/ESP32/HAL.h
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp b/Marlin/src/HAL/ESP32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
rename to Marlin/src/HAL/ESP32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.cpp b/Marlin/src/HAL/ESP32/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/Servo.cpp
rename to Marlin/src/HAL/ESP32/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.h b/Marlin/src/HAL/ESP32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/Servo.h
rename to Marlin/src/HAL/ESP32/Servo.h
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp b/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
rename to Marlin/src/HAL/ESP32/WebSocketSerial.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h b/Marlin/src/HAL/ESP32/WebSocketSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
rename to Marlin/src/HAL/ESP32/WebSocketSerial.h
diff --git a/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h b/Marlin/src/HAL/ESP32/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
rename to Marlin/src/HAL/ESP32/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_ESP32/fastio.h b/Marlin/src/HAL/ESP32/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/fastio.h
rename to Marlin/src/HAL/ESP32/fastio.h
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/i2s.cpp
rename to Marlin/src/HAL/ESP32/i2s.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.h b/Marlin/src/HAL/ESP32/i2s.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/i2s.h
rename to Marlin/src/HAL/ESP32/i2s.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h b/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h b/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
rename to Marlin/src/HAL/ESP32/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.cpp b/Marlin/src/HAL/ESP32/ota.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/ota.cpp
rename to Marlin/src/HAL/ESP32/ota.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.h b/Marlin/src/HAL/ESP32/ota.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/ota.h
rename to Marlin/src/HAL/ESP32/ota.h
diff --git a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp b/Marlin/src/HAL/ESP32/persistent_store_impl.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
rename to Marlin/src/HAL/ESP32/persistent_store_impl.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/servotimers.h b/Marlin/src/HAL/ESP32/servotimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/servotimers.h
rename to Marlin/src/HAL/ESP32/servotimers.h
diff --git a/Marlin/src/HAL/HAL_ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/spi_pins.h
rename to Marlin/src/HAL/ESP32/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.cpp b/Marlin/src/HAL/ESP32/spiffs.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/spiffs.cpp
rename to Marlin/src/HAL/ESP32/spiffs.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.h b/Marlin/src/HAL/ESP32/spiffs.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/spiffs.h
rename to Marlin/src/HAL/ESP32/spiffs.h
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.cpp b/Marlin/src/HAL/ESP32/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/timers.cpp
rename to Marlin/src/HAL/ESP32/timers.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/timers.h
rename to Marlin/src/HAL/ESP32/timers.h
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.cpp b/Marlin/src/HAL/ESP32/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/watchdog.cpp
rename to Marlin/src/HAL/ESP32/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.h b/Marlin/src/HAL/ESP32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/watchdog.h
rename to Marlin/src/HAL/ESP32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_ESP32/web.cpp b/Marlin/src/HAL/ESP32/web.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/web.cpp
rename to Marlin/src/HAL/ESP32/web.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/web.h b/Marlin/src/HAL/ESP32/web.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/web.h
rename to Marlin/src/HAL/ESP32/web.h
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/wifi.cpp
rename to Marlin/src/HAL/ESP32/wifi.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.h b/Marlin/src/HAL/ESP32/wifi.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/wifi.h
rename to Marlin/src/HAL/ESP32/wifi.h
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.cpp b/Marlin/src/HAL/LINUX/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/HAL.cpp
rename to Marlin/src/HAL/LINUX/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/HAL.h
rename to Marlin/src/HAL/LINUX/HAL.h
diff --git a/Marlin/src/HAL/HAL_LINUX/arduino.cpp b/Marlin/src/HAL/LINUX/arduino.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/arduino.cpp
rename to Marlin/src/HAL/LINUX/arduino.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/fastio.h b/Marlin/src/HAL/LINUX/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/fastio.h
rename to Marlin/src/HAL/LINUX/fastio.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp b/Marlin/src/HAL/LINUX/hardware/Clock.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
rename to Marlin/src/HAL/LINUX/hardware/Clock.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h b/Marlin/src/HAL/LINUX/hardware/Clock.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
rename to Marlin/src/HAL/LINUX/hardware/Clock.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp b/Marlin/src/HAL/LINUX/hardware/Gpio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
rename to Marlin/src/HAL/LINUX/hardware/Gpio.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h b/Marlin/src/HAL/LINUX/hardware/Gpio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
rename to Marlin/src/HAL/LINUX/hardware/Gpio.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp b/Marlin/src/HAL/LINUX/hardware/Heater.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
rename to Marlin/src/HAL/LINUX/hardware/Heater.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h b/Marlin/src/HAL/LINUX/hardware/Heater.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
rename to Marlin/src/HAL/LINUX/hardware/Heater.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
rename to Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
rename to Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp b/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
rename to Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h b/Marlin/src/HAL/LINUX/hardware/LinearAxis.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
rename to Marlin/src/HAL/LINUX/hardware/LinearAxis.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp b/Marlin/src/HAL/LINUX/hardware/Timer.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
rename to Marlin/src/HAL/LINUX/hardware/Timer.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h b/Marlin/src/HAL/LINUX/hardware/Timer.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
rename to Marlin/src/HAL/LINUX/hardware/Timer.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h b/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h b/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h b/Marlin/src/HAL/LINUX/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
rename to Marlin/src/HAL/LINUX/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h b/Marlin/src/HAL/LINUX/include/Arduino.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/include/Arduino.h
rename to Marlin/src/HAL/LINUX/include/Arduino.h
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
rename to Marlin/src/HAL/LINUX/include/pinmapping.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h b/Marlin/src/HAL/LINUX/include/pinmapping.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
rename to Marlin/src/HAL/LINUX/include/pinmapping.h
diff --git a/Marlin/src/HAL/HAL_LINUX/include/serial.h b/Marlin/src/HAL/LINUX/include/serial.h
similarity index 99%
rename from Marlin/src/HAL/HAL_LINUX/include/serial.h
rename to Marlin/src/HAL/LINUX/include/serial.h
index 1036d6539df9..c881d5dbdad9 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/serial.h
+++ b/Marlin/src/HAL/LINUX/include/serial.h
@@ -23,7 +23,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../../feature/emergency_parser.h"
+  #include "../../../feature/e_parser.h"
 #endif
 
 #include <stdarg.h>
diff --git a/Marlin/src/HAL/HAL_LINUX/main.cpp b/Marlin/src/HAL/LINUX/main.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/main.cpp
rename to Marlin/src/HAL/LINUX/main.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp b/Marlin/src/HAL/LINUX/persistent_store_impl.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
rename to Marlin/src/HAL/LINUX/persistent_store_impl.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/pinsDebug.h b/Marlin/src/HAL/LINUX/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/pinsDebug.h
rename to Marlin/src/HAL/LINUX/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_LINUX/servo_private.h b/Marlin/src/HAL/LINUX/servo_private.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/servo_private.h
rename to Marlin/src/HAL/LINUX/servo_private.h
diff --git a/Marlin/src/HAL/HAL_LINUX/spi_pins.h b/Marlin/src/HAL/LINUX/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/spi_pins.h
rename to Marlin/src/HAL/LINUX/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.cpp b/Marlin/src/HAL/LINUX/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/timers.cpp
rename to Marlin/src/HAL/LINUX/timers.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/timers.h
rename to Marlin/src/HAL/LINUX/timers.h
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.cpp b/Marlin/src/HAL/LINUX/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/watchdog.cpp
rename to Marlin/src/HAL/LINUX/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.h b/Marlin/src/HAL/LINUX/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/watchdog.h
rename to Marlin/src/HAL/LINUX/watchdog.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp b/Marlin/src/HAL/LPC1768/DebugMonitor.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
rename to Marlin/src/HAL/LPC1768/DebugMonitor.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL.cpp
rename to Marlin/src/HAL/LPC1768/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL.h
rename to Marlin/src/HAL/LPC1768/HAL.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
rename to Marlin/src/HAL/LPC1768/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
rename to Marlin/src/HAL/LPC1768/MarlinSerial.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h b/Marlin/src/HAL/LPC1768/MarlinSerial.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
rename to Marlin/src/HAL/LPC1768/MarlinSerial.h
index cfddc28406de..b6bbf8e453f2 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.h
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 #ifndef SERIAL_PORT
diff --git a/Marlin/src/HAL/HAL_LPC1768/Servo.h b/Marlin/src/HAL/LPC1768/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/Servo.h
rename to Marlin/src/HAL/LPC1768/Servo.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
rename to Marlin/src/HAL/LPC1768/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
rename to Marlin/src/HAL/LPC1768/fast_pwm.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/fastio.h b/Marlin/src/HAL/LPC1768/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/fastio.h
rename to Marlin/src/HAL/LPC1768/fastio.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
rename to Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
rename to Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
rename to Marlin/src/HAL/LPC1768/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h b/Marlin/src/HAL/LPC1768/include/SPI.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/SPI.h
rename to Marlin/src/HAL/LPC1768/include/SPI.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
rename to Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
rename to Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c b/Marlin/src/HAL/LPC1768/include/i2c_util.c
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
rename to Marlin/src/HAL/LPC1768/include/i2c_util.c
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h b/Marlin/src/HAL/LPC1768/include/i2c_util.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
rename to Marlin/src/HAL/LPC1768/include/i2c_util.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/main.cpp
rename to Marlin/src/HAL/LPC1768/main.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h b/Marlin/src/HAL/LPC1768/persistent_store_api.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
rename to Marlin/src/HAL/LPC1768/persistent_store_api.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
rename to Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp b/Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
rename to Marlin/src/HAL/LPC1768/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h b/Marlin/src/HAL/LPC1768/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/spi_pins.h
rename to Marlin/src/HAL/LPC1768/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.cpp b/Marlin/src/HAL/LPC1768/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/timers.cpp
rename to Marlin/src/HAL/LPC1768/timers.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/timers.h
rename to Marlin/src/HAL/LPC1768/timers.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
rename to Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h b/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
rename to Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
rename to Marlin/src/HAL/LPC1768/upload_extra_script.py
diff --git a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp b/Marlin/src/HAL/LPC1768/usb_serial.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
rename to Marlin/src/HAL/LPC1768/usb_serial.cpp
index 0af2d8347bb0..ddb31da20f6e 100644
--- a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
+++ b/Marlin/src/HAL/LPC1768/usb_serial.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(EMERGENCY_PARSER)
 
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
 EmergencyParser::State emergency_state;
 bool CDC_RecvCallback(const char buffer) {
   emergency_parser.update(emergency_state, buffer);
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp b/Marlin/src/HAL/LPC1768/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
rename to Marlin/src/HAL/LPC1768/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.h b/Marlin/src/HAL/LPC1768/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/watchdog.h
rename to Marlin/src/HAL/LPC1768/watchdog.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/win_usb_driver/lpc176x_usb_driver.inf b/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/win_usb_driver/lpc176x_usb_driver.inf
rename to Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL.cpp
rename to Marlin/src/HAL/SAMD51/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL.h
rename to Marlin/src/HAL/SAMD51/HAL.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp b/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
rename to Marlin/src/HAL/SAMD51/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
rename to Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
rename to Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/SAMD51.h b/Marlin/src/HAL/SAMD51/SAMD51.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/SAMD51.h
rename to Marlin/src/HAL/SAMD51/SAMD51.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/Servo.cpp
rename to Marlin/src/HAL/SAMD51/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h b/Marlin/src/HAL/SAMD51/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
rename to Marlin/src/HAL/SAMD51/ServoTimers.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
rename to Marlin/src/HAL/SAMD51/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/fastio.h
rename to Marlin/src/HAL/SAMD51/fastio.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
rename to Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
rename to Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
rename to Marlin/src/HAL/SAMD51/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
rename to Marlin/src/HAL/SAMD51/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/spi_pins.h
rename to Marlin/src/HAL/SAMD51/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/timers.cpp
rename to Marlin/src/HAL/SAMD51/timers.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/SAMD51/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/timers.h
rename to Marlin/src/HAL/SAMD51/timers.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp b/Marlin/src/HAL/SAMD51/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
rename to Marlin/src/HAL/SAMD51/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.h b/Marlin/src/HAL/SAMD51/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog.h
rename to Marlin/src/HAL/SAMD51/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL.cpp
rename to Marlin/src/HAL/STM32/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL.h
rename to Marlin/src/HAL/STM32/HAL.h
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/README.md b/Marlin/src/HAL/STM32/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/README.md
rename to Marlin/src/HAL/STM32/README.md
diff --git a/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp
rename to Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.cpp b/Marlin/src/HAL/STM32/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/Servo.cpp
rename to Marlin/src/HAL/STM32/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.h b/Marlin/src/HAL/STM32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/Servo.h
rename to Marlin/src/HAL/STM32/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.cpp b/Marlin/src/HAL/STM32/SoftwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/SoftwareSerial.cpp
rename to Marlin/src/HAL/STM32/SoftwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.h b/Marlin/src/HAL/STM32/SoftwareSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/SoftwareSerial.h
rename to Marlin/src/HAL/STM32/SoftwareSerial.h
diff --git a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h b/Marlin/src/HAL/STM32/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
rename to Marlin/src/HAL/STM32/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/fastio.cpp
rename to Marlin/src/HAL/STM32/fastio.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.h b/Marlin/src/HAL/STM32/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/fastio.h
rename to Marlin/src/HAL/STM32/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/STM32/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/STM32/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
rename to Marlin/src/HAL/STM32/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp b/Marlin/src/HAL/STM32/persistent_store_flash.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32/persistent_store_flash.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/STM32/persistent_store_impl.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
rename to Marlin/src/HAL/STM32/persistent_store_impl.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32/persistent_store_sdcard.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32/persistent_store_sdcard.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug.h
rename to Marlin/src/HAL/STM32/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h b/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
rename to Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
index 43f430a48f9d..e3d28aed070c 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
+++ b/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
@@ -29,9 +29,9 @@
 #ifdef BOARD_NR_GPIO_PINS  // Only in STM32GENERIC (Maple)
 
 #ifdef __STM32F1__
-  #include "../HAL_STM32F1/fastio.h"
+  #include "../STM32F1/fastio.h"
 #elif defined(STM32F4) || defined(STM32F7)
-  #include "../HAL_STM32_F4_F7/fastio.h"
+  #include "../STM32_F4_F7/fastio.h"
 #else
   #include "fastio.h"
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h b/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
rename to Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
diff --git a/Marlin/src/HAL/HAL_STM32/pins_Xref.h b/Marlin/src/HAL/STM32/pins_Xref.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/pins_Xref.h
rename to Marlin/src/HAL/STM32/pins_Xref.h
diff --git a/Marlin/src/HAL/HAL_STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/spi_pins.h
rename to Marlin/src/HAL/STM32/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/timers.cpp
rename to Marlin/src/HAL/STM32/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/timers.h
rename to Marlin/src/HAL/STM32/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/watchdog.cpp
rename to Marlin/src/HAL/STM32/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.h b/Marlin/src/HAL/STM32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/watchdog.h
rename to Marlin/src/HAL/STM32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL.cpp
rename to Marlin/src/HAL/STM32F1/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL.h
rename to Marlin/src/HAL/STM32F1/HAL.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp b/Marlin/src/HAL/STM32F1/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32F1/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/README.md b/Marlin/src/HAL/STM32F1/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/README.md
rename to Marlin/src/HAL/STM32F1/README.md
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SPI.cpp
rename to Marlin/src/HAL/STM32F1/SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SPI.h
rename to Marlin/src/HAL/STM32F1/SPI.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.cpp b/Marlin/src/HAL/STM32F1/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/Servo.cpp
rename to Marlin/src/HAL/STM32F1/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.h b/Marlin/src/HAL/STM32F1/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/Servo.h
rename to Marlin/src/HAL/STM32F1/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp b/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
rename to Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h b/Marlin/src/HAL/STM32F1/SoftwareSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
rename to Marlin/src/HAL/STM32F1/SoftwareSerial.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/build_flags.py b/Marlin/src/HAL/STM32F1/build_flags.py
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/build_flags.py
rename to Marlin/src/HAL/STM32F1/build_flags.py
index 6310740fe0d8..98c871a1d8f9 100755
--- a/Marlin/src/HAL/HAL_STM32F1/build_flags.py
+++ b/Marlin/src/HAL/STM32F1/build_flags.py
@@ -15,7 +15,7 @@
                     "--specs=nano.specs",
                     "--specs=nosys.specs",
 
-                    "-IMarlin/src/HAL/HAL_STM32F1",
+                    "-IMarlin/src/HAL/STM32F1",
 
                     "-MMD",
                     "-MP",
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
rename to Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
rename to Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
rename to Marlin/src/HAL/STM32F1/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/fastio.h b/Marlin/src/HAL/STM32F1/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/fastio.h
rename to Marlin/src/HAL/STM32F1/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32F1/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver/maple_serial.inf b/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver/maple_serial.inf
rename to Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp b/Marlin/src/HAL/STM32F1/msc_sd.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
rename to Marlin/src/HAL/STM32F1/msc_sd.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.h b/Marlin/src/HAL/STM32F1/msc_sd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/msc_sd.h
rename to Marlin/src/HAL/STM32F1/msc_sd.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
rename to Marlin/src/HAL/STM32F1/onboard_sd.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h b/Marlin/src/HAL/STM32F1/onboard_sd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
rename to Marlin/src/HAL/STM32F1/onboard_sd.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp b/Marlin/src/HAL/STM32F1/persistent_store_flash.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32F1/persistent_store_flash.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
similarity index 90%
rename from Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
rename to Marlin/src/HAL/STM32F1/pinsDebug.h
index 8d3eed52d0ba..913cb62afcfd 100644
--- a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef NUM_DIGITAL_PINS             // Only in ST's Arduino core (STM32duino, STM32Core)
-  #include "../HAL_STM32/pinsDebug_STM32duino.h"
+  #include "../STM32/pinsDebug_STM32duino.h"
 #elif defined(BOARD_NR_GPIO_PINS)   // Only in STM32GENERIC (Maple)
-  #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+  #include "../STM32/pinsDebug_STM32GENERIC.h"
 #else
   #error "M43 not supported for this board"
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.cpp b/Marlin/src/HAL/STM32F1/sdio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/sdio.cpp
rename to Marlin/src/HAL/STM32F1/sdio.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.h b/Marlin/src/HAL/STM32F1/sdio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/sdio.h
rename to Marlin/src/HAL/STM32F1/sdio.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/spi_pins.h b/Marlin/src/HAL/STM32F1/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/spi_pins.h
rename to Marlin/src/HAL/STM32F1/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.cpp b/Marlin/src/HAL/STM32F1/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/timers.cpp
rename to Marlin/src/HAL/STM32F1/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/timers.h
rename to Marlin/src/HAL/STM32F1/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp b/Marlin/src/HAL/STM32F1/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
rename to Marlin/src/HAL/STM32F1/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.h b/Marlin/src/HAL/STM32F1/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog.h
rename to Marlin/src/HAL/STM32F1/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp b/Marlin/src/HAL/STM32_F4_F7/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
rename to Marlin/src/HAL/STM32_F4_F7/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h b/Marlin/src/HAL/STM32_F4_F7/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
rename to Marlin/src/HAL/STM32_F4_F7/HAL.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp b/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/README.md b/Marlin/src/HAL/STM32_F4_F7/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/README.md
rename to Marlin/src/HAL/STM32_F4_F7/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/README.md b/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/README.md
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/README.md b/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/README.md
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h b/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp b/Marlin/src/HAL/STM32_F4_F7/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
rename to Marlin/src/HAL/STM32_F4_F7/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h b/Marlin/src/HAL/STM32_F4_F7/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
rename to Marlin/src/HAL/STM32_F4_F7/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp b/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp
rename to Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h b/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h
rename to Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h b/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
rename to Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h b/Marlin/src/HAL/STM32_F4_F7/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
rename to Marlin/src/HAL/STM32_F4_F7/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h b/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h b/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
similarity index 91%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
rename to Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
index 8672dd0a1b05..208a3524f700 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
+++ b/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef NUM_DIGITAL_PINS             // Only in ST's Arduino core (STM32duino, STM32Core)
-  #include "../HAL_STM32/pinsDebug_STM32duino.h"
+  #include "../STM32/pinsDebug_STM32duino.h"
 #elif defined(BOARD_NR_GPIO_PINS)   // Only in STM32GENERIC (Maple)
-  #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+  #include "../STM32/pinsDebug_STM32GENERIC.h"
 #else
   #error "M43 Pins Debugging not supported for this board."
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h b/Marlin/src/HAL/STM32_F4_F7/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
rename to Marlin/src/HAL/STM32_F4_F7/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h b/Marlin/src/HAL/STM32_F4_F7/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp b/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
rename to Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h b/Marlin/src/HAL/STM32_F4_F7/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
rename to Marlin/src/HAL/STM32_F4_F7/watchdog.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
rename to Marlin/src/HAL/TEENSY31_32/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
rename to Marlin/src/HAL/TEENSY31_32/HAL.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
rename to Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp b/Marlin/src/HAL/TEENSY31_32/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
rename to Marlin/src/HAL/TEENSY31_32/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h b/Marlin/src/HAL/TEENSY31_32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
rename to Marlin/src/HAL/TEENSY31_32/Servo.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
rename to Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h b/Marlin/src/HAL/TEENSY31_32/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
rename to Marlin/src/HAL/TEENSY31_32/fastio.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
rename to Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
rename to Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp b/Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
rename to Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/pinsDebug.h b/Marlin/src/HAL/TEENSY31_32/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/pinsDebug.h
rename to Marlin/src/HAL/TEENSY31_32/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h b/Marlin/src/HAL/TEENSY31_32/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
rename to Marlin/src/HAL/TEENSY31_32/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp b/Marlin/src/HAL/TEENSY31_32/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
rename to Marlin/src/HAL/TEENSY31_32/timers.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/timers.h
rename to Marlin/src/HAL/TEENSY31_32/timers.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp b/Marlin/src/HAL/TEENSY31_32/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
rename to Marlin/src/HAL/TEENSY31_32/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h b/Marlin/src/HAL/TEENSY31_32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
rename to Marlin/src/HAL/TEENSY31_32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
rename to Marlin/src/HAL/TEENSY35_36/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
rename to Marlin/src/HAL/TEENSY35_36/HAL.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
rename to Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp b/Marlin/src/HAL/TEENSY35_36/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
rename to Marlin/src/HAL/TEENSY35_36/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h b/Marlin/src/HAL/TEENSY35_36/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
rename to Marlin/src/HAL/TEENSY35_36/Servo.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
rename to Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h b/Marlin/src/HAL/TEENSY35_36/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
rename to Marlin/src/HAL/TEENSY35_36/fastio.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
rename to Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp b/Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
rename to Marlin/src/HAL/TEENSY35_36/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h b/Marlin/src/HAL/TEENSY35_36/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
rename to Marlin/src/HAL/TEENSY35_36/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp b/Marlin/src/HAL/TEENSY35_36/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
rename to Marlin/src/HAL/TEENSY35_36/timers.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/timers.h
rename to Marlin/src/HAL/TEENSY35_36/timers.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp b/Marlin/src/HAL/TEENSY35_36/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
rename to Marlin/src/HAL/TEENSY35_36/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h b/Marlin/src/HAL/TEENSY35_36/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
rename to Marlin/src/HAL/TEENSY35_36/watchdog.h
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index cbf8a9512bb9..cc462f37c5bd 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -21,32 +21,30 @@
  */
 #pragma once
 
+#define XSTR(V...) #V
+
 #ifdef __AVR__
-  #define HAL_PLATFORM HAL_AVR
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/AVR/NAME)
 #elif defined(ARDUINO_ARCH_SAM)
-  #define HAL_PLATFORM HAL_DUE
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/DUE/NAME)
 #elif defined(__MK20DX256__)
-  #define HAL_PLATFORM HAL_TEENSY31_32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY31_32/NAME)
 #elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
-  #define HAL_PLATFORM HAL_TEENSY35_36
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY35_36/NAME)
 #elif defined(TARGET_LPC1768)
-  #define HAL_PLATFORM HAL_LPC1768
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/LPC1768/NAME)
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
-  #define HAL_PLATFORM HAL_STM32F1
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME)
 #elif defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
-  #define HAL_PLATFORM HAL_STM32_F4_F7
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32_F4_F7/NAME)
 #elif defined(ARDUINO_ARCH_STM32)
-  #define HAL_PLATFORM HAL_STM32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME)
 #elif defined(ARDUINO_ARCH_ESP32)
-  #define HAL_PLATFORM HAL_ESP32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
 #elif defined(__PLAT_LINUX__)
-  #define HAL_PLATFORM HAL_LINUX
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME)
 #elif defined(__SAMD51__)
-  #define HAL_PLATFORM HAL_SAMD51
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
 #else
   #error "Unsupported Platform!"
 #endif
-
-#define XSTR_(M) #M
-#define XSTR(M) XSTR_(M)
-#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)
diff --git a/Marlin/src/HAL/shared/HAL_ST7920.h b/Marlin/src/HAL/shared/HAL_ST7920.h
index 12392a5ece23..69c1d741ae29 100644
--- a/Marlin/src/HAL/shared/HAL_ST7920.h
+++ b/Marlin/src/HAL/shared/HAL_ST7920.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * HAL/HAL_ST7920.h
+ * HAL/ST7920.h
  * For the HALs that provide direct access to the ST7920 display
  * (bypassing U8G), it will allow the LIGHTWEIGHT_UI to operate.
  */
diff --git a/Marlin/src/HAL/shared/servo.h b/Marlin/src/HAL/shared/servo.h
index 4e12720553bb..b582221b86ff 100644
--- a/Marlin/src/HAL/shared/servo.h
+++ b/Marlin/src/HAL/shared/servo.h
@@ -68,19 +68,19 @@
  */
 
 #if IS_TEENSY32
-  #include "../HAL_TEENSY31_32/Servo.h"
+  #include "../TEENSY31_32/Servo.h"
 #elif IS_TEENSY35 || IS_TEENSY36
-  #include "../HAL_TEENSY35_36/Servo.h"
+  #include "../TEENSY35_36/Servo.h"
 #elif defined(TARGET_LPC1768)
-  #include "../HAL_LPC1768/Servo.h"
+  #include "../LPC1768/Servo.h"
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
-  #include "../HAL_STM32F1/Servo.h"
+  #include "../STM32F1/Servo.h"
 #elif defined(STM32GENERIC) && defined(STM32F4)
-  #include "../HAL_STM32_F4_F7/Servo.h"
+  #include "../STM32_F4_F7/Servo.h"
 #elif defined(ARDUINO_ARCH_STM32)
-  #include "../HAL_STM32/Servo.h"
+  #include "../STM32/Servo.h"
 #elif defined(ARDUINO_ARCH_ESP32)
-  #include "../HAL_ESP32/Servo.h"
+  #include "../ESP32/Servo.h"
 #else
   #include <stdint.h>
 
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index 63761ce0f40c..58e455b1240c 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -44,11 +44,11 @@
 
 // Architecture specific include
 #ifdef __AVR__
-  #include "../HAL_AVR/ServoTimers.h"
+  #include "../AVR/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAM)
-  #include "../HAL_DUE/ServoTimers.h"
+  #include "../DUE/ServoTimers.h"
 #elif defined(__SAMD51__)
-  #include "../HAL_SAMD51/ServoTimers.h"
+  #include "../SAMD51/ServoTimers.h"
 #else
   #error "This library only supports boards with an AVR, SAM3X or SAMD51 processor."
 #endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 19208636b90c..771c03d4646e 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -78,7 +78,7 @@
 #endif
 
 #if ENABLED(MAX7219_DEBUG)
-  #include "feature/Max7219_Debug_LEDs.h"
+  #include "feature/max7219.h"
 #endif
 
 #if HAS_COLOR_LEDS
@@ -107,7 +107,7 @@
 #endif
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "feature/I2CPositionEncoder.h"
+  #include "feature/encoder_i2c.h"
 #endif
 
 #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
@@ -142,7 +142,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "feature/power_loss_recovery.h"
+  #include "feature/powerloss.h"
 #endif
 
 #if ENABLED(CANCEL_OBJECTS)
@@ -174,7 +174,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "feature/prusa_MMU2/mmu2.h"
+  #include "feature/mmu2/mmu2.h"
 #endif
 
 #if HAS_L64XX
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 74821ba2ec5f..23e1d71fd57a 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -32,7 +32,7 @@
 #include "../../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 xy_pos_t bilinear_grid_spacing, bilinear_start;
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index f302d172bf9b..6e9e04861df1 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -43,7 +43,7 @@
 #include "../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 bool leveling_is_valid() {
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index e80b9e9d2f15..3d4c4a98c1de 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -29,7 +29,7 @@
   #include "../../../module/motion.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   mesh_bed_leveling mbl;
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index f1a67061335e..3366167733ec 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -37,7 +37,7 @@
   #include "../../../module/probe.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   #include "math.h"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index fa82cccdacfc..3c18760ba0a5 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -46,7 +46,7 @@
   #include "../../../core/debug_out.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   #include <math.h>
diff --git a/Marlin/src/feature/emergency_parser.cpp b/Marlin/src/feature/e_parser.cpp
similarity index 97%
rename from Marlin/src/feature/emergency_parser.cpp
rename to Marlin/src/feature/e_parser.cpp
index 60fba1f1b617..e7d79bf745c1 100644
--- a/Marlin/src/feature/emergency_parser.cpp
+++ b/Marlin/src/feature/e_parser.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(EMERGENCY_PARSER)
 
-#include "emergency_parser.h"
+#include "e_parser.h"
 
 // Static data members
 bool EmergencyParser::killed_by_M112, // = false
diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/e_parser.h
similarity index 97%
rename from Marlin/src/feature/emergency_parser.h
rename to Marlin/src/feature/e_parser.h
index 24540b1d4638..41261402a10f 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -75,6 +75,7 @@ class EmergencyParser {
   FORCE_INLINE static void disable() { enabled = false; }
 
   FORCE_INLINE static void update(State &state, const uint8_t c) {
+    #define ISEOL(C) ((C) == '\n' || (C) == '\r')
     switch (state) {
       case EP_RESET:
         switch (c) {
@@ -164,11 +165,11 @@ class EmergencyParser {
       #endif
 
       case EP_IGNORE:
-        if (c == '\n' || c == '\r') state = EP_RESET;
+        if (ISEOL(c)) state = EP_RESET;
         break;
 
       default:
-        if (c == '\n' || c == '\r') {
+        if (ISEOL(c)) {
           if (enabled) switch (state) {
             case EP_M108: wait_for_user = wait_for_heatup = false; break;
             case EP_M112: killed_by_M112 = true; break;
diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/encoder_i2c.cpp
similarity index 99%
rename from Marlin/src/feature/I2CPositionEncoder.cpp
rename to Marlin/src/feature/encoder_i2c.cpp
index 9c1e53df74c4..a70227a27011 100644
--- a/Marlin/src/feature/I2CPositionEncoder.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -32,7 +32,7 @@
 
 #if ENABLED(I2C_POSITION_ENCODERS)
 
-#include "I2CPositionEncoder.h"
+#include "encoder_i2c.h"
 
 #include "../module/temperature.h"
 #include "../module/stepper.h"
diff --git a/Marlin/src/feature/I2CPositionEncoder.h b/Marlin/src/feature/encoder_i2c.h
similarity index 100%
rename from Marlin/src/feature/I2CPositionEncoder.h
rename to Marlin/src/feature/encoder_i2c.h
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index f6927effc8ad..66afb63b054e 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -37,7 +37,7 @@
 Joystick joystick;
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_JOY_ADC_X
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/max7219.cpp
similarity index 99%
rename from Marlin/src/feature/Max7219_Debug_LEDs.cpp
rename to Marlin/src/feature/max7219.cpp
index e9ed522e8857..c3877b92bd60 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -41,7 +41,7 @@
 
 #define MAX7219_ERRORS // Disable to save 406 bytes of Program Memory
 
-#include "Max7219_Debug_LEDs.h"
+#include "max7219.h"
 
 #include "../module/planner.h"
 #include "../module/stepper.h"
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/max7219.h
similarity index 100%
rename from Marlin/src/feature/Max7219_Debug_LEDs.h
rename to Marlin/src/feature/max7219.h
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/mmu2/mmu2.cpp
similarity index 99%
rename from Marlin/src/feature/prusa_MMU2/mmu2.cpp
rename to Marlin/src/feature/mmu2/mmu2.cpp
index d71edbac35f4..895098eb8ab6 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp
+++ b/Marlin/src/feature/mmu2/mmu2.cpp
@@ -43,7 +43,7 @@ MMU2 mmu2;
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(MMU2_DEBUG)
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.h b/Marlin/src/feature/mmu2/mmu2.h
similarity index 100%
rename from Marlin/src/feature/prusa_MMU2/mmu2.h
rename to Marlin/src/feature/mmu2/mmu2.h
diff --git a/Marlin/src/feature/prusa_MMU2/serial-protocol.md b/Marlin/src/feature/mmu2/serial-protocol.md
similarity index 100%
rename from Marlin/src/feature/prusa_MMU2/serial-protocol.md
rename to Marlin/src/feature/mmu2/serial-protocol.md
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 175a2d21cde1..fb69803ee72a 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -50,7 +50,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #include "../core/language.h"
diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/powerloss.cpp
similarity index 99%
rename from Marlin/src/feature/power_loss_recovery.cpp
rename to Marlin/src/feature/powerloss.cpp
index 704700ab8326..7666b5adc693 100644
--- a/Marlin/src/feature/power_loss_recovery.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(POWER_LOSS_RECOVERY)
 
-#include "power_loss_recovery.h"
+#include "powerloss.h"
 #include "../core/macros.h"
 
 bool PrintJobRecovery::enabled; // Initialized by settings.load()
diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/powerloss.h
similarity index 100%
rename from Marlin/src/feature/power_loss_recovery.h
rename to Marlin/src/feature/powerloss.h
diff --git a/Marlin/src/feature/probe_temp_compensation.cpp b/Marlin/src/feature/probe_temp_comp.cpp
similarity index 99%
rename from Marlin/src/feature/probe_temp_compensation.cpp
rename to Marlin/src/feature/probe_temp_comp.cpp
index edb70ff268ad..326ebb4080e5 100644
--- a/Marlin/src/feature/probe_temp_compensation.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -24,7 +24,7 @@
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
 
-#include "probe_temp_compensation.h"
+#include "probe_temp_comp.h"
 #include <math.h>
 
 ProbeTempComp temp_comp;
diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_comp.h
similarity index 100%
rename from Marlin/src/feature/probe_temp_compensation.h
rename to Marlin/src/feature/probe_temp_comp.h
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 3cf81303ddbe..bd4a653e9903 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -69,7 +69,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 void event_filament_runout() {
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 813f44e05e7d..8188ad27ba52 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -34,7 +34,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index b84c60a6ae87..375041975549 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 //#define M420_C_USE_MEAN
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index c81e5f0a8a7d..1834f599e64f 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -37,7 +37,7 @@
 #include "../../queue.h"
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
-  #include "../../../feature/probe_temp_compensation.h"
+  #include "../../../feature/probe_temp_comp.h"
   #include "../../../module/temperature.h"
 #endif
 
@@ -57,7 +57,7 @@
 #include "../../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 #if HOTENDS > 1
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index 85ff70757514..3cd2673d66c2 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -32,7 +32,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 0a9a7f439bfc..6c8fafe23ff2 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -39,7 +39,7 @@
 #include "../../../module/stepper.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 // Save 130 bytes with non-duplication of PSTR
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index ca4af1e0c026..bd65c21ad3c8 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -32,7 +32,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 2457bc911010..c878f83a17f2 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -35,7 +35,7 @@
 #include "../../feature/bedlevel/bedlevel.h"
 #include "../../module/temperature.h"
 #include "../../module/probe.h"
-#include "../../feature/probe_temp_compensation.h"
+#include "../../feature/probe_temp_comp.h"
 
 /**
  * G76: calibrate probe and/or bed temperature offsets
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 39da37394439..7d819af6b30e 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -43,7 +43,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #ifndef GET_PIN_MAP_PIN_M43
diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp
index cb2fce6c25e7..e6b3bb5d6817 100644
--- a/Marlin/src/gcode/control/T.cpp
+++ b/Marlin/src/gcode/control/T.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../../feature/prusa_MMU2/mmu2.h"
+  #include "../../feature/mmu2/mmu2.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin/src/gcode/feature/leds/M7219.cpp
index a02ea0cc3078..bd535f0853e7 100644
--- a/Marlin/src/gcode/feature/leds/M7219.cpp
+++ b/Marlin/src/gcode/feature/leds/M7219.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(MAX7219_GCODE)
 
 #include "../../gcode.h"
-#include "../../../feature/Max7219_Debug_LEDs.h"
+#include "../../../feature/max7219.h"
 
 /**
  * M7219: Control the Max7219 LED matrix
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 6cf0847a9dc4..206815a200ec 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../feature/power_loss_recovery.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index be76814c0d9a..aa3c3c4c30b1 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../../../feature/prusa_MMU2/mmu2.h"
+  #include "../../../feature/mmu2/mmu2.h"
 #endif
 
 #if ENABLED(MIXING_EXTRUDER)
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 546fea9bdeb5..ea2c6e3dab1b 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -25,11 +25,11 @@
 #if ENABLED(POWER_LOSS_RECOVERY)
 
 #include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
 #include "../../../lcd/ultralcd.h"
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 2b3f478b203a..67e756d5d230 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(POWER_LOSS_RECOVERY)
 
 #include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
 #include "../../../lcd/ultralcd.h"
 
diff --git a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
index b9b74ebf71dd..0a9c519451a0 100644
--- a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
+++ b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(PRUSA_MMU2)
 
 #include "../../gcode.h"
-#include "../../../feature/prusa_MMU2/mmu2.h"
+#include "../../../feature/mmu2/mmu2.h"
 
 /**
  * M403: Set filament type for MMU2
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index e58ca5b15be6..266361a0998e 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -46,7 +46,7 @@ GcodeSuite gcode;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #include "../sd/cardreader.h"
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if ENABLED(CANCEL_OBJECTS)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 7360fcb9fbfa..27a038dde9ef 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -287,7 +287,7 @@
 #include "parser.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "../feature/I2CPositionEncoder.h"
+  #include "../feature/encoder_i2c.h"
 #endif
 
 enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 0ed10beb54c2..91a746dd7610 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -25,7 +25,7 @@
 #include "../../module/stepper.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "../../feature/I2CPositionEncoder.h"
+  #include "../../feature/encoder_i2c.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 27950a8af1bc..21766932090b 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_LEDS_OFF_FLAG
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 3a1f3d2d3da9..13047b215101 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -44,7 +44,7 @@ GCodeQueue queue;
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 /**
@@ -150,6 +150,8 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
   return true;
 }
 
+#define ISEOL(C) ((C) == '\n' || (C) == '\r')
+
 /**
  * Enqueue with Serial Echo
  * Return true if the command was consumed
@@ -160,7 +162,7 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
   //SERIAL_ECHO(cmd);
   //SERIAL_ECHOPGM("\") \n");
 
-  if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
+  if (*cmd == 0 || ISEOL(*cmd)) return true;
 
   if (_enqueue(cmd)) {
     SERIAL_ECHO_MSG(STR_ENQUEUEING, cmd, "\"");
@@ -432,7 +434,7 @@ void GCodeQueue::get_serial_commands() {
 
       const char serial_char = c;
 
-      if (serial_char == '\n' || serial_char == '\r') {
+      if (ISEOL(serial_char)) {
 
         // Reset our state, continue if the line was empty
         if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]))
@@ -549,7 +551,7 @@ void GCodeQueue::get_serial_commands() {
       if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
 
       const char sd_char = (char)n;
-      const bool is_eol = sd_char == '\n' || sd_char == '\r';
+      const bool is_eol = ISEOL(sd_char);
       if (is_eol || card_eof) {
 
         // Reset stream state, terminate the buffer, and commit a non-empty command
diff --git a/Marlin/src/gcode/sdcard/M20.cpp b/Marlin/src/gcode/sd/M20.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M20.cpp
rename to Marlin/src/gcode/sd/M20.cpp
diff --git a/Marlin/src/gcode/sdcard/M21_M22.cpp b/Marlin/src/gcode/sd/M21_M22.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M21_M22.cpp
rename to Marlin/src/gcode/sd/M21_M22.cpp
diff --git a/Marlin/src/gcode/sdcard/M23.cpp b/Marlin/src/gcode/sd/M23.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M23.cpp
rename to Marlin/src/gcode/sd/M23.cpp
diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
similarity index 98%
rename from Marlin/src/gcode/sdcard/M24_M25.cpp
rename to Marlin/src/gcode/sd/M24_M25.cpp
index db1a671fe406..c1e6dde8de75 100644
--- a/Marlin/src/gcode/sdcard/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../feature/power_loss_recovery.h"
+  #include "../../feature/powerloss.h"
 #endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob
diff --git a/Marlin/src/gcode/sdcard/M26.cpp b/Marlin/src/gcode/sd/M26.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M26.cpp
rename to Marlin/src/gcode/sd/M26.cpp
diff --git a/Marlin/src/gcode/sdcard/M27.cpp b/Marlin/src/gcode/sd/M27.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M27.cpp
rename to Marlin/src/gcode/sd/M27.cpp
diff --git a/Marlin/src/gcode/sdcard/M28_M29.cpp b/Marlin/src/gcode/sd/M28_M29.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M28_M29.cpp
rename to Marlin/src/gcode/sd/M28_M29.cpp
diff --git a/Marlin/src/gcode/sdcard/M30.cpp b/Marlin/src/gcode/sd/M30.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M30.cpp
rename to Marlin/src/gcode/sd/M30.cpp
diff --git a/Marlin/src/gcode/sdcard/M32.cpp b/Marlin/src/gcode/sd/M32.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M32.cpp
rename to Marlin/src/gcode/sd/M32.cpp
diff --git a/Marlin/src/gcode/sdcard/M33.cpp b/Marlin/src/gcode/sd/M33.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M33.cpp
rename to Marlin/src/gcode/sd/M33.cpp
diff --git a/Marlin/src/gcode/sdcard/M34.cpp b/Marlin/src/gcode/sd/M34.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M34.cpp
rename to Marlin/src/gcode/sd/M34.cpp
diff --git a/Marlin/src/gcode/sdcard/M524.cpp b/Marlin/src/gcode/sd/M524.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M524.cpp
rename to Marlin/src/gcode/sd/M524.cpp
diff --git a/Marlin/src/gcode/sdcard/M928.cpp b/Marlin/src/gcode/sd/M928.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M928.cpp
rename to Marlin/src/gcode/sd/M928.cpp
diff --git a/Marlin/src/gcode/temperature/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
similarity index 99%
rename from Marlin/src/gcode/temperature/M104_M109.cpp
rename to Marlin/src/gcode/temp/M104_M109.cpp
index ab99ea940ced..434c6c96637f 100644
--- a/Marlin/src/gcode/temperature/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M104_M109.cpp
+ * gcode/temp/M104_M109.cpp
  *
  * Hotend target temperature control
  */
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temp/M105.cpp
similarity index 100%
rename from Marlin/src/gcode/temperature/M105.cpp
rename to Marlin/src/gcode/temp/M105.cpp
diff --git a/Marlin/src/gcode/temperature/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
similarity index 100%
rename from Marlin/src/gcode/temperature/M106_M107.cpp
rename to Marlin/src/gcode/temp/M106_M107.cpp
diff --git a/Marlin/src/gcode/temperature/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
similarity index 98%
rename from Marlin/src/gcode/temperature/M140_M190.cpp
rename to Marlin/src/gcode/temp/M140_M190.cpp
index ad7608705a34..2da438707bbb 100644
--- a/Marlin/src/gcode/temperature/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M140_M190.cpp
+ * gcode/temp/M140_M190.cpp
  *
  * Bed target temperature control
  */
diff --git a/Marlin/src/gcode/temperature/M141_M191.cpp b/Marlin/src/gcode/temp/M141_M191.cpp
similarity index 98%
rename from Marlin/src/gcode/temperature/M141_M191.cpp
rename to Marlin/src/gcode/temp/M141_M191.cpp
index 66849b99e6be..3f02836476a1 100644
--- a/Marlin/src/gcode/temperature/M141_M191.cpp
+++ b/Marlin/src/gcode/temp/M141_M191.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M141_M191.cpp
+ * gcode/temp/M141_M191.cpp
  *
  * Chamber target temperature control
  */
diff --git a/Marlin/src/gcode/temperature/M155.cpp b/Marlin/src/gcode/temp/M155.cpp
similarity index 100%
rename from Marlin/src/gcode/temperature/M155.cpp
rename to Marlin/src/gcode/temp/M155.cpp
diff --git a/Marlin/src/gcode/temperature/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
similarity index 97%
rename from Marlin/src/gcode/temperature/M303.cpp
rename to Marlin/src/gcode/temp/M303.cpp
index 31f7bf350117..63dcc3f4c48e 100644
--- a/Marlin/src/gcode/temperature/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -28,7 +28,7 @@
 #include "../../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 /**
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
index 2bab99cf80f2..2b4080485fad 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
@@ -32,7 +32,7 @@
 
 #include "DGUSDisplay.h"
 #include "DGUSVPVariable.h"
-#include "DGUSDisplayDefinition.h"
+#include "DGUSDisplayDef.h"
 
 #include "../../ui_api.h"
 
@@ -45,7 +45,7 @@
 #include "../../../../libs/duration_t.h"
 #include "../../../../module/printcounter.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/power_loss_recovery.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
similarity index 92%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
index eebf18e37742..7af1ffefa7ba 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
@@ -42,9 +42,9 @@ extern const struct VPMapping VPMap[];
 extern const struct DGUS_VP_Variable ListOfVP[];
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
-  #include "DGUSDisplayDefinitionOrigin.h"
+  #include "origin/DGUSDisplayDef.h"
 #elif ENABLED(DGUS_LCD_UI_FYSETC)
-  #include "DGUSDisplayDefinitionFYSETC.h"
+  #include "fysetc/DGUSDisplayDef.h"
 #elif ENABLED(DGUS_LCD_UI_HIPRECY)
-  #include "DGUSDisplayDefinitionHIPRECY.h"
+  #include "hiprecy/DGUSDisplayDef.h"
 #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h b/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
rename to Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
index 531e372a96f6..49d89948ba49 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
@@ -22,19 +22,19 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
 
-#include "../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../ui_api.h"
+#include "../../../../ultralcd.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
rename to Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
rename to Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
index 520608442715..3ccde11411d5 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -22,19 +22,19 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HIPRECY)
 
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
 
-#include "../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../ui_api.h"
+#include "../../../../ultralcd.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
rename to Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
rename to Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
index cd5ad54400ff..37b7335e67ce 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
@@ -22,18 +22,18 @@
 
 /* DGUS implementation written by coldtobi in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
 
-#include "../../../ultralcd.h"
+#include "../../../../ultralcd.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
rename to Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/config.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/config.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/fonts.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/fonts.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/theme.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/theme.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/ui_api.cpp
rename to Marlin/src/lcd/extui/ui_api.cpp
index 759d290af6f0..79e12f36d19c 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -65,7 +65,7 @@
 #endif
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/ui_api.h
rename to Marlin/src/lcd/extui/ui_api.h
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 5c6f11d7cb48..66a58f82dc08 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -30,9 +30,9 @@
 
 #if HAS_DGUS_LCD
 
-#include "extensible_ui/ui_api.h"
-#include "extensible_ui/lib/dgus/DGUSDisplay.h"
-#include "extensible_ui/lib/dgus/DGUSDisplayDefinition.h"
+#include "extui/ui_api.h"
+#include "extui/lib/dgus/DGUSDisplay.h"
+#include "extui/lib/dgus/DGUSDisplayDef.h"
 
 extern const char NUL_STR[];
 
diff --git a/Marlin/src/lcd/extui_example.cpp b/Marlin/src/lcd/extui_example.cpp
index 5e65af73815e..741787dbe665 100644
--- a/Marlin/src/lcd/extui_example.cpp
+++ b/Marlin/src/lcd/extui_example.cpp
@@ -23,7 +23,7 @@
 
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
 
 // To implement a new UI, complete the functions below and
 // read or update Marlin's state using the methods in the
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index 8987723534a6..3b67422a1845 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -47,7 +47,7 @@
 
 #define DEBUG_MALYAN_LCD
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
 
 #include "ultralcd.h"
 #include "../sd/cardreader.h"
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index d2285e083560..ae0abbf74668 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../feature/power_loss_recovery.h"
+  #include "../../feature/powerloss.h"
 #endif
 
 #if HAS_BED_PROBE
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 2b3cac5bd2b4..aa35a6915cf1 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 void _man_probe_pt(const xy_pos_t &xy) {
diff --git a/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin/src/lcd/menu/menu_job_recovery.cpp
index 5b57992f457e..31db50fe23d3 100644
--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -31,7 +31,7 @@
 #include "menu.h"
 #include "../../gcode/queue.h"
 #include "../../sd/cardreader.h"
-#include "../../feature/power_loss_recovery.h"
+#include "../../feature/powerloss.h"
 
 static void lcd_power_loss_recovery_resume() {
   ui.return_to_status();
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index c2b8d4ae0a3c..c278c423d2e1 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -24,7 +24,7 @@
 
 #if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
 
-#include "../../feature/prusa_MMU2/mmu2.h"
+#include "../../feature/mmu2/mmu2.h"
 #include "menu_mmu2.h"
 #include "menu.h"
 
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index b67ec0ab4ee8..b929acbd85f9 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1309,7 +1309,7 @@ void MarlinUI::update() {
 #if HAS_DISPLAY
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "extensible_ui/ui_api.h"
+    #include "extui/ui_api.h"
   #endif
 
   ////////////////////////////////////////////
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index 35631708c425..3b0a23917871 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -28,7 +28,7 @@
 #include "../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 Buzzer::state_t Buzzer::state;
diff --git a/Marlin/src/libs/stopwatch.cpp b/Marlin/src/libs/stopwatch.cpp
index fe80b17462b9..6b01158cb9a9 100644
--- a/Marlin/src/libs/stopwatch.cpp
+++ b/Marlin/src/libs/stopwatch.cpp
@@ -25,7 +25,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 Stopwatch::State Stopwatch::state;
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 16e88b7bfd5b..ae82e59447f2 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -71,7 +71,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_SERVOS
@@ -87,7 +87,7 @@
 #include "../feature/fwretract.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #include "../feature/pause.h"
@@ -119,7 +119,7 @@
 #endif
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
-  #include "../feature/probe_temp_compensation.h"
+  #include "../feature/probe_temp_comp.h"
 #endif
 
 #pragma pack(push, 1) // No padding between variables
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index b42cadc3b7a1..efe4d31ccf7c 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -101,7 +101,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if HAS_CUTTER
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 3fa09c8834ec..4b4d4b60ad9f 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -30,7 +30,7 @@ Stopwatch print_job_timer;      // Global Print Job Timer instance
 #else // PRINTCOUNTER
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #include "printcounter.h"
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 63008170bd43..6376f925930e 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -78,7 +78,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index dacef0f2cb6e..b83f2c2ce28f 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -130,7 +130,7 @@ Stepper stepper; // Singleton
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 // public:
diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h
index d44bc19a7486..39192cea2580 100644
--- a/Marlin/src/module/stepper/TMC26X.h
+++ b/Marlin/src/module/stepper/TMC26X.h
@@ -32,7 +32,7 @@
 
 #include <SPI.h>
 #if defined(STM32GENERIC) && defined(STM32F7)
-  #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
+  #include "../../HAL/STM32_F4_F7/STM32F7/TMC2660.h"
 #else
   #include <TMC26XStepper.h>
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c6caa0a2c997..e15d42db6a70 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -33,7 +33,7 @@
 #include "../core/language.h"
 #include "../HAL/shared/Delay.h"
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(MAX6675_IS_MAX31865)
@@ -80,7 +80,7 @@
 #endif
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../feature/emergency_parser.h"
+  #include "../feature/e_parser.h"
 #endif
 
 #if ENABLED(PRINTER_EVENT_LEDS)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 2a8fd42198e2..3a6e7b20ce36 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -74,7 +74,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../feature/prusa_MMU2/mmu2.h"
+  #include "../feature/mmu2/mmu2.h"
 #endif
 
 #if HAS_LCD_MENU
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 5e12aeef2da1..c7209d2b14e5 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -35,11 +35,11 @@
 #include "../module/configuration_store.h"
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../feature/emergency_parser.h"
+  #include "../feature/e_parser.h"
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/platformio.ini b/platformio.ini
index 943889c7d561..39885b0cd37c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -63,7 +63,7 @@ board             = megaatmega2560
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # ATmega1280
@@ -74,7 +74,7 @@ board             = megaatmega1280
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # RAMBo
@@ -85,7 +85,7 @@ board             = reprap_rambo
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.3
@@ -96,7 +96,7 @@ board             = fysetc_f6_13
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.4
@@ -107,7 +107,7 @@ board             = fysetc_f6_14
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega644p)
@@ -117,7 +117,7 @@ platform      = atmelavr
 board         = sanguino_atmega644p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega1284p)
@@ -127,7 +127,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Melzi and clones (ATmega1284p)
@@ -137,7 +137,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 lib_ignore    = TMCStepper
 upload_speed  = 57600
 
@@ -149,7 +149,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 lib_ignore    = TMCStepper
 upload_speed  = 115200
 
@@ -166,7 +166,7 @@ board         = at90usb1286
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # AT90USB1286 boards using DFU bootloader
@@ -179,7 +179,7 @@ platform      = teensy
 board         = at90usb1286
 lib_deps      = ${common.lib_deps}
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
@@ -190,18 +190,18 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 [env:DUE]
 platform      = atmelsam
 board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_USB]
 platform      = atmelsam
 board         = dueUSB
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_debug]
 # Used when WATCHDOG_RESET_MANUAL is enabled
 platform      = atmelsam
 board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 build_flags   = ${common.build_flags}
   -funwind-tables
   -mpoke-function-name
@@ -212,14 +212,14 @@ build_flags   = ${common.build_flags}
 [env:LPC1768]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1768
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
 # debug options for backtrace
 #  -funwind-tables
 #  -mpoke-function-name
 lib_ldf_mode      = off
 lib_compat_mode   = strict
-extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
+src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -230,14 +230,14 @@ lib_deps          = Servo
 [env:LPC1769]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1769
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
 # debug options for backtrace
 #  -funwind-tables
 #  -mpoke-function-name
 lib_ldf_mode      = off
 lib_compat_mode   = strict
-extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
+src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -252,10 +252,10 @@ lib_deps          = Servo
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -269,11 +269,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 #board_build.core = maple
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -294,11 +294,11 @@ upload_protocol   = serial
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -308,11 +308,11 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -323,11 +323,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -338,11 +338,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -355,10 +355,10 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -372,11 +372,11 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -388,11 +388,11 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -408,7 +408,7 @@ platform      = ststm32
 board         = disco_f407vg
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 
 #
 # STM32F7 with STM32GENERIC
@@ -418,7 +418,7 @@ platform      = ststm32
 board         = remram_v1
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F4>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F4>
 
 #
 # ARMED (STM32)
@@ -429,9 +429,9 @@ board         = armed_v1
 build_flags   = ${common.build_flags}
   -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
   -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 lib_ignore    = Adafruit NeoPixel, SoftwareSerial
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Geeetech GTM32 (STM32F103VET6)
@@ -439,12 +439,12 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 [env:STM32F103VE_GTM32]
 platform        = ststm32
 board           = genericSTM32F103VE
-build_flags     = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags     = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
   -DBOARD_generic_stm32f103v -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
   -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 build_unflags = -std=gnu++11
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter      = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore      = Adafruit NeoPixel, SPI
 upload_protocol = serial
 
@@ -454,12 +454,12 @@ upload_protocol = serial
 [env:STM32F103VE_longer]
 platform      = ststm32
 board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
   -DSTM32F1xx -DU20 -DTS_V12
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 
 #
@@ -468,11 +468,11 @@ lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 [env:mks_robin_mini]
 platform      = ststm32
 board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -482,11 +482,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103VE
 platform_packages = tool-stm32duino
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
@@ -497,11 +497,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:mks_robin]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -511,10 +511,10 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103ZE
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps      = ${common.lib_deps}
 lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 
@@ -524,11 +524,11 @@ lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 [env:mks_robin_lite]
 platform      = ststm32
 board         = genericSTM32F103RC
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -538,10 +538,10 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103RC
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps      = ${common.lib_deps}
 lib_ignore    = Adafruit NeoPixel, SPI
 
@@ -551,11 +551,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:jgaurora_a5s_a1]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -564,9 +564,9 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:STM32F103CB_malyan]
 platform    = ststm32
 board       = malyanM200
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
+build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
   -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
-src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI
 
 #
@@ -575,11 +575,11 @@ lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
 [env:chitu_f103]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts = buildroot/share/PlatformIO/scripts/chitu_crypt.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel
 
 #
@@ -594,12 +594,12 @@ build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_STEVAL -DSTM32F401xE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STEVAL_F401VE\"
  -DDISABLE_GENERIC_SERIALUSB
- -IMarlin/src/HAL/HAL_STM32
+ -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # FLYF407ZG
@@ -611,11 +611,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DSTM32F4 -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 
 #
@@ -633,7 +633,7 @@ build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 lib_ignore        = Arduino-L6470
 debug_tool        = stlink
 #upload_protocol   = stlink
@@ -651,11 +651,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
@@ -667,11 +667,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 #upload_protocol   = stlink
 #upload_command    = "$PROJECT_PACKAGES_DIR/tool-stm32duino/stlink/ST-LINK_CLI.exe" -c SWD -P "$BUILD_DIR/firmware.bin" 0x8008000 -Rst -Run
 debug_tool        = stlink
@@ -689,7 +689,7 @@ extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_varian
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407IG\"
   -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 lib_deps          =
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
   LiquidCrystal
@@ -698,7 +698,7 @@ lib_deps          =
   LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed     = 250000
 
 #
@@ -718,7 +718,7 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
@@ -729,7 +729,7 @@ board         = teensy31
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY31_32>
+src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
@@ -740,7 +740,7 @@ board         = teensy35
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
+src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
 
 #
 # Espressif ESP32
@@ -756,7 +756,7 @@ lib_deps      = ${common.lib_deps}
   arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
   ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
 lib_ignore    = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
+src_filter    = ${common.default_src_filter} +<src/HAL/ESP32>
 upload_speed  = 115200
 #upload_port   = marlinesp.local
 #board_build.flash_mode = qio
@@ -769,11 +769,11 @@ upload_speed  = 115200
 platform        = native
 framework       =
 build_flags     = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
-src_build_flags = -Wall -IMarlin/src/HAL/HAL_LINUX/include
+src_build_flags = -Wall -IMarlin/src/HAL/LINUX/include
 build_unflags   = -Wall
 lib_ldf_mode    = off
 lib_deps        =
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
+src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 
 #
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
@@ -783,7 +783,7 @@ platform       = atmelsam
 board          = adafruit_grandcentral_m4
 build_flags    = ${common.build_flags} -std=gnu++17 -Wno-register
 build_unflags  = -std=gnu++11
-src_filter     = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
+src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
 lib_deps       = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 debug_tool     = jlink
@@ -810,7 +810,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed = 500000
 upload_protocol = dfu
 
@@ -831,7 +831,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32> +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 upload_protocol = dfu
 
 #

From 983a8cee45d39ace14a80b43a9618ce61beb69b0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 14 Mar 2020 00:04:00 +0000
Subject: [PATCH 426/565] [cron] Bump distribution date (2020-03-14)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3b725fcb125c..fa20c9724804 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-13"
+  #define STRING_DISTRIBUTION_DATE "2020-03-14"
 #endif
 
 /**

From a96be32faefb9e054f923d9204b04420f075a62c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 11 Mar 2020 19:17:38 -0500
Subject: [PATCH 427/565] Fix G26 corrupted position

---
 Marlin/src/gcode/bedlevel/G26.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index b8ec262693f6..3662661ecd1d 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -640,10 +640,8 @@ void GcodeSuite::G26() {
    */
   set_bed_leveling_enabled(!parser.seen('D'));
 
-  if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES) {
+  if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES)
     do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
-    current_position = destination;
-  }
 
   #if DISABLED(NO_VOLUMETRICS)
     bool volumetric_was_enabled = parser.volumetric_enabled;

From 118bd2f8b2a1f81884cb55a8fc00b708a51aa15b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 13 Mar 2020 23:18:16 -0500
Subject: [PATCH 428/565] Apply loop shorthand macros (#17159)

---
 Marlin/src/HAL/AVR/HAL_SPI.cpp                |   4 +-
 Marlin/src/HAL/AVR/MarlinSerial.cpp           |   2 +-
 Marlin/src/HAL/AVR/fast_pwm.cpp               |   2 +-
 Marlin/src/HAL/AVR/pinsDebug.h                |   4 +-
 Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp |   4 +-
 Marlin/src/HAL/DUE/MarlinSerial.cpp           |   2 +-
 Marlin/src/HAL/DUE/MarlinSerialUSB.cpp        |   2 +-
 .../dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp    |   4 +-
 Marlin/src/HAL/DUE/fastio/G2_PWM.h            |   2 +-
 Marlin/src/HAL/LPC1768/main.cpp               |   2 +-
 .../u8g/u8g_com_HAL_LPC1768_sw_spi.cpp        |  16 +-
 Marlin/src/HAL/SAMD51/HAL.cpp                 |   6 +-
 Marlin/src/HAL/STM32/fastio.cpp               |   2 +-
 .../STM32F1/dogm/u8g_com_stm32duino_swspi.cpp |  16 +-
 Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp |   2 +-
 Marlin/src/HAL/shared/servo.cpp               |   2 +-
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/core/macros.h                      |   5 +
 Marlin/src/core/types.h                       |   6 -
 Marlin/src/feature/bedlevel/abl/abl.cpp       |  18 +-
 Marlin/src/feature/bedlevel/bedlevel.cpp      |  21 +-
 .../bedlevel/mbl/mesh_bed_leveling.cpp        |   8 +-
 .../feature/bedlevel/mbl/mesh_bed_leveling.h  |   4 +-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |  20 +-
 Marlin/src/feature/bedlevel/ubl/ubl.h         |   4 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   | 281 ++++++++----------
 .../src/feature/digipot/digipot_mcp4018.cpp   |   4 +-
 .../src/feature/digipot/digipot_mcp4451.cpp   |   2 +-
 Marlin/src/feature/filwidth.cpp               |   2 +-
 Marlin/src/feature/fwretract.cpp              |   6 +-
 Marlin/src/feature/max7219.cpp                |  22 +-
 Marlin/src/feature/mixing.cpp                 |   4 +-
 Marlin/src/feature/mmu2/mmu2.cpp              |   8 +-
 Marlin/src/feature/powerloss.cpp              |   2 +-
 Marlin/src/feature/probe_temp_comp.cpp        |   6 +-
 Marlin/src/feature/runout.h                   |   2 +-
 Marlin/src/feature/twibus.cpp                 |   2 +-
 Marlin/src/gcode/bedlevel/G26.cpp             | 115 ++++---
 Marlin/src/gcode/bedlevel/M420.cpp            |  13 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   4 +-
 Marlin/src/gcode/calibrate/G425.cpp           |   4 +-
 Marlin/src/gcode/calibrate/M100.cpp           |   4 +-
 Marlin/src/gcode/calibrate/M48.cpp            |   8 +-
 Marlin/src/gcode/config/M305.cpp              |   2 +-
 Marlin/src/gcode/config/M43.cpp               |   8 +-
 Marlin/src/gcode/config/M672.cpp              |   2 +-
 Marlin/src/gcode/config/M92.cpp               |   2 +-
 Marlin/src/gcode/control/M111.cpp             |   2 +-
 Marlin/src/gcode/control/M350_M351.cpp        |   2 +-
 Marlin/src/gcode/feature/camera/M240.cpp      |   2 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   |   4 +-
 Marlin/src/gcode/feature/leds/M7219.cpp       |   2 +-
 Marlin/src/gcode/host/M114.cpp                |   2 +-
 Marlin/src/gcode/queue.cpp                    |   4 +-
 Marlin/src/inc/Conditionals_LCD.h             |  44 +++
 Marlin/src/inc/Conditionals_adv.h             |   4 +
 Marlin/src/inc/Conditionals_post.h            |  47 ---
 Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp   |   4 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    |   2 +-
 .../lcd/dogm/status_screen_lite_ST7920.cpp    |   8 +-
 .../lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp    |   4 +-
 ...8g_dev_tft_320x240_upscale_from_128x64.cpp |   2 +-
 Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h   |   2 +-
 .../extended/unicode/western_char_set.cpp     |   4 +-
 .../screens/move_axis_screen.cpp              |   2 +-
 Marlin/src/lcd/extui_malyan_lcd.cpp           |   4 +-
 Marlin/src/lcd/menu/game/brickout.cpp         |   6 +-
 Marlin/src/lcd/menu/game/invaders.cpp         |   6 +-
 Marlin/src/lcd/menu/game/maze.cpp             |   2 +-
 Marlin/src/lcd/menu/game/snake.cpp            |  14 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  16 +-
 Marlin/src/lcd/menu/menu_filament.cpp         |   8 +-
 Marlin/src/lcd/menu/menu_mixer.cpp            |   2 +-
 Marlin/src/lcd/menu/menu_mmu2.cpp             |   2 +-
 Marlin/src/lcd/menu/menu_motion.cpp           |   2 +-
 Marlin/src/lcd/menu/menu_temperature.cpp      |   4 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |   4 +-
 Marlin/src/lcd/ultralcd.cpp                   |   2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |   2 +-
 Marlin/src/libs/nozzle.cpp                    |   8 +-
 Marlin/src/libs/vector_3.cpp                  |  12 +-
 Marlin/src/module/configuration_store.cpp     |   6 +-
 Marlin/src/module/endstops.cpp                |   2 +-
 Marlin/src/module/planner.cpp                 |   4 +-
 Marlin/src/module/planner.h                   |   4 +-
 Marlin/src/module/probe.cpp                   |   4 +-
 Marlin/src/module/stepper.cpp                 |   4 +-
 Marlin/src/module/temperature.cpp             |   4 +-
 Marlin/src/module/tool_change.cpp             |   2 +-
 Marlin/src/pins/pinsDebug.h                   |   2 +-
 Marlin/src/sd/Sd2Card.cpp                     |  10 +-
 Marlin/src/sd/SdBaseFile.cpp                  |  10 +-
 Marlin/src/sd/cardreader.cpp                  |   6 +-
 93 files changed, 458 insertions(+), 498 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
index 29d5e3870027..f1f9654c4e90 100644
--- a/Marlin/src/HAL/AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -197,7 +197,7 @@ void spiBegin() {
     // output pin high - like sending 0xFF
     WRITE(MOSI_PIN, HIGH);
 
-    for (uint8_t i = 0; i < 8; i++) {
+    LOOP_L_N(i, 8) {
       WRITE(SCK_PIN, HIGH);
 
       nop; // adjust so SCK is nice
@@ -224,7 +224,7 @@ void spiBegin() {
   void spiSend(uint8_t data) {
     // no interrupts during byte send - about 8µs
     cli();
-    for (uint8_t i = 0; i < 8; i++) {
+    LOOP_L_N(i, 8) {
       WRITE(SCK_PIN, LOW);
       WRITE(MOSI_PIN, data & 0x80);
       data <<= 1;
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index aa453cfee96d..350d0f302d19 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -682,7 +682,7 @@
 
     // Round correctly so that print(1.999, 2) prints as "2.00"
     double rounding = 0.5;
-    for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
+    LOOP_L_N(i, digits) rounding *= 0.1;
     number += rounding;
 
     // Extract the integer part of the number and print it
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 78a7ad883bd8..42e7cc3f107e 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -167,7 +167,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
     uint16_t prescaler[] = { 0, 1, 8, /*TIMER2 ONLY*/32, 64, /*TIMER2 ONLY*/128, 256, 1024 };
 
     // loop over prescaler values
-    for (uint8_t i = 1; i < 8; i++) {
+    LOOP_S_L_N(i, 1, 8) {
       uint16_t res_temp_fast = 255, res_temp_phase_correct = 255;
       if (timer.n == 2) {
         // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index cea82ef3fa28..fbd2e084fad7 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -70,12 +70,12 @@
 
 void PRINT_ARRAY_NAME(uint8_t x) {
   char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
-  for (uint8_t y = 0; y < MAX_NAME_LENGTH; y++) {
+  LOOP_L_N(y, MAX_NAME_LENGTH) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)
       SERIAL_CHAR(temp_char);
     else {
-      for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; i++) SERIAL_CHAR(' ');
+      LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
       break;
     }
   }
diff --git a/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
index 60b4e8310496..fab79646f06b 100644
--- a/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
+++ b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
@@ -88,7 +88,7 @@ void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
   volatile uint8_t *outData = u8g_outData,
                    *outClock = u8g_outClock;
   U8G_ATOMIC_START();
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (val & 0x80)
       *outData |= bitData;
     else
@@ -108,7 +108,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
   volatile uint8_t *outData = u8g_outData,
                    *outClock = u8g_outClock;
   U8G_ATOMIC_START();
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     *outClock &= bitNotClock;
     if (val & 0x80)
       *outData |= bitData;
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index d0cb4c956deb..d827def42251 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -606,7 +606,7 @@ void MarlinSerial<Cfg>::printFloat(double number, uint8_t digits) {
 
   // Round correctly so that print(1.999, 2) prints as "2.00"
   double rounding = 0.5;
-  for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
+  LOOP_L_N(i, digits) rounding *= 0.1;
   number += rounding;
 
   // Extract the integer part of the number and print it
diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index 43748209ee23..41ffb52ba112 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -259,7 +259,7 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
 
   // Round correctly so that print(1.999, 2) prints as "2.00"
   double rounding = 0.5;
-  for (uint8_t i = 0; i < digits; ++i)
+  LOOP_L_N(i, digits)
     rounding *= 0.1;
 
   number += rounding;
diff --git a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
index 2563cf110fa8..96b7a1f61eb8 100644
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
@@ -80,7 +80,7 @@ Pio *SCK_pPio, *MOSI_pPio;
 uint32_t SCK_dwMask, MOSI_dwMask;
 
 void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (val & 0x80)
       MOSI_pPio->PIO_SODR = MOSI_dwMask;
     else
@@ -94,7 +94,7 @@ void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
 }
 
 void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     SCK_pPio->PIO_CODR = SCK_dwMask;
     DELAY_NS(50);
     if (val & 0x80)
diff --git a/Marlin/src/HAL/DUE/fastio/G2_PWM.h b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
index 1a802ed0f376..a94c1c527657 100644
--- a/Marlin/src/HAL/DUE/fastio/G2_PWM.h
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
@@ -63,7 +63,7 @@ extern PWM_map ISR_table[NUM_PWMS];
 extern uint32_t motor_current_setting[3];
 
 #define IR_BIT(p) (WITHIN(p, 0, 3) ? (p) : (p) + 4)
-#define COPY_ACTIVE_TABLE() do{ for (uint8_t i = 0; i < 6 ; i++) work_table[i] = active_table[i]; }while(0)
+#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) work_table[i] = active_table[i]; }while(0)
 
 #define PWM_MR0 19999         // base repetition rate minus one count - 20mS
 #define PWM_PR 24             // prescaler value - prescaler divide by 24 + 1  -  1 MHz output
diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
index 149153e8a734..fb7394344ea4 100644
--- a/Marlin/src/HAL/LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -67,7 +67,7 @@ void HAL_init() {
     #endif
 
     // Flash status LED 3 times to indicate Marlin has started booting
-    for (uint8_t i = 0; i < 6; ++i) {
+    LOOP_L_N(i, 6) {
       TOGGLE(LED_PIN);
       delay(100);
     }
diff --git a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
index a98c5eea9cb9..6eac5daf244e 100644
--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
@@ -73,7 +73,7 @@
 
 uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
 
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (spi_speed == 0) {
       LPC176x::gpio_set(mosi_pin, !!(b & 0x80));
       LPC176x::gpio_set(sck_pin, HIGH);
@@ -83,16 +83,16 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
     }
     else {
       const uint8_t state = (b & 0x80) ? HIGH : LOW;
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(mosi_pin, state);
 
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         LPC176x::gpio_set(sck_pin, HIGH);
 
       b <<= 1;
       if (miso_pin >= 0 && LPC176x::gpio_get(miso_pin)) b |= 1;
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(sck_pin, LOW);
     }
   }
@@ -102,7 +102,7 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
 
 uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
 
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     const uint8_t state = (b & 0x80) ? HIGH : LOW;
     if (spi_speed == 0) {
       LPC176x::gpio_set(sck_pin, LOW);
@@ -111,13 +111,13 @@ uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck
       LPC176x::gpio_set(sck_pin, HIGH);
     }
     else {
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         LPC176x::gpio_set(sck_pin, LOW);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(mosi_pin, state);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(sck_pin, HIGH);
     }
     b <<= 1;
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index 4828c40ff705..b3a741fe13da 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -478,10 +478,10 @@ void HAL_adc_init() {
   #if ADC_IS_REQUIRED
     memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results));                 // Fill result with invalid values
 
-    for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi)
+    LOOP_L_N(pi, COUNT(adc_pins))
       pinPeripheral(adc_pins[pi], PIO_ANALOG);
 
-    for (uint8_t ai = FIRST_ADC; ai <= LAST_ADC; ++ai) {
+    LOOP_S_LE_N(ai, FIRST_ADC, LAST_ADC) {
       Adc* adc = ((Adc*[])ADC_INSTS)[ai];
 
       // ADC clock setup
@@ -513,7 +513,7 @@ void HAL_adc_init() {
 
 void HAL_adc_start_conversion(const uint8_t adc_pin) {
   #if ADC_IS_REQUIRED
-    for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi) {
+    LOOP_L_N(pi, COUNT(adc_pins)) {
       if (adc_pin == adc_pins[pi]) {
         HAL_adc_result = HAL_adc_results[pi];
         return;
diff --git a/Marlin/src/HAL/STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
index 4c8b63fa1039..c51effaa0430 100644
--- a/Marlin/src/HAL/STM32/fastio.cpp
+++ b/Marlin/src/HAL/STM32/fastio.cpp
@@ -27,7 +27,7 @@
 GPIO_TypeDef* FastIOPortMap[LastPort + 1];
 
 void FastIO_init() {
-  for (uint8_t i = 0; i < NUM_DIGITAL_PINS; i++)
+  LOOP_L_N(i, NUM_DIGITAL_PINS)
     FastIOPortMap[STM_PORT(digitalPin[i])] = get_GPIO_Port(STM_PORT(digitalPin[i]));
 }
 
diff --git a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
index 8cf9099c8159..2e9d11f97e61 100644
--- a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -32,7 +32,7 @@
 static uint8_t SPI_speed = SPI_SPEED;
 
 static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (spi_speed == 0) {
       WRITE(DOGLCD_MOSI, !!(b & 0x80));
       WRITE(DOGLCD_SCK, HIGH);
@@ -42,16 +42,16 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
     }
     else {
       const uint8_t state = (b & 0x80) ? HIGH : LOW;
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_MOSI, state);
 
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         WRITE(DOGLCD_SCK, HIGH);
 
       b <<= 1;
       if (miso_pin >= 0 && READ(miso_pin)) b |= 1;
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_SCK, LOW);
     }
   }
@@ -59,7 +59,7 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
 }
 
 static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     const uint8_t state = (b & 0x80) ? HIGH : LOW;
     if (spi_speed == 0) {
       WRITE(DOGLCD_SCK, LOW);
@@ -68,13 +68,13 @@ static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, c
       WRITE(DOGLCD_SCK, HIGH);
     }
     else {
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         WRITE(DOGLCD_SCK, LOW);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_MOSI, state);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_SCK, HIGH);
     }
     b <<= 1;
diff --git a/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
index 4e76e9712b77..cc1a1bb01e79 100644
--- a/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
@@ -102,7 +102,7 @@ void eeprom_read_block(void *__dst, const void *__src, size_t __n) {
 
   uint16_t data = 0xFF;
   uint16_t eeprom_address = unsigned(__src);
-  for (uint8_t c = 0; c < __n; c++) {
+  LOOP_L_N(c, __n) {
     EE_ReadVariable(eeprom_address+c, &data);
     *((uint8_t*)__dst + c) = data;
   }
diff --git a/Marlin/src/HAL/shared/servo.cpp b/Marlin/src/HAL/shared/servo.cpp
index d03b80b20097..2c3d7bb7d3e0 100644
--- a/Marlin/src/HAL/shared/servo.cpp
+++ b/Marlin/src/HAL/shared/servo.cpp
@@ -68,7 +68,7 @@ uint8_t ServoCount = 0;                         // the total number of attached
 
 static boolean isTimerActive(timer16_Sequence_t timer) {
   // returns true if any servo is active on this timer
-  for (uint8_t channel = 0; channel < SERVOS_PER_TIMER; channel++) {
+  LOOP_L_N(channel, SERVOS_PER_TIMER) {
     if (SERVO(timer, channel).Pin.isActive)
       return true;
   }
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 771c03d4646e..f19aaef968d5 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -274,7 +274,7 @@ void setup_powerhold() {
 
 bool pin_is_protected(const pin_t pin) {
   static const pin_t sensitive_pins[] PROGMEM = SENSITIVE_PINS;
-  for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) {
+  LOOP_L_N(i, COUNT(sensitive_pins)) {
     pin_t sensitive_pin;
     memcpy_P(&sensitive_pin, &sensitive_pins[i], sizeof(pin_t));
     if (pin == sensitive_pin) return true;
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index ba0fc342a0d7..56ec11bd7cee 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -248,6 +248,11 @@
 #define _JOIN_1(O)         (O)
 #define JOIN_N(N,C,V...)   (DO(JOIN,C,LIST_N(N,V)))
 
+#define LOOP_S_LE_N(VAR, S, N) for (uint8_t VAR=(S); VAR<=(N); VAR++)
+#define LOOP_S_L_N(VAR, S, N) for (uint8_t VAR=(S); VAR<(N); VAR++)
+#define LOOP_LE_N(VAR, N) LOOP_S_LE_N(VAR, 0, N)
+#define LOOP_L_N(VAR, N) LOOP_S_L_N(VAR, 0, N)
+
 #define NOOP (void(0))
 
 #define CEILING(x,y) (((x) + (y) - 1) / (y))
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index acab36ec5cad..1212eb5ba299 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -50,12 +50,6 @@ enum AxisEnum : uint8_t {
 //
 // Loop over XYZE axes
 //
-
-#define LOOP_S_LE_N(VAR, S, N) for (uint8_t VAR=(S); VAR<=(N); VAR++)
-#define LOOP_S_L_N(VAR, S, N) for (uint8_t VAR=(S); VAR<(N); VAR++)
-#define LOOP_LE_N(VAR, N) LOOP_S_LE_N(VAR, 0, N)
-#define LOOP_L_N(VAR, N) LOOP_S_L_N(VAR, 0, N)
-
 #define LOOP_XYZ(VAR) LOOP_S_LE_N(VAR, X_AXIS, Z_AXIS)
 #define LOOP_XYZE(VAR) LOOP_S_LE_N(VAR, X_AXIS, E_AXIS)
 #define LOOP_XYZE_N(VAR) LOOP_S_L_N(VAR, X_AXIS, XYZE_N)
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 23e1d71fd57a..33c9cbdfde36 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -115,8 +115,8 @@ void extrapolate_unprobed_bed_level() {
                       ylen = ctry1;
   #endif
 
-  for (uint8_t xo = 0; xo <= xlen; xo++)
-    for (uint8_t yo = 0; yo <= ylen; yo++) {
+  LOOP_LE_N(xo, xlen)
+    LOOP_LE_N(yo, ylen) {
       uint8_t x2 = ctrx2 + xo, y2 = ctry2 + yo;
       #ifndef HALF_IN_X
         const uint8_t x1 = ctrx1 - xo;
@@ -209,8 +209,8 @@ void print_bilinear_leveling_grid() {
 
   static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const float &tx, const float &ty) {
     float row[4], column[4];
-    for (uint8_t i = 0; i < 4; i++) {
-      for (uint8_t j = 0; j < 4; j++) {
+    LOOP_L_N(i, 4) {
+      LOOP_L_N(j, 4) {
         column[j] = bed_level_virt_coord(i + x - 1, j + y - 1);
       }
       row[i] = bed_level_virt_cmr(column, 1, ty);
@@ -221,11 +221,11 @@ void print_bilinear_leveling_grid() {
   void bed_level_virt_interpolate() {
     bilinear_grid_spacing_virt = bilinear_grid_spacing / (BILINEAR_SUBDIVISIONS);
     bilinear_grid_factor_virt = bilinear_grid_spacing_virt.reciprocal();
-    for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t ty = 0; ty < BILINEAR_SUBDIVISIONS; ty++)
-          for (uint8_t tx = 0; tx < BILINEAR_SUBDIVISIONS; tx++) {
-            if ((ty && y == GRID_MAX_POINTS_Y - 1) || (tx && x == GRID_MAX_POINTS_X - 1))
+    LOOP_L_N(y, GRID_MAX_POINTS_Y)
+      LOOP_L_N(x, GRID_MAX_POINTS_X)
+        LOOP_L_N(ty, BILINEAR_SUBDIVISIONS)
+          LOOP_L_N(tx, BILINEAR_SUBDIVISIONS) {
+            if ((ty && y == (GRID_MAX_POINTS_Y) - 1) || (tx && x == (GRID_MAX_POINTS_X) - 1))
               continue;
             z_values_virt[x * (BILINEAR_SUBDIVISIONS) + tx][y * (BILINEAR_SUBDIVISIONS) + ty] =
               bed_level_virt_2cmr(
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 6e9e04861df1..63493712a8c9 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -143,13 +143,12 @@ void reset_bed_level() {
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
       bilinear_start.reset();
       bilinear_grid_spacing.reset();
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-          z_values[x][y] = NAN;
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(x, y, 0);
-          #endif
-        }
+      GRID_LOOP(x, y) {
+        z_values[x][y] = NAN;
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, 0);
+        #endif
+      }
     #elif ABL_PLANAR
       planner.bed_level_matrix.set_to_identity();
     #endif
@@ -173,7 +172,7 @@ void reset_bed_level() {
    */
   void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, element_2d_fn fn) {
     #ifndef SCAD_MESH_OUTPUT
-      for (uint8_t x = 0; x < sx; x++) {
+      LOOP_L_N(x, sx) {
         serial_spaces(precision + (x < 10 ? 3 : 2));
         SERIAL_ECHO(int(x));
       }
@@ -182,14 +181,14 @@ void reset_bed_level() {
     #ifdef SCAD_MESH_OUTPUT
       SERIAL_ECHOLNPGM("measured_z = ["); // open 2D array
     #endif
-    for (uint8_t y = 0; y < sy; y++) {
+    LOOP_L_N(y, sy) {
       #ifdef SCAD_MESH_OUTPUT
         SERIAL_ECHOPGM(" [");             // open sub-array
       #else
         if (y < 10) SERIAL_CHAR(' ');
         SERIAL_ECHO(int(y));
       #endif
-      for (uint8_t x = 0; x < sx; x++) {
+      LOOP_L_N(x, sx) {
         SERIAL_CHAR(' ');
         const float offset = fn(x, y);
         if (!isnan(offset)) {
@@ -202,7 +201,7 @@ void reset_bed_level() {
               SERIAL_CHAR(' ');
             SERIAL_ECHOPGM("NAN");
           #else
-            for (uint8_t i = 0; i < precision + 3; i++)
+            LOOP_L_N(i, precision + 3)
               SERIAL_CHAR(i ? '=' : ' ');
           #endif
         }
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index 3d4c4a98c1de..7439c3fcd3e9 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -40,9 +40,9 @@
         mesh_bed_leveling::index_to_ypos[GRID_MAX_POINTS_Y];
 
   mesh_bed_leveling::mesh_bed_leveling() {
-    for (uint8_t i = 0; i < GRID_MAX_POINTS_X; ++i)
+    LOOP_L_N(i, GRID_MAX_POINTS_X)
       index_to_xpos[i] = MESH_MIN_X + i * (MESH_X_DIST);
-    for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; ++i)
+    LOOP_L_N(i, GRID_MAX_POINTS_Y)
       index_to_ypos[i] = MESH_MIN_Y + i * (MESH_Y_DIST);
     reset();
   }
@@ -51,9 +51,7 @@
     z_offset = 0;
     ZERO(z_values);
     #if ENABLED(EXTENSIBLE_UI)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          ExtUI::onMeshUpdate(x, y, 0);
+      GRID_LOOP(x, y) ExtUI::onMeshUpdate(x, y, 0);
     #endif
   }
 
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index 4c8773107f77..3a1cbaccb0f5 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -52,9 +52,7 @@ class mesh_bed_leveling {
   static void reset();
 
   FORCE_INLINE static bool has_mesh() {
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-        if (z_values[x][y]) return true;
+    GRID_LOOP(x, y) if (z_values[x][y]) return true;
     return false;
   }
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 3366167733ec..8ef2ad564c06 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -49,7 +49,7 @@
   void unified_bed_leveling::report_current_mesh() {
     if (!leveling_is_valid()) return;
     SERIAL_ECHO_MSG("  G29 I99");
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
+    LOOP_L_N(x, GRID_MAX_POINTS_X)
       for (uint8_t y = 0;  y < GRID_MAX_POINTS_Y; y++)
         if (!isnan(z_values[x][y])) {
           SERIAL_ECHO_START();
@@ -101,9 +101,7 @@
     storage_slot = -1;
     ZERO(z_values);
     #if ENABLED(EXTENSIBLE_UI)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          ExtUI::onMeshUpdate(x, y, 0);
+      GRID_LOOP(x, y) ExtUI::onMeshUpdate(x, y, 0);
     #endif
     if (was_enabled) report_current_position();
   }
@@ -114,13 +112,11 @@
   }
 
   void unified_bed_leveling::set_all_mesh_points_to_value(const float value) {
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-        z_values[x][y] = value;
-        #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::onMeshUpdate(x, y, value);
-        #endif
-      }
+    GRID_LOOP(x, y) {
+      z_values[x][y] = value;
+      #if ENABLED(EXTENSIBLE_UI)
+        ExtUI::onMeshUpdate(x, y, value);
+      #endif
     }
   }
 
@@ -190,7 +186,7 @@
       }
 
       // Row Values (I indexes)
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
+      LOOP_L_N(i, GRID_MAX_POINTS_X) {
 
         // Opening Brace or Space
         const bool is_current = i == curr.x && j == curr.y;
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 370d792fc5d6..9e227f02d9f7 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -298,9 +298,7 @@ class unified_bed_leveling {
     #endif
 
     static inline bool mesh_is_valid() {
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          if (isnan(z_values[x][y])) return false;
+      GRID_LOOP(x, y) if (isnan(z_values[x][y])) return false;
       return true;
     }
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 3c18760ba0a5..1aad462f160d 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -365,25 +365,23 @@
         #endif
 
         case 0:
-          for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {   // Create a bowl shape - similar to
-            for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { // a poorly calibrated Delta.
-              const float p1 = 0.5f * (GRID_MAX_POINTS_X) - x,
-                          p2 = 0.5f * (GRID_MAX_POINTS_Y) - y;
-              z_values[x][y] += 2.0f * HYPOT(p1, p2);
-              #if ENABLED(EXTENSIBLE_UI)
-                ExtUI::onMeshUpdate(x, y, z_values[x][y]);
-              #endif
-            }
+          GRID_LOOP(x, y) {                                     // Create a bowl shape similar to a poorly-calibrated Delta
+            const float p1 = 0.5f * (GRID_MAX_POINTS_X) - x,
+                        p2 = 0.5f * (GRID_MAX_POINTS_Y) - y;
+            z_values[x][y] += 2.0f * HYPOT(p1, p2);
+            #if ENABLED(EXTENSIBLE_UI)
+              ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+            #endif
           }
           break;
 
         case 1:
-          for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {  // Create a diagonal line several Mesh cells thick that is raised
+          LOOP_L_N(x, GRID_MAX_POINTS_X) {                     // Create a diagonal line several Mesh cells thick that is raised
             z_values[x][x] += 9.999f;
-            z_values[x][x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1] += 9.999f; // We want the altered line several mesh points thick
+            z_values[x][x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1] += 9.999f; // We want the altered line several mesh points thick
             #if ENABLED(EXTENSIBLE_UI)
               ExtUI::onMeshUpdate(x, x, z_values[x][x]);
-              ExtUI::onMeshUpdate(x, (x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1), z_values[x][x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1]);
+              ExtUI::onMeshUpdate(x, (x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1), z_values[x][x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1]);
             #endif
 
           }
@@ -467,7 +465,7 @@
             //
             // Manually Probe Mesh in areas that can't be reached by the probe
             //
-            SERIAL_ECHOLNPGM("Manually probing unreachable mesh locations.");
+            SERIAL_ECHOLNPGM("Manually probing unreachable points.");
             do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
 
             if (parser.seen('C') && !xy_seen) {
@@ -537,9 +535,7 @@
                 if (cpos.x < 0) {
                   // No more REAL INVALID mesh points to populate, so we ASSUME
                   // user meant to populate ALL INVALID mesh points to value
-                  for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-                    for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-                      if (isnan(z_values[x][y])) z_values[x][y] = g29_constant;
+                  GRID_LOOP(x, y) if (isnan(z_values[x][y])) z_values[x][y] = g29_constant;
                   break; // No more invalid Mesh Points to populate
                 }
                 else {
@@ -696,12 +692,11 @@
   void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const float value) {
     float sum = 0;
     int n = 0;
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-        if (!isnan(z_values[x][y])) {
-          sum += z_values[x][y];
-          n++;
-        }
+    GRID_LOOP(x, y)
+      if (!isnan(z_values[x][y])) {
+        sum += z_values[x][y];
+        n++;
+      }
 
     const float mean = sum / n;
 
@@ -709,10 +704,9 @@
     // Sum the squares of difference from mean
     //
     float sum_of_diff_squared = 0;
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-        if (!isnan(z_values[x][y]))
-          sum_of_diff_squared += sq(z_values[x][y] - mean);
+    GRID_LOOP(x, y)
+      if (!isnan(z_values[x][y]))
+        sum_of_diff_squared += sq(z_values[x][y] - mean);
 
     SERIAL_ECHOLNPAIR("# of samples: ", n);
     SERIAL_ECHOLNPAIR_F("Mean Mesh Height: ", mean, 6);
@@ -721,27 +715,25 @@
     SERIAL_ECHOLNPAIR_F("Standard Deviation: ", sigma, 6);
 
     if (cflag)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          if (!isnan(z_values[x][y])) {
-            z_values[x][y] -= mean + value;
-            #if ENABLED(EXTENSIBLE_UI)
-              ExtUI::onMeshUpdate(x, y, z_values[x][y]);
-            #endif
-          }
-  }
-
-  void unified_bed_leveling::shift_mesh_height() {
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
+      GRID_LOOP(x, y)
         if (!isnan(z_values[x][y])) {
-          z_values[x][y] += g29_constant;
+          z_values[x][y] -= mean + value;
           #if ENABLED(EXTENSIBLE_UI)
             ExtUI::onMeshUpdate(x, y, z_values[x][y]);
           #endif
         }
   }
 
+  void unified_bed_leveling::shift_mesh_height() {
+    GRID_LOOP(x, y)
+      if (!isnan(z_values[x][y])) {
+        z_values[x][y] += g29_constant;
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+        #endif
+      }
+  }
+
   #if HAS_BED_PROBE
     /**
      * Probe all invalidated locations of the mesh that can be reached by the probe.
@@ -1243,52 +1235,46 @@
 
     mesh_index_pair farthest { -1, -1, -99999.99 };
 
-    for (int8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-      for (int8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
+    GRID_LOOP(i, j) {
+      if (!isnan(z_values[i][j])) continue;  // Skip valid mesh points
 
-        if (isnan(z_values[i][j])) {                  // Invalid mesh point?
+      // Skip unreachable points
+      if (!probe.can_reach(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
+        continue;
 
-          // Skip points the probe can't reach
-          if (!probe.can_reach(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
-            continue;
+      found_a_NAN = true;
 
-          found_a_NAN = true;
+      xy_int8_t near { -1, -1 };
+      float d1, d2 = 99999.9f;
+      GRID_LOOP(k, l) {
+        if (isnan(z_values[k][l])) continue;
 
-          xy_int8_t near { -1, -1 };
-          float d1, d2 = 99999.9f;
-          for (int8_t k = 0; k < GRID_MAX_POINTS_X; k++) {
-            for (int8_t l = 0; l < GRID_MAX_POINTS_Y; l++) {
-              if (!isnan(z_values[k][l])) {
-                found_a_real = true;
+        found_a_real = true;
 
-                // Add in a random weighting factor that scrambles the probing of the
-                // last half of the mesh (when every unprobed mesh point is one index
-                // from a probed location).
+        // Add in a random weighting factor that scrambles the probing of the
+        // last half of the mesh (when every unprobed mesh point is one index
+        // from a probed location).
 
-                d1 = HYPOT(i - k, j - l) + (1.0f / ((millis() % 47) + 13));
+        d1 = HYPOT(i - k, j - l) + (1.0f / ((millis() % 47) + 13));
 
-                if (d1 < d2) {    // Invalid mesh point (i,j) is closer to the defined point (k,l)
-                  d2 = d1;
-                  near.set(i, j);
-                }
-              }
-            }
-          }
+        if (d1 < d2) {    // Invalid mesh point (i,j) is closer to the defined point (k,l)
+          d2 = d1;
+          near.set(i, j);
+        }
+      }
 
-          //
-          // At this point d2 should have the near defined mesh point to invalid mesh point (i,j)
-          //
+      //
+      // At this point d2 should have the near defined mesh point to invalid mesh point (i,j)
+      //
 
-          if (found_a_real && near.x >= 0 && d2 > farthest.distance) {
-            farthest.pos = near;      // Found an invalid location farther from the defined mesh point
-            farthest.distance = d2;
-          }
-        }
-      } // for j
-    } // for i
+      if (found_a_real && near.x >= 0 && d2 > farthest.distance) {
+        farthest.pos = near;      // Found an invalid location farther from the defined mesh point
+        farthest.distance = d2;
+      }
+    } // GRID_LOOP
 
     if (!found_a_real && found_a_NAN) {        // if the mesh is totally unpopulated, start the probing
-      farthest.pos.set(GRID_MAX_POINTS_X / 2, GRID_MAX_POINTS_Y / 2);
+      farthest.pos.set((GRID_MAX_POINTS_X) / 2, (GRID_MAX_POINTS_Y) / 2);
       farthest.distance = 1;
     }
     return farthest;
@@ -1304,36 +1290,34 @@
 
     float best_so_far = 99999.99f;
 
-    for (int8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-      for (int8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
-        if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
-          || (type == SET_IN_BITMAP && !done_flags->marked(i, j))
-        ) {
-          // Found a Mesh Point of the specified type!
-          const xy_pos_t mpos = { mesh_index_to_xpos(i), mesh_index_to_ypos(j) };
+    GRID_LOOP(i, j) {
+      if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
+        || (type == SET_IN_BITMAP && !done_flags->marked(i, j))
+      ) {
+        // Found a Mesh Point of the specified type!
+        const xy_pos_t mpos = { mesh_index_to_xpos(i), mesh_index_to_ypos(j) };
 
-          // If using the probe as the reference there are some unreachable locations.
-          // Also for round beds, there are grid points outside the bed the nozzle can't reach.
-          // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
+        // If using the probe as the reference there are some unreachable locations.
+        // Also for round beds, there are grid points outside the bed the nozzle can't reach.
+        // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
 
-          if (!(probe_relative ? probe.can_reach(mpos) : position_is_reachable(mpos)))
-            continue;
+        if (!(probe_relative ? probe.can_reach(mpos) : position_is_reachable(mpos)))
+          continue;
 
-          // Reachable. Check if it's the best_so_far location to the nozzle.
+        // Reachable. Check if it's the best_so_far location to the nozzle.
 
-          const xy_pos_t diff = current_position - mpos;
-          const float distance = (ref - mpos).magnitude() + diff.magnitude() * 0.1f;
+        const xy_pos_t diff = current_position - mpos;
+        const float distance = (ref - mpos).magnitude() + diff.magnitude() * 0.1f;
 
-          // factor in the distance from the current location for the normal case
-          // so the nozzle isn't running all over the bed.
-          if (distance < best_so_far) {
-            best_so_far = distance;   // Found a closer location with the desired value type.
-            closest.pos.set(i, j);
-            closest.distance = best_so_far;
-          }
+        // factor in the distance from the current location for the normal case
+        // so the nozzle isn't running all over the bed.
+        if (distance < best_so_far) {
+          best_so_far = distance;   // Found a closer location with the desired value type.
+          closest.pos.set(i, j);
+          closest.distance = best_so_far;
         }
-      } // for j
-    } // for i
+      }
+    } // GRID_LOOP
 
     return closest;
   }
@@ -1373,7 +1357,7 @@
       info3 PROGMEM = { GRID_MAX_POINTS_X - 1, 0,  0, GRID_MAX_POINTS_Y,      true  };  // Right side of the mesh looking left
     static const smart_fill_info * const info[] PROGMEM = { &info0, &info1, &info2, &info3 };
 
-    for (uint8_t i = 0; i < COUNT(info); ++i) {
+    LOOP_L_N(i, COUNT(info)) {
       const smart_fill_info *f = (smart_fill_info*)pgm_read_ptr(&info[i]);
       const int8_t sx = pgm_read_byte(&f->sx), sy = pgm_read_byte(&f->sy),
                    ex = pgm_read_byte(&f->ex), ey = pgm_read_byte(&f->ey);
@@ -1496,12 +1480,13 @@
 
         bool zig_zag = false;
 
-        uint16_t total_points = g29_grid_size * g29_grid_size, point_num = 1;
+        const uint16_t total_points = sq(g29_grid_size);
+        uint16_t point_num = 1;
 
         xy_pos_t rpos;
-        for (uint8_t ix = 0; ix < g29_grid_size; ix++) {
+        LOOP_L_N(ix, g29_grid_size) {
           rpos.x = x_min + ix * dx;
-          for (int8_t iy = 0; iy < g29_grid_size; iy++) {
+          LOOP_L_N(iy, g29_grid_size) {
             rpos.y = y_min + dy * (zig_zag ? g29_grid_size - 1 - iy : iy);
 
             if (!abort_flag) {
@@ -1569,39 +1554,37 @@
 
       matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
 
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-        for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
-          float mx = mesh_index_to_xpos(i),
-                my = mesh_index_to_ypos(j),
-                mz = z_values[i][j];
-
-          if (DEBUGGING(LEVELING)) {
-            DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(my, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(mz, 7);
-            DEBUG_ECHOPGM("]   ---> ");
-            DEBUG_DELAY(20);
-          }
+      GRID_LOOP(i, j) {
+        float mx = mesh_index_to_xpos(i),
+              my = mesh_index_to_ypos(j),
+              mz = z_values[i][j];
+
+        if (DEBUGGING(LEVELING)) {
+          DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(my, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(mz, 7);
+          DEBUG_ECHOPGM("]   ---> ");
+          DEBUG_DELAY(20);
+        }
 
-          apply_rotation_xyz(rotation, mx, my, mz);
+        apply_rotation_xyz(rotation, mx, my, mz);
 
-          if (DEBUGGING(LEVELING)) {
-            DEBUG_ECHOPAIR_F("after rotation = [", mx, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(my, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(mz, 7);
-            DEBUG_ECHOLNPGM("]");
-            DEBUG_DELAY(20);
-          }
-
-          z_values[i][j] = mz - lsf_results.D;
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(i, j, z_values[i][j]);
-          #endif
+        if (DEBUGGING(LEVELING)) {
+          DEBUG_ECHOPAIR_F("after rotation = [", mx, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(my, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(mz, 7);
+          DEBUG_ECHOLNPGM("]");
+          DEBUG_DELAY(20);
         }
+
+        z_values[i][j] = mz - lsf_results.D;
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(i, j, z_values[i][j]);
+        #endif
       }
 
       if (DEBUGGING(LEVELING)) {
@@ -1661,7 +1644,7 @@
       // being extrapolated so that nearby points will have greater influence on
       // the point being extrapolated.  Then extrapolate the mesh point from WLSF.
 
-      static_assert(GRID_MAX_POINTS_Y <= 16, "GRID_MAX_POINTS_Y too big");
+      static_assert((GRID_MAX_POINTS_Y) <= 16, "GRID_MAX_POINTS_Y too big");
       uint16_t bitmap[GRID_MAX_POINTS_X] = { 0 };
       struct linear_fit_data lsf_results;
 
@@ -1669,23 +1652,20 @@
 
       const float weight_scaled = weight_factor * _MAX(MESH_X_DIST, MESH_Y_DIST);
 
-      for (uint8_t jx = 0; jx < GRID_MAX_POINTS_X; jx++)
-        for (uint8_t jy = 0; jy < GRID_MAX_POINTS_Y; jy++)
-          if (!isnan(z_values[jx][jy]))
-            SBI(bitmap[jx], jy);
+      GRID_LOOP(jx, jy) if (!isnan(z_values[jx][jy])) SBI(bitmap[jx], jy);
 
       xy_pos_t ppos;
-      for (uint8_t ix = 0; ix < GRID_MAX_POINTS_X; ix++) {
+      LOOP_L_N(ix, GRID_MAX_POINTS_X) {
         ppos.x = mesh_index_to_xpos(ix);
-        for (uint8_t iy = 0; iy < GRID_MAX_POINTS_Y; iy++) {
+        LOOP_L_N(iy, GRID_MAX_POINTS_Y) {
           ppos.y = mesh_index_to_ypos(iy);
           if (isnan(z_values[ix][iy])) {
             // undefined mesh point at (ppos.x,ppos.y), compute weighted LSF from original valid mesh points.
             incremental_LSF_reset(&lsf_results);
             xy_pos_t rpos;
-            for (uint8_t jx = 0; jx < GRID_MAX_POINTS_X; jx++) {
+            LOOP_L_N(jx, GRID_MAX_POINTS_X) {
               rpos.x = mesh_index_to_xpos(jx);
-              for (uint8_t jy = 0; jy < GRID_MAX_POINTS_Y; jy++) {
+              LOOP_L_N(jy, GRID_MAX_POINTS_Y) {
                 if (TEST(bitmap[jx], jy)) {
                   rpos.y = mesh_index_to_ypos(jy);
                   const float rz = z_values[jx][jy],
@@ -1747,7 +1727,7 @@
       SERIAL_ECHOLNPAIR("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
 
       SERIAL_ECHOPGM("X-Axis Mesh Points at: ");
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
+      LOOP_L_N(i, GRID_MAX_POINTS_X) {
         SERIAL_ECHO_F(LOGICAL_X_POSITION(mesh_index_to_xpos(i)), 3);
         SERIAL_ECHOPGM("  ");
         serial_delay(25);
@@ -1755,7 +1735,7 @@
       SERIAL_EOL();
 
       SERIAL_ECHOPGM("Y-Axis Mesh Points at: ");
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; i++) {
+      LOOP_L_N(i, GRID_MAX_POINTS_Y) {
         SERIAL_ECHO_F(LOGICAL_Y_POSITION(mesh_index_to_ypos(i)), 3);
         SERIAL_ECHOPGM("  ");
         serial_delay(25);
@@ -1840,13 +1820,12 @@
 
       SERIAL_ECHOLNPAIR("Subtracting mesh in slot ", g29_storage_slot, " from current mesh.");
 
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-          z_values[x][y] -= tmp_z_values[x][y];
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(x, y, z_values[x][y]);
-          #endif
-        }
+      GRID_LOOP(x, y) {
+        z_values[x][y] -= tmp_z_values[x][y];
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+        #endif
+      }
     }
 
   #endif // UBL_DEVEL_DEBUGGING
diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
index 888acc55d050..e8df4a475fee 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
@@ -92,11 +92,11 @@ void digipot_i2c_set_current(const uint8_t channel, const float current) {
 void digipot_i2c_init() {
   static const float digipot_motor_current[] PROGMEM = DIGIPOT_I2C_MOTOR_CURRENTS;
 
-  for (uint8_t i = 0; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
+  LOOP_L_N(i, DIGIPOT_I2C_NUM_CHANNELS)
     pots[i].i2c_init();
 
   // setup initial currents as defined in Configuration_adv.h
-  for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++)
+  LOOP_L_N(i, COUNT(digipot_motor_current))
     digipot_i2c_set_current(i, pgm_read_float(&digipot_motor_current[i]));
 }
 
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index e84bd28d35c6..1183c96aa515 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -83,7 +83,7 @@ void digipot_i2c_init() {
   #endif
   // setup initial currents as defined in Configuration_adv.h
   static const float digipot_motor_current[] PROGMEM = DIGIPOT_I2C_MOTOR_CURRENTS;
-  for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++)
+  LOOP_L_N(i, COUNT(digipot_motor_current))
     digipot_i2c_set_current(i, pgm_read_float(&digipot_motor_current[i]));
 }
 
diff --git a/Marlin/src/feature/filwidth.cpp b/Marlin/src/feature/filwidth.cpp
index ae8c43d43091..4357d39fe031 100644
--- a/Marlin/src/feature/filwidth.cpp
+++ b/Marlin/src/feature/filwidth.cpp
@@ -42,7 +42,7 @@ int8_t FilamentWidthSensor::ratios[MAX_MEASUREMENT_DELAY + 1],          // Ring
 
 void FilamentWidthSensor::init() {
   const int8_t ratio = sample_to_size_ratio();
-  for (uint8_t i = 0; i < COUNT(ratios); ++i) ratios[i] = ratio;
+  LOOP_L_N(i, COUNT(ratios)) ratios[i] = ratio;
   index_r = index_w = 0;
 }
 
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 2436170b3542..7d756ac6d060 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -73,7 +73,7 @@ void FWRetract::reset() {
   settings.swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
   current_hop = 0.0;
 
-  for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+  LOOP_L_N(i, EXTRUDERS) {
     retracted[i] = false;
     #if EXTRUDERS > 1
       retracted_swap[i] = false;
@@ -117,7 +117,7 @@ void FWRetract::retract(const bool retracting
       " swapping ", swapping,
       " active extruder ", active_extruder
     );
-    for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+    LOOP_L_N(i, EXTRUDERS) {
       SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
       #if EXTRUDERS > 1
         SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
@@ -201,7 +201,7 @@ void FWRetract::retract(const bool retracting
     SERIAL_ECHOLNPAIR("retracting ", retracting);
     SERIAL_ECHOLNPAIR("swapping ", swapping);
     SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
-    for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+    LOOP_L_N(i, EXTRUDERS) {
       SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
       #if EXTRUDERS > 1
         SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index c3877b92bd60..2ec23f019c93 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -147,7 +147,7 @@ void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/
  */
 inline uint32_t flipped(const uint32_t bits, const uint8_t n_bytes) {
   uint32_t mask = 1, outbits = 0;
-  for (uint8_t b = 0; b < n_bytes * 8; b++) {
+  LOOP_L_N(b, n_bytes * 8) {
     outbits <<= 1;
     if (bits & mask) outbits |= 1;
     mask <<= 1;
@@ -329,13 +329,13 @@ void Max7219::fill() {
 
 void Max7219::clear_row(const uint8_t row) {
   if (row >= MAX7219_Y_LEDS) return error(PSTR("clear_row"), row);
-  for (uint8_t x = 0; x < MAX7219_X_LEDS; x++) CLR_7219(x, row);
+  LOOP_L_N(x, MAX7219_X_LEDS) CLR_7219(x, row);
   send_row(row);
 }
 
 void Max7219::clear_column(const uint8_t col) {
   if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
-  for (uint8_t y = 0; y < MAX7219_Y_LEDS; y++) CLR_7219(col, y);
+  LOOP_L_N(y, MAX7219_Y_LEDS) CLR_7219(col, y);
   send_column(col);
 }
 
@@ -347,7 +347,7 @@ void Max7219::clear_column(const uint8_t col) {
 void Max7219::set_row(const uint8_t row, const uint32_t val) {
   if (row >= MAX7219_Y_LEDS) return error(PSTR("set_row"), row);
   uint32_t mask = _BV32(MAX7219_X_LEDS - 1);
-  for (uint8_t x = 0; x < MAX7219_X_LEDS; x++) {
+  LOOP_L_N(x, MAX7219_X_LEDS) {
     if (val & mask) SET_7219(x, row); else CLR_7219(x, row);
     mask >>= 1;
   }
@@ -362,7 +362,7 @@ void Max7219::set_row(const uint8_t row, const uint32_t val) {
 void Max7219::set_column(const uint8_t col, const uint32_t val) {
   if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
   uint32_t mask = _BV32(MAX7219_Y_LEDS - 1);
-  for (uint8_t y = 0; y < MAX7219_Y_LEDS; y++) {
+  LOOP_L_N(y, MAX7219_Y_LEDS) {
     if (val & mask) SET_7219(col, y); else CLR_7219(col, y);
     mask >>= 1;
   }
@@ -427,23 +427,23 @@ void Max7219::set_columns_32bits(const uint8_t x, uint32_t val) {
 
 // Initialize the Max7219
 void Max7219::register_setup() {
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_scanLimit, 0x07);
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_decodeMode, 0x00);       // Using an led matrix (not digits)
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_shutdown, 0x01);         // Not in shutdown mode
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_displayTest, 0x00);      // No display test
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_intensity, 0x01 & 0x0F); // The first 0x0F is the value you can set
                                               // Range: 0x00 to 0x0F
   pulse_load();                               // Tell the chips to load the clocked out data
@@ -537,7 +537,7 @@ void Max7219::init() {
 
   register_setup();
 
-  for (uint8_t i = 0; i <= 7; i++) {  // Empty registers to turn all LEDs off
+  LOOP_LE_N(i, 7) {  // Empty registers to turn all LEDs off
     led_line[i] = 0x00;
     send(max7219_reg_digit0 + i, 0);
     pulse_load();                     // Tell the chips to load the clocked out data
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index de1cda14beca..d6ae2bb6290b 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -98,13 +98,13 @@ void Mixer::normalize(const uint8_t tool_index) {
 void Mixer::reset_vtools() {
   // Virtual Tools 0, 1, 2, 3 = Filament 1, 2, 3, 4, etc.
   // Every virtual tool gets a pure filament
-  for (uint8_t t = 0; t < MIXING_VIRTUAL_TOOLS && t < MIXING_STEPPERS; t++)
+  LOOP_L_N(t, MIXING_VIRTUAL_TOOLS && t < MIXING_STEPPERS)
     MIXER_STEPPER_LOOP(i)
       color[t][i] = (t == i) ? COLOR_A_MASK : 0;
 
   // Remaining virtual tools are 100% filament 1
   #if MIXING_VIRTUAL_TOOLS > MIXING_STEPPERS
-    for (uint8_t t = MIXING_STEPPERS; t < MIXING_VIRTUAL_TOOLS; t++)
+    LOOP_S_L_N(t, MIXING_STEPPERS, MIXING_VIRTUAL_TOOLS)
       MIXER_STEPPER_LOOP(i)
         color[t][i] = (i == 0) ? COLOR_A_MASK : 0;
   #endif
diff --git a/Marlin/src/feature/mmu2/mmu2.cpp b/Marlin/src/feature/mmu2/mmu2.cpp
index 895098eb8ab6..2df34176da89 100644
--- a/Marlin/src/feature/mmu2/mmu2.cpp
+++ b/Marlin/src/feature/mmu2/mmu2.cpp
@@ -381,7 +381,7 @@ bool MMU2::rx_str_P(const char* str) {
 void MMU2::tx_str_P(const char* str) {
   clear_rx_buffer();
   uint8_t len = strlen_P(str);
-  for (uint8_t i = 0; i < len; i++) mmuSerial.write(pgm_read_byte(str++));
+  LOOP_L_N(i, len) mmuSerial.write(pgm_read_byte(str++));
   rx_buffer[0] = '\0';
   last_request = millis();
 }
@@ -392,7 +392,7 @@ void MMU2::tx_str_P(const char* str) {
 void MMU2::tx_printf_P(const char* format, int argument = -1) {
   clear_rx_buffer();
   uint8_t len = sprintf_P(tx_buffer, format, argument);
-  for (uint8_t i = 0; i < len; i++) mmuSerial.write(tx_buffer[i]);
+  LOOP_L_N(i, len) mmuSerial.write(tx_buffer[i]);
   rx_buffer[0] = '\0';
   last_request = millis();
 }
@@ -403,7 +403,7 @@ void MMU2::tx_printf_P(const char* format, int argument = -1) {
 void MMU2::tx_printf_P(const char* format, int argument1, int argument2) {
   clear_rx_buffer();
   uint8_t len = sprintf_P(tx_buffer, format, argument1, argument2);
-  for (uint8_t i = 0; i < len; i++) mmuSerial.write(tx_buffer[i]);
+  LOOP_L_N(i, len) mmuSerial.write(tx_buffer[i]);
   rx_buffer[0] = '\0';
   last_request = millis();
 }
@@ -780,7 +780,7 @@ void MMU2::filament_runout() {
 
     const E_Step* step = sequence;
 
-    for (uint8_t i = 0; i < steps; i++) {
+    LOOP_L_N(i, steps) {
       const float es = pgm_read_float(&(step->extrude));
       const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
 
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 7666b5adc693..bb0062d4ec63 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -391,7 +391,7 @@ void PrintJobRecovery::resume() {
 
   // Restore retract and hop state
   #if ENABLED(FWRETRACT)
-    for (uint8_t e = 0; e < EXTRUDERS; e++) {
+    LOOP_L_N(e, EXTRUDERS) {
       if (info.retract[e] != 0.0) {
         fwretract.current_retract[e] = info.retract[e];
         fwretract.retracted[e] = true;
diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 326ebb4080e5..6b787f420a33 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -54,7 +54,7 @@ uint8_t ProbeTempComp::calib_idx; // = 0
 float ProbeTempComp::init_measurement; // = 0.0
 
 void ProbeTempComp::clear_offsets(const TempSensorID tsi) {
-  for (uint8_t i = 0; i < cali_info[tsi].measurements; ++i)
+  LOOP_L_N(i, cali_info[tsi].measurements)
     sensor_z_offsets[tsi][i] = 0;
   calib_idx = 0;
 }
@@ -66,7 +66,7 @@ bool ProbeTempComp::set_offset(const TempSensorID tsi, const uint8_t idx, const
 }
 
 void ProbeTempComp::print_offsets() {
-  for (uint8_t s = 0; s < TSI_COUNT; s++) {
+  LOOP_L_N(s, TSI_COUNT) {
     float temp = cali_info[s].start_temp;
     for (int16_t i = -1; i < cali_info[s].measurements; ++i) {
       serialprintPGM(s == TSI_BED ? PSTR("Bed") :
@@ -198,7 +198,7 @@ bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d
         sum_x2 = sq(start_temp),
         sum_xy = 0, sum_y = 0;
 
-  for (uint8_t i = 0; i < calib_idx; ++i) {
+  LOOP_L_N(i, calib_idx) {
     const float xi = start_temp + (i + 1) * res_temp,
                 yi = static_cast<float>(data[i]);
     sum_x += xi;
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 8188ad27ba52..b975551c6e58 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -184,7 +184,7 @@ class FilamentSensorBase {
         #ifdef FILAMENT_RUNOUT_SENSOR_DEBUG
           if (change) {
             SERIAL_ECHOPGM("Motion detected:");
-            for (uint8_t e = 0; e < NUM_RUNOUT_SENSORS; e++)
+            LOOP_L_N(e, NUM_RUNOUT_SENSORS)
               if (TEST(change, e)) SERIAL_CHAR(' ', '0' + e);
             SERIAL_EOL();
           }
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index f0687b34b318..60d78018a2ea 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -104,7 +104,7 @@ void TWIBus::echodata(uint8_t bytes, const char prefix[], uint8_t adr) {
 
 void TWIBus::echobuffer(const char prefix[], uint8_t adr) {
   echoprefix(buffer_s, prefix, adr);
-  for (uint8_t i = 0; i < buffer_s; i++) SERIAL_CHAR(buffer[i]);
+  LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]);
   SERIAL_EOL();
 }
 
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 3662661ecd1d..28fdf581ffd0 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -157,7 +157,7 @@ float g26_extrusion_multiplier,
       g26_layer_height,
       g26_prime_length;
 
-xy_pos_t g26_pos; // = { 0, 0 }
+xy_pos_t g26_xy_pos; // = { 0, 0 }
 
 int16_t g26_bed_temp,
         g26_hotend_temp;
@@ -187,29 +187,27 @@ mesh_index_pair find_closest_circle_to_print(const xy_pos_t &pos) {
 
   out_point.pos = -1;
 
-  for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-    for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
-      if (!circle_flags.marked(i, j)) {
-        // We found a circle that needs to be printed
-        const xy_pos_t m = { _GET_MESH_X(i), _GET_MESH_Y(j) };
+  GRID_LOOP(i, j) {
+    if (!circle_flags.marked(i, j)) {
+      // We found a circle that needs to be printed
+      const xy_pos_t m = { _GET_MESH_X(i), _GET_MESH_Y(j) };
 
-        // Get the distance to this intersection
-        float f = (pos - m).magnitude();
+      // Get the distance to this intersection
+      float f = (pos - m).magnitude();
 
-        // It is possible that we are being called with the values
-        // to let us find the closest circle to the start position.
-        // But if this is not the case, add a small weighting to the
-        // distance calculation to help it choose a better place to continue.
-        f += (g26_pos - m).magnitude() / 15.0f;
+      // It is possible that we are being called with the values
+      // to let us find the closest circle to the start position.
+      // But if this is not the case, add a small weighting to the
+      // distance calculation to help it choose a better place to continue.
+      f += (g26_xy_pos - m).magnitude() / 15.0f;
 
-        // Add the specified amount of Random Noise to our search
-        if (random_deviation > 1.0) f += random(0.0, random_deviation);
+      // Add the specified amount of Random Noise to our search
+      if (random_deviation > 1.0) f += random(0.0, random_deviation);
 
-        if (f < closest) {
-          closest = f;          // Found a closer un-printed location
-          out_point.pos.set(i, j);  // Save its data
-          out_point.distance = closest;
-        }
+      if (f < closest) {
+        closest = f;          // Found a closer un-printed location
+        out_point.pos.set(i, j);  // Save its data
+        out_point.distance = closest;
       }
     }
   }
@@ -308,51 +306,49 @@ inline bool look_for_lines_to_connect() {
   xyz_pos_t s, e;
   s.z = e.z = g26_layer_height;
 
-  for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-    for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
+  GRID_LOOP(i, j) {
 
-      #if HAS_LCD_MENU
-        if (user_canceled()) return true;
-      #endif
+    #if HAS_LCD_MENU
+      if (user_canceled()) return true;
+    #endif
 
-      if (i < GRID_MAX_POINTS_X) {  // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
+    if (i < (GRID_MAX_POINTS_X)) {  // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
                                     // Already a half circle at the edge of the bed.
 
-        if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) {   // Test whether a leftward line can be done
-          if (!horizontal_mesh_line_flags.marked(i, j)) {
-            // Two circles need a horizontal line to connect them
-            s.x = _GET_MESH_X(  i  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
-            e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
+      if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) {   // Test whether a leftward line can be done
+        if (!horizontal_mesh_line_flags.marked(i, j)) {
+          // Two circles need a horizontal line to connect them
+          s.x = _GET_MESH_X(  i  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
+          e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
 
-            LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
-            s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
-            LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
+          LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
+          s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
+          LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
 
-            if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
-              print_line_from_here_to_there(s, e);
+          if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+            print_line_from_here_to_there(s, e);
 
-            horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
-          }
+          horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
         }
+      }
 
-        if (j < GRID_MAX_POINTS_Y) {  // Can't connect to anything further back than GRID_MAX_POINTS_Y.
+      if (j < (GRID_MAX_POINTS_Y)) {  // Can't connect to anything further back than GRID_MAX_POINTS_Y.
                                       // Already a half circle at the edge of the bed.
 
-          if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) {   // Test whether a downward line can be done
-            if (!vertical_mesh_line_flags.marked(i, j)) {
-              // Two circles that need a vertical line to connect them
-              s.y = _GET_MESH_Y(  j  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
-              e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
+        if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) {   // Test whether a downward line can be done
+          if (!vertical_mesh_line_flags.marked(i, j)) {
+            // Two circles that need a vertical line to connect them
+            s.y = _GET_MESH_Y(  j  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
+            e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
 
-              s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
-              LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
-              LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+            s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
+            LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+            LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
 
-              if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
-                print_line_from_here_to_there(s, e);
+            if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+              print_line_from_here_to_there(s, e);
 
-              vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
-            }
+            vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
           }
         }
       }
@@ -628,9 +624,9 @@ void GcodeSuite::G26() {
     return;
   }
 
-  g26_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
-              parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
-  if (!position_is_reachable(g26_pos.x, g26_pos.y)) {
+  g26_xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
+                 parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
+  if (!position_is_reachable(g26_xy_pos)) {
     SERIAL_ECHOLNPGM("?Specified X,Y coordinate out of bounds.");
     return;
   }
@@ -695,7 +691,7 @@ void GcodeSuite::G26() {
       #error "A_CNT must be a positive value. Please change A_INT."
     #endif
     float trig_table[A_CNT];
-    for (uint8_t i = 0; i < A_CNT; i++)
+    LOOP_L_N(i, A_CNT)
       trig_table[i] = INTERSECTION_CIRCLE_RADIUS * cos(RADIANS(i * A_INT));
 
   #endif // !ARC_SUPPORT
@@ -703,7 +699,7 @@ void GcodeSuite::G26() {
   mesh_index_pair location;
   do {
     // Find the nearest confluence
-    location = find_closest_circle_to_print(g26_continue_with_closest ? xy_pos_t(current_position) : g26_pos);
+    location = find_closest_circle_to_print(g26_continue_with_closest ? xy_pos_t(current_position) : g26_xy_pos);
 
     if (location.valid()) {
       const xy_pos_t circle = _GET_MESH_POS(location.pos);
@@ -834,12 +830,9 @@ void GcodeSuite::G26() {
 
   retract_filament(destination);
   destination.z = Z_CLEARANCE_BETWEEN_PROBES;
+  move_to(destination, 0);                                    // Raise the nozzle
 
-  move_to(destination, 0); // Raise the nozzle
-
-  destination.set(g26_pos.x, g26_pos.y);                      // Move back to the starting position
-  //destination.z = Z_CLEARANCE_BETWEEN_PROBES;               // Keep the nozzle where it is
-
+  destination = g26_xy_pos;                                   // Move back to the starting XY position
   move_to(destination, 0);                                    // Move back to the starting position
 
   #if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 375041975549..d042ace8da1f 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -71,13 +71,12 @@ void GcodeSuite::M420() {
         bilinear_grid_spacing.set((x_max - x_min) / (GRID_MAX_POINTS_X - 1),
                                   (y_max - y_min) / (GRID_MAX_POINTS_Y - 1));
       #endif
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-          Z_VALUES(x, y) = 0.001 * random(-200, 200);
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
-          #endif
-        }
+      GRID_LOOP(x, y) {
+        Z_VALUES(x, y) = 0.001 * random(-200, 200);
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
+        #endif
+      }
       SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
       SERIAL_ECHOPAIR(" (", x_min);
       SERIAL_CHAR(','); SERIAL_ECHO(y_min);
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 1834f599e64f..2d782e9e33da 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -746,7 +746,7 @@ G29_TYPE GcodeSuite::G29() {
 
       // Probe at 3 arbitrary points
 
-      for (uint8_t i = 0; i < 3; ++i) {
+      LOOP_L_N(i, 3) {
         if (verbose_level) SERIAL_ECHOLNPAIR("Probing point ", int(i), "/3.");
         #if HAS_DISPLAY
           ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i));
@@ -861,7 +861,7 @@ G29_TYPE GcodeSuite::G29() {
         auto print_topo_map = [&](PGM_P const title, const bool get_min) {
           serialprintPGM(title);
           for (int8_t yy = abl_grid_points.y - 1; yy >= 0; yy--) {
-            for (uint8_t xx = 0; xx < abl_grid_points.x; xx++) {
+            LOOP_L_N(xx, abl_grid_points.x) {
               const int ind = indexIntoAB[xx][yy];
               xyz_float_t tmp = { eqnAMatrix[ind + 0 * abl_points],
                                   eqnAMatrix[ind + 1 * abl_points], 0 };
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 4cf0f62a05a9..69fb29165dfb 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -124,7 +124,7 @@ inline void park_above_object(measurements_t &m, const float uncertainty) {
 #if HAS_HOTEND_OFFSET
 
   inline void normalize_hotend_offsets() {
-    for (uint8_t e = 1; e < HOTENDS; e++)
+    LOOP_S_L_N(e, 1, HOTENDS)
       hotend_offset[e] -= hotend_offset[0];
     hotend_offset[0].reset();
   }
@@ -393,7 +393,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     // This function requires normalize_hotend_offsets() to be called
     //
     inline void report_hotend_offsets() {
-      for (uint8_t e = 1; e < HOTENDS; e++)
+      LOOP_S_L_N(e, 1, HOTENDS)
         SERIAL_ECHOLNPAIR_P(PSTR("T"), int(e), PSTR(" Hotend Offset X"), hotend_offset[e].x, SP_Y_STR, hotend_offset[e].y, SP_Z_STR, hotend_offset[e].z);
     }
   #endif
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index 274caeec1ddc..6b8a0de528f7 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -158,14 +158,14 @@ inline int32_t count_test_bytes(const char * const start_free_memory) {
     while (start_free_memory < end_free_memory) {
       print_hex_address(start_free_memory);             // Print the address
       SERIAL_CHAR(':');
-      for (uint8_t i = 0; i < 16; i++) {  // and 16 data bytes
+      LOOP_L_N(i, 16) {  // and 16 data bytes
         if (i == 8) SERIAL_CHAR('-');
         print_hex_byte(start_free_memory[i]);
         SERIAL_CHAR(' ');
       }
       serial_delay(25);
       SERIAL_CHAR('|');                   // Point out non test bytes
-      for (uint8_t i = 0; i < 16; i++) {
+      LOOP_L_N(i, 16) {
         char ccc = (char)start_free_memory[i]; // cast to char before automatically casting to char on assignment, in case the compiler is broken
         ccc = (ccc == TEST_BYTE) ? ' ' : '?';
         SERIAL_CHAR(ccc);
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index fb8651779951..c1e8b0e9f8f0 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -126,7 +126,7 @@ void GcodeSuite::M48() {
   if (probing_good) {
     randomSeed(millis());
 
-    for (uint8_t n = 0; n < n_samples; n++) {
+    LOOP_L_N(n, n_samples) {
       #if HAS_SPI_LCD
         // Display M48 progress in the status bar
         ui.status_printf_P(0, PSTR(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
@@ -149,7 +149,7 @@ void GcodeSuite::M48() {
           SERIAL_ECHOLNPGM("CW");
         }
 
-        for (uint8_t l = 0; l < n_legs - 1; l++) {
+        LOOP_L_N(l, n_legs - 1) {
           float delta_angle;
 
           if (schizoid_flag) {
@@ -204,7 +204,7 @@ void GcodeSuite::M48() {
        * Get the current mean for the data points we have so far
        */
       float sum = 0.0;
-      for (uint8_t j = 0; j <= n; j++) sum += sample_set[j];
+      LOOP_LE_N(j, n) sum += sample_set[j];
       mean = sum / (n + 1);
 
       NOMORE(min, sample_set[n]);
@@ -215,7 +215,7 @@ void GcodeSuite::M48() {
        * data points we have so far
        */
       sum = 0.0;
-      for (uint8_t j = 0; j <= n; j++)
+      LOOP_LE_N(j, n)
         sum += sq(sample_set[j] - mean);
 
       sigma = SQRT(sum / (n + 1));
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index 47a81cdb6c81..d45e18f1b3a9 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -71,7 +71,7 @@ void GcodeSuite::M305() {
         SERIAL_ECHO_MSG("!Invalid Steinhart-Hart C coeff. (-0.01 < C < +0.01)");
   }                       // If not setting then report parameters
   else if (t_index < 0) { // ...all user thermistors
-    for (uint8_t i = 0; i < USER_THERMISTORS; i++)
+    LOOP_L_N(i, USER_THERMISTORS)
       thermalManager.log_user_thermistor(i);
   }
   else                    // ...one user thermistor
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 7d819af6b30e..661c413191b6 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -57,7 +57,7 @@ inline void toggle_pins() {
             end = PARSED_PIN_INDEX('L', NUM_DIGITAL_PINS - 1),
             wait = parser.intval('W', 500);
 
-  for (uint8_t i = start; i <= end; i++) {
+  LOOP_S_LE_N(i, start, end) {
     pin_t pin = GET_PIN_MAP_PIN_M43(i);
     if (!VALID_PIN(pin)) continue;
     if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) {
@@ -313,7 +313,7 @@ void GcodeSuite::M43() {
       NOLESS(first_pin, 2); // Don't hijack the UART pins
     #endif
     uint8_t pin_state[last_pin - first_pin + 1];
-    for (uint8_t i = first_pin; i <= last_pin; i++) {
+    LOOP_S_LE_N(i, first_pin, last_pin) {
       pin_t pin = GET_PIN_MAP_PIN_M43(i);
       if (!VALID_PIN(pin)) continue;
       if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
@@ -339,7 +339,7 @@ void GcodeSuite::M43() {
     #endif
 
     for (;;) {
-      for (uint8_t i = first_pin; i <= last_pin; i++) {
+      LOOP_S_LE_N(i, first_pin, last_pin) {
         pin_t pin = GET_PIN_MAP_PIN_M43(i);
         if (!VALID_PIN(pin)) continue;
         if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
@@ -365,7 +365,7 @@ void GcodeSuite::M43() {
   }
   else {
     // Report current state of selected pin(s)
-    for (uint8_t i = first_pin; i <= last_pin; i++) {
+    LOOP_S_LE_N(i, first_pin, last_pin) {
       pin_t pin = GET_PIN_MAP_PIN_M43(i);
       if (VALID_PIN(pin)) report_pin_state_extended(pin, ignore_protection, true);
     }
diff --git a/Marlin/src/gcode/config/M672.cpp b/Marlin/src/gcode/config/M672.cpp
index ca4b028dc7da..cc160bde665a 100644
--- a/Marlin/src/gcode/config/M672.cpp
+++ b/Marlin/src/gcode/config/M672.cpp
@@ -62,7 +62,7 @@
 //  b3 b2 b1 b0 ~b0  ... lo bits, NOT last bit
 //
 void M672_send(uint8_t b) {    // bit rate requirement: 1KHz +/- 30%
-  for (uint8_t bits = 0; bits < 14; bits++) {
+  LOOP_L_N(bits, 14) {
     switch (bits) {
       default: { OUT_WRITE(SMART_EFFECTOR_MOD_PIN, !!(b & 0x80)); b <<= 1; break; } // send bit, shift next into place
       case  7:
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 642de9672579..bc86ff4d3256 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -34,7 +34,7 @@ void report_M92(const bool echo=true, const int8_t e=-1) {
   SERIAL_EOL();
 
   #if ENABLED(DISTINCT_E_FACTORS)
-    for (uint8_t i = 0; i < E_STEPPERS; i++) {
+    LOOP_L_N(i, E_STEPPERS) {
       if (e >= 0 && i != e) continue;
       if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
       SERIAL_ECHOLNPAIR_P(PSTR(" M92 T"), (int)i,
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index bb1a77836be1..20ed44fb2ebe 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M111() {
   SERIAL_ECHOPGM(STR_DEBUG_PREFIX);
   if (marlin_debug_flags) {
     uint8_t comma = 0;
-    for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
+    LOOP_L_N(i, COUNT(debug_strings)) {
       if (TEST(marlin_debug_flags, i)) {
         if (comma++) SERIAL_CHAR(',');
         serialprintPGM((char*)pgm_read_ptr(&debug_strings[i]));
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index ae448a63ec18..54b29a21d361 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -33,7 +33,7 @@
  * Warning: Steps-per-unit remains unchanged.
  */
 void GcodeSuite::M350() {
-  if (parser.seen('S')) for (uint8_t i = 0; i <= 4; i++) stepper.microstep_mode(i, parser.value_byte());
+  if (parser.seen('S')) LOOP_LE_N(i, 4) stepper.microstep_mode(i, parser.value_byte());
   LOOP_XYZE(i) if (parser.seen(axis_codes[i])) stepper.microstep_mode(i, parser.value_byte());
   if (parser.seen('B')) stepper.microstep_mode(4, parser.value_byte());
   stepper.microstep_readings();
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index 804eec205f63..3c045a7e687f 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -90,7 +90,7 @@
 
     inline void spin_photo_pin() {
       static constexpr uint32_t sequence[] = PHOTO_PULSES_US;
-      for (uint8_t i = 0; i < COUNT(sequence); i++)
+      LOOP_L_N(i, COUNT(sequence))
         pulse_photo_pin(sequence[i], !(i & 1));
     }
 
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index a8ded07d774a..fe8e37ebdd0e 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -46,7 +46,7 @@ void GcodeSuite::M907() {
 
     LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.digipot_current(i, parser.value_int());
     if (parser.seenval('B')) stepper.digipot_current(4, parser.value_int());
-    if (parser.seenval('S')) for (uint8_t i = 0; i <= 4; i++) stepper.digipot_current(i, parser.value_int());
+    if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.digipot_current(i, parser.value_int());
 
   #elif HAS_MOTOR_CURRENT_PWM
 
@@ -74,7 +74,7 @@ void GcodeSuite::M907() {
   #if ENABLED(DAC_STEPPER_CURRENT)
     if (parser.seenval('S')) {
       const float dac_percent = parser.value_float();
-      for (uint8_t i = 0; i <= 4; i++) dac_current_percent(i, dac_percent);
+      LOOP_LE_N(i, 4) dac_current_percent(i, dac_percent);
     }
     LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) dac_current_percent(i, parser.value_float());
   #endif
diff --git a/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin/src/gcode/feature/leds/M7219.cpp
index bd535f0853e7..acbd55957f9e 100644
--- a/Marlin/src/gcode/feature/leds/M7219.cpp
+++ b/Marlin/src/gcode/feature/leds/M7219.cpp
@@ -79,7 +79,7 @@ void GcodeSuite::M7219() {
   }
 
   if (parser.seen('P')) {
-    for (uint8_t r = 0; r < MAX7219_LINES; r++) {
+    LOOP_L_N(r, MAX7219_LINES) {
       SERIAL_ECHOPGM("led_line[");
       if (r < 10) SERIAL_CHAR(' ');
       SERIAL_ECHO(int(r));
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 1a8655135bc3..ec5b950b6494 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -36,7 +36,7 @@
 
   void report_xyze(const xyze_pos_t &pos, const uint8_t n=XYZE, const uint8_t precision=3) {
     char str[12];
-    for (uint8_t a = 0; a < n; a++) {
+    LOOP_L_N(a, n) {
       SERIAL_CHAR(' ', axis_codes[a], ':');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 13047b215101..abb50b960daa 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -94,7 +94,7 @@ static PGM_P injected_commands_P = nullptr;
 
 GCodeQueue::GCodeQueue() {
   // Send "ok" after commands by default
-  for (uint8_t i = 0; i < COUNT(send_ok); i++) send_ok[i] = true;
+  LOOP_L_N(i, COUNT(send_ok)) send_ok[i] = true;
 }
 
 /**
@@ -427,7 +427,7 @@ void GCodeQueue::get_serial_commands() {
    * Loop while serial characters are incoming and the queue is not full
    */
   while (length < BUFSIZE && serial_data_available()) {
-    for (uint8_t i = 0; i < NUM_SERIAL; ++i) {
+    LOOP_L_N(i, NUM_SERIAL) {
 
       const int c = read_serial(i);
       if (c < 0) continue;
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 71f422ffd9fc..2907694fb4c5 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -604,8 +604,52 @@
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 #endif
 
+/**
+ * Set granular options based on the specific type of leveling
+ */
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #undef LCD_BED_LEVELING
+  #if ENABLED(DELTA)
+    #define UBL_SEGMENTED 1
+  #endif
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+  #define ABL_PLANAR 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+  #define ABL_GRID 1
+#endif
+#if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
+  #define HAS_ABL_NOT_UBL 1
+#endif
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
+  #define HAS_MESH 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
+  #define NEEDS_THREE_PROBE_POINTS 1
+#endif
+#if EITHER(HAS_ABL_NOT_UBL, AUTO_BED_LEVELING_UBL)
+  #define HAS_ABL_OR_UBL 1
+  #if DISABLED(PROBE_MANUALLY)
+    #define HAS_AUTOLEVEL 1
+  #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, MESH_BED_LEVELING)
+  #define HAS_LEVELING 1
+  #if DISABLED(AUTO_BED_LEVELING_UBL)
+    #define PLANNER_LEVELING 1
+  #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, Z_MIN_PROBE_REPEATABILITY_TEST)
+  #define HAS_PROBING_PROCEDURE 1
+#endif
+#if !HAS_LEVELING
+  #undef RESTORE_LEVELING_AFTER_G28
+#endif
+
 #ifdef GRID_MAX_POINTS_X
   #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
+  #define GRID_LOOP(A,B) LOOP_L_N(A, GRID_MAX_POINTS_X) LOOP_L_N(B, GRID_MAX_POINTS_Y)
 #endif
 
 #ifndef INVERT_X_DIR
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 675b94146df7..09de5d89d70a 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -83,6 +83,10 @@
   #endif
 #endif
 
+#if ANY(FWRETRACT, HAS_LEVELING, SKEW_CORRECTION)
+  #define HAS_POSITION_MODIFIERS 1
+#endif
+
 #if ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
   #define HAS_EXTRA_ENDSTOPS 1
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 3f96fad08330..97090d477571 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1854,53 +1854,6 @@
   #endif
 #endif // SKEW_CORRECTION
 
-/**
- * Set granular options based on the specific type of leveling
- */
-#if ENABLED(AUTO_BED_LEVELING_UBL)
-  #undef LCD_BED_LEVELING
-  #if ENABLED(DELTA)
-    #define UBL_SEGMENTED 1
-  #endif
-#endif
-#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
-  #define ABL_PLANAR 1
-#endif
-#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
-  #define ABL_GRID 1
-#endif
-#if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
-  #define HAS_ABL_NOT_UBL 1
-#endif
-#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
-  #define HAS_MESH 1
-#endif
-#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
-  #define NEEDS_THREE_PROBE_POINTS 1
-#endif
-#if EITHER(HAS_ABL_NOT_UBL, AUTO_BED_LEVELING_UBL)
-  #define HAS_ABL_OR_UBL 1
-  #if DISABLED(PROBE_MANUALLY)
-    #define HAS_AUTOLEVEL 1
-  #endif
-#endif
-#if EITHER(HAS_ABL_OR_UBL, MESH_BED_LEVELING)
-  #define HAS_LEVELING 1
-  #if DISABLED(AUTO_BED_LEVELING_UBL)
-    #define PLANNER_LEVELING 1
-  #endif
-#endif
-#if EITHER(HAS_ABL_OR_UBL, Z_MIN_PROBE_REPEATABILITY_TEST)
-  #define HAS_PROBING_PROCEDURE 1
-#endif
-#if ANY(FWRETRACT, HAS_LEVELING, SKEW_CORRECTION)
-  #define HAS_POSITION_MODIFIERS 1
-#endif
-
-#if !HAS_LEVELING
-  #undef RESTORE_LEVELING_AFTER_G28
-#endif
-
 /**
  * Heater, Fan, and Probe interactions
  */
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index a032450add74..ee025f6585d6 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -102,7 +102,7 @@
 
 static void createChar_P(const char c, const byte * const ptr) {
   byte temp[8];
-  for (uint8_t i = 0; i < 8; i++)
+  LOOP_L_N(i, 8)
     temp[i] = pgm_read_byte(&ptr[i]);
   lcd.createChar(c, temp);
 }
@@ -414,7 +414,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
     else {
       PGM_P p = text;
       int dly = time / _MAX(slen, 1);
-      for (uint8_t i = 0; i <= slen; i++) {
+      LOOP_LE_N(i, slen) {
 
         // Print the text at the correct place
         lcd_put_u8str_max_P(col, line, p, len);
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 6d76b8ce70e3..92f935f04b70 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -564,7 +564,7 @@ void MarlinUI::draw_status_screen() {
   if (PAGE_UNDER(6 + 1 + 12 + 1 + 6 + 1)) {
     // Extruders
     #if DO_DRAW_HOTENDS
-      for (uint8_t e = 0; e < MAX_HOTEND_DRAW; ++e)
+      LOOP_L_N(e, MAX_HOTEND_DRAW)
         _draw_hotend_status((heater_ind_t)e, blink);
     #endif
 
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index f5931917ae08..e623776b31bc 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -209,7 +209,7 @@ void ST7920_Lite_Status_Screen::clear_ddram() {
 
 /* This fills the entire graphics buffer with zeros */
 void ST7920_Lite_Status_Screen::clear_gdram() {
-  for (uint8_t y = 0; y < BUFFER_HEIGHT; y++) {
+  LOOP_L_N(y, BUFFER_HEIGHT) {
     set_gdram_address(0, y);
     begin_data();
     for (uint8_t i = (BUFFER_WIDTH) / 16; i--;) write_word(0);
@@ -407,7 +407,7 @@ void ST7920_Lite_Status_Screen::draw_degree_symbol(uint8_t x, uint8_t y, const b
     const uint8_t x_word  = x >> 1,
                   y_top   = degree_symbol_y_top,
                   y_bot   = y_top + COUNT(degree_symbol);
-    for (uint8_t i = y_top; i < y_bot; i++) {
+    LOOP_S_L_N(i, y_top, y_bot) {
       uint8_t byte = pgm_read_byte(p_bytes++);
       set_gdram_address(x_word, i + y * 16);
       begin_data();
@@ -467,10 +467,10 @@ void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
   const uint8_t char_pcnt  = 100 / width; // How many percent does each 16-bit word represent?
 
   // Draw the progress bar as a bitmap in CGRAM
-  for (uint8_t y = top; y <= bottom; y++) {
+  LOOP_S_LE_N(y, top, bottom) {
     set_gdram_address(left, y);
     begin_data();
-    for (uint8_t x = 0; x < width; x++) {
+    LOOP_L_N(x, width) {
       uint16_t gfx_word = 0x0000;
       if ((x + 1) * char_pcnt <= value)
         gfx_word = 0xFFFF;                                              // Draw completely filled bytes
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
index b6449bd4ae90..599ee2a9efaf 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
@@ -87,11 +87,11 @@ void clear_graphics_DRAM(u8g_t *u8g, u8g_dev_t *dev) {
   u8g_SetAddress(u8g, dev, 0);         // cmd mode
   u8g_WriteByte(u8g, dev, 0x08);       //display off, cursor+blink off
   u8g_WriteByte(u8g, dev, 0x3E);       //extended mode + GDRAM active
-  for (uint8_t y = 0; y < (LCD_PIXEL_HEIGHT) / 2; y++) { //clear GDRAM
+  LOOP_L_N(y, (LCD_PIXEL_HEIGHT) / 2) { //clear GDRAM
     u8g_WriteByte(u8g, dev, 0x80 | y); //set y
     u8g_WriteByte(u8g, dev, 0x80);     //set x = 0
     u8g_SetAddress(u8g, dev, 1);                  /* data mode */
-    for (uint8_t i = 0; i < 2 * (LCD_PIXEL_WIDTH) / 8; i++) //2x width clears both segments
+    LOOP_L_N(i, 2 * (LCD_PIXEL_WIDTH) / 8) //2x width clears both segments
       u8g_WriteByte(u8g, dev, 0);
     u8g_SetAddress(u8g, dev, 0);           /* cmd mode */
   }
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
index fcfebcbe1288..206f61c675be 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
@@ -670,7 +670,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
     case U8G_DEV_MSG_PAGE_NEXT:
       if (++page > (HEIGHT / PAGE_HEIGHT)) return 1;
 
-      for (uint8_t y = 0; y < PAGE_HEIGHT; y++) {
+      LOOP_L_N(y, PAGE_HEIGHT) {
         uint32_t k = 0;
         #ifdef LCD_USE_DMA_FSMC
           buffer = (y & 1) ? bufferB : bufferA;
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
index 3b44859dd49d..00e626adc990 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
@@ -237,7 +237,7 @@ class DGUSScreenVariableHandler {
     if (!var.memadr) return;
     union { unsigned char tmp[sizeof(T)]; T t; } x;
     unsigned char *ptr = (unsigned char*)val_ptr;
-    for (uint8_t i = 0; i < sizeof(T); i++) x.tmp[i] = ptr[sizeof(T) - i - 1];
+    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
     *(T*)var.memadr = x.t;
   }
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
index 688b68ae0c51..e2ce15dc8f18 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
@@ -339,11 +339,11 @@
     alt_fm.stride = 19;
     alt_fm.width  = 38;
     alt_fm.height = 49;
-    for (uint8_t i = 0; i < 127; i++)
+    LOOP_L_N(i, 127)
       alt_fm.char_widths[i] = 0;
 
     // For special characters, copy the character widths from the char tables
-    for (uint8_t i = 0; i < NUM_ELEMENTS(char_recipe); i++) {
+    LOOP_L_N(i, NUM_ELEMENTS(char_recipe)) {
       uint8_t std_char, alt_char, alt_data;
       get_char_data(i, std_char, alt_char, alt_data);
       if (std_char == 0)
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
index 8513c79f8457..4bf8ed190e0a 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
@@ -36,7 +36,7 @@ void MoveAxisScreen::onEntry() {
   // ourselves. The relative distances are reset to zero whenever this
   // screen is entered.
 
-  for (uint8_t i = 0; i < ExtUI::extruderCount; i++) {
+  LOOP_L_N(i, ExtUI::extruderCount) {
     screen_data.MoveAxisScreen.e_rel[i] = 0;
   }
   BaseNumericAdjustmentScreen::onEntry();
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index 3b67422a1845..0bb8060b07c0 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -81,7 +81,7 @@ void write_to_lcd_P(PGM_P const message) {
   char encoded_message[MAX_CURLY_COMMAND];
   uint8_t message_length = _MIN(strlen_P(message), sizeof(encoded_message));
 
-  for (uint8_t i = 0; i < message_length; i++)
+  LOOP_L_N(i, message_length)
     encoded_message[i] = pgm_read_byte(&message[i]) | 0x80;
 
   LCD_SERIAL.Print::write(encoded_message, message_length);
@@ -91,7 +91,7 @@ void write_to_lcd(const char * const message) {
   char encoded_message[MAX_CURLY_COMMAND];
   const uint8_t message_length = _MIN(strlen(message), sizeof(encoded_message));
 
-  for (uint8_t i = 0; i < message_length; i++)
+  LOOP_L_N(i, message_length)
     encoded_message[i] = message[i] | 0x80;
 
   LCD_SERIAL.Print::write(encoded_message, message_length);
diff --git a/Marlin/src/lcd/menu/game/brickout.cpp b/Marlin/src/lcd/menu/game/brickout.cpp
index 50da0f9cc756..6fe0a31ffaea 100644
--- a/Marlin/src/lcd/menu/game/brickout.cpp
+++ b/Marlin/src/lcd/menu/game/brickout.cpp
@@ -140,13 +140,13 @@ void BrickoutGame::game_screen() {
 
   // Draw bricks
   if (PAGE_CONTAINS(BRICK_TOP, BRICK_BOT)) {
-    for (uint8_t y = 0; y < BRICK_ROWS; ++y) {
+    LOOP_L_N(y, BRICK_ROWS) {
       const uint8_t yy = y * BRICK_H + BRICK_TOP;
       if (PAGE_CONTAINS(yy, yy + BRICK_H - 1)) {
-        for (uint8_t x = 0; x < BRICK_COLS; ++x) {
+        LOOP_L_N(x, BRICK_COLS) {
           if (TEST(bdat.bricks[y], x)) {
             const uint8_t xx = x * BRICK_W;
-            for (uint8_t v = 0; v < BRICK_H - 1; ++v)
+            LOOP_L_N(v, BRICK_H - 1)
               if (PAGE_CONTAINS(yy + v, yy + v))
                 u8g.drawHLine(xx, yy + v, BRICK_W - 1);
           }
diff --git a/Marlin/src/lcd/menu/game/invaders.cpp b/Marlin/src/lcd/menu/game/invaders.cpp
index 487f5406716f..31df47ce7f0f 100644
--- a/Marlin/src/lcd/menu/game/invaders.cpp
+++ b/Marlin/src/lcd/menu/game/invaders.cpp
@@ -170,7 +170,7 @@ inline void update_invader_data() {
     uint8_t m = idat.bugs[y];
     if (m) idat.botmost = y + 1;
     inv_mask |= m;
-    for (uint8_t x = 0; x < INVADER_COLS; ++x)
+    LOOP_L_N(x, INVADER_COLS)
       if (TEST(m, x)) idat.shooters[sc++] = (y << 4) | x;
   }
   idat.leftmost = 0;
@@ -371,11 +371,11 @@ void InvadersGame::game_screen() {
   // Draw invaders
   if (PAGE_CONTAINS(idat.pos.y, idat.pos.y + idat.botmost * (INVADER_ROW_H) - 2 - 1)) {
     int8_t yy = idat.pos.y;
-    for (uint8_t y = 0; y < INVADER_ROWS; ++y) {
+    LOOP_L_N(y, INVADER_ROWS) {
       const uint8_t type = inv_type[y];
       if (PAGE_CONTAINS(yy, yy + INVADER_H - 1)) {
         int8_t xx = idat.pos.x;
-        for (uint8_t x = 0; x < INVADER_COLS; ++x) {
+        LOOP_L_N(x, INVADER_COLS) {
           if (TEST(idat.bugs[y], x))
             u8g.drawBitmapP(xx, yy, 2, INVADER_H, invader[type][idat.game_blink]);
           xx += INVADER_COL_W;
diff --git a/Marlin/src/lcd/menu/game/maze.cpp b/Marlin/src/lcd/menu/game/maze.cpp
index 9cfa5da4da6e..d92f14ecd8b1 100644
--- a/Marlin/src/lcd/menu/game/maze.cpp
+++ b/Marlin/src/lcd/menu/game/maze.cpp
@@ -83,7 +83,7 @@ void MazeGame::game_screen() {
   if (PAGE_UNDER(HEADER_H)) lcd_put_int(0, HEADER_H - 1, score);
 
   // Draw the maze
-  // for (uint8_t n = 0; n < head_ind; ++n) {
+  // LOOP_L_N(n, head_ind) {
   //   const pos_t &p = maze_walls[n], &q = maze_walls[n + 1];
   //   if (p.x == q.x) {
   //     const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
diff --git a/Marlin/src/lcd/menu/game/snake.cpp b/Marlin/src/lcd/menu/game/snake.cpp
index 8c5280b6898d..d6af22455312 100644
--- a/Marlin/src/lcd/menu/game/snake.cpp
+++ b/Marlin/src/lcd/menu/game/snake.cpp
@@ -84,14 +84,14 @@ void shorten_tail() {
   }
   if (shift) {
     sdat.head_ind--;
-    for (uint8_t i = 0; i <= sdat.head_ind; ++i)
+    LOOP_LE_N(i, sdat.head_ind)
       sdat.snake_tail[i] = sdat.snake_tail[i + 1];
   }
 }
 
 // The food is on a line
 inline bool food_on_line() {
-  for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+  LOOP_L_N(n, sdat.head_ind) {
     pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
     if (p.x == q.x) {
       if ((sdat.foodx == p.x - 1 || sdat.foodx == p.x) && WITHIN(sdat.foody, _MIN(p.y, q.y), _MAX(p.y, q.y)))
@@ -151,7 +151,7 @@ bool snake_overlap() {
   // VERTICAL head segment?
   if (h1.x == h2.x) {
     // Loop from oldest to segment two away from head
-    for (uint8_t n = 0; n < sdat.head_ind - 2; ++n) {
+    LOOP_L_N(n, sdat.head_ind - 2) {
       // Segment p to q
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x != q.x) {
@@ -163,7 +163,7 @@ bool snake_overlap() {
   }
   else {
     // Loop from oldest to segment two away from head
-    for (uint8_t n = 0; n < sdat.head_ind - 2; ++n) {
+    LOOP_L_N(n, sdat.head_ind - 2) {
       // Segment p to q
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.y != q.y) {
@@ -240,7 +240,7 @@ void SnakeGame::game_screen() {
   #if SNAKE_WH < 2
 
     // At this scale just draw a line
-    for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+    LOOP_L_N(n, sdat.head_ind) {
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x == q.x) {
         const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
@@ -256,7 +256,7 @@ void SnakeGame::game_screen() {
   #elif SNAKE_WH == 2
 
     // At this scale draw two lines
-    for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+    LOOP_L_N(n, sdat.head_ind) {
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x == q.x) {
         const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
@@ -275,7 +275,7 @@ void SnakeGame::game_screen() {
   #else
 
     // Draw a series of boxes
-    for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+    LOOP_L_N(n, sdat.head_ind) {
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x == q.x) {
         const int8_t y1 = _MIN(p.y, q.y), y2 = _MAX(p.y, q.y);
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 2a53f9490eec..a4a8176d3a8b 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -114,7 +114,7 @@ void menu_cancelobject();
       #if EXTRUDERS == 1
         EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
       #elif EXTRUDERS > 1
-        for (uint8_t n = 0; n < EXTRUDERS; n++)
+        LOOP_L_N(n, EXTRUDERS)
           EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
       #endif
     #endif
@@ -125,7 +125,7 @@ void menu_cancelobject();
       if (parser.volumetric_enabled) {
         EDIT_ITEM_FAST(float43, MSG_FILAMENT_DIAM, &planner.filament_size[active_extruder], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
         #if EXTRUDERS > 1
-          for (uint8_t n = 0; n < EXTRUDERS; n++)
+          LOOP_L_N(n, EXTRUDERS)
             EDIT_ITEM_FAST_N(float43, n, MSG_FILAMENT_DIAM_E, &planner.filament_size[n], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
         #endif
       }
@@ -142,13 +142,13 @@ void menu_cancelobject();
 
       EDIT_ITEM_FAST(float3, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
       #if EXTRUDERS > 1
-        for (uint8_t n = 0; n < EXTRUDERS; n++)
+        LOOP_L_N(n, EXTRUDERS)
           EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
       #endif
 
       EDIT_ITEM_FAST(float3, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
       #if EXTRUDERS > 1
-        for (uint8_t n = 0; n < EXTRUDERS; n++)
+        LOOP_L_N(n, EXTRUDERS)
           EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
       #endif
     #endif
@@ -358,7 +358,7 @@ void menu_cancelobject();
       EDIT_ITEM_FAST(float3, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
     #endif
     #if ENABLED(DISTINCT_E_FACTORS)
-      for (uint8_t n = 0; n < E_STEPPERS; n++)
+      LOOP_L_N(n, E_STEPPERS)
         EDIT_ITEM_FAST_N(float3, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
     #endif
 
@@ -409,7 +409,7 @@ void menu_cancelobject();
 
     #if ENABLED(DISTINCT_E_FACTORS)
       EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
-      for (uint8_t n = 0; n < E_STEPPERS; n++)
+      LOOP_L_N(n, E_STEPPERS)
         EDIT_ITEM_FAST_N(long5_25, n, MSG_AMAX_EN, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(n)], 100, max_accel_edit_scaled.e, []{ _reset_e_acceleration_rate(MenuItemBase::itemIndex); });
     #elif E_STEPPERS
       EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
@@ -484,7 +484,7 @@ void menu_advanced_steps_per_mm() {
 
   #if ENABLED(DISTINCT_E_FACTORS)
     EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, []{ planner.refresh_positioning(); });
-    for (uint8_t n = 0; n < E_STEPPERS; n++)
+    LOOP_L_N(n, E_STEPPERS)
       EDIT_ITEM_FAST_N(float51, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{ _planner_refresh_e_positioning(MenuItemBase::itemIndex); });
   #elif E_STEPPERS
     EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
@@ -558,7 +558,7 @@ void menu_advanced_settings() {
     #if EXTRUDERS == 1
       EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
-      for (uint8_t n = 0; n < E_STEPPERS; n++)
+      LOOP_L_N(n, E_STEPPERS)
         EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 5f2ecb9ccd33..0c8f1f61c865 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -114,7 +114,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
         GCODES_ITEM_P(msg, PSTR("M600 B0"));
     #else
       PGM_P const msg = GET_TEXT(MSG_FILAMENTCHANGE_E);
-      for (uint8_t s = 0; s < E_STEPPERS; s++) {
+      LOOP_L_N(s, E_STEPPERS) {
         if (thermalManager.targetTooColdToExtrude(s))
           SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
         else {
@@ -138,7 +138,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
             GCODES_ITEM_P(msg_load, PSTR("M701"));
         #else
           PGM_P const msg_load = GET_TEXT(MSG_FILAMENTLOAD_E);
-          for (uint8_t s = 0; s < E_STEPPERS; s++) {
+          LOOP_L_N(s, E_STEPPERS) {
             if (thermalManager.targetTooColdToExtrude(s))
               SUBMENU_N_P(s, msg_load, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, MenuItemBase::itemIndex); });
             else {
@@ -162,7 +162,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
           #if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
           {
             bool too_cold = false;
-            for (uint8_t s = 0; s < E_STEPPERS; s++) {
+            LOOP_L_N(s, E_STEPPERS) {
               if (thermalManager.targetTooColdToExtrude(s)) {
                 too_cold = true; break;
               }
@@ -174,7 +174,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
           }
           #endif
           PGM_P const msg_unload = GET_TEXT(MSG_FILAMENTUNLOAD_E);
-          for (uint8_t s = 0; s < E_STEPPERS; s++) {
+          LOOP_L_N(s, E_STEPPERS) {
             if (thermalManager.targetTooColdToExtrude(s))
               SUBMENU_N_P(s, msg_unload, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, MenuItemBase::itemIndex); });
             else {
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index 65b8af20ca19..a74fcb6e6a49 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -181,7 +181,7 @@ void lcd_mixer_mix_edit() {
 
     #if CHANNEL_MIX_EDITING
 
-      for (uint8_t n = 1; n <= MIXING_STEPPERS; n++)
+      LOOP_S_LE_N(n, 1, MIXING_STEPPERS)
         EDIT_ITEM_FAST_N(float52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
 
       ACTION_ITEM(MSG_CYCLE_MIX, _lcd_mixer_cycle_mix);
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index c278c423d2e1..e2f5e8d65813 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -54,7 +54,7 @@ void _mmu2_load_filament(uint8_t index) {
   ui.reset_status();
 }
 void action_mmu2_load_all() {
-  for (uint8_t i = 0; i < EXTRUDERS; i++)
+  LOOP_L_N(i, EXTRUDERS)
     _mmu2_load_filament(i);
   ui.return_to_status();
 }
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 3f14e58781c1..b7f57c8146fa 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -357,7 +357,7 @@ void menu_move() {
     #elif E_MANUAL > 1
 
       // Independent extruders with one E-stepper per hotend
-      for (uint8_t n = 0; n < E_MANUAL; n++) SUBMENU_MOVE_E(n);
+      LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
 
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 40fb88fccaed..01cf39d7b318 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -111,7 +111,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
       #if HAS_HEATED_BED
         _PREHEAT_ITEMS(1,0);
       #endif
-      for (uint8_t n = 1; n < HOTENDS; n++) PREHEAT_ITEMS(1,n);
+      LOOP_S_L_N(n, 1, HOTENDS) PREHEAT_ITEMS(1,n);
       ACTION_ITEM(MSG_PREHEAT_1_ALL, []() {
         #if HAS_HEATED_BED
           _preheat_bed(0);
@@ -139,7 +139,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
       #if HAS_HEATED_BED
         _PREHEAT_ITEMS(2,0);
       #endif
-      for (uint8_t n = 1; n < HOTENDS; n++) PREHEAT_ITEMS(2,n);
+      LOOP_S_L_N(n, 1, HOTENDS) PREHEAT_ITEMS(2,n);
       ACTION_ITEM(MSG_PREHEAT_2_ALL, []() {
         #if HAS_HEATED_BED
           _preheat_bed(1);
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 9221d7700541..216decf71800 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -222,7 +222,7 @@ void menu_tune() {
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
     // Flow En:
     #if EXTRUDERS > 1
-      for (uint8_t n = 0; n < EXTRUDERS; n++)
+      LOOP_L_N(n, EXTRUDERS)
         EDIT_ITEM_N(int3, n, MSG_FLOW_N, &planner.flow_percentage[n], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
     #endif
   #endif
@@ -234,7 +234,7 @@ void menu_tune() {
     #if EXTRUDERS == 1
       EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
-      for (uint8_t n = 0; n < EXTRUDERS; n++)
+      LOOP_L_N(n, EXTRUDERS)
         EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index b929acbd85f9..48129b61aed2 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1136,7 +1136,7 @@ void MarlinUI::update() {
       thermalManager.current_ADCKey_raw = HAL_ADC_RANGE;
       thermalManager.ADCKey_count = 0;
       if (currentkpADCValue < adc_other_button)
-        for (uint8_t i = 0; i < ADC_KEY_NUM; i++) {
+        LOOP_L_N(i, ADC_KEY_NUM) {
           const uint16_t lo = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMin),
                          hi = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMax);
           if (WITHIN(currentkpADCValue, lo, hi)) return pgm_read_byte(&stADCKeyTable[i].ADCKeyNo);
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 37fbf021d17f..ad7053714128 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -508,7 +508,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   // Work on the drivers
   //
 
-  for (uint8_t k = 0; k < driver_count; k++) {
+  LOOP_L_N(k, driver_count) {
     uint8_t not_found = true;
     for (j = 1; j <= L64XX::chain[0]; j++) {
       PGM_P const str = (PGM_P)pgm_read_ptr(&index_to_axis[L64XX::chain[j]]);
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index 58ba57e42571..ecbfeb331ede 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -54,7 +54,7 @@ Nozzle nozzle;
     #endif
 
     // Start the stroke pattern
-    for (uint8_t i = 0; i < (strokes >> 1); i++) {
+    LOOP_L_N(i, strokes >> 1) {
       do_blocking_move_to_xy(end);
       do_blocking_move_to_xy(start);
     }
@@ -91,7 +91,7 @@ Nozzle nozzle;
     const bool horiz = ABS(diff.x) >= ABS(diff.y);    // Do a horizontal wipe?
     const float P = (horiz ? diff.x : diff.y) / zigs; // Period of each zig / zag
     const xyz_pos_t *side;
-    for (uint8_t j = 0; j < strokes; j++) {
+    LOOP_L_N(j, strokes) {
       for (int8_t i = 0; i < zigs; i++) {
         side = (i & 1) ? &end : &start;
         if (horiz)
@@ -134,8 +134,8 @@ Nozzle nozzle;
       do_blocking_move_to(start);
     #endif
 
-    for (uint8_t s = 0; s < strokes; s++)
-      for (uint8_t i = 0; i < NOZZLE_CLEAN_CIRCLE_FN; i++)
+    LOOP_L_N(s, strokes)
+      LOOP_L_N(i, NOZZLE_CLEAN_CIRCLE_FN)
         do_blocking_move_to_xy(
           middle.x + sin((RADIANS(360) / NOZZLE_CLEAN_CIRCLE_FN) * i) * radius,
           middle.y + cos((RADIANS(360) / NOZZLE_CLEAN_CIRCLE_FN) * i) * radius
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index d2af0f3d5630..c0da29e702bd 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -96,8 +96,8 @@ void apply_rotation_xyz(const matrix_3x3 &matrix, float &_x, float &_y, float &_
 
 // Reset to identity. No rotate or translate.
 void matrix_3x3::set_to_identity() {
-  for (uint8_t i = 0; i < 3; i++)
-    for (uint8_t j = 0; j < 3; j++)
+  LOOP_L_N(i, 3)
+    LOOP_L_N(j, 3)
       vectors[i][j] = float(i == j);
 }
 
@@ -134,8 +134,8 @@ matrix_3x3 matrix_3x3::create_look_at(const vector_3 &target) {
 // Get a transposed copy of the matrix
 matrix_3x3 matrix_3x3::transpose(const matrix_3x3 &original) {
   matrix_3x3 new_matrix;
-  for (uint8_t i = 0; i < 3; i++)
-    for (uint8_t j = 0; j < 3; j++)
+  LOOP_L_N(i, 3)
+    LOOP_L_N(j, 3)
       new_matrix.vectors[i][j] = original.vectors[j][i];
   return new_matrix;
 }
@@ -145,8 +145,8 @@ void matrix_3x3::debug(PGM_P const title) {
     serialprintPGM(title);
     SERIAL_EOL();
   }
-  for (uint8_t i = 0; i < 3; i++) {
-    for (uint8_t j = 0; j < 3; j++) {
+  LOOP_L_N(i, 3) {
+    LOOP_L_N(j, 3) {
       if (vectors[i][j] >= 0.0) SERIAL_CHAR('+');
       SERIAL_ECHO_F(vectors[i][j], 6);
       SERIAL_CHAR(' ');
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index ae82e59447f2..eb773250942f 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -583,7 +583,7 @@ void MarlinSettings::postprocess() {
 
       #if HAS_HOTEND_OFFSET
         // Skip hotend 0 which must be 0
-        for (uint8_t e = 1; e < HOTENDS; e++)
+        LOOP_S_L_N(e, 1, HOTENDS)
           EEPROM_WRITE(hotend_offset[e]);
       #endif
     }
@@ -1420,7 +1420,7 @@ void MarlinSettings::postprocess() {
       {
         #if HAS_HOTEND_OFFSET
           // Skip hotend 0 which must be 0
-          for (uint8_t e = 1; e < HOTENDS; e++)
+          LOOP_S_L_N(e, 1, HOTENDS)
             EEPROM_READ(hotend_offset[e]);
         #endif
       }
@@ -2915,7 +2915,7 @@ void MarlinSettings::reset() {
     #if HAS_HOTEND_OFFSET
       CONFIG_ECHO_HEADING("Hotend offsets:");
       CONFIG_ECHO_START();
-      for (uint8_t e = 1; e < HOTENDS; e++) {
+      LOOP_S_L_N(e, 1, HOTENDS) {
         SERIAL_ECHOPAIR_P(
           PSTR("  M218 T"), (int)e,
           SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 58de4a8d05f9..1c8384cc53d4 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -481,7 +481,7 @@ void _O2 Endstops::report_states() {
       print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
     #else
       #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
-      for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
+      LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) {
         pin_t pin;
         switch (i) {
           default: continue;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index efe4d31ccf7c..74177490882f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1408,7 +1408,7 @@ void Planner::check_axes_activity() {
    * The multiplier converts a given E value into a length.
    */
   void Planner::calculate_volumetric_multipliers() {
-    for (uint8_t i = 0; i < COUNT(filament_size); i++) {
+    LOOP_L_N(i, COUNT(filament_size)) {
       volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
       refresh_e_factor(i);
     }
@@ -1991,7 +1991,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
       #if ENABLED(DISABLE_INACTIVE_EXTRUDER) // Enable only the selected extruder
 
-        for (uint8_t i = 0; i < EXTRUDERS; i++)
+        LOOP_L_N(i, EXTRUDERS)
           if (g_uc_extruder_last_move[i] > 0) g_uc_extruder_last_move[i]--;
 
         #if HAS_DUPLICATION_MODE
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 3e5d9d902eea..ae104eb35415 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -403,7 +403,7 @@ class Planner {
       FORCE_INLINE static void set_filament_size(const uint8_t e, const float &v) {
         filament_size[e] = v;
         // make sure all extruders have some sane value for the filament size
-        for (uint8_t i = 0; i < COUNT(filament_size); i++)
+        LOOP_L_N(i, COUNT(filament_size))
           if (!filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
       }
 
@@ -807,7 +807,7 @@ class Planner {
       FORCE_INLINE static void recalculate_max_e_jerk() {
         #define GET_MAX_E_JERK(N) SQRT(SQRT(0.5) * junction_deviation_mm * (N) * RECIPROCAL(1.0 - SQRT(0.5)))
         #if ENABLED(DISTINCT_E_FACTORS)
-          for (uint8_t i = 0; i < EXTRUDERS; i++)
+          LOOP_L_N(i, EXTRUDERS)
             max_e_jerk[i] = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS_N(i)]);
         #else
           max_e_jerk = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS]);
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 6376f925930e..962c2307757d 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -624,7 +624,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
       #if EXTRA_PROBING
         // Insert Z measurement into probes[]. Keep it sorted ascending.
-        for (uint8_t i = 0; i <= p; i++) {                            // Iterate the saved Zs to insert the new Z
+        LOOP_LE_N(i, p) {                            // Iterate the saved Zs to insert the new Z
           if (i == p || probes[i] > z) {                              // Last index or new Z is smaller than this Z
             for (int8_t m = p; --m >= i;) probes[m + 1] = probes[m];  // Shift items down after the insertion point
             probes[i] = z;                                            // Insert the new Z measurement
@@ -662,7 +662,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
           max_avg_idx--; else min_avg_idx++;
 
       // Return the average value of all remaining probes.
-      for (uint8_t i = min_avg_idx; i <= max_avg_idx; i++)
+      LOOP_S_LE_N(i, min_avg_idx, max_avg_idx)
         probes_z_sum += probes[i];
 
     #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b83f2c2ce28f..ed48b83d5a6c 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2116,7 +2116,7 @@ void Stepper::init() {
   #if MB(ALLIGATOR)
     const float motor_current[] = MOTOR_CURRENT;
     unsigned int digipot_motor = 0;
-    for (uint8_t i = 0; i < 3 + EXTRUDERS; i++) {
+    LOOP_L_N(i, 3 + EXTRUDERS) {
       digipot_motor = 255 * (motor_current[i] / 2.5);
       dac084s085::setValue(i, digipot_motor);
     }
@@ -2756,7 +2756,7 @@ void Stepper::report_positions() {
         SPI.begin();
         SET_OUTPUT(DIGIPOTSS_PIN);
 
-        for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++) {
+        LOOP_L_N(i, COUNT(digipot_motor_current)) {
           //digitalPotWrite(digipot_ch[i], digipot_motor_current[i]);
           digipot_current(i, digipot_motor_current[i]);
         }
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e15d42db6a70..d0b1ddf0a337 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -708,7 +708,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
     }while(0)
 
     uint8_t fanDone = 0;
-    for (uint8_t f = 0; f < COUNT(fanBit); f++) {
+    LOOP_L_N(f, COUNT(fanBit)) {
       const uint8_t realFan = pgm_read_byte(&fanBit[f]);
       if (TEST(fanDone, realFan)) continue;
       const bool fan_on = TEST(fanState, realFan);
@@ -2422,7 +2422,7 @@ void Temperature::readings_ready() {
       #endif // HOTENDS > 1
     };
 
-    for (uint8_t e = 0; e < COUNT(temp_dir); e++) {
+    LOOP_L_N(e, COUNT(temp_dir)) {
       const int8_t tdir = temp_dir[e];
       if (tdir) {
         const int16_t rawtemp = temp_hotend[e].raw * tdir; // normal direction, +rawtemp, else -rawtemp
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 3a6e7b20ce36..0d91669973ba 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -251,7 +251,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
 #elif ENABLED(PARKING_EXTRUDER)
 
   void pe_solenoid_init() {
-    for (uint8_t n = 0; n <= 1; ++n)
+    LOOP_LE_N(n, 1)
       #if ENABLED(PARKING_EXTRUDER_SOLENOIDS_INVERT)
         pe_activate_solenoid(n);
       #else
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index a2f2cd455f1a..c08acd383621 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -228,7 +228,7 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
     return true;
   };
 
-  for (uint8_t x = 0; x < COUNT(pin_array); x++)  {    // scan entire array and report all instances of this pin
+  LOOP_L_N(x, COUNT(pin_array))  {    // scan entire array and report all instances of this pin
     if (GET_ARRAY_PIN(x) == pin) {
       if (!found) {    // report digital and analog pin number only on the first time through
         if (start_string) serialprintPGM(start_string);
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index f82fab1b50a8..ba233d36f625 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -74,7 +74,7 @@
   #else
     static uint8_t CRC7(const uint8_t* data, uint8_t n) {
       uint8_t crc = 0;
-      for (uint8_t i = 0; i < n; i++) {
+      LOOP_L_N(i, n) {
         uint8_t d = data[i];
         d ^= crc << 1;
         if (d & 0x80) d ^= 9;
@@ -106,7 +106,7 @@ uint8_t Sd2Card::cardCommand(const uint8_t cmd, const uint32_t arg) {
     d[5] = CRC7(d, 5);
 
     // Send message
-    for (uint8_t k = 0; k < 6; k++) spiSend(d[k]);
+    LOOP_L_N(k, 6) spiSend(d[k]);
 
   #else
     // Send command
@@ -246,7 +246,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
   spiInit(spiRate_);
 
   // Must supply min of 74 clock cycles with CS high.
-  for (uint8_t i = 0; i < 10; i++) spiSend(0xFF);
+  LOOP_L_N(i, 10) spiSend(0xFF);
 
   watchdog_refresh(); // In case init takes too long
 
@@ -272,7 +272,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
     }
 
     // Get the last byte of r7 response
-    for (uint8_t i = 0; i < 4; i++) status_ = spiRec();
+    LOOP_L_N(i, 4) status_ = spiRec();
     if (status_ == 0xAA) {
       type(SD_CARD_TYPE_SD2);
       break;
@@ -303,7 +303,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
     }
     if ((spiRec() & 0xC0) == 0xC0) type(SD_CARD_TYPE_SDHC);
     // Discard rest of ocr - contains allowed voltage range
-    for (uint8_t i = 0; i < 3; i++) spiRec();
+    LOOP_L_N(i, 3) spiRec();
   }
   chipDeselect();
 
diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index cdb1072cbef7..27c191a6a6ae 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -204,7 +204,7 @@ bool SdBaseFile::dirEntry(dir_t* dir) {
  */
 void SdBaseFile::dirName(const dir_t& dir, char* name) {
   uint8_t j = 0;
-  for (uint8_t i = 0; i < 11; i++) {
+  LOOP_L_N(i, 11) {
     if (dir.name[i] == ' ')continue;
     if (i == 8) name[j++] = '.';
     name[j++] = dir.name[i];
@@ -345,10 +345,10 @@ int8_t SdBaseFile::lsPrintNext(uint8_t flags, uint8_t indent) {
         && DIR_IS_FILE_OR_SUBDIR(&dir)) break;
   }
   // indent for dir level
-  for (uint8_t i = 0; i < indent; i++) SERIAL_CHAR(' ');
+  LOOP_L_N(i, indent) SERIAL_CHAR(' ');
 
   // print name
-  for (uint8_t i = 0; i < 11; i++) {
+  LOOP_L_N(i, 11) {
     if (dir.name[i] == ' ')continue;
     if (i == 8) {
       SERIAL_CHAR('.');
@@ -478,7 +478,7 @@ bool SdBaseFile::mkdir(SdBaseFile* parent, const uint8_t dname[11]) {
   // make entry for '.'
   memcpy(&d, p, sizeof(d));
   d.name[0] = '.';
-  for (uint8_t i = 1; i < 11; i++) d.name[i] = ' ';
+  LOOP_S_L_N(i, 1, 11) d.name[i] = ' ';
 
   // cache block for '.'  and '..'
   block = vol_->clusterStartBlock(firstCluster_);
@@ -1088,7 +1088,7 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
         if (WITHIN(seq, 1, MAX_VFAT_ENTRIES)) {
           // TODO: Store the filename checksum to verify if a long-filename-unaware system modified the file table.
           n = (seq - 1) * (FILENAME_LENGTH);
-          for (uint8_t i = 0; i < FILENAME_LENGTH; i++)
+          LOOP_L_N(i, FILENAME_LENGTH)
             longFilename[n + i] = (i < 5) ? VFAT->name1[i] : (i < 11) ? VFAT->name2[i - 5] : VFAT->name3[i - 11];
           // If this VFAT entry is the last one, add a NUL terminator at the end of the string
           if (VFAT->sequenceNumber & 0x40) longFilename[n + FILENAME_LENGTH] = '\0';
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index c7209d2b14e5..aadd355afded 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -143,7 +143,7 @@ CardReader::CardReader() {
 //
 char *createFilename(char * const buffer, const dir_t &p) {
   char *pos = buffer;
-  for (uint8_t i = 0; i < 11; i++) {
+  LOOP_L_N(i, 11) {
     if (p.name[i] == ' ') continue;
     if (i == 8) *pos++ = '.';
     *pos++ = p.name[i];
@@ -435,7 +435,7 @@ void CardReader::getAbsFilename(char *dst) {
     if (cnt < MAXPATHNAMELENGTH) { *dst = '/'; dst++; cnt++; }
   };
 
-  for (uint8_t i = 0; i < workDirDepth; i++)                // Loop down to current work dir
+  LOOP_L_N(i, workDirDepth)                // Loop down to current work dir
     appendAtom(workDirParents[i]);
 
   if (cnt < MAXPATHNAMELENGTH - (FILENAME_LENGTH) - 1) {    // Leave room for filename and nul
@@ -1046,7 +1046,7 @@ void CardReader::cdroot() {
       #if ENABLED(SDSORT_DYNAMIC_RAM)
         delete sort_order;
         #if ENABLED(SDSORT_CACHE_NAMES)
-          for (uint8_t i = 0; i < sort_count; ++i) {
+          LOOP_L_N(i, sort_count) {
             free(sortshort[i]); // strdup
             free(sortnames[i]); // strdup
           }

From cee07f3f6b3fad54919283529daa65a964266000 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 14 Mar 2020 00:22:04 -0400
Subject: [PATCH 429/565] Quad Z leveling, G34 (R)ecalculate (#17122)

---
 Marlin/src/gcode/calibrate/G34_M422.cpp | 73 +++++++++++++++----------
 Marlin/src/inc/SanityCheck.h            |  4 +-
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index fecbb4be6828..672f40737a5b 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -64,6 +64,7 @@ inline void set_all_z_lock(const bool lock) {
  *   I<iterations>
  *   T<accuracy>
  *   A<amplification>
+ *   R<recalculate> points based on current probe offsets
  */
 void GcodeSuite::G34() {
   if (DEBUGGING(LEVELING)) {
@@ -73,8 +74,10 @@ void GcodeSuite::G34() {
 
   do { // break out on error
 
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      SERIAL_ECHOLNPGM("Alignment not supported for over 3 steppers");
+    #if NUM_Z_STEPPER_DRIVERS == 4
+      SERIAL_ECHOLNPGM("Alignment for 4 steppers is Experimental!");
+    #elif NUM_Z_STEPPER_DRIVERS > 4
+      SERIAL_ECHOLNPGM("Alignment not supported for over 4 steppers");
       break;
     #endif
 
@@ -101,6 +104,8 @@ void GcodeSuite::G34() {
         }
       #endif
 
+    if (parser.seen('R')) z_stepper_align.reset_to_default();
+
     const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
 
     // Wait for planner moves to finish!
@@ -139,13 +144,18 @@ void GcodeSuite::G34() {
 
     // Compute a worst-case clearance height to probe from. After the first
     // iteration this will be re-calculated based on the actual bed position
-    float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * (
+    auto magnitude2 = [&](const uint8_t i, const uint8_t j) {
+      const xy_pos_t diff = z_stepper_align.xy[i] - z_stepper_align.xy[j];
+      return HYPOT2(diff.x, diff.y);
+    };
+    float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * SQRT(
       #if NUM_Z_STEPPER_DRIVERS == 3
-         SQRT(_MAX(HYPOT2(z_stepper_align.xy[0].x - z_stepper_align.xy[1].x, z_stepper_align.xy[0].y - z_stepper_align.xy[1].y),
-                   HYPOT2(z_stepper_align.xy[1].x - z_stepper_align.xy[2].x, z_stepper_align.xy[1].y - z_stepper_align.xy[2].y),
-                   HYPOT2(z_stepper_align.xy[2].x - z_stepper_align.xy[0].x, z_stepper_align.xy[2].y - z_stepper_align.xy[0].y)))
+         _MAX(magnitude2(0, 1), magnitude2(1, 2), magnitude2(2, 0))
+      #elif NUM_Z_STEPPER_DRIVERS == 4
+         _MAX(magnitude2(0, 1), magnitude2(1, 2), magnitude2(2, 3),
+              magnitude2(3, 0), magnitude2(0, 2), magnitude2(1, 3))
       #else
-         HYPOT(z_stepper_align.xy[0].x - z_stepper_align.xy[1].x, z_stepper_align.xy[0].y - z_stepper_align.xy[1].y)
+         magnitude2(0, 1)
       #endif
     );
 
@@ -159,7 +169,7 @@ void GcodeSuite::G34() {
     // This hack is un-done at the end of G34 - either by re-homing, or by using the probed heights of the last iteration.
 
     #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-      float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f);
+      float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f, 10000.0f);
     #else
       float last_z_align_level_indicator = 10000.0f;
     #endif
@@ -241,7 +251,7 @@ void GcodeSuite::G34() {
         linear_fit_data lfd;
         incremental_LSF_reset(&lfd);
         LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-          SERIAL_ECHOLNPAIR("PROBEPT_", ('0' + i), ": ", z_measured[i]);
+          SERIAL_ECHOLNPAIR("PROBEPT_", int(i), ": ", z_measured[i]);
           incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
         }
         finish_incremental_LSF(&lfd);
@@ -322,9 +332,12 @@ void GcodeSuite::G34() {
         switch (zstepper) {
           case 0: stepper.set_z_lock(false); break;
           case 1: stepper.set_z2_lock(false); break;
-          #if NUM_Z_STEPPER_DRIVERS == 3
+          #if NUM_Z_STEPPER_DRIVERS >= 3
             case 2: stepper.set_z3_lock(false); break;
           #endif
+          #if NUM_Z_STEPPER_DRIVERS == 4
+            case 3: stepper.set_z4_lock(false); break;
+          #endif
         }
 
         #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
@@ -348,28 +361,13 @@ void GcodeSuite::G34() {
 
     } // for (iteration)
 
-    if (err_break) {
+    if (err_break)
       SERIAL_ECHOLNPGM("G34 aborted.");
-      set_axis_not_trusted(Z_AXIS);  // The Z coordinate is messed up now
-      break;
+    else {
+      SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " of ", int(z_auto_align_iterations));
+      SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
     }
 
-    SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " iterations of ", int(z_auto_align_iterations));
-    SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
-
-    // Restore the active tool after homing
-    #if HOTENDS > 1
-      tool_change(old_tool_index, (true
-        #if ENABLED(PARKING_EXTRUDER)
-          && false // Fetch the previous toolhead
-        #endif
-      ));
-    #endif
-
-    #if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G34)
-      set_bed_leveling_enabled(leveling_was_active);
-    #endif
-
     // Stow the probe, as the last call to probe.probe_at_point(...) left
     // the probe deployed if it was successful.
     probe.stow();
@@ -377,7 +375,6 @@ void GcodeSuite::G34() {
     #if ENABLED(HOME_AFTER_G34)
       // After this operation the z position needs correction
       set_axis_not_trusted(Z_AXIS);
-
       // Home Z after the alignment procedure
       process_subcommands_now_P(PSTR("G28Z"));
     #else
@@ -388,6 +385,15 @@ void GcodeSuite::G34() {
       sync_plan_position();
     #endif
 
+    // Restore the active tool after homing
+    #if HOTENDS > 1
+      tool_change(old_tool_index, DISABLED(PARKING_EXTRUDER)); // Fetch previous tool for parking extruder
+    #endif
+
+    #if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G34)
+      set_bed_leveling_enabled(leveling_was_active);
+    #endif
+
   }while(0);
 
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G34");
@@ -406,9 +412,16 @@ void GcodeSuite::G34() {
  * S and W require an X and/or Y parameter
  *   X<pos>   : X position to set (Unchanged if omitted)
  *   Y<pos>   : Y position to set (Unchanged if omitted)
+ *
+ * R : Recalculate points based on current probe offsets
  */
 void GcodeSuite::M422() {
 
+  if (parser.seen('R')) {
+    z_stepper_align.reset_to_default();
+    return;
+  }
+
   if (!parser.seen_any()) {
     LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
       SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), int(i + 1), SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index d017dbf2db5b..454183e54885 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2509,8 +2509,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     #error "Z_STEPPER_AUTO_ALIGN requires NUM_Z_STEPPER_DRIVERS greater than 1."
   #elif !HAS_BED_PROBE
     #error "Z_STEPPER_AUTO_ALIGN requires a Z-bed probe."
-  #elif ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) && NUM_Z_STEPPER_DRIVERS != 3
-    #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3."
+  #elif ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) && NUM_Z_STEPPER_DRIVERS < 3
+    #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3 or 4."
   #endif
 #endif
 

From 8b2d55e345c6fadd4ca64209df323dc795af9969 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 Mar 2020 20:47:44 -0500
Subject: [PATCH 430/565] Config version 020005

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 2 +-
 Marlin/src/inc/Version.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5bbaeba74151..a92557977f85 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -36,7 +36,7 @@
  * Advanced settings can be found in Configuration_adv.h
  *
  */
-#define CONFIGURATION_H_VERSION 020004
+#define CONFIGURATION_H_VERSION 020005
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5a49c87758f9..f5d80a3eb3e8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -31,7 +31,7 @@
  * Basic settings can be found in Configuration.h
  *
  */
-#define CONFIGURATION_ADV_H_VERSION 020004
+#define CONFIGURATION_ADV_H_VERSION 020005
 
 // @section temperature
 
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fa20c9724804..25748f7d3179 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -52,7 +52,7 @@
  * to alert users to major changes.
  */
 
-#define MARLIN_HEX_VERSION 020004
+#define MARLIN_HEX_VERSION 020005
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From 9f85165101008a87f37cb935591522e45910e848 Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Sat, 14 Mar 2020 18:12:29 -0500
Subject: [PATCH 431/565] Allow Tool Offset adjustments to have another digit
 of precision

Some of the items in the Tool Offset Adjustment menu (in particular, the Z Offset!!!) were only adjustable with .1mm accuracy.
This is not enough.    So the edit menu is switched to float52 to fix the issue.
---
 Marlin/src/lcd/menu/menu_configuration.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index ae0abbf74668..25b253b26183 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -138,12 +138,12 @@ void menu_advanced_settings();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
     #if ENABLED(DUAL_X_CARRIAGE)
-      EDIT_ITEM_FAST(float51, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
+      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
     #else
-      EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
+      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
     #endif
-    EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
-    EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
     #if ENABLED(EEPROM_SETTINGS)
       ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
     #endif

From 5c1970a22978c405d4d945a3db5c6299f3783426 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 15 Mar 2020 00:04:39 +0000
Subject: [PATCH 432/565] [cron] Bump distribution date (2020-03-15)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 25748f7d3179..7b8461567c46 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-14"
+  #define STRING_DISTRIBUTION_DATE "2020-03-15"
 #endif
 
 /**

From 41ffe9851d3d902f450a5b1bd85b1197295dcd7a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 14 Mar 2020 19:23:08 -0500
Subject: [PATCH 433/565] Fix LCD progress bar

Fixes #17162
---
 Marlin/Configuration_adv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f5d80a3eb3e8..61837116461d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -999,7 +999,7 @@
   #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
 #endif
 
-#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
+#if HAS_GRAPHICAL_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
   #if ENABLED(SHOW_REMAINING_TIME)
@@ -1008,7 +1008,7 @@
   #endif
 #endif
 
-#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
+#if HAS_CHARACTER_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
   #if ENABLED(LCD_PROGRESS_BAR)
     #define PROGRESS_BAR_BAR_TIME 2000    // (ms) Amount of time to show the bar

From 095a1123c191db46040688daba4b4505d4615d6e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 14 Mar 2020 18:47:44 -0500
Subject: [PATCH 434/565] Add a global machine state

---
 Marlin/src/MarlinCore.cpp         |  6 ++++--
 Marlin/src/MarlinCore.h           | 16 +++++++++++++---
 Marlin/src/gcode/control/M999.cpp |  4 ++--
 Marlin/src/module/temperature.cpp |  4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index f19aaef968d5..b4ddc8045474 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -202,7 +202,7 @@ const char NUL_STR[] PROGMEM = "",
            SP_Z_LBL[] PROGMEM = " Z:",
            SP_E_LBL[] PROGMEM = " E:";
 
-bool Running = true;
+MarlinState marlin_state = MF_INITIALIZING;
 
 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
 bool wait_for_heatup = true;
@@ -839,7 +839,7 @@ void stop() {
     SERIAL_ERROR_MSG(STR_ERR_STOPPED);
     LCD_MESSAGEPGM(MSG_STOPPED);
     safe_delay(350);       // allow enough time for messages to get out before stopping
-    Running = false;
+    marlin_state = MF_STOPPED;
   }
 }
 
@@ -1183,6 +1183,8 @@ void setup() {
     SETUP_RUN(max7219.init());
   #endif
 
+  marlin_state = MF_RUNNING;
+
   SETUP_LOG("setup() completed.");
 }
 
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 141ce7156e3a..3bce72ab80fc 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -76,9 +76,19 @@ void minkill(const bool steppers_off=false);
 
 void quickstop_stepper();
 
-extern bool Running;
-inline bool IsRunning() { return  Running; }
-inline bool IsStopped() { return !Running; }
+// Global State of the firmware
+enum MarlinState : uint8_t {
+  MF_INITIALIZING =  0,
+  MF_RUNNING      = _BV(0),
+  MF_PAUSED       = _BV(1),
+  MF_WAITING      = _BV(2),
+  MF_STOPPED      = _BV(3),
+  MF_KILLED       = _BV(7)
+};
+
+extern MarlinState marlin_state;
+inline bool IsRunning() { return marlin_state == MF_RUNNING; }
+inline bool IsStopped() { return marlin_state != MF_RUNNING; }
 
 bool printingIsActive();
 bool printingIsPaused();
diff --git a/Marlin/src/gcode/control/M999.cpp b/Marlin/src/gcode/control/M999.cpp
index c498e66cabf0..79cd5e1854e2 100644
--- a/Marlin/src/gcode/control/M999.cpp
+++ b/Marlin/src/gcode/control/M999.cpp
@@ -23,7 +23,7 @@
 #include "../gcode.h"
 
 #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
-#include "../../MarlinCore.h"   // for Running
+#include "../../MarlinCore.h"   // for marlin_state
 #include "../queue.h"           // for flush_and_request_resend
 
 /**
@@ -37,7 +37,7 @@
  *
  */
 void GcodeSuite::M999() {
-  Running = true;
+  marlin_state = MF_RUNNING;
   ui.reset_alert_level();
 
   if (parser.boolval('S')) return;
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index d0b1ddf0a337..f16a3af04693 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -765,7 +765,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
 //
 
 inline void loud_kill(PGM_P const lcd_msg, const heater_ind_t heater) {
-  Running = false;
+  marlin_state = MF_KILLED;
   #if USE_BEEPER
     for (uint8_t i = 20; i--;) {
       WRITE(BEEPER_PIN, HIGH); delay(25);
@@ -2003,7 +2003,7 @@ void Temperature::init() {
 
     /**
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: ");
+      SERIAL_ECHOPGM("Thermal Runaway Running. Heater ID: ");
       if (heater_id == H_CHAMBER) SERIAL_ECHOPGM("chamber");
       if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHO(heater_id);
       SERIAL_ECHOPAIR(" ;  State:", sm.state, " ;  Timer:", sm.timer, " ;  Temperature:", current, " ;  Target Temp:", target);

From 090a90a0364fec1f13ade0680bbf26aa5aef23d9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 10 Mar 2020 17:45:39 -0500
Subject: [PATCH 435/565] Add EEPROM_BOOT_SILENT option

---
 Marlin/Configuration.h                    | 1 +
 Marlin/src/module/configuration_store.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a92557977f85..6cac225fce51 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1446,6 +1446,7 @@
 //#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
+#define EEPROM_BOOT_SILENT    // Keep M503 quiet and only give errors during first load
 #if ENABLED(EEPROM_SETTINGS)
   //#define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
 #endif
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index eb773250942f..fd28c3cc408d 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2185,8 +2185,10 @@ void MarlinSettings::postprocess() {
     }
 
     #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
-      if (!validating) report();
+      // Report the EEPROM settings
+      if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report();
     #endif
+
     EEPROM_FINISH();
 
     return !eeprom_error;

From 695e01407565f082b191268cab81d0bfee0867e6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 10 Mar 2020 17:46:20 -0500
Subject: [PATCH 436/565] Do later mounting of LCD-based SD

---
 Marlin/src/MarlinCore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index b4ddc8045474..5e2fe02077cd 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -991,8 +991,8 @@ void setup() {
     SETUP_RUN(ui.show_bootscreen());
   #endif
 
-  #if ENABLED(SDSUPPORT)
-    SETUP_RUN(card.mount());          // Mount the SD card before settings.first_load
+  #if ENABLED(SDSUPPORT) && defined(SDCARD_CONNECTION) && !SD_CONNECTION_IS(LCD)
+    SETUP_RUN(card.mount());          // Mount onboard / custom SD card before settings.first_load
   #endif
 
   SETUP_RUN(settings.first_load());   // Load data from EEPROM if available (or use defaults)

From 406d4df2fde010b25d614a0bdb565fe52e4f5c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 16 Mar 2020 01:56:50 +0500
Subject: [PATCH 437/565] =?UTF-8?q?#39=20-=20=D1=81=D0=BA=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B8=20=D1=81=D0=BB=D0=BE=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                 |   2 +
 Marlin/src/gcode/queue.cpp                 | 191 ++++++++++++++++++++-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp |  23 +++
 Marlin/src/module/planner.cpp              |   7 +
 4 files changed, 221 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3d734984f37a..90a2eebb71cd 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1222,6 +1222,8 @@
   // Show SD percentage next to the progress bar
   #define DOGM_SD_PERCENT
   #define DOGM_SD_PRESENT // https://github.com/ursoft/Marlin/issues/34
+  #define DOGM_SHOW_SPEED // https://github.com/ursoft/Marlin/issues/39
+  #define DOGM_SHOW_LAYER // https://github.com/ursoft/Marlin/issues/39
 
   // Enable to save many cycles by drawing a hollow frame on the Info Screen
   #define XYZ_HOLLOW_FRAME
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 7d17ca602b6f..51cd0cd23b7e 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -135,11 +135,45 @@ void GCodeQueue::_commit_command(bool say_ok
  * Return true if the command was successfully added.
  * Return false for a full buffer, or if the 'command' is a comment.
  */
+#if ENABLED(DOGM_SHOW_LAYER)
+  int runLayer = 0, runLayerCnt = 0;
+  int dogmLayerCnt = 0, dogmLayer = 0;
+  bool lastLayerCountEncountered = false;
+  void AnalyzeComment(const char* cmd) {
+    if(*cmd == ';') {
+      int val;
+      if(cmd[1] == 'L' && cmd[2] == 'A' && cmd[3] == 'Y' && cmd[4] == 'E' && cmd[5] == 'R') {
+        if(cmd[6] == ':') {
+          if(1 == sscanf(cmd + 7, "%d", &val)) {
+            dogmLayer = val + 1;
+            if(val == 0 && !lastLayerCountEncountered) {
+              dogmLayerCnt = 0;
+            }
+            lastLayerCountEncountered = false;
+          }
+        } else if(cmd[6] == '_' && cmd[7] == 'C' && cmd[8] == 'O' && cmd[9] == 'U' && cmd[10] == 'N' && cmd[11] == 'T' && cmd[12] == ':') {
+          if(1 == sscanf(cmd + 13, "%d", &val)) {
+            dogmLayer = 0;
+            dogmLayerCnt = val;
+            lastLayerCountEncountered = true;
+          }
+        } else {
+          lastLayerCountEncountered = false;
+        }
+      }
+      return;
+    }
+    lastLayerCountEncountered = false;
+  }
+#endif
 bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
   #if NUM_SERIAL > 1
     , int16_t pn/*=-1*/
   #endif
 ) {
+#if ENABLED(DOGM_SHOW_LAYER)
+  AnalyzeComment(cmd);
+#endif
   if (*cmd == ';' || length >= BUFSIZE) return false;
   strcpy(command_buffer[index_w], cmd);
   _commit_command(say_ok
@@ -314,9 +348,129 @@ FORCE_INLINE bool is_M29(const char * const cmd) {  // matches "M29" & "M29 ", b
 #define PS_QUOTED 2
 #define PS_PAREN  3
 #define PS_ESC    4
+#if ENABLED(DOGM_SHOW_LAYER)
+  #define PS_EOL_SKIP 104
+  #define PS_EOL_L 105
+  #define PS_EOL_A 106
+  #define PS_EOL_Y 107
+  #define PS_EOL_E 108
+  #define PS_EOL_R 109
+  #define PS_EOL_LP 110
+  #define PS_EOL_S 111
+  #define PS_EOL_C 112
+  #define PS_EOL_O 113
+  #define PS_EOL_U 114
+  #define PS_EOL_N 115
+  #define PS_EOL_T 116
+  #define PS_EOL_CP 117
+#endif
 
 inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
-
+#if ENABLED(DOGM_SHOW_LAYER)
+  switch(sis) {
+    case PS_EOL:
+      if(c != 'L') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_L;
+      break;
+    case PS_EOL_SKIP:
+        return;
+    case PS_EOL_L:
+      if(c != 'A') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_A;
+      break;
+    case PS_EOL_A:
+      if(c != 'Y') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_Y;
+      break;
+    case PS_EOL_Y:
+      if(c != 'E') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_E;
+      break;
+    case PS_EOL_E:
+      if(c != 'R') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_R;
+      break;
+    case PS_EOL_R:
+      if(c != ':') {
+        if(c != '_') {
+          sis = PS_EOL_SKIP;
+          return;
+        } else {
+          sis = PS_EOL_S;
+        }
+      } else {
+        sis = PS_EOL_LP;
+        runLayer = 0;
+      }
+      break;
+    case PS_EOL_LP:
+      if(c < '0' || c > '9') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else {
+        runLayer = (c - '0') + runLayer * 10;
+      }
+      break;
+    case PS_EOL_S:
+      if(c != 'C') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_C;
+      break;
+    case PS_EOL_C:
+      if(c != 'O') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_O;
+      break;
+    case PS_EOL_O:
+      if(c != 'U') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_U;
+      break;
+    case PS_EOL_U:
+      if(c != 'N') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_N;
+      break;
+    case PS_EOL_N:
+      if(c != 'T') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else sis = PS_EOL_T;
+      break;
+    case PS_EOL_T:
+      if(c != ':') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else {
+        sis = PS_EOL_CP;
+        runLayerCnt = 0;
+      }
+      break;
+    case PS_EOL_CP:
+      if(c < '0' || c > '9') {
+        sis = PS_EOL_SKIP;
+        return;
+      } else {
+        runLayerCnt = (c - '0') + runLayerCnt * 10;
+      }
+      break;
+  }
+  if (sis >= PS_EOL) return;    // EOL comment or overflow
+#endif
   if (sis == PS_EOL) return;    // EOL comment or overflow
 
   #if ENABLED(PAREN_COMMENTS)
@@ -414,7 +568,23 @@ void GCodeQueue::get_serial_commands() {
       const char serial_char = c;
 
       if (serial_char == '\n' || serial_char == '\r') {
-
+#if ENABLED(DOGM_SHOW_LAYER)
+        switch(serial_input_state[i]) {
+          case PS_EOL_LP:
+            dogmLayer = runLayer + 1;
+            if(dogmLayer == 1 && !lastLayerCountEncountered)
+              dogmLayerCnt = 0;
+            lastLayerCountEncountered = false;
+            break;
+          case PS_EOL_CP:
+            dogmLayerCnt = runLayerCnt;
+            lastLayerCountEncountered = true;
+            break;
+          default:
+            if(serial_count[i] > 1) lastLayerCountEncountered = false;
+            break;
+        }
+#endif
         // Reset our state, continue if the line was empty
         if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]))
           continue;
@@ -532,6 +702,23 @@ void GCodeQueue::get_serial_commands() {
       const char sd_char = (char)n;
       const bool is_eol = sd_char == '\n' || sd_char == '\r';
       if (is_eol || card_eof) {
+#if ENABLED(DOGM_SHOW_LAYER)
+        switch(sd_input_state) {
+          case PS_EOL_LP:
+            dogmLayer = runLayer + 1;
+            if(dogmLayer == 1 && !lastLayerCountEncountered)
+              dogmLayerCnt = 0;
+            lastLayerCountEncountered = false;
+            break;
+          case PS_EOL_CP:
+            dogmLayerCnt = runLayerCnt;
+            lastLayerCountEncountered = true;
+            break;
+          default:
+            if(sd_count > 1) lastLayerCountEncountered = false;
+            break;
+        }
+#endif
 
         // Reset stream state, terminate the buffer, and commit a non-empty command
         if (!is_eol && sd_count) ++sd_count;          // End of file with no newline
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 09d944ad82de..2e7956ef6d2a 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -346,6 +346,13 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   }
 }
 
+#if ENABLED(DOGM_SHOW_SPEED)
+ extern int16_t dogmSpeedToShow;
+#endif
+#if ENABLED(DOGM_SHOW_LAYER)
+  extern int dogmLayerCnt, dogmLayer;
+  extern char conv[8];
+#endif
 void MarlinUI::draw_status_screen() {
 
   static char xstring[5
@@ -502,6 +509,22 @@ void MarlinUI::draw_status_screen() {
 
   // Status Menu Font
   set_font(FONT_STATUSMENU);
+  #if ENABLED(DOGM_SHOW_SPEED)
+    u8g.drawHLine(35, 0, 6);
+    u8g.drawHLine(33, 3, 6);
+    u8g.drawHLine(31, 6, 6);
+    lcd_put_u8str(43, 7, i16tostr3(dogmSpeedToShow));
+  #endif
+  #if ENABLED(DOGM_SHOW_LAYER)
+    if(dogmLayer) {
+      sprintf(conv, "L%d", dogmLayer);
+      lcd_put_u8str(32 - 5 * (dogmLayer > 999) - 5 * (dogmLayerCnt > 999), 16, conv);
+      if(dogmLayerCnt) {
+        sprintf(conv, "/%d", dogmLayerCnt);
+        lcd_put_u8str(conv);
+      }
+    }
+  #endif
 
   #if DO_DRAW_LOGO
     if (PAGE_CONTAINS(STATUS_LOGO_Y, STATUS_LOGO_Y + STATUS_LOGO_HEIGHT - 1))
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index b42cadc3b7a1..95afcfb35933 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -76,6 +76,10 @@
   #include "../feature/bedlevel/bedlevel.h"
 #endif
 
+#if ENABLED(DOGM_SHOW_SPEED)
+ int16_t dogmSpeedToShow = 0;
+#endif
+
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
   #include "../feature/filwidth.h"
 #endif
@@ -2506,6 +2510,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Update previous path unit_vector and nominal speed
   previous_speed = current_speed;
   previous_nominal_speed_sqr = block->nominal_speed_sqr;
+#if ENABLED(DOGM_SHOW_SPEED)
+  dogmSpeedToShow = int16_t(0.5 + SQRT(block->nominal_speed_sqr));
+#endif
 
   // Update the position
   position = target;

From 358b95e46677dcb5eaeaf2eb8b2572d87763a2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 16 Mar 2020 01:58:02 +0500
Subject: [PATCH 438/565] #35 improved

---
 Marlin/src/sd/cardreader.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index caa8c95f14d3..c2a30c444c7c 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -864,9 +864,9 @@ void CardReader::cdroot() {
    */
   void CardReader::getfilename_sorted(const uint16_t nr) {
     selectFileByIndex(
-      #if ENABLED(SDSORT_GCODE)
-        sort_alpha &&
-      #endif
+      //#if ENABLED(SDSORT_GCODE)
+      //  sort_alpha &&
+      //#endif
       (nr < sort_count) ? sort_order[nr] : nr
     );
   }
@@ -972,9 +972,9 @@ void CardReader::cdroot() {
             selectFileByIndex(i);
             SET_SORTNAME(i);
             SET_SORTSHORT(i);
-            // char out[30];
-            // sprintf_P(out, PSTR("---- %i %s %s"), i, flag.filenameIsDir ? "D" : " ", sortnames[i]);
-            // SERIAL_ECHOLN(out);
+             char out[30];
+             sprintf_P(out, PSTR("---- %i %s %s"), i, flag.filenameIsDir ? "D" : " ", sortnames[i]);
+             SERIAL_ECHOLN(out);
             #if HAS_FOLDER_SORTING
               const uint16_t bit = i & 0x07, ind = i >> 3;
               if (bit == 0) isDir[ind] = 0x00;
@@ -987,8 +987,7 @@ void CardReader::cdroot() {
       // Sorting may be turned off
       #if ENABLED(SDSORT_GCODE)
         if (!sort_alpha) {
-          for (uint16_t i = 0; i < fileCnt; i++)
-            sort_order[i] = i;
+          sort_count = fileCnt;
         } else
       #endif
         for (uint16_t i = fileCnt; --i;) {

From 85187290a78f0947eed8f590942e34da05ee447a Mon Sep 17 00:00:00 2001
From: Karl Andersson <karl@iaccess.se>
Date: Mon, 16 Mar 2020 00:03:10 +0100
Subject: [PATCH 439/565] Fix incorrect type on ubl_storage_slot (#17170)

---
 Marlin/src/module/configuration_store.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index fd28c3cc408d..3a83dd7c1d00 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1531,10 +1531,10 @@ void MarlinSettings::postprocess() {
         _FIELD_TEST(planner_leveling_active);
         #if ENABLED(AUTO_BED_LEVELING_UBL)
           const bool &planner_leveling_active = planner.leveling_active;
-          const uint8_t &ubl_storage_slot = ubl.storage_slot;
+          const int8_t &ubl_storage_slot = ubl.storage_slot;
         #else
           bool planner_leveling_active;
-          uint8_t ubl_storage_slot;
+          int8_t ubl_storage_slot;
         #endif
         EEPROM_READ(planner_leveling_active);
         EEPROM_READ(ubl_storage_slot);

From c39873759f1602e30343369bab2a0de7d5165058 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 15 Mar 2020 18:14:58 -0500
Subject: [PATCH 440/565] Fix Z after ABL Bilinear G29 with fade

Co-Authored-By: Alan T <interstellarmisfit@users.noreply.github.com>
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 2d782e9e33da..de6954598321 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -934,7 +934,12 @@ G29_TYPE GcodeSuite::G29() {
 
         // Unapply the offset because it is going to be immediately applied
         // and cause compensation movement in Z
-        current_position.z -= bilinear_z_offset(current_position);
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+          const float fade_scaling_factor = planner.fade_scaling_factor_for_z(current_position.z);
+        #else
+          constexpr float fade_scaling_factor = 1.0f;
+        #endif
+        current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
 
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z);
       }

From 3b987dfcec653bfa8c79412d44cc70fd07941bd2 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Mon, 16 Mar 2020 00:23:24 +0100
Subject: [PATCH 441/565] Fix G34 Z lower, extra "BLTOUCH" debug line (#17175)

---
 Marlin/src/core/utility.cpp             | 1 -
 Marlin/src/gcode/calibrate/G34_M422.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 19247ff69fc2..5e159af58176 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -67,7 +67,6 @@ void safe_delay(millis_t ms) {
       TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
       TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
       TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
-      TERN(BLTOUCH, "BLTOUCH", "")
       TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
       TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
       TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 672f40737a5b..d1b828d079b8 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -203,7 +203,7 @@ void GcodeSuite::G34() {
         const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
 
         // Safe clearance even on an incline
-        if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
+        if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
 
         if (DEBUGGING(LEVELING))
           DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);

From 775a4294fc280d7e8c90e429118a2e1dacfb115e Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 15 Mar 2020 19:29:18 -0400
Subject: [PATCH 442/565] Configurable SLOWDOWN divisor (#17171)

---
 Marlin/Configuration_adv.h    | 6 +++++-
 Marlin/src/module/planner.cpp | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 61837116461d..6149864ab4fd 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -753,8 +753,12 @@
 // Minimum time that a segment needs to take if the buffer is emptied
 #define DEFAULT_MINSEGMENTTIME        20000   // (ms)
 
-// If defined the movements slow down when the look ahead buffer is only half full
+// Slow down the machine if the look ahead buffer is (by default) half full.
+// Increase the slowdown divisor for larger buffer sizes.
 #define SLOWDOWN
+#if ENABLED(SLOWDOWN)
+  #define SLOWDOWN_DIVISOR 2
+#endif
 
 // Frequency limit
 // See nophead's blog for more info
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 74177490882f..3b2daf1812e9 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2041,7 +2041,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
 
   #if ENABLED(SLOWDOWN)
-    if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / 2 - 1)) {
+    #ifndef SLOWDOWN_DIVISOR
+      #define SLOWDOWN_DIVISOR 2
+    #endif
+    if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / (SLOWDOWN_DIVISOR) - 1)) {
       if (segment_time_us < settings.min_segment_time_us) {
         // buffer is draining, add extra time.  The amount of time added increases if the buffer is still emptied more.
         const uint32_t nst = segment_time_us + LROUND(2 * (settings.min_segment_time_us - segment_time_us) / moves_queued);

From a662079cbc6bda43edaf146a996d39195f0e6dae Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 16 Mar 2020 00:04:45 +0000
Subject: [PATCH 443/565] [cron] Bump distribution date (2020-03-16)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7b8461567c46..16f3effcccb5 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-15"
+  #define STRING_DISTRIBUTION_DATE "2020-03-16"
 #endif
 
 /**

From 2fc0df1b392e9dc8c89f77b64fd64865785e24d5 Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Date: Mon, 16 Mar 2020 20:11:55 +0100
Subject: [PATCH 444/565] Shorter LCD remaining time to prevent overlap
 (#17181)

---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 92f935f04b70..be414ab30372 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -448,10 +448,10 @@ void MarlinUI::draw_status_screen() {
         #endif
       }
 
+      constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
       if (ev != lastElapsed) {
         lastElapsed = ev;
-        const bool has_days = (elapsed.value >= 60*60*24L);
-        const uint8_t len = elapsed.toDigital(elapsed_string, has_days);
+        const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
         elapsed_x_pos = _SD_INFO_X(len);
 
         #if ENABLED(SHOW_REMAINING_TIME)
@@ -468,8 +468,7 @@ void MarlinUI::draw_status_screen() {
             }
             else {
               duration_t estimation = timeval;
-              const bool has_days = (estimation.value >= 60*60*24L);
-              const uint8_t len = estimation.toDigital(estimation_string, has_days);
+              const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
               estimation_x_pos = _SD_INFO_X(len
                 #if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
                   + 1

From b14c933171b50c87808367bf14872fb7acced92d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 16 Mar 2020 15:59:05 -0500
Subject: [PATCH 445/565] LPC1768 EEPROM fallback to flash, add overrides
 (#17184)

---
 Marlin/src/HAL/DUE/inc/Conditionals_post.h        |  2 +-
 Marlin/src/HAL/ESP32/inc/Conditionals_post.h      |  5 +++++
 Marlin/src/HAL/LPC1768/inc/Conditionals_post.h    |  8 ++------
 Marlin/src/HAL/LPC1768/persistent_store_flash.cpp |  3 +--
 Marlin/src/HAL/SAMD51/inc/Conditionals_post.h     |  2 +-
 Marlin/src/HAL/STM32/inc/Conditionals_post.h      |  5 +++++
 .../src/HAL/STM32_F4_F7/inc/Conditionals_post.h   |  3 +--
 .../src/HAL/TEENSY31_32/inc/Conditionals_post.h   |  5 +++++
 Marlin/src/inc/Conditionals_post.h                |  4 +---
 Marlin/src/inc/SanityCheck.h                      | 15 +++++++++++++++
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h         |  6 ++++++
 Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h     |  6 ++++++
 Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h      |  6 ++++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h       |  6 ++++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h       |  6 ++++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h       |  8 ++++++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h     |  4 ++++
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h     |  6 ++++++
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h          |  8 ++++++++
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h         |  6 ++++++
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h       |  6 ++++++
 Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h     |  6 ++++++
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h       |  7 ++++++-
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h     |  8 ++++++++
 .../src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h   |  6 ++++++
 Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h |  6 ++++++
 Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h    |  6 ++++++
 Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h   |  6 ++++++
 Marlin/src/pins/lpc1769/pins_MKS_SGEN.h           |  8 +++++++-
 Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h      |  6 ++++++
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h       |  6 ++++++
 31 files changed, 168 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/HAL/DUE/inc/Conditionals_post.h b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
index 223890d79016..b52462f6d891 100644
--- a/Marlin/src/HAL/DUE/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
@@ -24,5 +24,5 @@
 #if USE_EMULATED_EEPROM
   #undef SRAM_EEPROM_EMULATION
   #undef SDCARD_EEPROM_EMULATION
-  #define FLASH_EEPROM_EMULATION 1
+  #define FLASH_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
index 0285c52ee365..e51b55698e49 100644
--- a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
@@ -20,3 +20,8 @@
  *
  */
 #pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
index 26371745431a..a8d102e865ae 100644
--- a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-#if ENABLED(EEPROM_SETTINGS)
-  #undef USE_REAL_EEPROM
-  #define USE_EMULATED_EEPROM 1
-  #if DISABLED(FLASH_EEPROM_EMULATION)
-    #define SDCARD_EEPROM_EMULATION 1
-  #endif
+#if USE_EMULATED_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
index 5525f818a046..e166858d6460 100644
--- a/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
@@ -36,12 +36,11 @@
  * 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
  * unused).
  */
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "persistent_store_api.h"
-#include "../../inc/MarlinConfig.h"
 
 extern "C" {
   #include <lpc17xx_iap.h>
diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
index 223890d79016..b52462f6d891 100644
--- a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
@@ -24,5 +24,5 @@
 #if USE_EMULATED_EEPROM
   #undef SRAM_EEPROM_EMULATION
   #undef SDCARD_EEPROM_EMULATION
-  #define FLASH_EEPROM_EMULATION 1
+  #define FLASH_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
index 0285c52ee365..e51b55698e49 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
@@ -20,3 +20,8 @@
  *
  */
 #pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
index 6e2cf6210163..5a190342ac7c 100644
--- a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
@@ -23,8 +23,7 @@
 
 #if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
   #undef USE_REAL_EEPROM
-  #define USE_EMULATED_EEPROM 1
   #undef SRAM_EEPROM_EMULATION
   #undef SDCARD_EEPROM_EMULATION
-  #define FLASH_EEPROM_EMULATION 1
+  #define FLASH_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
index 0285c52ee365..e51b55698e49 100644
--- a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
@@ -20,3 +20,8 @@
  *
  */
 #pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 97090d477571..ebc77b9383a7 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -35,15 +35,13 @@
   #define HAS_LINEAR_E_JERK 1
 #endif
 
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
 #if ENABLED(EEPROM_SETTINGS)
   #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM)
     #define USE_REAL_EEPROM 1
   #else
     #define USE_EMULATED_EEPROM 1
   #endif
-  #if NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
-    #define SDCARD_EEPROM_EMULATION 1
-  #endif
 #else
   #undef I2C_EEPROM
   #undef SPI_EEPROM
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 454183e54885..574d6a336eae 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1993,9 +1993,24 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     static_assert(PWM_PIN(E2_AUTO_FAN_PIN), "E2" AF_ERR_SUFF);
   #elif HAS_AUTO_FAN_3
     static_assert(PWM_PIN(E3_AUTO_FAN_PIN), "E3" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_4
+    static_assert(PWM_PIN(E4_AUTO_FAN_PIN), "E4" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_5
+    static_assert(PWM_PIN(E5_AUTO_FAN_PIN), "E5" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_6
+    static_assert(PWM_PIN(E6_AUTO_FAN_PIN), "E6" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_7
+    static_assert(PWM_PIN(E7_AUTO_FAN_PIN), "E7" AF_ERR_SUFF);
   #endif
 #endif
 
+/**
+ * Make sure only one EEPROM type is enabled
+ */
+#if ENABLED(EEPROM_SETTINGS) && 1 < ENABLED(SDCARD_EEPROM_EMULATION) + ENABLED(FLASH_EEPROM_EMULATION) + ENABLED(SRAM_EEPROM_EMULATION)
+  #error "Please select only one of SDCARD, FLASH, or SRAM_EEPROM_EMULATION."
+#endif
+
 /**
  * Make sure only one display is enabled
  */
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 1f02f9299e35..ef064694abad 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -31,6 +31,12 @@
 
 #define BOARD_INFO_NAME "AZSMZ MINI"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
index 4ff4ebc73bde..a4800dcc73d5 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -38,6 +38,12 @@
   #define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
 #endif
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Limit Switches
 //
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index 17a9b7d58da8..549b44019a42 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -36,6 +36,12 @@
 
 #define BOARD_INFO_NAME "BIQU BQ111-A4"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Limit Switches
 //
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index 104f40fdf16c..feadafa5922d 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -23,6 +23,12 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR 1.1"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Limit Switches
 //
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index bd0ad468de0b..3bd2640665f5 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -23,6 +23,12 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR 1.3"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 /**
  * Trinamic Stallguard pins
  */
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 3fb66aa156c7..25a8dda3a78e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -25,6 +25,14 @@
   #define BOARD_INFO_NAME "BIGTREE SKR 1.4"
 #endif
 
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
 //
 // SD Connection
 //
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index e84d3de2b1e3..2844fb3cdab8 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -32,6 +32,10 @@
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
 
+#if DISABLED(SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+#endif
+
 //
 // Steppers
 //
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 28445962ac7b..5ebf6ecba16e 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -30,6 +30,12 @@
 // Ignore temp readings during develpment.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Enable 12MHz clock output on P1.27 pin to sync TMC2208 chip clocks
 //
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index b3dba6794c9a..6fb38f3e4646 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -38,6 +38,14 @@
   #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE"
 #endif
 
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
 #define LED_PIN            P1_18   // Used as a status indicator
 #define LED2_PIN           P1_19
 #define LED3_PIN           P1_20
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 58f9eb549337..e7471f6ec644 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -32,6 +32,12 @@
 #define BOARD_INFO_NAME   "MKS SGen-L"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index bf989798fd1d..18c3ee992b51 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -42,6 +42,12 @@
 
 #define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 1a8e997eb2c7..3c55ac9be3fe 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -32,6 +32,12 @@
 #define BOARD_INFO_NAME   "Selena Compact"
 #define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 5ee0e5856621..1b91e4f50bb1 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -32,6 +32,12 @@
 #define BOARD_INFO_NAME   "Azteeg X5 GT"
 #define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
@@ -47,7 +53,6 @@
 #define Z_MIN_PIN          P1_26
 #define Z_MAX_PIN          P1_29
 
-
 //
 // Steppers
 //
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 2c54bd603527..7559d6ad509a 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -187,6 +187,14 @@
 
 #endif // HAS_SPI_LCD
 
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
 //
 // SD Support
 //
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
index 4b731ae9d343..1e5d2f3a2c11 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
@@ -31,6 +31,12 @@
 
 #define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // DIGIPOT slave addresses
 //
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
index 937ba56bb729..a8649b6f8ddc 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
@@ -24,6 +24,12 @@
 #define BOARD_INFO_NAME "BIGTREE SKR 1.4 TURBO"
 #define SKR_HAS_LPC1769
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Include SKR 1.4 pins
 //
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 739603e2b644..3556ff83f004 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -31,6 +31,12 @@
 
 #define BOARD_INFO_NAME "Cohesion3D Mini"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index 58bf0d6e71c9..2502c765801d 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -31,6 +31,12 @@
 
 #define BOARD_INFO_NAME "Cohesion3D ReMix"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index a5a91f6207b9..cac0868d5103 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -31,8 +31,14 @@
 
 #define BOARD_INFO_NAME   "MKS SGen"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN"
-#define MKS_HAS_LPC1769
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
+#define MKS_HAS_LPC1769
 #include "../lpc1768/pins_MKS_SBASE.h"
 
 #undef E1_STEP_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 5bf64e9d02fa..3db8a994036d 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -32,6 +32,12 @@
 #define BOARD_INFO_NAME   "Smoothieboard"
 #define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 8f7d00bb3bdd..9f28c2d94e74 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -32,6 +32,12 @@
 #define BOARD_INFO_NAME   "TH3D EZBoard"
 #define BOARD_WEBSITE_URL "th3dstudio.com"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //

From f6e80d576dc0c538852fa32dd09584b564314916 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 16 Mar 2020 17:49:33 -0500
Subject: [PATCH 446/565] Fix Z_MIN_PROBE_PIN on SKR 1.4 (#17187)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 25a8dda3a78e..e9a46ba55140 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -96,11 +96,7 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #if Z_STOP_PIN != P1_27
-    #define Z_MIN_PROBE_PIN P1_27
-  #else
-    #define Z_MIN_PROBE_PIN P0_10
-  #endif
+  #define Z_MIN_PROBE_PIN  P0_10
 #endif
 
 //

From c1672220fd01d90f73e453b87877f7c605d7b5db Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 17 Mar 2020 00:04:33 +0000
Subject: [PATCH 447/565] [cron] Bump distribution date (2020-03-17)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 16f3effcccb5..4bb902e42081 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-16"
+  #define STRING_DISTRIBUTION_DATE "2020-03-17"
 #endif
 
 /**

From 230364c69785179bd1286d91e2be01f33ddf946d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Tue, 17 Mar 2020 13:17:09 +0500
Subject: [PATCH 448/565] =?UTF-8?q?=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/leds.h | 2 +-
 Marlin/src/sd/cardreader.cpp   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index b5458e6dd7ac..4bfc505939fc 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -128,7 +128,7 @@ typedef struct LEDColor {
 #define LEDColorOff()             LEDColor(  0,   0,   0)
 #define LEDColorRed()             LEDColor(255,   0,   0)
 #if ENABLED(LED_COLORS_REDUCE_GREEN)
-  #define LEDColorOrange()        LEDColor(255,  25,   0)
+  #define LEDColorOrange()        LEDColor(255, 128,   0)
   #define LEDColorYellow()        LEDColor(255,  75,   0)
 #else
   #define LEDColorOrange()        LEDColor(255,  80,   0)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index c2a30c444c7c..99dcc7d52cb9 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -972,9 +972,9 @@ void CardReader::cdroot() {
             selectFileByIndex(i);
             SET_SORTNAME(i);
             SET_SORTSHORT(i);
-             char out[30];
-             sprintf_P(out, PSTR("---- %i %s %s"), i, flag.filenameIsDir ? "D" : " ", sortnames[i]);
-             SERIAL_ECHOLN(out);
+            // char out[30];
+            // sprintf_P(out, PSTR("---- %i %s %s"), i, flag.filenameIsDir ? "D" : " ", sortnames[i]);
+            // SERIAL_ECHOLN(out);
             #if HAS_FOLDER_SORTING
               const uint16_t bit = i & 0x07, ind = i >> 3;
               if (bit == 0) isDir[ind] = 0x00;

From 40922c7da76f536632ffda809f13785ee4610632 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 18 Mar 2020 08:51:57 +1300
Subject: [PATCH 449/565] Fix MKS SBASE 1.6 E1 heater pin (#17191)

---
 Marlin/src/pins/ramps/pins_MKS_BASE_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
index 0406da560503..e859310bf063 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
@@ -29,7 +29,7 @@
   #define BOARD_INFO_NAME "MKS BASE"
 #endif
 
-#if MKS_BASE_VERSION == 14 || MKS_BASE_VERSION == 15
+#if MKS_BASE_VERSION >= 14
   //
   // Heaters / Fans
   //

From e5dcab8fd26e0c755969450f738b1e7a2ad21d9f Mon Sep 17 00:00:00 2001
From: Karl Andersson <karl@iaccess.se>
Date: Tue, 17 Mar 2020 21:05:12 +0100
Subject: [PATCH 450/565] ARMED support for TMC UART, probe temp (#17186)

---
 Marlin/src/pins/stm32/pins_ARMED.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h
index 03f267a3a456..1e3333651247 100644
--- a/Marlin/src/pins/stm32/pins_ARMED.h
+++ b/Marlin/src/pins/stm32/pins_ARMED.h
@@ -118,6 +118,10 @@
 #define TEMP_1_PIN         PC1   // Analog Input
 #define TEMP_BED_PIN       PC2   // Analog Input
 
+#if HOTENDS == 1 && TEMP_SENSOR_PROBE
+  #define TEMP_PROBE_PIN   PC1
+#endif
+
 //
 // Heaters / Fans
 //
@@ -199,3 +203,29 @@
 #define EXT7_PIN           PD12
 #define EXT8_PIN           PB10
 #define EXT9_PIN           PB11
+
+#if HAS_TMC_UART
+  // TMC2208/TMC2209 stepper drivers
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN EXT0_PIN
+  #define X_SERIAL_RX_PIN EXT0_PIN
+
+  #define Y_SERIAL_TX_PIN EXT1_PIN
+  #define Y_SERIAL_RX_PIN EXT1_PIN
+
+  #define Z_SERIAL_TX_PIN EXT2_PIN
+  #define Z_SERIAL_RX_PIN EXT2_PIN
+
+  #define E0_SERIAL_TX_PIN EXT3_PIN
+  #define E0_SERIAL_RX_PIN EXT3_PIN
+
+  #define E1_SERIAL_RX_PIN EXT4_PIN
+  #define E1_SERIAL_TX_PIN EXT4_PIN
+
+  #define Z2_SERIAL_RX_PIN EXT4_PIN
+  #define Z2_SERIAL_TX_PIN EXT4_PIN
+
+  #define TMC_BAUD_RATE 19200
+#endif

From e8205af6fb131f0f8ced2a860ce721787a33f58d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 17 Mar 2020 15:05:33 -0500
Subject: [PATCH 451/565] Apply HAS_TMC_UART to pins files

---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h          | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h       | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h       | 2 +-
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h          | 2 +-
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h         | 2 +-
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h       | 2 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN.h           | 2 +-
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h         | 2 +-
 Marlin/src/pins/ramps/pins_FYSETC_F6_14.h         | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h                | 2 +-
 Marlin/src/pins/ramps/pins_TT_OSCAR.h             | 2 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h            | 2 +-
 Marlin/src/pins/samd/pins_RAMPS_144.h             | 2 +-
 Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h      | 2 +-
 Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h         | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h       | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h | 2 +-
 Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h     | 2 +-
 Marlin/src/pins/stm32/pins_FLYF407ZG.h            | 2 +-
 Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h   | 2 +-
 Marlin/src/pins/stm32/pins_FYSETC_S6.h            | 2 +-
 Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h        | 2 +-
 Marlin/src/pins/stm32/pins_RUMBA32_MKS.h          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index d206547ab8ba..b1f7ecee387d 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -271,7 +271,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 3bd2640665f5..adf726f02455 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -150,7 +150,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index e9a46ba55140..00c66521e645 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -175,7 +175,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 6fb38f3e4646..28b94f019af4 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -313,7 +313,7 @@
  #endif
 #endif
 
-#if MB(MKS_SBASE) && HAS_TMC220x
+#if MB(MKS_SBASE) && HAS_TMC_UART
 
   /**
    * TMC2208/TMC2209 stepper drivers
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index e7471f6ec644..5dc1db8f3fb3 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -152,7 +152,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index 18c3ee992b51..2303c1885c0d 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -120,7 +120,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index cac0868d5103..7a6d283fb45e 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -50,7 +50,7 @@
 //#define BTN_EN1            P1_23   // EXP2.5
 //#define BTN_EN2            P1_22   // EXP2.3
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index c67f8283b71f..6b7f2d582b40 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -117,7 +117,7 @@
 // the jumper next to the limit switch socket when using sensorless homing.
 //
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index be5b92d4c17f..dff4749fb728 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -29,7 +29,7 @@
 
 #define Z_MAX_PIN           2
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    */
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 4ec882bccef9..06b5eeafaf4a 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -298,7 +298,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 3b2d3c8b8d92..9fc53379d5c4 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -99,7 +99,7 @@
 #define E4_ENABLE_PIN      47
 #define E4_CS_PIN          E0_CS_PIN
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 2e0350447547..ee44dd795000 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -205,7 +205,7 @@
 
 #endif // HAS_SPI_LCD
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 107ef9f57e95..20da59e39592 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -171,7 +171,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
index bfae524743a8..5d2c83e3b9e3 100644
--- a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
@@ -110,7 +110,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
index 0500c5d95327..eaef0b09dff7 100644
--- a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
@@ -165,7 +165,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
index f5c35bbdcdd6..fa555f4151e3 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
@@ -109,7 +109,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
index 5701dd5c5629..8935da85af17 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -30,7 +30,7 @@
 /**
  * TMC2208/TMC2209 stepper drivers
  */
-#if HAS_TMC220x
+#if HAS_TMC_UART
   //
   // Software serial
   //
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
index bdee26a51a80..3376a997116b 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
@@ -115,7 +115,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
index 97aaf3fdfc6a..8c8ea2adc1c0 100644
--- a/Marlin/src/pins/stm32/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
@@ -196,7 +196,7 @@
 // Trinamic Software Serial
 //
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   #define X_SERIAL_TX_PIN  PG13
   #define X_SERIAL_RX_PIN  PG13
 
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
index 5f7136c15654..3e283911b464 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
@@ -38,7 +38,7 @@
 
 #define FAN1_PIN          PB0 // Fan1
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
 
   /**
    * TMC2208/TMC2209 stepper drivers
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
index 5bda7b1c97be..d135ef0750c0 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
@@ -107,7 +107,7 @@
 #define E2_ENABLE_PIN      PE3
 #define E2_CS_PIN          PC15
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   //
   // TMC2208/TMC2209 stepper drivers
   //
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
index ec43ab8fc3c7..9090fb34c4b3 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
@@ -118,7 +118,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
index 8e2bb3b8afbd..a6bc2b49a6c0 100644
--- a/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
@@ -56,7 +56,7 @@
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *

From 1f5824247f632af71b1725f8bb41e66f55b14919 Mon Sep 17 00:00:00 2001
From: Joe Prints <33383148+JoePrints@users.noreply.github.com>
Date: Tue, 17 Mar 2020 15:12:52 -0500
Subject: [PATCH 452/565] More decimal places for babystep / Z probe offset
 (#17195)

---
 Marlin/src/lcd/menu/menu.cpp               |  4 ++--
 Marlin/src/lcd/menu/menu.h                 | 22 +++++++++++--------
 Marlin/src/lcd/menu/menu_advanced.cpp      | 10 ++++-----
 Marlin/src/lcd/menu/menu_configuration.cpp |  8 +++----
 Marlin/src/lcd/menu/menu_mixer.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_tune.cpp          |  8 +++----
 Marlin/src/libs/numtostr.cpp               | 25 ++++++++++++++++------
 Marlin/src/libs/numtostr.h                 |  9 +++++---
 8 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 959c1c416049..501120252ab9 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -193,7 +193,7 @@ DEFINE_MENU_EDIT_ITEM(uint16_3);    // 123        right-justified
 DEFINE_MENU_EDIT_ITEM(uint16_4);    // 1234       right-justified
 DEFINE_MENU_EDIT_ITEM(uint16_5);    // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM(float3);      // 123        right-justified
-DEFINE_MENU_EDIT_ITEM(float52);     // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM(float42_52);  // _2.34, 12.34, -2.34 or 123.45, -23.45
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM(float5_25);   // 12345      right-justified (25 increment)
@@ -428,7 +428,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
           MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
       #endif
       if (do_probe) {
-        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), ftostr52sign(probe.offset.z));
+        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
         #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
           _lcd_zoffset_overlay_gfx(probe.offset.z);
         #endif
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 4ba618e5ca02..e9ec3b2496b7 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -47,14 +47,18 @@ typedef void (*selectFunc_t)();
   void _lcd_zoffset_overlay_gfx(const float zvalue);
 #endif
 
-#if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
-  // Only values from -9.999 to 9.999
-  #define LCD_Z_OFFSET_FUNC(N) ftostr54sign(N)
-  #define LCD_Z_OFFSET_TYPE float43
-#else
-  // Values from -99.99 to 99.99
-  #define LCD_Z_OFFSET_FUNC(N) ftostr52sign(N)
-  #define LCD_Z_OFFSET_TYPE float52
+#if HAS_BED_PROBE
+  #if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+    #define LCD_Z_OFFSET_TYPE float43    // Values from -9.000 to +9.000
+  #else
+    #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99
+  #endif
+#endif
+
+#if ENABLED(BABYSTEP_ZPROBE_OFFSET) && Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+  #define BABYSTEP_TO_STR(N) ftostr43sign(N)
+#elif ENABLED(BABYSTEPPING)
+  #define BABYSTEP_TO_STR(N) ftostr53sign(N)
 #endif
 
 ////////////////////////////////////////////
@@ -289,7 +293,7 @@ DEFINE_MENU_EDIT_ITEM_TYPE(uint16_3    ,uint16_t ,ui16tostr3rj    ,   1     );
 DEFINE_MENU_EDIT_ITEM_TYPE(uint16_4    ,uint16_t ,ui16tostr4rj    ,   0.1f  );   // 1234       right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(uint16_5    ,uint16_t ,ui16tostr5rj    ,   0.01f );   // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(float3      ,float    ,ftostr3         ,   1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float52     ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM_TYPE(float42_52  ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
 DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );   // -1.234, _1.234, +1.234
 DEFINE_MENU_EDIT_ITEM_TYPE(float5      ,float    ,ftostr5rj       ,   1     );   // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(float5_25   ,float    ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index a4a8176d3a8b..ca02dc9622ce 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -112,10 +112,10 @@ void menu_cancelobject();
 
     #if ENABLED(LIN_ADVANCE)
       #if EXTRUDERS == 1
-        EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+        EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
       #elif EXTRUDERS > 1
         LOOP_L_N(n, EXTRUDERS)
-          EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+          EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
       #endif
     #endif
 
@@ -257,7 +257,7 @@ void menu_cancelobject();
       EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
       EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
       EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
-      EDIT_ITEM(float52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
+      EDIT_ITEM(float42_52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
     #endif
 
     //
@@ -556,10 +556,10 @@ void menu_advanced_settings() {
     SUBMENU(MSG_FILAMENT, menu_advanced_filament);
   #elif ENABLED(LIN_ADVANCE)
     #if EXTRUDERS == 1
-      EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+      EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
       LOOP_L_N(n, E_STEPPERS)
-        EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 25b253b26183..c9b9d26d6696 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -138,12 +138,12 @@ void menu_advanced_settings();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
     #if ENABLED(DUAL_X_CARRIAGE)
-      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
+      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
     #else
-      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
+      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
     #endif
-    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
-    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
     #if ENABLED(EEPROM_SETTINGS)
       ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
     #endif
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index a74fcb6e6a49..7230320fa202 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -182,7 +182,7 @@ void lcd_mixer_mix_edit() {
     #if CHANNEL_MIX_EDITING
 
       LOOP_S_LE_N(n, 1, MIXING_STEPPERS)
-        EDIT_ITEM_FAST_N(float52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
+        EDIT_ITEM_FAST_N(float42_52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
 
       ACTION_ITEM(MSG_CYCLE_MIX, _lcd_mixer_cycle_mix);
       ACTION_ITEM(MSG_COMMIT_VTOOL, _lcd_mixer_commit_vtool);
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 216decf71800..ac18e89df48a 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -65,7 +65,7 @@
     }
     if (ui.should_draw()) {
       const float spm = planner.steps_to_mm[axis];
-      MenuEditItemBase::draw_edit_screen(msg, LCD_Z_OFFSET_FUNC(spm * babystep.accum));
+      MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
       #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
         const bool in_view = (true
           #if HAS_GRAPHICAL_LCD
@@ -81,7 +81,7 @@
           #endif
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
           lcd_put_wchar(':');
-          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
+          lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
       #endif
     }
@@ -232,10 +232,10 @@ void menu_tune() {
   //
   #if ENABLED(LIN_ADVANCE) && DISABLED(SLIM_LCD_MENUS)
     #if EXTRUDERS == 1
-      EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+      EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
       LOOP_L_N(n, EXTRUDERS)
-        EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
 
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index 3b641e0dd384..ac82bf16f12f 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -174,9 +174,9 @@ const char* ftostr12ns(const float &f) {
   return &conv[3];
 }
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
 const char* ftostr42_52(const float &f) {
-  if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
+  if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
   conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
   conv[3] = DIGIMOD(i, 100);
@@ -198,9 +198,9 @@ const char* ftostr52(const float &f) {
   return &conv[1];
 }
 
-// Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
-const char* ftostr43_53(const float &f) {
-  if (f <= -10 || f >= 100) return ftostr53(f); // need more digits
+// Convert signed float to fixed-length string with 12.345 / _2.345 / -2.345 or -23.45 / 123.45 format
+const char* ftostr53_63(const float &f) {
+  if (f <= -10 || f >= 100) return ftostr63(f); // -23.456 / 123.456
   long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
   conv[1] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000));
   conv[2] = DIGIMOD(i, 1000);
@@ -212,7 +212,7 @@ const char* ftostr43_53(const float &f) {
 }
 
 // Convert signed float to fixed-length string with 023.456 / -23.456 format
-const char* ftostr53(const float &f) {
+const char* ftostr63(const float &f) {
   long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
   conv[0] = MINUSOR(i, DIGIMOD(i, 100000));
   conv[1] = DIGIMOD(i, 10000);
@@ -310,6 +310,19 @@ const char* ftostr52sign(const float &f) {
   return conv;
 }
 
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f) {
+  long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
+  conv[0] = MINUSOR(i, '+');
+  conv[1] = DIGIMOD(i, 10000);
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return conv;
+}
+
 // Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
 const char* ftostr51rj(const float &f) {
   const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index d5453e817629..8b6b83391f8e 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -58,17 +58,17 @@ const char* i16tostr4signrj(const int16_t x);
 // Convert unsigned float to string with 1.23 format
 const char* ftostr12ns(const float &x);
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
 const char* ftostr42_52(const float &x);
 
 // Convert signed float to fixed-length string with 023.45 / -23.45 format
 const char* ftostr52(const float &x);
 
 // Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
-const char* ftostr43_53(const float &x);
+const char* ftostr53_63(const float &x);
 
 // Convert signed float to fixed-length string with 023.456 / -23.456 format
-const char* ftostr53(const float &x);
+const char* ftostr63(const float &x);
 
 // Convert float to fixed-length string with +123.4 / -123.4 format
 const char* ftostr41sign(const float &x);
@@ -91,6 +91,9 @@ const char* ftostr52sp(const float &x);
 // Convert signed float to string with +123.45 format
 const char* ftostr52sign(const float &x);
 
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f);
+
 // Convert unsigned float to string with 1234.5 format omitting trailing zeros
 const char* ftostr51rj(const float &x);
 

From c768605bde89d636cd021e953f0ee4e5d3ed025b Mon Sep 17 00:00:00 2001
From: RasmusAaen <rasmus@aaen.net>
Date: Tue, 17 Mar 2020 21:25:10 +0100
Subject: [PATCH 453/565] Add Copymaster3D board (#17188)

---
 Marlin/Configuration.h                        |  1 +
 Marlin/Makefile                               |  2 +
 Marlin/src/core/boards.h                      |  1 +
 Marlin/src/module/thermistor/thermistor_202.h | 69 +++++++++++++++++++
 Marlin/src/module/thermistor/thermistors.h    |  3 +
 Marlin/src/pins/pins.h                        |  2 +
 Marlin/src/pins/ramps/pins_COPYMASTER_3D.h    | 33 +++++++++
 Marlin/src/pins/ramps/pins_RAMPS.h            |  4 +-
 8 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 Marlin/src/module/thermistor/thermistor_202.h
 create mode 100644 Marlin/src/pins/ramps/pins_COPYMASTER_3D.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6cac225fce51..007b8fc5df46 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -363,6 +363,7 @@
  *   331 : (3.3V scaled thermistor 1 table for MEGA)
  *   332 : (3.3V scaled thermistor 1 table for DUE)
  *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
+ *   202 : 200k thermistor - Copymaster 3D
  *     3 : Mendel-parts thermistor (4.7k pullup)
  *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
  *     5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
diff --git a/Marlin/Makefile b/Marlin/Makefile
index fcd763881eef..0a9b3a45d708 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -267,6 +267,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1147)
 else ifeq ($(HARDWARE_MOTHERBOARD),1148)
 # MKS GEN L V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+# Copymaster 3D
+else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 
 #
 # RAMBo and derivatives
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 09b0eada1a17..86107f7d86a4 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -103,6 +103,7 @@
 #define BOARD_HJC2560C_REV2           1147  // ADIMLab Gantry v2
 #define BOARD_TANGO                   1148  // BIQU Tango V1
 #define BOARD_MKS_GEN_L_V2            1149  // MKS GEN L V2
+#define BOARD_COPYMASTER_3D           1150  // Copymaster 3D
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/module/thermistor/thermistor_202.h b/Marlin/src/module/thermistor/thermistor_202.h
new file mode 100644
index 000000000000..9da3d45f454c
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_202.h
@@ -0,0 +1,69 @@
+//
+// Unknown 200K thermistor on a Copymaster 3D hotend
+// Temptable sent from dealer technologyoutlet.co.uk
+//
+
+const short temptable_202[][2] PROGMEM = {
+  { OV(   1), 864 },
+  { OV(  35), 300 },
+  { OV(  38), 295 },
+  { OV(  41), 290 },
+  { OV(  44), 285 },
+  { OV(  47), 280 },
+  { OV(  51), 275 },
+  { OV(  55), 270 },
+  { OV(  60), 265 },
+  { OV(  65), 260 },
+  { OV(  70), 255 },
+  { OV(  76), 250 },
+  { OV(  83), 245 },
+  { OV(  90), 240 },
+  { OV(  98), 235 },
+  { OV( 107), 230 },
+  { OV( 116), 225 },
+  { OV( 127), 220 },
+  { OV( 138), 215 },
+  { OV( 151), 210 },
+  { OV( 164), 205 },
+  { OV( 179), 200 },
+  { OV( 195), 195 },
+  { OV( 213), 190 },
+  { OV( 232), 185 },
+  { OV( 253), 180 },
+  { OV( 275), 175 },
+  { OV( 299), 170 },
+  { OV( 325), 165 },
+  { OV( 352), 160 },
+  { OV( 381), 155 },
+  { OV( 411), 150 },
+  { OV( 443), 145 },
+  { OV( 476), 140 },
+  { OV( 511), 135 },
+  { OV( 546), 130 },
+  { OV( 581), 125 },
+  { OV( 617), 120 },
+  { OV( 652), 115 },
+  { OV( 687), 110 },
+  { OV( 720), 105 },
+  { OV( 753), 100 },
+  { OV( 783),  95 },
+  { OV( 812),  90 },
+  { OV( 839),  85 },
+  { OV( 864),  80 },
+  { OV( 886),  75 },
+  { OV( 906),  70 },
+  { OV( 924),  65 },
+  { OV( 940),  60 },
+  { OV( 954),  55 },
+  { OV( 966),  50 },
+  { OV( 976),  45 },
+  { OV( 985),  40 },
+  { OV( 992),  35 },
+  { OV( 998),  30 },
+  { OV(1003),  25 },
+  { OV(1007),  20 },
+  { OV(1011),  15 },
+  { OV(1014),  10 },
+  { OV(1016),   5 },
+  { OV(1018),   0 }
+};
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 2a1500eebe3a..8ac9f11a554b 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -151,6 +151,9 @@
 #if ANY_THERMISTOR_IS(201) // Pt100 with LMV324 Overlord
   #include "thermistor_201.h"
 #endif
+#if ANY_THERMISTOR_IS(202) // 200K thermistor in Copymaker3D hotend
+  #include "thermistor_202.h"
+#endif
 #if ANY_THERMISTOR_IS(331) // Like table 1, but with 3V3 as input voltage for MEGA
   #include "thermistor_331.h"
 #endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 64b9e85ba8de..27d9545c3fbd 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -188,6 +188,8 @@
   #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:mega2560
 #elif MB(MKS_GEN_L_V2)
   #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:mega2560
+#elif MB(COPYMASTER_3D)
+  #include "ramps/pins_COPYMASTER_3D.h"         // ATmega2560                             env:mega2560
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
new file mode 100644
index 000000000000..7ee66b1194a2
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
@@ -0,0 +1,33 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "Copymaster 3D RAMPS"
+
+#define Z_STEP_PIN        47
+#define FIL_RUNOUT_PIN    15
+#define SD_DETECT_PIN     66
+
+//
+// Import RAMPS 1.4 pins
+//
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 06b5eeafaf4a..272ff5636b60 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -133,7 +133,9 @@
   #define Y_CS_PIN         49
 #endif
 
-#define Z_STEP_PIN         46
+#ifndef Z_STEP_PIN
+  #define Z_STEP_PIN       46
+#endif
 #define Z_DIR_PIN          48
 #define Z_ENABLE_PIN       62
 #ifndef Z_CS_PIN

From 252178fe6249ab576bd9c1b542dcb289da8b161d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 18 Mar 2020 00:04:28 +0000
Subject: [PATCH 454/565] [cron] Bump distribution date (2020-03-18)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4bb902e42081..4bae2a13df5f 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-17"
+  #define STRING_DISTRIBUTION_DATE "2020-03-18"
 #endif
 
 /**

From abea6d5787654dc67bc86ac75207a997da9a7219 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 18 Mar 2020 10:30:19 -0500
Subject: [PATCH 455/565] Tweak some lambdas

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp  | 2 +-
 Marlin/src/gcode/feature/advance/M900.cpp    | 2 +-
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 2 +-
 Marlin/src/lcd/ultralcd.cpp                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 1aad462f160d..1ac036e5bc29 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1611,7 +1611,7 @@
          * numbers for those locations should be 0.
          */
         #ifdef VALIDATE_MESH_TILT
-          auto d_from = []() { DEBUG_ECHOPGM("D from "); };
+          auto d_from = []{ DEBUG_ECHOPGM("D from "); };
           auto normed = [&](const xy_pos_t &pos, const float &zadd) {
             return normal.x * pos.x + normal.y * pos.y + zadd;
           };
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 5a029cbf0162..b3985401cf1a 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -42,7 +42,7 @@
  */
 void GcodeSuite::M900() {
 
-  auto echo_value_oor = [] (const char ltr, const bool ten=true) {
+  auto echo_value_oor = [](const char ltr, const bool ten=true) {
     SERIAL_CHAR('?'); SERIAL_CHAR(ltr);
     SERIAL_ECHOPGM(" value out of range");
     if (ten) SERIAL_ECHOPGM(" (0-10)");
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index aa35a6915cf1..a27e2c97261b 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -103,7 +103,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
 #endif
 
 void lcd_delta_settings() {
-  auto _recalc_delta_settings = []() {
+  auto _recalc_delta_settings = []{
     #if HAS_LEVELING
       reset_bed_level(); // After changing kinematics bed-level data is no longer valid
     #endif
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 48129b61aed2..1cb23baa25c1 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -227,7 +227,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
     SETCURSOR(col, row);
     if (!string) return;
 
-    auto _newline = [&col, &row]() {
+    auto _newline = [&col, &row]{
       col = 0; row++;                 // Move col to string len (plus space)
       SETCURSOR(0, row);              // Simulate carriage return
     };

From 83eec683c969d793b473015476d03f868b470c04 Mon Sep 17 00:00:00 2001
From: Erkan Colak <erkanc@gmx.de>
Date: Wed, 18 Mar 2020 19:41:12 +0100
Subject: [PATCH 456/565] New Controller Fan options and M710 gcode (#17149)

---
 Marlin/Configuration_adv.h                    | 19 +++--
 Marlin/src/MarlinCore.cpp                     | 10 +--
 Marlin/src/feature/controllerfan.cpp          | 85 ++++++++++++-------
 Marlin/src/feature/controllerfan.h            | 54 +++++++++++-
 Marlin/src/feature/power.cpp                  |  4 +-
 .../src/gcode/feature/controllerfan/M710.cpp  | 83 ++++++++++++++++++
 Marlin/src/gcode/gcode.cpp                    |  4 +
 Marlin/src/gcode/gcode.h                      |  4 +
 Marlin/src/inc/SanityCheck.h                  |  2 +
 Marlin/src/lcd/language/language_de.h         |  5 ++
 Marlin/src/lcd/language/language_en.h         |  5 ++
 Marlin/src/lcd/menu/menu_configuration.cpp    | 25 ++++++
 Marlin/src/module/configuration_store.cpp     | 47 ++++++++++
 buildroot/share/tests/mega2560-tests          | 12 +--
 14 files changed, 307 insertions(+), 52 deletions(-)
 create mode 100644 Marlin/src/gcode/feature/controllerfan/M710.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6149864ab4fd..370fbaf6ecae 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -338,15 +338,22 @@
  * Controller Fan
  * To cool down the stepper drivers and MOSFETs.
  *
- * The fan will turn on automatically whenever any stepper is enabled
- * and turn off after a set period after all steppers are turned off.
+ * The fan turns on automatically whenever any driver is enabled and turns
+ * off (or reduces to idle speed) shortly after drivers are turned off.
+ *
  */
 //#define USE_CONTROLLER_FAN
 #if ENABLED(USE_CONTROLLER_FAN)
-  //#define CONTROLLER_FAN_PIN -1           // Set a custom pin for the controller fan
-  #define CONTROLLERFAN_SECS 60             // Duration in seconds for the fan to run after all motors are disabled
-  #define CONTROLLERFAN_SPEED 255           // 255 == full speed
-  //#define CONTROLLERFAN_SPEED_Z_ONLY 127  // Reduce noise on machines that keep Z enabled
+  //#define CONTROLLER_FAN_PIN -1        // Set a custom pin for the controller fan
+  //#define CONTROLLER_FAN_USE_Z_ONLY    // With this option only the Z axis is considered
+  #define CONTROLLERFAN_SPEED_MIN      0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
+  #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled
+  #define CONTROLLERFAN_SPEED_IDLE     0 // (0-255) Idle speed, used when motors are disabled
+  #define CONTROLLERFAN_IDLE_TIME     60 // (seconds) Extra time to keep the fan running after disabling motors
+  //#define CONTROLLER_FAN_EDITABLE      // Enable M710 configurable settings
+  #if ENABLED(CONTROLLER_FAN_EDITABLE)
+    #define CONTROLLER_FAN_MENU          // Enable the Controller Fan submenu
+  #endif
 #endif
 
 // When first starting the main fan, run it at full speed for the
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5e2fe02077cd..0ea1a22fd8da 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -567,7 +567,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
   #endif
 
   #if ENABLED(USE_CONTROLLER_FAN)
-    controllerfan_update(); // Check if fan should be turned on to cool stepper drivers down
+    controllerFan.update(); // Check if fan should be turned on to cool stepper drivers down
   #endif
 
   #if ENABLED(AUTO_POWER_CONTROL)
@@ -984,6 +984,10 @@ void setup() {
     SETUP_RUN(leds.setup());
   #endif
 
+  #if ENABLED(USE_CONTROLLER_FAN)     // Set up fan controller to initialize also the default configurations.
+    SETUP_RUN(controllerFan.setup());
+  #endif
+
   SETUP_RUN(ui.init());
   SETUP_RUN(ui.reset_status());       // Load welcome message early. (Retained if no errors exist.)
 
@@ -1047,10 +1051,6 @@ void setup() {
     SETUP_RUN(endstops.enable_z_probe(false));
   #endif
 
-  #if ENABLED(USE_CONTROLLER_FAN)
-    SET_OUTPUT(CONTROLLER_FAN_PIN);
-  #endif
-
   #if HAS_STEPPER_RESET
     SETUP_RUN(enableStepperDrivers());
   #endif
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index b9d8c394609b..ed7fca1fe731 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -24,60 +24,79 @@
 
 #if ENABLED(USE_CONTROLLER_FAN)
 
+#include "controllerfan.h"
 #include "../module/stepper/indirection.h"
 #include "../module/temperature.h"
 
-uint8_t controllerfan_speed;
+ControllerFan controllerFan;
 
-void controllerfan_update() {
-  static millis_t lastMotorOn = 0, // Last time a motor was turned on
+uint8_t ControllerFan::speed;
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  controllerFan_settings_t ControllerFan::settings; // {0}
+#endif
+
+void ControllerFan::setup() {
+  SET_OUTPUT(CONTROLLER_FAN_PIN);
+  init();
+}
+
+void ControllerFan::set_fan_speed(const uint8_t s) {
+  speed = s < (CONTROLLERFAN_SPEED_MIN) ? 0 : s; // Fan OFF below minimum
+}
+
+void ControllerFan::update() {
+  static millis_t lastMotorOn = 0,    // Last time a motor was turned on
                   nextMotorCheck = 0; // Last time the state was checked
   const millis_t ms = millis();
   if (ELAPSED(ms, nextMotorCheck)) {
     nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
 
-    const bool xory = X_ENABLE_READ() == bool(X_ENABLE_ON) || Y_ENABLE_READ() == bool(Y_ENABLE_ON);
+    #define MOTOR_IS_ON(A,B) (A##_ENABLE_READ() == bool(B##_ENABLE_ON))
+    #define _OR_ENABLED_E(N) || MOTOR_IS_ON(E##N,E)
+
+    const bool
+    xy_motor_on = MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
+                  #if HAS_X2_ENABLE
+                    || MOTOR_IS_ON(X2,X)
+                  #endif
+                  #if HAS_Y2_ENABLE
+                    || MOTOR_IS_ON(Y2,Y)
+                  #endif
+                  ,
+    z_motor_on  = MOTOR_IS_ON(Z,Z)
+                  #if HAS_Z2_ENABLE
+                    || MOTOR_IS_ON(Z2,Z)
+                  #endif
+                  #if HAS_Z3_ENABLE
+                    || MOTOR_IS_ON(Z3,Z)
+                  #endif
+                  #if HAS_Z4_ENABLE
+                    || MOTOR_IS_ON(Z4,Z)
+                  #endif
+                  ;
 
     // If any of the drivers or the bed are enabled...
-    if (xory || Z_ENABLE_READ() == bool(Z_ENABLE_ON)
+    if (xy_motor_on || z_motor_on
       #if HAS_HEATED_BED
         || thermalManager.temp_bed.soft_pwm_amount > 0
       #endif
-      #if HAS_X2_ENABLE
-        || X2_ENABLE_READ() == bool(X_ENABLE_ON)
-      #endif
-      #if HAS_Y2_ENABLE
-        || Y2_ENABLE_READ() == bool(Y_ENABLE_ON)
-      #endif
-      #if HAS_Z2_ENABLE
-        || Z2_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #endif
-      #if HAS_Z3_ENABLE
-        || Z3_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #endif
-      #if HAS_Z4_ENABLE
-        || Z4_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #endif
       #if E_STEPPERS
-        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == bool(E_ENABLE_ON)
         REPEAT(E_STEPPERS, _OR_ENABLED_E)
       #endif
-    ) {
-      lastMotorOn = ms; //... set time to NOW so the fan will turn on
-    }
+    ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
 
-    // Fan off if no steppers have been enabled for CONTROLLERFAN_SECS seconds
-    controllerfan_speed = (!lastMotorOn || ELAPSED(ms, lastMotorOn + (CONTROLLERFAN_SECS) * 1000UL)) ? 0 : (
-      #ifdef CONTROLLERFAN_SPEED_Z_ONLY
-        xory ? CONTROLLERFAN_SPEED : CONTROLLERFAN_SPEED_Z_ONLY
-      #else
-        CONTROLLERFAN_SPEED
-      #endif
+    // Fan Settings. Set fan > 0:
+    //  - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.
+    //  - If System is on idle and idle fan speed settings is activated.
+    set_fan_speed(
+      settings.auto_mode && lastMotorOn && PENDING(ms, lastMotorOn + settings.duration * 1000UL)
+      ? settings.active_speed : settings.idle_speed
     );
 
     // Allow digital or PWM fan output (see M42 handling)
-    WRITE(CONTROLLER_FAN_PIN, controllerfan_speed);
-    analogWrite(pin_t(CONTROLLER_FAN_PIN), controllerfan_speed);
+    WRITE(CONTROLLER_FAN_PIN, speed);
+    analogWrite(pin_t(CONTROLLER_FAN_PIN), speed);
   }
 }
 
diff --git a/Marlin/src/feature/controllerfan.h b/Marlin/src/feature/controllerfan.h
index f2facc288f30..bc48a6e2616d 100644
--- a/Marlin/src/feature/controllerfan.h
+++ b/Marlin/src/feature/controllerfan.h
@@ -21,4 +21,56 @@
  */
 #pragma once
 
-void controllerfan_update();
+#include "../inc/MarlinConfigPre.h"
+
+typedef struct {
+  uint8_t   active_speed,    // 0-255 (fullspeed); Speed with enabled stepper motors
+            idle_speed;      // 0-255 (fullspeed); Speed after idle period with all motors are disabled
+  uint16_t  duration;        // Duration in seconds for the fan to run after all motors are disabled
+  bool      auto_mode;       // Default true
+} controllerFan_settings_t;
+
+#ifndef CONTROLLERFAN_SPEED_ACTIVE
+  #define CONTROLLERFAN_SPEED_ACTIVE 255
+#endif
+#ifndef CONTROLLERFAN_SPEED_IDLE
+  #define CONTROLLERFAN_SPEED_IDLE     0
+#endif
+#ifndef CONTROLLERFAN_IDLE_TIME
+  #define CONTROLLERFAN_IDLE_TIME     60
+#endif
+
+static constexpr controllerFan_settings_t controllerFan_defaults = {
+  CONTROLLERFAN_SPEED_ACTIVE,
+  CONTROLLERFAN_SPEED_IDLE,
+  CONTROLLERFAN_IDLE_TIME,
+  true
+};
+
+#if ENABLED(USE_CONTROLLER_FAN)
+
+class ControllerFan {
+  private:
+    static uint8_t speed;
+    static void set_fan_speed(const uint8_t s);
+
+  public:
+    #if ENABLED(CONTROLLER_FAN_EDITABLE)
+      static controllerFan_settings_t settings;
+    #else
+      static const controllerFan_settings_t &settings = controllerFan_defaults;
+    #endif
+    static inline bool state() { return speed > 0; }
+    static inline void init() { reset(); }
+    static inline void reset() {
+      #if ENABLED(CONTROLLER_FAN_EDITABLE)
+        settings = controllerFan_defaults;
+      #endif
+    }
+    static void setup();
+    static void update();
+};
+
+extern ControllerFan controllerFan;
+
+#endif
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index cf18e2130c7c..1fa751811e61 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -46,8 +46,8 @@ bool Power::is_power_needed() {
     HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
   #endif
 
-  #if ENABLED(AUTO_POWER_CONTROLLERFAN, USE_CONTROLLER_FAN) && HAS_CONTROLLER_FAN
-    if (controllerfan_speed) return true;
+  #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+    if (controllerFan.state()) return true;
   #endif
 
   #if ENABLED(AUTO_POWER_CHAMBER_FAN)
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
new file mode 100644
index 000000000000..8e5845fa851c
--- /dev/null
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -0,0 +1,83 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+
+#include "../../gcode.h"
+#include "../../../feature/controllerfan.h"
+
+void M710_report(const bool forReplay) {
+  if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
+  SERIAL_ECHOLNPAIR("M710 "
+    "S", int(controllerFan.settings.active_speed),
+    "I", int(controllerFan.settings.idle_speed),
+    "A", int(controllerFan.settings.auto_mode),
+    "D", controllerFan.settings.duration,
+    " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
+    " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
+  );
+}
+
+/**
+ * M710: Set controller fan settings
+ *
+ *  R         : Reset to defaults
+ *  S[0-255]  : Fan speed when motors are active
+ *  I[0-255]  : Fan speed when motors are idle
+ *  A[0|1]    : Turn auto mode on or off
+ *  D         : Set auto mode idle duration
+ *
+ * Examples:
+ *   M710                   ; Report current Settings
+ *   M710 R                 ; Reset SIAD to defaults
+ *   M710 I64               ; Set controller fan Idle Speed to 25%
+ *   M710 S255              ; Set controller fan Active Speed to 100%
+ *   M710 S0                ; Set controller fan Active Speed to OFF
+ *   M710 I255 A0           ; Set controller fan Idle Speed to 100% with Auto Mode OFF
+ *   M710 I127 A1 S255 D160 ; Set controller fan idle speed 50%, AutoMode On, Fan speed 100%, duration to 160 Secs
+ */
+void GcodeSuite::M710() {
+
+  const bool seenR = parser.seen('R');
+  if (seenR) controllerFan.reset();
+
+  const bool seenS = parser.seenval('S');
+  if (seenS) controllerFan.settings.active_speed = parser.value_byte();
+
+  const bool seenI = parser.seenval('I');
+  if (seenI) controllerFan.settings.idle_speed = parser.value_byte();
+
+  const bool seenA = parser.seenval('A');
+  if (seenA) controllerFan.settings.auto_mode = parser.value_bool();
+
+  const bool seenD = parser.seenval('D');
+  if (seenD) controllerFan.settings.duration = parser.value_ushort();
+
+  if (seenR || seenS || seenI || seenA || seenD)
+    controllerFan.update();
+  else
+    M710_report(false);
+}
+
+#endif // CONTROLLER_FAN_EDITABLE
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 266361a0998e..1ce1e3d5cb65 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -752,6 +752,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 702: M702(); break;                                  // M702: Unload Filament
       #endif
 
+      #if ENABLED(CONTROLLER_FAN_EDITABLE)
+        case 710: M710(); break;                                  // M710: Set Controller Fan settings
+      #endif
+
       #if ENABLED(GCODE_MACROS)
         case 810: case 811: case 812: case 813: case 814:
         case 815: case 816: case 817: case 818: case 819:
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 27a038dde9ef..c1024ac44090 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -972,6 +972,10 @@ class GcodeSuite {
     static void M7219();
   #endif
 
+  #if ENABLED(CONTROLLER_FAN_EDITABLE)
+    static void M710();
+  #endif
+
   static void T(const uint8_t tool_index);
 
 };
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 574d6a336eae..89b53362d6ed 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -270,6 +270,8 @@
   #error "Replace SLED_PIN with SOL1_PIN (applies to both Z_PROBE_SLED and SOLENOID_PROBE)."
 #elif defined(CONTROLLERFAN_PIN)
   #error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SPEED)
+  #error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE. Please update your Configuration_adv.h."
 #elif defined(MIN_RETRACT)
   #error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
 #elif defined(ADVANCE)
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 5ac8ee04da52..cd201ded34ac 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -236,6 +236,11 @@ namespace Language_de {
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Lüfter ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Geschw. Extralüfter");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Geschw. Extralüfter ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Lüfter Kontroller");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Lüfter Leerlauf");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Motorlast Modus");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Lüfter Motorlast");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Ausschalt Delay");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flussrate");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flussrate ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Einstellungen");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index b5f508973df6..75c13de9c71b 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -247,6 +247,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra Fan Speed");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra Fan Speed ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controller Fan");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Idle Speed");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Auto Mode");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Active Speed");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Idle Period");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flow");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flow ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index c9b9d26d6696..59c80b1af081 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -227,6 +227,24 @@ void menu_advanced_settings();
   }
 #endif
 
+#if ENABLED(CONTROLLER_FAN_MENU)
+
+  #include "../../feature/controllerfan.h"
+
+  void menu_controller_fan() {
+    START_MENU();
+    BACK_ITEM(MSG_CONFIGURATION);
+    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255, controllerFan.update);
+    EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode, controllerFan.update);
+    if (controllerFan.settings.auto_mode) {
+      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255, controllerFan.update);
+      EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800, controllerFan.update);
+    }
+    END_MENU();
+  }
+
+#endif
+
 #if ENABLED(CASE_LIGHT_MENU)
 
   #include "../../feature/caselight.h"
@@ -320,6 +338,13 @@ void menu_configuration() {
     EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
+  //
+  // Set Fan Controller speed
+  //
+  #if ENABLED(CONTROLLER_FAN_MENU)
+    SUBMENU(MSG_CONTROLLER_FAN, menu_controller_fan);
+  #endif
+
   const bool busy = printer_busy();
   if (!busy) {
     #if EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 3a83dd7c1d00..4b7946c6a9a7 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -122,6 +122,11 @@
   #include "../feature/probe_temp_comp.h"
 #endif
 
+#include "../feature/controllerfan.h"
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  void M710_report(const bool forReplay);
+#endif
+
 #pragma pack(push, 1) // No padding between variables
 
 typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stepper_current_t;
@@ -292,6 +297,11 @@ typedef struct SettingsDataStruct {
   //
   int16_t lcd_contrast;                                 // M250 C
 
+  //
+  // Controller fan settings
+  //
+  controllerFan_settings_t controllerFan_settings;      // M710
+
   //
   // POWER_LOSS_RECOVERY
   //
@@ -880,6 +890,19 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(lcd_contrast);
     }
 
+    //
+    // Controller Fan
+    //
+    {
+      _FIELD_TEST(controllerFan_settings);
+      #if ENABLED(USE_CONTROLLER_FAN)
+        const controllerFan_settings_t &cfs = controllerFan.settings;
+      #else
+        controllerFan_settings_t cfs = controllerFan_defaults;
+      #endif
+      EEPROM_WRITE(cfs);
+    }
+
     //
     // Power-Loss Recovery
     //
@@ -1719,6 +1742,19 @@ void MarlinSettings::postprocess() {
         #endif
       }
 
+      //
+      // Controller Fan
+      //
+      {
+        _FIELD_TEST(controllerFan_settings);
+        #if ENABLED(CONTROLLER_FAN_EDITABLE)
+          const controllerFan_settings_t &cfs = controllerFan.settings;
+        #else
+          controllerFan_settings_t cfs = { 0 };
+        #endif
+        EEPROM_READ(cfs);
+      }
+
       //
       // Power-Loss Recovery
       //
@@ -2590,6 +2626,13 @@ void MarlinSettings::reset() {
     ui.set_contrast(DEFAULT_LCD_CONTRAST);
   #endif
 
+  //
+  // Controller Fan
+  //
+  #if ENABLED(USE_CONTROLLER_FAN)
+    controllerFan.reset();
+  #endif
+
   //
   // Power-Loss Recovery
   //
@@ -3154,6 +3197,10 @@ void MarlinSettings::reset() {
       SERIAL_ECHOLNPAIR("  M250 C", ui.contrast);
     #endif
 
+    #if ENABLED(CONTROLLER_FAN_EDITABLE)
+      M710_report(forReplay);
+    #endif
+
     #if ENABLED(POWER_LOSS_RECOVERY)
       CONFIG_ECHO_HEADING("Power-Loss Recovery:");
       CONFIG_ECHO_START();
diff --git a/buildroot/share/tests/mega2560-tests b/buildroot/share/tests/mega2560-tests
index f120cdd6ea4f..0bedfd5a73d2 100755
--- a/buildroot/share/tests/mega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -115,21 +115,23 @@ exec_test $1 $2 "RAMPS | ZONESTAR_LCD | MMU2 | Servo Probe | ABL 3-Pt | Debug Le
 # Test MINIRAMBO with PWM_MOTOR_CURRENT and many features
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_MINIRAMBO
+opt_set MOTHERBOARD BOARD_MEGACONTROLLER
 opt_set LCD_LANGUAGE de
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT \
-           ULTIMAKERCONTROLLER SDSUPPORT PCA9632 LCD_INFO_MENU \
+           MINIPANEL SDSUPPORT PCA9632 LCD_INFO_MENU \
            AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
-            LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
            INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS M100_FREE_MEMORY_WATCHER \
            NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
            ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES \
-           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL \
+           USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE
+opt_set CONTROLLERFAN_SPEED_IDLE 128
 opt_add M100_FREE_MEMORY_DUMPER
 opt_add M100_FREE_MEMORY_CORRUPTOR
 opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
 opt_set I2C_SLAVE_ADDRESS 63
-exec_test $1 $2 "MINIRAMBO | Ultimaker LCD | M100 | PWM_MOTOR_CURRENT | PRINTCOUNTER | Advanced Pause ..."
+exec_test $1 $2 "MEGACONTROLLER | Ultimaker LCD | M100 | PWM_MOTOR_CURRENT | PRINTCOUNTER | Advanced Pause ..."
 
 #
 # Mixing Extruder with 5 steppers, Cyrillic

From de45ac41ad175dafa799c15a85c05b812f284b42 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 18 Mar 2020 14:35:52 -0500
Subject: [PATCH 457/565] Implement CONTROLLER_FAN_USE_Z_ONLY

Followup to #17149
---
 Marlin/src/feature/controllerfan.cpp          | 51 ++++++++++---------
 .../src/gcode/feature/controllerfan/M710.cpp  |  4 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |  8 +--
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index ed7fca1fe731..074670040781 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -55,35 +55,36 @@ void ControllerFan::update() {
     #define MOTOR_IS_ON(A,B) (A##_ENABLE_READ() == bool(B##_ENABLE_ON))
     #define _OR_ENABLED_E(N) || MOTOR_IS_ON(E##N,E)
 
-    const bool
-    xy_motor_on = MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
-                  #if HAS_X2_ENABLE
-                    || MOTOR_IS_ON(X2,X)
-                  #endif
-                  #if HAS_Y2_ENABLE
-                    || MOTOR_IS_ON(Y2,Y)
-                  #endif
-                  ,
-    z_motor_on  = MOTOR_IS_ON(Z,Z)
-                  #if HAS_Z2_ENABLE
-                    || MOTOR_IS_ON(Z2,Z)
-                  #endif
-                  #if HAS_Z3_ENABLE
-                    || MOTOR_IS_ON(Z3,Z)
-                  #endif
-                  #if HAS_Z4_ENABLE
-                    || MOTOR_IS_ON(Z4,Z)
-                  #endif
-                  ;
+    const bool motor_on = MOTOR_IS_ON(Z,Z)
+      #if HAS_Z2_ENABLE
+        || MOTOR_IS_ON(Z2,Z)
+      #endif
+      #if HAS_Z3_ENABLE
+        || MOTOR_IS_ON(Z3,Z)
+      #endif
+      #if HAS_Z4_ENABLE
+        || MOTOR_IS_ON(Z4,Z)
+      #endif
+      || (DISABLED(CONTROLLER_FAN_USE_Z_ONLY) && (
+          MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
+          #if HAS_X2_ENABLE
+            || MOTOR_IS_ON(X2,X)
+          #endif
+          #if HAS_Y2_ENABLE
+            || MOTOR_IS_ON(Y2,Y)
+          #endif
+          #if E_STEPPERS
+            REPEAT(E_STEPPERS, _OR_ENABLED_E)
+          #endif
+        )
+      )
+    ;
 
-    // If any of the drivers or the bed are enabled...
-    if (xy_motor_on || z_motor_on
+    // If any of the drivers or the heated bed are enabled...
+    if (motor_on
       #if HAS_HEATED_BED
         || thermalManager.temp_bed.soft_pwm_amount > 0
       #endif
-      #if E_STEPPERS
-        REPEAT(E_STEPPERS, _OR_ENABLED_E)
-      #endif
     ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
 
     // Fan Settings. Set fan > 0:
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index 8e5845fa851c..e00fa77d62b6 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -74,9 +74,7 @@ void GcodeSuite::M710() {
   const bool seenD = parser.seenval('D');
   if (seenD) controllerFan.settings.duration = parser.value_ushort();
 
-  if (seenR || seenS || seenI || seenA || seenD)
-    controllerFan.update();
-  else
+  if (!(seenR || seenS || seenI || seenA || seenD))
     M710_report(false);
 }
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 59c80b1af081..6dbc680659c6 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -234,11 +234,11 @@ void menu_advanced_settings();
   void menu_controller_fan() {
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
-    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255, controllerFan.update);
-    EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode, controllerFan.update);
+    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+    EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode);
     if (controllerFan.settings.auto_mode) {
-      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255, controllerFan.update);
-      EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800, controllerFan.update);
+      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+      EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
     }
     END_MENU();
   }

From 84dec5da1065e1d506d2b4bd18294e5837ebe976 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 18 Mar 2020 17:12:51 -0400
Subject: [PATCH 458/565] Add M42 M, improve M43 (#17173)

---
 Marlin/src/gcode/config/M43.cpp  |  2 ++
 Marlin/src/gcode/control/M42.cpp | 25 ++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 661c413191b6..2c28da62fb21 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -67,6 +67,7 @@ inline void toggle_pins() {
     else {
       watchdog_refresh();
       report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing   "));
+      const bool prior_mode = GET_PINMODE(pin);
       #if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO
         if (pin == TEENSY_E2) {
           SET_OUTPUT(TEENSY_E2);
@@ -95,6 +96,7 @@ inline void toggle_pins() {
           watchdog_refresh();
         }
       }
+      pinMode(pin, prior_mode);
     }
     SERIAL_EOL();
   }
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 7106ce55027b..74625b03184a 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -37,16 +37,33 @@
  *
  *  S<byte> Pin status from 0 - 255
  *  I       Flag to ignore Marlin's pin protection
+ *
+ *  M<mode> Pin mode: 0=INPUT  1=OUTPUT  2=INPUT_PULLUP  3=INPUT_PULLDOWN
  */
 void GcodeSuite::M42() {
-  if (!parser.seenval('S')) return;
-  const byte pin_status = parser.value_byte();
-
   const int pin_index = PARSED_PIN_INDEX('P', GET_PIN_MAP_INDEX(LED_PIN));
   if (pin_index < 0) return;
 
   const pin_t pin = GET_PIN_MAP_PIN(pin_index);
 
+  if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
+
+  if (parser.seenval('M')) {
+    switch (parser.value_byte()) {
+      case 0: pinMode(pin, INPUT); break;
+      case 1: pinMode(pin, OUTPUT); break;
+      case 2: pinMode(pin, INPUT_PULLUP); break;
+      #ifdef INPUT_PULLDOWN
+        case 3: pinMode(pin, INPUT_PULLDOWN); break;
+      #endif
+      default: SERIAL_ECHOLNPGM("Invalid Pin Mode");
+    }
+    return;
+  }
+
+  if (!parser.seenval('S')) return;
+  const byte pin_status = parser.value_byte();
+
   #if FAN_COUNT > 0
     switch (pin) {
       #if HAS_FAN0
@@ -76,8 +93,6 @@ void GcodeSuite::M42() {
     }
   #endif
 
-  if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
-
   pinMode(pin, OUTPUT);
   extDigitalWrite(pin, pin_status);
   analogWrite(pin, pin_status);

From 14daf1ee5ea831e0c7229988c9aeeeb5069e8337 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 19 Mar 2020 00:03:40 +0000
Subject: [PATCH 459/565] [cron] Bump distribution date (2020-03-19)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4bae2a13df5f..c54f01273604 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-18"
+  #define STRING_DISTRIBUTION_DATE "2020-03-19"
 #endif
 
 /**

From 9abe92833cf66b46f178dfe8f2ff0e7e4653c4cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Thu, 19 Mar 2020 05:13:46 +0500
Subject: [PATCH 460/565] =?UTF-8?q?#41=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=80=D1=87=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=BC=D1=8F=D1=82=D0=B8=20=D0=B2=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8E=20=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=BE=D1=81=D0=B8=20Z?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_motion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 669b76b7f3af..7c1691045f15 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -255,7 +255,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
           + 1
         #endif
       );
-        char tmp[20], numstr[10];
+        char tmp[30], numstr[10];
         // Determine digits needed right of decimal
         const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
                              !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) *  100 - int((SHORT_MANUAL_Z_MOVE) *  100)) ? 3 : 2;

From 71db5c16055c2d68c6fda8a6a2192e428538f8b7 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Fri, 20 Mar 2020 03:11:55 +0800
Subject: [PATCH 461/565] Fix FYSETC mini 12864 init / glitches (#17209)

---
 Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
index e6fc310df161..94956e74108f 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
@@ -118,7 +118,7 @@ static const uint8_t u8g_dev_uc1701_mini12864_HAL_init_seq[] PROGMEM = {
 static const uint8_t u8g_dev_uc1701_mini12864_HAL_data_start[] PROGMEM = {
   U8G_ESC_ADR(0),             // instruction mode
   U8G_ESC_CS(1),              // enable chip
-  #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+  #if ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY, FYSETC_MINI_12864)
     UC1701_START_LINE(0),     // set display start line to 0
     UC1701_ADC_REVERSE(0),    // ADC set to reverse
     UC1701_OUT_MODE(1),       // common output mode

From 1738c13bc27f7cc233fc99217348c8e0413191dd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 20 Mar 2020 00:03:07 +0000
Subject: [PATCH 462/565] [cron] Bump distribution date (2020-03-20)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c54f01273604..fddda1557d4f 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-19"
+  #define STRING_DISTRIBUTION_DATE "2020-03-20"
 #endif
 
 /**

From 42b7fd7bde8005d1a0325123b56d37673ba91ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Sat, 21 Mar 2020 00:57:40 +0500
Subject: [PATCH 463/565] fix #41

---
 Marlin/Configuration.h                     |   6 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ru.h | 174 +++++++++++++--------
 Marlin/src/lcd/language/language_ru.h      |   3 +-
 3 files changed, 113 insertions(+), 70 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f3331b2bd3f7..2c6574af8a9b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1692,8 +1692,10 @@
  *
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
  */
-#define LCD_LANGUAGE en
-
+#define LCD_LANGUAGE ru
+#if (GITHUB_USER==URSOFT)
+ #define SUPPRESS_RU_TRANSLATION //не патриотично, но перевод явно надо доработать
+#endif
 /**
  * LCD Character Set
  *
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
index 85a0bde3abdc..cfbcecf64e22 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
@@ -5,74 +5,114 @@
  */
 #include <U8glib.h>
 
-const u8g_fntpgm_uint8_t fontpage_8_144_152[135] U8G_FONT_SECTION("fontpage_8_144_152") = {
-  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x98,0x00,0x07,0xff,0x00,
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,
-  0x07,0x06,0x00,0x00,0xf0,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
-  0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,
-  0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0x50,
-  0x50,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,
-  0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0x70,0x20,0x70,0xa8,0xa8,0x05,0x07,0x07,
-  0x06,0x00,0x00,0x70,0x88,0x08,0x70,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
-  0x88,0x88,0x98,0xa8,0xc8,0x88,0x88};
-const u8g_fntpgm_uint8_t fontpage_8_154_168[214] U8G_FONT_SECTION("fontpage_8_154_168") = {
-  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9a,0xa8,0x00,0x07,0xfe,0x00,
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,
-  0x07,0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x48,0x48,0x88,0x05,0x07,0x07,0x06,0x00,
-  0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,
-  0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,
-  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,
-  0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,
-  0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,
-  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,
-  0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20,
-  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x09,0x09,
-  0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x07,0x07,0x06,
-  0x00,0x00,0x88,0x88,0x88,0x78,0x08,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,
-  0xa8,0xa8,0xa8,0xa8,0xa8,0xf8};
-const u8g_fntpgm_uint8_t fontpage_8_171_173[56] U8G_FONT_SECTION("fontpage_8_171_173") = {
-  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xab,0xad,0x00,0x07,0x00,0x00,
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xc8,0xa8,0xa8,0xc8,0x04,0x07,
-  0x07,0x06,0x01,0x00,0x80,0x80,0x80,0xe0,0x90,0x90,0xe0,0x05,0x07,0x07,0x06,0x00,
-  0x00,0x70,0x88,0x08,0x78,0x08,0x88,0x70};
-const u8g_fntpgm_uint8_t fontpage_8_175_201[334] U8G_FONT_SECTION("fontpage_8_175_201") = {
-  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaf,0xc9,0x00,0x08,0xfe,0x00,
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x88,0x88,0x78,0x28,0x48,0x88,0x05,0x05,
-  0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
-  0x80,0xf0,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,0x88,0xf0,0x88,
-  0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x05,0x06,0x06,0x06,
-  0x00,0xff,0x30,0x50,0x50,0x50,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
-  0xf0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0x70,0x20,0x70,0xa8,0x05,0x05,
-  0x05,0x06,0x00,0x00,0x70,0x88,0x30,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
-  0x98,0xa8,0xc8,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x88,0x70,0x00,0x88,0x98,0xa8,
-  0xc8,0x88,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x05,0x05,
-  0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0xd8,
-  0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x05,0x05,
-  0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,
-  0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,0x88,0x88,0xf0,0x80,
-  0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x05,0x05,0x05,0x06,
-  0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,
-  0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x20,0x20,0x70,0xa8,0xa8,0xa8,
-  0x70,0x20,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x07,
-  0x07,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x05,0x05,0x06,0x00,
-  0x00,0x88,0x88,0x78,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,
-  0xf8,0x05,0x07,0x07,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xf8,0x08,0x08};
-const u8g_fntpgm_uint8_t fontpage_8_203_207[72] U8G_FONT_SECTION("fontpage_8_203_207") = {
-  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcb,0xcf,0x00,0x05,0x00,0x00,
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0xc8,0x04,0x05,0x05,0x06,
-  0x01,0x00,0x80,0x80,0xe0,0x90,0xe0,0x04,0x05,0x05,0x06,0x01,0x00,0xe0,0x10,0x70,
-  0x10,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x04,0x05,0x05,
-  0x06,0x01,0x00,0x70,0x90,0x70,0x50,0x90};
-const u8g_fntpgm_uint8_t fontpage_8_209_209[30] U8G_FONT_SECTION("fontpage_8_209_209") = {
-  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd1,0xd1,0x00,0x07,0x00,0x00,
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0xf0,0x80,0x70};
+const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x00,0x0a,0xfe,0x00,
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0x20,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,
+  0xf8,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,
+  0x05,0x09,0x09,0x06,0x00,0xfe,0xe0,0x40,0x40,0x70,0x48,0x48,0x48,0x08,0x30,0x05,
+  0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0xf0,0x80,0x88,0x70,0x05,0x07,0x07,0x06,
+  0x00,0x00,0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,
+  0x40,0x40,0x40,0x40,0x40,0xe0,0x03,0x09,0x09,0x06,0x01,0x00,0xa0,0x00,0xe0,0x40,
+  0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x38,0x10,0x10,0x10,0x10,
+  0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x60,0xa0,0xa0,0xb0,0xa8,0xa8,0xb0,0x05,
+  0x07,0x07,0x06,0x00,0x00,0xa0,0xa0,0xa0,0xf0,0xa8,0xa8,0xb0,0x05,0x07,0x07,0x06,
+  0x00,0x00,0xe0,0x40,0x40,0x70,0x48,0x48,0x48,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,
+  0x20,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,
+  0x20,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x0a,0x0a,0x06,0x00,0x00,0x88,
+  0x70,0x00,0x88,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x88,
+  0x88,0x88,0x88,0x88,0x88,0xf8,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,
+  0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x80,0x80,0xf0,0x88,
+  0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,
+  0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,
+  0x00,0xff,0x30,0x50,0x50,0x50,0x50,0x50,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,
+  0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0x70,
+  0x20,0x70,0xa8,0xa8,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,0x70,0x08,0x88,
+  0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x0a,
+  0x0a,0x06,0x00,0x00,0x88,0x70,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x07,
+  0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,
+  0x00,0x38,0x48,0x48,0x48,0x48,0x48,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,
+  0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,
+  0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,
+  0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
+  0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
+  0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,
+  0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x78,0x08,0x70,
+  0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20,0x05,0x07,0x07,
+  0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x09,0x09,0x06,0x00,0xfe,
+  0x90,0x90,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0x88,
+  0x88,0x88,0x78,0x08,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,
+  0xa8,0xa8,0xf8,0x05,0x09,0x09,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xa8,0xa8,0xf8,
+  0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xc0,0x40,0x40,0x70,0x48,0x48,0x70,0x05,
+  0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xc8,0xa8,0xa8,0xc8,0x04,0x07,0x07,0x06,
+  0x01,0x00,0x80,0x80,0x80,0xe0,0x90,0x90,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
+  0x88,0x08,0x78,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x90,0xa8,0xa8,0xe8,
+  0xa8,0xa8,0x90,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x88,0x88,0x78,0x28,0x48,0x88,
+  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,
+  0x00,0x70,0x80,0xf0,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,0x88,
+  0xf0,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x05,0x06,
+  0x06,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,
+  0x70,0x88,0xf0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0x70,0x20,0x70,0xa8,
+  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x30,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
+  0x00,0x88,0x98,0xa8,0xc8,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x88,0x70,0x00,0x88,
+  0x98,0xa8,0xc8,0x88,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,
+  0x05,0x05,0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x88,0x05,0x05,0x05,0x06,0x00,0x00,
+  0x88,0xd8,0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,
+  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
+  0x00,0xf8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,0x88,0x88,
+  0xf0,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x05,0x05,
+  0x05,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,
+  0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x20,0x20,0x70,0xa8,
+  0xa8,0xa8,0x70,0x20,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,
+  0x05,0x07,0x07,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x05,0x05,
+  0x06,0x00,0x00,0x88,0x88,0x78,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,
+  0xa8,0xa8,0xf8,0x05,0x07,0x07,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xf8,0x08,0x08,
+  0x05,0x05,0x05,0x06,0x00,0x00,0xc0,0x40,0x70,0x48,0x70,0x05,0x05,0x05,0x06,0x00,
+  0x00,0x88,0x88,0xc8,0xa8,0xc8,0x04,0x05,0x05,0x06,0x01,0x00,0x80,0x80,0xe0,0x90,
+  0xe0,0x04,0x05,0x05,0x06,0x01,0x00,0xe0,0x10,0x70,0x10,0xe0,0x05,0x05,0x05,0x06,
+  0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x04,0x05,0x05,0x06,0x01,0x00,0x70,0x90,0x70,
+  0x50,0x90,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x88,0xf0,0x80,0x70,
+  0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x09,0x09,
+  0x06,0x00,0xfe,0x40,0xe0,0x40,0x70,0x48,0x48,0x48,0x08,0x10,0x05,0x08,0x08,0x06,
+  0x00,0x00,0x10,0x20,0x00,0xf8,0x80,0x80,0x80,0x80,0x04,0x05,0x05,0x06,0x01,0x00,
+  0x70,0x80,0xe0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x78,0x80,0x70,0x08,0xf0,
+  0x03,0x06,0x06,0x06,0x01,0x00,0x40,0x00,0xc0,0x40,0x40,0xe0,0x03,0x06,0x06,0x06,
+  0x01,0x00,0xa0,0x00,0xc0,0x40,0x40,0xe0,0x04,0x08,0x08,0x06,0x01,0xfe,0x10,0x00,
+  0x30,0x10,0x10,0x10,0x90,0x60,0x05,0x05,0x05,0x06,0x00,0x00,0x60,0xa0,0xb0,0xa8,
+  0xb0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0xa0,0xf0,0xa8,0xb0,0x05,0x07,0x07,0x06,
+  0x00,0x00,0x40,0xe0,0x40,0x70,0x48,0x48,0x48,0x04,0x08,0x08,0x06,0x01,0x00,0x20,
+  0x40,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,
+  0x88,0x98,0xa8,0xc8,0x88,0x05,0x0a,0x0a,0x06,0x00,0xfe,0x88,0x70,0x00,0x88,0x88,
+  0x88,0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x88,0xf8,
+  0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x88,0x88,0xa8,0xa8,0xa8,0x50,0x05,
+  0x05,0x05,0x06,0x00,0x00,0x50,0x88,0xa8,0xa8,0x50,0x05,0x07,0x07,0x06,0x00,0x00,
+  0x40,0xf0,0x40,0x70,0x48,0x48,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0x40,0xf0,
+  0x40,0x70,0x48,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x98,0xa0,0xa0,0xf8,0xa0,0xa0,
+  0x98,0x05,0x05,0x05,0x06,0x00,0x00,0x98,0xa0,0xf8,0xa0,0x98,0x05,0x07,0x07,0x06,
+  0x00,0x00,0x20,0x50,0x50,0x88,0xf8,0xa8,0xa8,0x05,0x06,0x06,0x06,0x00,0x00,0x20,
+  0x50,0x50,0x88,0xf8,0xa8,0x05,0x07,0x07,0x06,0x00,0x00,0x90,0x90,0xb8,0xf8,0xb8,
+  0xb8,0xb8,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0x90,0xf8,0xb8,0xb8,0x05,0x08,0x08,
+  0x06,0x00,0x00,0xf8,0x88,0x50,0x50,0x70,0xa8,0xa8,0xa8,0x05,0x06,0x06,0x06,0x00,
+  0x00,0xf8,0x88,0x50,0x70,0xa8,0xa8,0x06,0x08,0x08,0x06,0x00,0x00,0xfc,0xc4,0xa8,
+  0x90,0xf8,0xb8,0xb8,0xa8,0x06,0x06,0x06,0x06,0x00,0x00,0xfc,0xa8,0x90,0xf8,0xb8,
+  0xa8,0x05,0x0c,0x0c,0x06,0x00,0xfe,0x50,0x20,0x00,0x70,0x88,0x08,0x30,0x08,0x08,
+  0x70,0x80,0x70,0x05,0x0a,0x0a,0x06,0x00,0xfe,0x50,0x20,0x00,0x70,0x88,0x30,0x08,
+  0x70,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0x70,0x20,0x20,0x20,
+  0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x70,0x20,0x20,0x05,0x07,0x07,0x06,0x00,
+  0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
+  0xf8,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0x90,0x50,0x50,0x50,0x20,
+  0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x90,0x50,0x50,0x20,0x05,0x0a,0x0a,0x06,0x00,
+  0x00,0x90,0x48,0x00,0x88,0x90,0x90,0x50,0x50,0x50,0x20,0x05,0x08,0x08,0x06,0x00,
+  0x00,0x90,0x48,0x00,0x88,0x90,0x50,0x50,0x20,0x05,0x09,0x09,0x06,0x00,0xfe,0x40,
+  0xa0,0xa0,0xb8,0xb8,0xb8,0x58,0x08,0x10,0x05,0x07,0x07,0x06,0x00,0xfe,0x58,0xb8,
+  0xb8,0xb8,0x58,0x08,0x10,0x05,0x0a,0x0a,0x06,0x00,0xff,0x20,0x70,0xa8,0x88,0x88,
+  0x88,0x88,0xa8,0x70,0x20,0x05,0x08,0x08,0x06,0x00,0xff,0x20,0x70,0xa8,0x88,0x88,
+  0xa8,0x70,0x20,0x05,0x09,0x09,0x06,0x00,0x00,0x70,0x00,0x20,0x20,0x88,0x88,0x88,
+  0xa8,0x50,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x00,0x20,0xa8,0x88,0xa8,0x50,0x05,
+  0x0a,0x0a,0x06,0x00,0x00,0xf8,0xa8,0x00,0x50,0x88,0x88,0xa8,0xa8,0xa8,0x50,0x05,
+  0x08,0x08,0x06,0x00,0x00,0xf8,0xa8,0x00,0x50,0x88,0xa8,0xa8,0x50};
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(8, 144, 152, fontpage_8_144_152), // 'А' -- 'И'
-    FONTDATA_ITEM(8, 154, 168, fontpage_8_154_168), // 'К' -- 'Ш'
-    FONTDATA_ITEM(8, 171, 173, fontpage_8_171_173), // 'Ы' -- 'Э'
-    FONTDATA_ITEM(8, 175, 201, fontpage_8_175_201), // 'Я' -- 'щ'
-    FONTDATA_ITEM(8, 203, 207, fontpage_8_203_207), // 'ы' -- 'я'
-    FONTDATA_ITEM(8, 209, 209, fontpage_8_209_209), // 'ё' -- 'ё'
+    FONTDATA_ITEM(8, 129, 255, fontpage_8_128_255), // 'ё' -- 'ё'
 };
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 82c91c65029c..eaa50b4074c4 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -37,6 +37,7 @@ namespace Language_ru {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Russian");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" готов.");
+#ifndef SUPPRESS_RU_TRANSLATION
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Назад");
   PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Карта вставлена");
   PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Карта извлечена");
@@ -476,7 +477,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Режим без эндстопов");
   PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Режим шага");
   PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("Тихий режим вкл");
-
+#endif
   // TODO: Service
 
   // TODO: Backlash

From 198f5afe671478f3b13bb3e9a6448e6f4cb81cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Sat, 21 Mar 2020 01:16:33 +0500
Subject: [PATCH 464/565] fix #26

---
 Marlin/Configuration_adv.h                 |  1 +
 Marlin/Version.h                           |  2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ru.h |  2 +-
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp      |  7 ++--
 Marlin/src/lcd/ultralcd.cpp                | 38 +++++++++++++++++++++-
 Marlin/src/sd/SdBaseFile.cpp               | 19 ++++++++++-
 6 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 90a2eebb71cd..268ef1d1774c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1104,6 +1104,7 @@
   #define LONG_FILENAME_HOST_SUPPORT
   #if (GITHUB_USER==URSOFT)
    #define LONG_FILENAME_OVERRIDE_SHORT //https://github.com/ursoft/Marlin/issues/26
+   #define CYRILLIC_FILENAMES
   #endif
  
   // Enable this option to scroll long filenames in the SD card menu
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1db508a9fc7b..f46c0199c08b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-#define SHORT_BUILD_VERSION "bf-2.0.x.5" //last is build No
+#define SHORT_BUILD_VERSION "bf-2.0.x.6" //last is build No
 
 /**
  * Verbose version identifier which should contain a reference to the location
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
index cfbcecf64e22..01ada25deafb 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
@@ -114,5 +114,5 @@ const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_1
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(8, 129, 255, fontpage_8_128_255), // 'ё' -- 'ё'
+    FONTDATA_ITEM(8, 129, 255, fontpage_8_128_255), // cyr
 };
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index ffc3199b981c..362f3f737e06 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -487,8 +487,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
     void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
       if (mark_as_selected(row, sel)) {
-        if (isDir) lcd_put_wchar(LCD_STR_FOLDER[0]);
-        constexpr uint8_t maxlen = LCD_WIDTH - 1;
+        uint8_t maxlen = LCD_WIDTH;
+        if (isDir) {
+          lcd_put_wchar(LCD_STR_FOLDER[0]);
+          --maxlen;
+        }
         const u8g_uint_t pixw = maxlen * (MENU_FONT_WIDTH);
         u8g_uint_t n = pixw - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), pixw);
         while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index a682605f32b7..9d6240c318ae 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -160,7 +160,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
     const char * MarlinUI::scrolled_filename(CardReader &theCard, const uint8_t maxlen, uint8_t hash, const bool doScroll) {
       const char *outstr = theCard.longest_filename();
       if (theCard.longFilename[0]) {
-        #if ENABLED(SCROLL_LONG_FILENAMES)
+        #if ENABLED(SCROLL_LONG_FILENAMES) //сам скроллингом имен не пользуюсь - поэтому проленюсь делать тут кириллицу
           if (doScroll) {
             for (uint8_t l = FILENAME_LENGTH; l--;)
               hash = ((hash << 1) | (hash >> 7)) ^ theCard.filename[l];      // rotate, xor
@@ -174,7 +174,43 @@ millis_t MarlinUI::next_button_update_ms; // = 0
             outstr += filename_scroll_pos;
           }
         #else
+          static char longFilenameCyr[LONG_FILENAME_LENGTH*3];
           theCard.longFilename[maxlen] = '\0'; // cutoff at screen edge
+          #ifdef CYRILLIC_FILENAMES // convert 1251 to  utf8
+            static const int table[128] = {                    
+                0x82D0,0x83D0,0x9A80E2,0x93D1,0x9E80E2,0xA680E2,0xA080E2,0xA180E2,
+                0xAC82E2,0xB080E2,0x89D0,0xB980E2,0x8AD0,0x8CD0,0x8BD0,0x8FD0,    
+                0x92D1,0x9880E2,0x9980E2,0x9C80E2,0x9D80E2,0xA280E2,0x9380E2,0x9480E2,
+                0,0xA284E2,0x99D1,0xBA80E2,0x9AD1,0x9CD1,0x9BD1,0x9FD1,               
+                0xA0C2,0x8ED0,0x9ED1,0x88D0,0xA4C2,0x90D2,0xA6C2,0xA7C2,              
+                0x81D0,0xA9C2,0x84D0,0xABC2,0xACC2,0xADC2,0xAEC2,0x87D0,              
+                0xB0C2,0xB1C2,0x86D0,0x96D1,0x91D2,0xB5C2,0xB6C2,0xB7C2,              
+                0x91D1,0x9684E2,0x94D1,0xBBC2,0x98D1,0x85D0,0x95D1,0x97D1,            
+                0x90D0,0x91D0,0x92D0,0x93D0,0x94D0,0x95D0,0x96D0,0x97D0,
+                0x98D0,0x99D0,0x9AD0,0x9BD0,0x9CD0,0x9DD0,0x9ED0,0x9FD0,
+                0xA0D0,0xA1D0,0xA2D0,0xA3D0,0xA4D0,0xA5D0,0xA6D0,0xA7D0,
+                0xA8D0,0xA9D0,0xAAD0,0xABD0,0xACD0,0xADD0,0xAED0,0xAFD0,
+                0xB0D0,0xB1D0,0xB2D0,0xB3D0,0xB4D0,0xB5D0,0xB6D0,0xB7D0,
+                0xB8D0,0xB9D0,0xBAD0,0xBBD0,0xBCD0,0xBDD0,0xBED0,0xBFD0,
+                0x80D1,0x81D1,0x82D1,0x83D1,0x84D1,0x85D1,0x86D1,0x87D1,
+                0x88D1,0x89D1,0x8AD1,0x8BD1,0x8CD1,0x8DD1,0x8ED1,0x8FD1
+            };
+            memcpy(longFilenameCyr, theCard.longFilename, LONG_FILENAME_LENGTH);
+            int n = 0;
+            for(int i = 0; i < LONG_FILENAME_LENGTH && n < 2*LONG_FILENAME_LENGTH; i++) {
+              char c1251 = theCard.longFilename[i];
+              if(c1251 >= 0 && c1251 <= 0x7f) longFilenameCyr[n++] = c1251; else {
+                int v = table[(int)(0x7f & c1251)];
+                longFilenameCyr[n++] = (char)v;
+                longFilenameCyr[n++] = (char)(v >> 8);
+                if (v >>= 16)
+                    longFilenameCyr[n++] = (char)v;
+              }
+              if(c1251 == 0) break;
+            }
+            longFilenameCyr[2*LONG_FILENAME_LENGTH - 1] = '\0';
+            outstr = longFilenameCyr;
+          #endif
         #endif
       }
       return outstr;
diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index cdb1072cbef7..be8c84bc0834 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -1088,8 +1088,25 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
         if (WITHIN(seq, 1, MAX_VFAT_ENTRIES)) {
           // TODO: Store the filename checksum to verify if a long-filename-unaware system modified the file table.
           n = (seq - 1) * (FILENAME_LENGTH);
-          for (uint8_t i = 0; i < FILENAME_LENGTH; i++)
+          for (uint8_t i = 0; i < FILENAME_LENGTH; i++)            
+#ifdef CYRILLIC_FILENAMES // convert u16 to 1251
+          {
+            longFilename[n + i] = '?';
+            uint16_t c16 = (i < 5) ? VFAT->name1[i] : (i < 11) ? VFAT->name2[i - 5] : VFAT->name3[i - 11];
+            uint8_t byte1 = (c16 & 0xFF00) >> 8;
+            if(c16 <= 0x7F) longFilename[n + i] = (char)c16;
+            else if (c16 <= 0x7FF && byte1 == 0x4) { // Two bytes.
+                uint8_t byte2 = (c16 & 0xFF);
+                switch(byte2) {
+                  case 0x01: longFilename[n + i] = (char)0xA8; break;
+                  case 0x51: longFilename[n + i] = (char)0xB8; break;
+                  default: if(byte2 >= 0x10 && byte2 <= 0x4F) longFilename[n + i] = char(0xB0 + byte2); break;
+                }
+            }
+          }
+#else
             longFilename[n + i] = (i < 5) ? VFAT->name1[i] : (i < 11) ? VFAT->name2[i - 5] : VFAT->name3[i - 11];
+#endif
           // If this VFAT entry is the last one, add a NUL terminator at the end of the string
           if (VFAT->sequenceNumber & 0x40) longFilename[n + FILENAME_LENGTH] = '\0';
         }

From 3151856e981a14e836074e70836c780e93a2be55 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 21 Mar 2020 00:03:28 +0000
Subject: [PATCH 465/565] [cron] Bump distribution date (2020-03-21)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fddda1557d4f..e6d77e842cc6 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-20"
+  #define STRING_DISTRIBUTION_DATE "2020-03-21"
 #endif
 
 /**

From 04cea864bcc197a91a162f8cc48cd6588260f8af Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 20 Mar 2020 23:45:00 -0500
Subject: [PATCH 466/565] Split up STM32 pins files (#17212)

---
 Marlin/src/pins/pins.h                        | 84 +++++++++----------
 .../{stm32 => stm32f1}/pins_BTT_SKR_E3_DIP.h  |  0
 .../{stm32 => stm32f1}/pins_BTT_SKR_MINI_E3.h |  0
 .../pins_BTT_SKR_MINI_E3_V1_0.h               |  0
 .../pins_BTT_SKR_MINI_E3_V1_2.h               |  0
 .../pins_BTT_SKR_MINI_V1_1.h                  |  0
 .../pins/{stm32 => stm32f1}/pins_CHITU3D.h    |  0
 .../{stm32 => stm32f1}/pins_FYSETC_AIO_II.h   |  0
 .../{stm32 => stm32f1}/pins_FYSETC_CHEETAH.h  |  0
 .../pins_FYSETC_CHEETAH_V12.h                 |  0
 .../pins/{stm32 => stm32f1}/pins_GTM32_MINI.h |  0
 .../{stm32 => stm32f1}/pins_GTM32_MINI_A30.h  |  0
 .../{stm32 => stm32f1}/pins_GTM32_PRO_VB.h    |  0
 .../{stm32 => stm32f1}/pins_GTM32_REV_B.h     |  0
 .../{stm32 => stm32f1}/pins_JGAURORA_A5S_A1.h |  0
 .../{stm32 => stm32f1}/pins_LONGER3D_LK.h     |  0
 .../{stm32 => stm32f1}/pins_MALYAN_M200.h     |  0
 .../pins/{stm32 => stm32f1}/pins_MKS_ROBIN.h  |  0
 .../{stm32 => stm32f1}/pins_MKS_ROBIN_LITE.h  |  0
 .../{stm32 => stm32f1}/pins_MKS_ROBIN_LITE3.h |  0
 .../{stm32 => stm32f1}/pins_MKS_ROBIN_MINI.h  |  0
 .../{stm32 => stm32f1}/pins_MKS_ROBIN_NANO.h  |  0
 .../{stm32 => stm32f1}/pins_MKS_ROBIN_PRO.h   |  0
 .../pins/{stm32 => stm32f1}/pins_MORPHEUS.h   |  0
 .../pins/{stm32 => stm32f1}/pins_STM32F1R.h   |  0
 .../pins/{stm32 => stm32f1}/pins_STM3R_MINI.h |  0
 .../src/pins/{stm32 => stm32f4}/pins_ARMED.h  |  0
 .../src/pins/{stm32 => stm32f4}/pins_BEAST.h  |  0
 .../pins_BLACK_STM32F407VE.h                  |  0
 .../{stm32 => stm32f4}/pins_BTT_BTT002_V1_0.h |  0
 .../{stm32 => stm32f4}/pins_BTT_GTR_V1_0.h    |  0
 .../pins_BTT_SKR_PRO_V1_1.h                   |  0
 .../pins/{stm32 => stm32f4}/pins_FLYF407ZG.h  |  0
 .../pins/{stm32 => stm32f4}/pins_FYSETC_S6.h  |  0
 .../{stm32 => stm32f4}/pins_GENERIC_STM32F4.h |  0
 .../pins/{stm32 => stm32f4}/pins_LERDGE_K.h   |  0
 .../pins/{stm32 => stm32f4}/pins_LERDGE_X.h   |  0
 .../pins/{stm32 => stm32f4}/pins_MKS_ROBIN2.h |  0
 .../{stm32 => stm32f4}/pins_RUMBA32_AUS3D.h   |  0
 .../{stm32 => stm32f4}/pins_RUMBA32_MKS.h     |  0
 .../{stm32 => stm32f4}/pins_RUMBA32_common.h  |  0
 .../{stm32 => stm32f4}/pins_STEVAL_3DP001V1.h |  0
 .../pins/{stm32 => stm32f4}/pins_VAKE403D.h   |  0
 .../pins/{stm32 => stm32f7}/pins_REMRAM_V1.h  |  0
 .../pins/{stm32 => stm32f7}/pins_THE_BORG.h   |  0
 45 files changed, 42 insertions(+), 42 deletions(-)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_BTT_SKR_E3_DIP.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_BTT_SKR_MINI_E3.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_BTT_SKR_MINI_E3_V1_0.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_BTT_SKR_MINI_E3_V1_2.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_BTT_SKR_MINI_V1_1.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_CHITU3D.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_FYSETC_AIO_II.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_FYSETC_CHEETAH.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_FYSETC_CHEETAH_V12.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_GTM32_MINI.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_GTM32_MINI_A30.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_GTM32_PRO_VB.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_GTM32_REV_B.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_JGAURORA_A5S_A1.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_LONGER3D_LK.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MALYAN_M200.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MKS_ROBIN.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MKS_ROBIN_LITE.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MKS_ROBIN_LITE3.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MKS_ROBIN_MINI.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MKS_ROBIN_NANO.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MKS_ROBIN_PRO.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_MORPHEUS.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_STM32F1R.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f1}/pins_STM3R_MINI.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_ARMED.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_BEAST.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_BLACK_STM32F407VE.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_BTT_BTT002_V1_0.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_BTT_GTR_V1_0.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_BTT_SKR_PRO_V1_1.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_FLYF407ZG.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_FYSETC_S6.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_GENERIC_STM32F4.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_LERDGE_K.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_LERDGE_X.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_MKS_ROBIN2.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_RUMBA32_AUS3D.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_RUMBA32_MKS.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_RUMBA32_common.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_STEVAL_3DP001V1.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f4}/pins_VAKE403D.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f7}/pins_REMRAM_V1.h (100%)
 rename Marlin/src/pins/{stm32 => stm32f7}/pins_THE_BORG.h (100%)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 27d9545c3fbd..b43ba1cbc6d9 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -467,53 +467,53 @@
 //
 
 #elif MB(STM32F103RE)
-  #include "stm32/pins_STM32F1R.h"              // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_STM32F1R.h"            // STM32F1                                env:STM32F103RE
 #elif MB(MALYAN_M200)
-  #include "stm32/pins_MALYAN_M200.h"           // STM32F1                                env:STM32F103CB_malyan
+  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F1                                env:STM32F103CB_malyan
 #elif MB(STM3R_MINI)
-  #include "stm32/pins_STM3R_MINI.h"            // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_PRO_VB)
-  #include "stm32/pins_GTM32_PRO_VB.h"          // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_MINI_A30)
-  #include "stm32/pins_GTM32_MINI_A30.h"        // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_MINI)
-  #include "stm32/pins_GTM32_MINI.h"            // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_REV_B)
-  #include "stm32/pins_GTM32_REV_B.h"           // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F1                                env:STM32F103RE
 #elif MB(MORPHEUS)
-  #include "stm32/pins_MORPHEUS.h"              // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_MORPHEUS.h"            // STM32F1                                env:STM32F103RE
 #elif MB(CHITU3D)
-  #include "stm32/pins_CHITU3D.h"               // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_CHITU3D.h"             // STM32F1                                env:STM32F103RE
 #elif MB(MKS_ROBIN)
-  #include "stm32/pins_MKS_ROBIN.h"             // STM32F1                                env:mks_robin
+  #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin
 #elif MB(MKS_ROBIN_MINI)
-  #include "stm32/pins_MKS_ROBIN_MINI.h"        // STM32F1                                env:mks_robin_mini
+  #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini
 #elif MB(MKS_ROBIN_NANO)
-  #include "stm32/pins_MKS_ROBIN_NANO.h"        // STM32F1                                env:mks_robin_nano
+  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano
 #elif MB(MKS_ROBIN_LITE)
-  #include "stm32/pins_MKS_ROBIN_LITE.h"        // STM32F1                                env:mks_robin_lite
+  #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite
 #elif MB(BTT_SKR_MINI_V1_1)
-  #include "stm32/pins_BTT_SKR_MINI_V1_1.h"     // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_0)
-  #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_2)
-  #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_E3_DIP)
-  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(JGAURORA_A5S_A1)
-  #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
+  #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1
 #elif MB(FYSETC_AIO_II)
-  #include "stm32/pins_FYSETC_AIO_II.h"         // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_AIO_II.h"       // STM32F1                                env:STM32F103RC_fysetc
 #elif MB(FYSETC_CHEETAH)
-  #include "stm32/pins_FYSETC_CHEETAH.h"        // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_CHEETAH.h"      // STM32F1                                env:STM32F103RC_fysetc
 #elif MB(FYSETC_CHEETAH_V12)
-  #include "stm32/pins_FYSETC_CHEETAH_V12.h"    // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_CHEETAH_V12.h"  // STM32F1                                env:STM32F103RC_fysetc
 #elif MB(LONGER3D_LK)
-  #include "stm32/pins_LONGER3D_LK.h"           // STM32F1                                env:STM32F103VE_longer
+  #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer
 #elif MB(MKS_ROBIN_LITE3)
-  #include "stm32/pins_MKS_ROBIN_LITE3.h"       // STM32F1                                env:mks_robin_lite3
+  #include "stm32f1/pins_MKS_ROBIN_LITE3.h"     // STM32F1                                env:mks_robin_lite3
 #elif MB(MKS_ROBIN_PRO)
-  #include "stm32/pins_MKS_ROBIN_PRO.h"         // STM32F1                                env:mks_robin_pro
+  #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro
 
 //
 // ARM Cortex-M4F
@@ -529,46 +529,46 @@
 //
 
 #elif MB(BEAST)
-  #include "stm32/pins_BEAST.h"                 // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_BEAST.h"               // STM32F4                                env:STM32F4
 #elif MB(GENERIC_STM32F4)
-  #include "stm32/pins_GENERIC_STM32F4.h"       // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_GENERIC_STM32F4.h"     // STM32F4                                env:STM32F4
 #elif MB(ARMED)
-  #include "stm32/pins_ARMED.h"                 // STM32F4                                env:ARMED
+  #include "stm32f4/pins_ARMED.h"               // STM32F4                                env:ARMED
 #elif MB(RUMBA32_AUS3D)
-  #include "stm32/pins_RUMBA32_AUS3D.h"         // STM32F4                                env:rumba32_f446ve
+  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32_f446ve
 #elif MB(RUMBA32_MKS)
-  #include "stm32/pins_RUMBA32_MKS.h"           // STM32F4                                env:rumba32_mks
+  #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32_mks
 #elif MB(BLACK_STM32F407VE)
-  #include "stm32/pins_BLACK_STM32F407VE.h"     // STM32F4                                env:STM32F407VE_black
+  #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
 #elif MB(STEVAL_3DP001V1)
-  #include "stm32/pins_STEVAL_3DP001V1.h"       // STM32F4                                env:STM32F401VE_STEVAL
+  #include "stm32f4/pins_STEVAL_3DP001V1.h"     // STM32F4                                env:STM32F401VE_STEVAL
 #elif MB(BTT_SKR_PRO_V1_1)
-  #include "stm32/pins_BTT_SKR_PRO_V1_1.h"      // STM32F4                                env:BIGTREE_SKR_PRO
+  #include "stm32f4/pins_BTT_SKR_PRO_V1_1.h"    // STM32F4                                env:BIGTREE_SKR_PRO
 #elif MB(BTT_GTR_V1_0)
-  #include "stm32/pins_BTT_GTR_V1_0.h"          // STM32F4                                env:BIGTREE_GTR_V1_0
+  #include "stm32f4/pins_BTT_GTR_V1_0.h"        // STM32F4                                env:BIGTREE_GTR_V1_0
 #elif MB(BTT_BTT002_V1_0)
-  #include "stm32/pins_BTT_BTT002_V1_0.h"       // STM32F4                                env:BIGTREE_BTT002
+  #include "stm32f4/pins_BTT_BTT002_V1_0.h"     // STM32F4                                env:BIGTREE_BTT002
 #elif MB(LERDGE_K)
-  #include "stm32/pins_LERDGE_K.h"              // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:STM32F4
 #elif MB(LERDGE_X)
-  #include "stm32/pins_LERDGE_X.h"              // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_LERDGE_X.h"            // STM32F4                                env:STM32F4
 #elif MB(VAKE403D)
-  #include "stm32/pins_VAKE403D.h"              // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_VAKE403D.h"            // STM32F4                                env:STM32F4
 #elif MB(FYSETC_S6)
-  #include "stm32/pins_FYSETC_S6.h"             // STM32F4                                env:FYSETC_S6
+  #include "stm32f4/pins_FYSETC_S6.h"           // STM32F4                                env:FYSETC_S6
 #elif MB(FLYF407ZG)
-  #include "stm32/pins_FLYF407ZG.h"             // STM32F4                                env:FLYF407ZG
+  #include "stm32f4/pins_FLYF407ZG.h"           // STM32F4                                env:FLYF407ZG
 #elif MB(MKS_ROBIN2)
-  #include "pins_MKS_ROBIN2.h"                  // STM32F4                                env:MKS_ROBIN2
+  #include "stm32f4/pins_MKS_ROBIN2.h"          // STM32F4                                env:MKS_ROBIN2
 
 //
 // ARM Cortex M7
 //
 
 #elif MB(THE_BORG)
-  #include "stm32/pins_THE_BORG.h"              // STM32F7                                env:STM32F7
+  #include "stm32f7/pins_THE_BORG.h"            // STM32F7                                env:STM32F7
 #elif MB(REMRAM_V1)
-  #include "stm32/pins_REMRAM_V1.h"             // STM32F7                                env:STM32F7
+  #include "stm32f7/pins_REMRAM_V1.h"           // STM32F7                                env:STM32F7
 
 //
 // Espressif ESP32
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_CHITU3D.h
rename to Marlin/src/pins/stm32f1/pins_CHITU3D.h
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_GTM32_MINI.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
diff --git a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
diff --git a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_GTM32_REV_B.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
rename to Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_LONGER3D_LK.h
rename to Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
diff --git a/Marlin/src/pins/stm32/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MALYAN_M200.h
rename to Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
diff --git a/Marlin/src/pins/stm32/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MORPHEUS.h
rename to Marlin/src/pins/stm32f1/pins_MORPHEUS.h
diff --git a/Marlin/src/pins/stm32/pins_STM32F1R.h b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_STM32F1R.h
rename to Marlin/src/pins/stm32f1/pins_STM32F1R.h
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_STM3R_MINI.h
rename to Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_ARMED.h
rename to Marlin/src/pins/stm32f4/pins_ARMED.h
diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32f4/pins_BEAST.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BEAST.h
rename to Marlin/src/pins/stm32f4/pins_BEAST.h
diff --git a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
rename to Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
rename to Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
rename to Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
rename to Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_FLYF407ZG.h
rename to Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_FYSETC_S6.h
rename to Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
diff --git a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
rename to Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_LERDGE_K.h
rename to Marlin/src/pins/stm32f4/pins_LERDGE_K.h
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_LERDGE_X.h
rename to Marlin/src/pins/stm32f4/pins_LERDGE_X.h
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
rename to Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h
rename to Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
rename to Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_RUMBA32_common.h
rename to Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
rename to Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
diff --git a/Marlin/src/pins/stm32/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_VAKE403D.h
rename to Marlin/src/pins/stm32f4/pins_VAKE403D.h
diff --git a/Marlin/src/pins/stm32/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_REMRAM_V1.h
rename to Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
diff --git a/Marlin/src/pins/stm32/pins_THE_BORG.h b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_THE_BORG.h
rename to Marlin/src/pins/stm32f7/pins_THE_BORG.h

From 29874b21b6ef17bccd6db04e31c84aff79ed94d0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 22 Mar 2020 00:03:15 +0000
Subject: [PATCH 467/565] [cron] Bump distribution date (2020-03-22)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e6d77e842cc6..2f99b9a6ed37 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-21"
+  #define STRING_DISTRIBUTION_DATE "2020-03-22"
 #endif
 
 /**

From 1674df00b14009e7c3c2daa5c8585cabe3fc7fc4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 18:15:37 -0500
Subject: [PATCH 468/565] Stay at v0.91 of USBComposite for STM32F1

---
 platformio.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index 39885b0cd37c..62582e1d93db 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -301,6 +301,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite_stm32f1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -315,6 +316,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite_stm32f1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -330,6 +332,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite_stm32f1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -345,6 +348,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite_stm32f1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 

From 7988e31f5ecd5d6e67b6290db9079cf2c097c56f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 21:16:08 -0500
Subject: [PATCH 469/565] whitespace

---
 Marlin/src/gcode/config/M220.cpp                            | 2 +-
 Marlin/src/lcd/language/language_tr.h                       | 1 -
 buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index 5ea75c09c692..f24c11e23de0 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -30,7 +30,7 @@
  *   S<percent> : Set the feed rate percentage factor
  *
  * Report the current speed percentage factor if no parameter is specified
- * 
+ *
  * With PRUSA_MMU2...
  *   B : Flag to back up the current factor
  *   R : Flag to restore the last-saved factor
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 0edade037497..096fef254cf2 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -606,4 +606,3 @@ namespace Language_tr {
   #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
   #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
 #endif
- 
diff --git a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
index ffdb81a636ed..571f3207e9a6 100644
--- a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
@@ -195,7 +195,7 @@ extern "C" {
   #define PIN_SERIAL2_RX        PD6
   #define PIN_SERIAL2_TX        PD5
 #else
-  #error'Invalid setting for SERIAL_UART_INSTANCE'
+  #error "Invalid setting for SERIAL_UART_INSTANCE."
 #endif
 
 // Timer Definitions

From e62b52da99883202f58aef71348823becfd61984 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 20:26:00 -0500
Subject: [PATCH 470/565] Use pin/port names for CHITU pins

---
 Marlin/src/pins/stm32f1/pins_CHITU3D.h | 152 ++++++++++++-------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index 2411500fb2b9..2db6b1bc0b92 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -86,7 +86,7 @@
 //
 #define SDSS               -1
 #define LED_PIN            -1
-#define CASE_LIGHT_PIN      8
+#define CASE_LIGHT_PIN     PA8   // 8
 
 #define PS_ON_PIN          -1
 #define KILL_PIN           PD6      // LED strip 24v
@@ -111,8 +111,8 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
+#define TEMP_BED_PIN       PA0  // Analog Input
+#define TEMP_0_PIN         PA1  // Analog Input
 #define TEMP_1_PIN         -1   // Analog Input
 #define TEMP_2_PIN         -1   // Analog Input
 
@@ -122,9 +122,9 @@
 #if HAS_SPI_LCD
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS         PD1   // 49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE     PD3   // 51  // SID (MOSI)
+    #define LCD_PINS_D4         PD4   // 52  // SCK (CLK) clock
   #elif BOTH(NEWPANEL, PANEL_ONE)
     #define LCD_PINS_RS         PB8
     #define LCD_PINS_ENABLE     PD2
@@ -140,13 +140,13 @@
     #define LCD_PINS_D6         PB14
     #define LCD_PINS_D7         PB15
     #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN        PC1   // 33
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK       PC6   // 38
+      //#define SHIFT_LD        PC10  // 42
+      //#define SHIFT_OUT       PC8   // 40
+      //#define SHIFT_EN        PA1   // 17
     #endif
   #endif
 
@@ -154,125 +154,125 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN        PC5
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1           PB15  // 31
+      #define BTN_EN2           PC1   // 33
+      #define BTN_ENC           PC3   // 35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define SD_DETECT_PIN     PD1   // 49
+      #define KILL_PIN          PC9   // 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN PC7   // 39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1           PE0   // 64
+      #define BTN_EN2           PD11  // 59
+      #define BTN_ENC           PD15  // 63
+      #define SD_DETECT_PIN     PC10  // 42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
+      #define BTN_EN1           PC15  // 47
+      #define BTN_EN2           PC11  // 43
+      #define BTN_ENC           PC0   // 32
+      #define LCD_SDSS          PD5   // 53
       #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
+      #define KILL_PIN          PC9   // 41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1           PB6   // 22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2           PA7   //  7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
 
       #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS          PD5   // 53
+      #define SD_DETECT_PIN     PD1   // 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN        PC1   // 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
+      #define DOGLCD_A0         PC12  // 44
+      #define DOGLCD_CS         PC13  // 45
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1           PB6   // 22
+      #define BTN_EN2           PA7   //  7
+      #define BTN_ENC           PC7   // 39
 
-      #define SDSS              53
+      #define SDSS              PD5   // 53
       #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          31
+      #define KILL_PIN          PB15  // 31
 
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define STAT_LED_RED_PIN  PC0   // 32
+      #define STAT_LED_BLUE_PIN PC3   // 35
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
-      #define LCD_BACKLIGHT_PIN 33
+      #define BTN_EN1           PC3   // 35
+      #define BTN_EN2           PC5   // 37
+      #define BTN_ENC           PB15  // 31
+      #define SD_DETECT_PIN     PD1   // 49
+      #define LCD_SDSS          PD5   // 53
+      #define KILL_PIN          PC9   // 41
+      #define BEEPER_PIN        PB7   // 23
+      #define DOGLCD_CS         PB13  // 29
+      #define DOGLCD_A0         PB11  // 27
+      #define LCD_BACKLIGHT_PIN PC1   // 33
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN        PC10  // 42
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
+      #define DOGLCD_A0         PC12  // 44
+      #define DOGLCD_CS         PE2   // 66
+      #define LCD_BACKLIGHT_PIN PE1   // 65   // backlight LED on A11/D65
+      #define SDSS              PD5   // 53
 
-      #define KILL_PIN          64
+      #define KILL_PIN          PE0   // 64
       // GLCD features
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
       // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1           PC8   // 40
+      #define BTN_EN2           PD15  // 63
+      #define BTN_ENC           PD11  // 59
       // not connected to a pin
-      #define SD_DETECT_PIN     49
+      #define SD_DETECT_PIN     PD1   // 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN        PC1   // 33
 
       // Buttons directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
+        #define BTN_EN1         PE0   // 64
+        #define BTN_EN2         PD11  // 59
+        #define BTN_ENC         PD15  // 63
+        #define SHIFT_OUT       PC8   // 40
+        #define SHIFT_CLK       PC12  // 44
+        #define SHIFT_LD        PC10  // 42
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1         PD11  // 59   // AUX2 PIN 3
+        #define BTN_EN2         PD15  // 63   // AUX2 PIN 4
+        #define BTN_ENC         PD1   // 49   // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1         PC5   // 37
+        #define BTN_EN2         PC3   // 35
+        #define BTN_ENC         PB15  // 31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN   PD1   // 49
+        #define KILL_PIN        PC9   // 41
       #else
         //#define SD_DETECT_PIN -1   // Ramps doesn't use this
       #endif

From 9340a339807da41a6b7c91325e2874d193d0a370 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 20:35:45 -0500
Subject: [PATCH 471/565] Add a pins formatting script

---
 buildroot/share/scripts/pinsformat.js | 141 ++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100755 buildroot/share/scripts/pinsformat.js

diff --git a/buildroot/share/scripts/pinsformat.js b/buildroot/share/scripts/pinsformat.js
new file mode 100755
index 000000000000..3e2a57b556dc
--- /dev/null
+++ b/buildroot/share/scripts/pinsformat.js
@@ -0,0 +1,141 @@
+#!/usr/bin/env node
+
+//
+// Formatter script for pins_MYPINS.h files
+//
+// Usage: mffmt [infile] [outfile]
+//
+// With no parameters convert STDIN to STDOUT
+//
+
+const fs = require("fs");
+
+// String lpad / rpad
+String.prototype.lpad = function(len, chr) {
+  if (!len) return this;
+  if (chr === undefined) chr = ' ';
+  var s = this+'', need = len - s.length;
+  if (need > 0) s = new Array(need+1).join(chr) + s;
+  return s;
+};
+
+String.prototype.rpad = function(len, chr) {
+  if (!len) return this;
+  if (chr === undefined) chr = ' ';
+  var s = this+'', need = len - s.length;
+  if (need > 0) s += new Array(need+1).join(chr);
+  return s;
+};
+
+const mpatt = [ '-?\\d+', 'P[A-I]\\d+', 'P\\d_\\d+' ],
+      definePatt = new RegExp(`^\\s*(//)?#define\\s+[A-Z_][A-Z0-9_]+\\s+(${mpatt[0]}|${mpatt[1]}|${mpatt[2]})\\s*(//.*)?$`, 'gm'),
+      ppad = [ 3, 4, 5 ],
+      col_comment = 50,
+      col_value_rj = col_comment - 3;
+
+var mexpr = [];
+for (let m of mpatt) mexpr.push(new RegExp('^' + m + '$'));
+
+const argv = process.argv.slice(2), argc = argv.length;
+
+var src_file = 0, src_name = 'STDIN', dst_file;
+if (argc > 0) {
+  src_file = src_name = argv[0];
+  dst_file = argv[argc > 1 ? 1 : 0];
+}
+
+// Read from file or STDIN until it terminates
+const filtered = process_text(fs.readFileSync(src_file).toString());
+if (dst_file)
+  fs.writeFileSync(dst_file, filtered);
+else
+  console.log(filtered);
+
+// Find the pin pattern so non-pin defines can be skipped
+function get_pin_pattern(txt) {
+  var r, m = 0, match_count = [ 0, 0, 0 ];
+  definePatt.lastIndex = 0;
+  while ((r = definePatt.exec(txt)) !== null) {
+    let ind = -1;
+    if (mexpr.some((p) => {
+      ind++;
+      const didmatch = r[2].match(p);
+      return r[2].match(p);
+    }) ) {
+      const m = ++match_count[ind];
+      if (m >= 10) {
+        return { match: mpatt[ind], pad:ppad[ind] };
+      }
+    }
+  }
+  return null;
+}
+
+function process_text(txt) {
+  if (!txt.length) return '(no text)';
+  const patt = get_pin_pattern(txt);
+  if (!patt) return txt;
+  const pindefPatt = new RegExp(`^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+(${patt.match})\\s*(//.*)?$`),
+         noPinPatt = new RegExp(`^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+(-1)\\s*(//.*)?$`),
+          skipPatt = new RegExp('^(\\s*(//)?#define)\\s+(AT90USB|USBCON|BOARD_.+|.+_MACHINE_NAME|.+_SERIAL)\\s+(.+)\\s*(//.*)?$'),
+         aliasPatt = new RegExp('^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+([A-Z_][A-Z0-9_()]+)\\s*(//.*)?$'),
+        switchPatt = new RegExp('^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s*(//.*)?$'),
+         undefPatt = new RegExp('^(\\s*(//)?#undef)\\s+([A-Z_][A-Z0-9_]+)\\s*(//.*)?$'),
+           defPatt = new RegExp('^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+(\\w+)\\s*(//.*)?$'),
+          condPatt = new RegExp('^(\\s*(//)?#(if|ifn?def|else|elif)(\\s+\\S+)*)\\s+(//.*)$'),
+          commPatt = new RegExp('^\\s{20,}(//.*)?$');
+  const col_value_lj = col_comment - patt.pad - 2;
+  var r, out = '', check_comment_next = false;
+  txt.split('\n').forEach((line) => {
+    if (check_comment_next)
+      check_comment_next = ((r = commPatt.exec(line)) !== null);
+
+    if (check_comment_next)
+      // Comments in column 45
+      line = ''.rpad(col_comment) + r[1];
+
+    else if ((r = pindefPatt.exec(line)) !== null) {
+      //
+      // #define MY_PIN [pin]
+      //
+      const pinnum = r[4].charAt(0) == 'P' ? r[4] : r[4].lpad(patt.pad);
+      line = r[1] + ' ' + r[3];
+      line = line.rpad(col_value_lj) + pinnum;
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = noPinPatt.exec(line)) !== null) {
+      //
+      // #define MY_PIN -1
+      //
+      line = r[1] + ' ' + r[3];
+      line = line.rpad(col_value_lj) + '-1';
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = skipPatt.exec(line)) !== null) {
+    }
+    else if ((r = aliasPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3];
+      line += r[4].lpad(col_value_rj + 1 - line.length);
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = switchPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3];
+      if (r[4]) line = line.rpad(col_comment) + r[4];
+      check_comment_next = true;
+    }
+    else if ((r = defPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3] + ' ' + r[4];
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = undefPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3];
+      if (r[4]) line = line.rpad(col_comment) + r[4];
+    }
+    else if ((r = condPatt.exec(line)) !== null) {
+      line = r[1].rpad(col_comment) + r[5];
+      check_comment_next = true;
+    }
+    out += line + '\n';
+  });
+  return out.replace(/\n\n+/g, '\n\n').replace(/\n\n$/g, '\n');
+}

From 2c325c2a7d9b66b50d8585a1d5ced422ed88b1ae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 21:13:19 -0500
Subject: [PATCH 472/565] Format some pins files

---
 Marlin/src/pins/esp32/pins_E4D.h              |  56 +-
 Marlin/src/pins/esp32/pins_ESP32.h            |  56 +-
 Marlin/src/pins/esp32/pins_MRR_ESPA.h         |  68 +--
 Marlin/src/pins/esp32/pins_MRR_ESPE.h         | 132 ++---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      | 456 ++++++++---------
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h     | 110 ++--
 Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h |  90 ++--
 Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h  |  81 ++-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   | 137 +++--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   | 244 ++++-----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   | 206 ++++----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |  44 +-
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h | 132 ++---
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      | 234 ++++-----
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     | 242 ++++-----
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   | 318 ++++++------
 Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h |  91 ++--
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h   |  91 ++--
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h | 146 +++---
 .../src/pins/lpc1769/pins_COHESION3D_MINI.h   | 116 ++---
 .../src/pins/lpc1769/pins_COHESION3D_REMIX.h  | 206 ++++----
 Marlin/src/pins/lpc1769/pins_MKS_SGEN.h       |  20 +-
 Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h  |  82 +--
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   | 114 ++---
 Marlin/src/pins/mega/pins_CHEAPTRONIC.h       |  48 +-
 Marlin/src/pins/mega/pins_CHEAPTRONICv2.h     | 112 ++--
 Marlin/src/pins/mega/pins_CNCONTROLS_11.h     | 132 ++---
 Marlin/src/pins/mega/pins_CNCONTROLS_12.h     | 138 ++---
 Marlin/src/pins/mega/pins_CNCONTROLS_15.h     |  78 +--
 Marlin/src/pins/mega/pins_EINSTART-S.h        |  68 +--
 Marlin/src/pins/mega/pins_ELEFU_3.h           | 104 ++--
 Marlin/src/pins/mega/pins_GT2560_REV_A.h      | 120 ++---
 Marlin/src/pins/mega/pins_GT2560_V3.h         | 114 ++---
 Marlin/src/pins/mega/pins_GT2560_V3_A20.h     |  14 +-
 Marlin/src/pins/mega/pins_GT2560_V3_MC2.h     |   8 +-
 Marlin/src/pins/mega/pins_HJC2560C_REV2.h     | 126 ++---
 Marlin/src/pins/mega/pins_LEAPFROG.h          |  66 +--
 Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h |  72 +--
 Marlin/src/pins/mega/pins_MEGACONTROLLER.h    | 110 ++--
 Marlin/src/pins/mega/pins_MEGATRONICS.h       |  96 ++--
 Marlin/src/pins/mega/pins_MEGATRONICS_2.h     | 114 ++---
 Marlin/src/pins/mega/pins_MEGATRONICS_3.h     | 164 +++---
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h  | 206 ++++----
 Marlin/src/pins/mega/pins_MINITRONICS.h       | 108 ++--
 Marlin/src/pins/mega/pins_OVERLORD.h          | 100 ++--
 Marlin/src/pins/mega/pins_PICA.h              | 100 ++--
 Marlin/src/pins/mega/pins_PICAOLD.h           |   8 +-
 Marlin/src/pins/mega/pins_SILVER_GATE.h       |  92 ++--
 Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h    |  70 +--
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h      | 124 ++---
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h      | 142 +++---
 Marlin/src/pins/rambo/pins_MINIRAMBO.h        | 152 +++---
 Marlin/src/pins/rambo/pins_RAMBO.h            | 192 +++----
 Marlin/src/pins/rambo/pins_SCOOVO_X9H.h       | 142 +++---
 Marlin/src/pins/ramps/pins_3DRAG.h            |  56 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3.h        |  32 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h    |  94 ++--
 Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h     |  10 +-
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h   |  47 +-
 .../src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h  |  70 +--
 Marlin/src/pins/ramps/pins_FELIX2.h           |  10 +-
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h   | 124 ++---
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h  |  28 +-
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   | 126 ++---
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h    | 132 +++--
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h     | 184 +++----
 Marlin/src/pins/ramps/pins_FYSETC_F6_14.h     |  26 +-
 Marlin/src/pins/ramps/pins_K8400.h            |  10 +-
 Marlin/src/pins/ramps/pins_K8800.h            |  80 +--
 Marlin/src/pins/ramps/pins_MKS_BASE_14.h      |  20 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_16.h      |  14 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_common.h  |  36 +-
 Marlin/src/pins/ramps/pins_MKS_GEN_13.h       |  28 +-
 Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h     |  32 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            | 482 +++++++++---------
 Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h   |  26 +-
 Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h     |  10 +-
 Marlin/src/pins/ramps/pins_RAMPS_OLD.h        |  74 +--
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h       |  22 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD.h       |  60 +--
 Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h    |  12 +-
 Marlin/src/pins/ramps/pins_RL200.h            |  18 +-
 Marlin/src/pins/ramps/pins_RUMBA.h            | 158 +++---
 Marlin/src/pins/ramps/pins_TANGO.h            |  14 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h    |  62 +--
 Marlin/src/pins/ramps/pins_TT_OSCAR.h         | 456 ++++++++---------
 Marlin/src/pins/ramps/pins_ULTIMAIN_2.h       | 100 ++--
 Marlin/src/pins/ramps/pins_ULTIMAKER.h        | 122 ++---
 Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h    | 172 +++----
 Marlin/src/pins/ramps/pins_VORON.h            |  10 +-
 Marlin/src/pins/ramps/pins_ZRIB_V20.h         |  46 +-
 Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h  | 188 +++----
 Marlin/src/pins/sam/pins_ADSK.h               |  62 +--
 Marlin/src/pins/sam/pins_ALLIGATOR_R2.h       | 136 ++---
 Marlin/src/pins/sam/pins_ARCHIM1.h            | 158 +++---
 Marlin/src/pins/sam/pins_ARCHIM2.h            | 186 +++----
 Marlin/src/pins/sam/pins_CNCONTROLS_15D.h     |  92 ++--
 Marlin/src/pins/sam/pins_DUE3DOM.h            | 148 +++---
 Marlin/src/pins/sam/pins_DUE3DOM_MINI.h       | 152 +++---
 Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h     | 116 ++---
 Marlin/src/pins/sam/pins_RADDS.h              | 232 ++++-----
 Marlin/src/pins/sam/pins_RAMPS_DUO.h          |  34 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h        | 164 +++---
 Marlin/src/pins/sam/pins_RAMPS_SMART.h        |  28 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       | 202 ++++----
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       | 190 +++----
 Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h   | 142 +++---
 Marlin/src/pins/samd/pins_RAMPS_144.h         | 218 ++++----
 Marlin/src/pins/sanguino/pins_ANET_10.h       |  84 +--
 .../src/pins/sanguino/pins_GEN3_MONOLITHIC.h  |  38 +-
 Marlin/src/pins/sanguino/pins_GEN3_PLUS.h     |  43 +-
 Marlin/src/pins/sanguino/pins_GEN6.h          |  54 +-
 Marlin/src/pins/sanguino/pins_GEN7_12.h       |  79 ++-
 Marlin/src/pins/sanguino/pins_GEN7_14.h       |  56 +-
 Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h   |  76 +--
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   |  14 +-
 Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h  |  12 +-
 Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h  |  20 +-
 Marlin/src/pins/sanguino/pins_OMCA.h          |  70 +--
 Marlin/src/pins/sanguino/pins_OMCA_A.h        |  50 +-
 .../src/pins/sanguino/pins_SANGUINOLOLU_11.h  | 190 +++----
 Marlin/src/pins/sanguino/pins_SETHI.h         |  56 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 126 ++---
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h   | 120 ++---
 .../pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h  |  18 +-
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 130 ++---
 Marlin/src/pins/stm32f1/pins_CHITU3D.h        | 272 +++++-----
 Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h  |  92 ++--
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |  76 +--
 .../pins/stm32f1/pins_FYSETC_CHEETAH_V12.h    |  18 +-
 Marlin/src/pins/stm32f1/pins_GTM32_MINI.h     | 130 ++---
 Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h | 130 ++---
 Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h   | 130 ++---
 Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h    | 136 ++---
 .../src/pins/stm32f1/pins_JGAURORA_A5S_A1.h   |  82 +--
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    | 114 ++---
 Marlin/src/pins/stm32f1/pins_MALYAN_M200.h    |  46 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      | 124 ++---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  94 ++--
 .../src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h   | 106 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h |  90 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h |  86 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  | 198 +++----
 Marlin/src/pins/stm32f1/pins_MORPHEUS.h       |  46 +-
 Marlin/src/pins/stm32f1/pins_STM32F1R.h       | 222 ++++----
 Marlin/src/pins/stm32f1/pins_STM3R_MINI.h     | 244 ++++-----
 Marlin/src/pins/stm32f4/pins_ARMED.h          | 188 +++----
 Marlin/src/pins/stm32f4/pins_BEAST.h          | 254 ++++-----
 .../src/pins/stm32f4/pins_BLACK_STM32F407VE.h | 128 ++---
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   | 138 ++---
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   | 316 ++++++------
 .../src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h  | 186 ++++---
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      | 237 +++++----
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      | 204 ++++----
 .../src/pins/stm32f4/pins_GENERIC_STM32F4.h   | 121 +++--
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h       | 114 ++---
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h       | 112 ++--
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h     |  69 ++-
 Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h    |  30 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h | 136 ++---
 .../src/pins/stm32f4/pins_STEVAL_3DP001V1.h   | 214 ++++----
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       | 146 +++---
 Marlin/src/pins/stm32f7/pins_REMRAM_V1.h      | 106 ++--
 Marlin/src/pins/stm32f7/pins_THE_BORG.h       | 168 +++---
 Marlin/src/pins/teensy2/pins_5DPRINT.h        |  68 +--
 Marlin/src/pins/teensy2/pins_BRAINWAVE.h      |  56 +-
 Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h  |  50 +-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD.h    |  92 ++--
 .../src/pins/teensy2/pins_PRINTRBOARD_REVF.h  | 156 +++---
 Marlin/src/pins/teensy2/pins_SAV_MKI.h        | 108 ++--
 Marlin/src/pins/teensy2/pins_TEENSY2.h        |  72 +--
 Marlin/src/pins/teensy2/pins_TEENSYLU.h       |  73 ++-
 Marlin/src/pins/teensy3/pins_TEENSY31_32.h    |  82 +--
 Marlin/src/pins/teensy3/pins_TEENSY35_36.h    |  94 ++--
 174 files changed, 9700 insertions(+), 9733 deletions(-)

diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 409f38129712..829c391c4dfe 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -42,49 +42,49 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          34
-#define Y_MIN_PIN          35
-#define Z_MIN_PIN          16   // 15
+#define X_MIN_PIN                             34
+#define Y_MIN_PIN                             35
+#define Z_MIN_PIN                             16  // 15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         12   // 34//27
-#define X_DIR_PIN          13   // 35//26
-#define X_ENABLE_PIN       17   // 0//17//25 // used free pin
-//#define X_CS_PIN            0
+#define X_STEP_PIN                            12  // 34//27
+#define X_DIR_PIN                             13  // 35//26
+#define X_ENABLE_PIN                          17  // 0//17//25 // used free pin
+//#define X_CS_PIN                             0
 
-#define Y_STEP_PIN         32   // 33
-#define Y_DIR_PIN          33   // 32
-#define Y_ENABLE_PIN       X_ENABLE_PIN
-//#define Y_CS_PIN           13
+#define Y_STEP_PIN                            32  // 33
+#define Y_DIR_PIN                             33  // 32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+//#define Y_CS_PIN                            13
 
-#define Z_STEP_PIN         25   // 14
-#define Z_DIR_PIN          26   // 12
-#define Z_ENABLE_PIN       X_ENABLE_PIN
-//#define Z_CS_PIN            5   // SS_PIN
+#define Z_STEP_PIN                            25  // 14
+#define Z_DIR_PIN                             26  // 12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        27   // 16
-#define E0_DIR_PIN         14   // 17
-#define E0_ENABLE_PIN      X_ENABLE_PIN
-//#define E0_CS_PIN          21
+#define E0_STEP_PIN                           27  // 16
+#define E0_DIR_PIN                            14  // 17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2   // 4//2//(D8)
-#define FAN_PIN             0   // 2//15//13 (D9)
-#define HEATER_BED_PIN     15   // 15//0 //(D10)
+#define HEATER_0_PIN                           2  // 4//2//(D8)
+#define FAN_PIN                                0  // 2//15//13 (D9)
+#define HEATER_BED_PIN                        15  // 15//0 //(D10)
 
 // SPI
-#define SDSS                 5
+#define SDSS                                   5
 #define I2S_STEPPER_STREAM
-#define I2S_WS              23
-#define I2S_BCK             22
-#define I2S_DATA            21
+#define I2S_WS                                23
+#define I2S_BCK                               22
+#define I2S_DATA                              21
diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h
index 99a5ea2f76df..e4da400528ed 100644
--- a/Marlin/src/pins/esp32/pins_ESP32.h
+++ b/Marlin/src/pins/esp32/pins_ESP32.h
@@ -35,52 +35,52 @@
 // I2S (steppers & other output-only pins)
 //
 #define I2S_STEPPER_STREAM
-#define I2S_WS              25
-#define I2S_BCK             26
-#define I2S_DATA            27
+#define I2S_WS                                25
+#define I2S_BCK                               26
+#define I2S_DATA                              27
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           34
-#define Y_MIN_PIN           35
-#define Z_MIN_PIN           15
+#define X_MIN_PIN                             34
+#define Y_MIN_PIN                             35
+#define Z_MIN_PIN                             15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         128
-#define X_DIR_PIN          129
-#define X_ENABLE_PIN       130
-//#define X_CS_PIN           0
+#define X_STEP_PIN                           128
+#define X_DIR_PIN                            129
+#define X_ENABLE_PIN                         130
+//#define X_CS_PIN                             0
 
-#define Y_STEP_PIN         131
-#define Y_DIR_PIN          132
-#define Y_ENABLE_PIN       133
-//#define Y_CS_PIN          13
+#define Y_STEP_PIN                           131
+#define Y_DIR_PIN                            132
+#define Y_ENABLE_PIN                         133
+//#define Y_CS_PIN                            13
 
-#define Z_STEP_PIN         134
-#define Z_DIR_PIN          135
-#define Z_ENABLE_PIN       136
-//#define Z_CS_PIN           5 // SS_PIN
+#define Z_STEP_PIN                           134
+#define Z_DIR_PIN                            135
+#define Z_ENABLE_PIN                         136
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        137
-#define E0_DIR_PIN         138
-#define E0_ENABLE_PIN      139
-//#define E0_CS_PIN         21
+#define E0_STEP_PIN                          137
+#define E0_DIR_PIN                           138
+#define E0_ENABLE_PIN                        139
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          36   // Analog Input
-#define TEMP_BED_PIN        39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN         2
-#define FAN_PIN             13
-#define HEATER_BED_PIN       4
+#define HEATER_0_PIN                           2
+#define FAN_PIN                               13
+#define HEATER_BED_PIN                         4
 
 // SPI
-#define SDSS                 5
+#define SDSS                                   5
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index a93f0f05c4aa..8a06f9a1693b 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -45,66 +45,66 @@
 #ifdef I2S_STEPPER_STREAM
   #undef I2S_STEPPER_STREAM
 #endif
-#define I2S_WS              -1
-#define I2S_BCK             -1
-#define I2S_DATA            -1
+#define I2S_WS                                -1
+#define I2S_BCK                               -1
+#define I2S_DATA                              -1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         35
-#define Z_STOP_PIN         15
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            35
+#define Z_STOP_PIN                            15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         27
-#define X_DIR_PIN          26
-#define X_ENABLE_PIN       25
-//#define X_CS_PIN           21
+#define X_STEP_PIN                            27
+#define X_DIR_PIN                             26
+#define X_ENABLE_PIN                          25
+//#define X_CS_PIN                            21
 
-#define Y_STEP_PIN         33
-#define Y_DIR_PIN          32
-#define Y_ENABLE_PIN       X_ENABLE_PIN
-//#define Y_CS_PIN           22
+#define Y_STEP_PIN                            33
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+//#define Y_CS_PIN                            22
 
-#define Z_STEP_PIN         14
-#define Z_DIR_PIN          12
-#define Z_ENABLE_PIN       X_ENABLE_PIN
-//#define Z_CS_PIN            5 // SS_PIN
+#define Z_STEP_PIN                            14
+#define Z_DIR_PIN                             12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        16
-#define E0_DIR_PIN         17
-#define E0_ENABLE_PIN      X_ENABLE_PIN
-//#define E0_CS_PIN          21
+#define E0_STEP_PIN                           16
+#define E0_DIR_PIN                            17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define FAN_PIN            13
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define FAN_PIN                               13
+#define HEATER_BED_PIN                         4
 
 //
 // MicroSD card
 //
-#define MOSI_PIN           23
-#define MISO_PIN           19
-#define SCK_PIN            18
-#define SDSS                5
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN                              23
+#define MISO_PIN                              19
+#define SCK_PIN                               18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 // Hardware serial pins
 // Add the following to Configuration.h or Configuration_adv.h to assign
 // specific pins to hardware Serial1.
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
 // MRR ESPA does not have enough spare pins for such reassignment.
-//#define HARDWARE_SERIAL1_RX 21
-//#define HARDWARE_SERIAL1_TX 22
+//#define HARDWARE_SERIAL1_RX                 21
+//#define HARDWARE_SERIAL1_TX                 22
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 0096027158e9..3dd50489df13 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -43,9 +43,9 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         35
-#define Y_STOP_PIN         32
-#define Z_STOP_PIN         33
+#define X_STOP_PIN                            35
+#define Y_STOP_PIN                            32
+#define Z_STOP_PIN                            33
 
 //
 // Enable I2S stepper stream
@@ -53,72 +53,72 @@
 #undef I2S_STEPPER_STREAM
 #define I2S_STEPPER_STREAM
 
-#undef LIN_ADVANCE  // Currently, I2S stream does not work with linear advance
+#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
 
-#define I2S_WS             26
-#define I2S_BCK            25
-#define I2S_DATA           27
+#define I2S_WS                                26
+#define I2S_BCK                               25
+#define I2S_DATA                              27
 
 //
 // Steppers
 //
-#define X_STEP_PIN        129
-#define X_DIR_PIN         130
-#define X_ENABLE_PIN      128
-//#define X_CS_PIN           21
-
-#define Y_STEP_PIN        132
-#define Y_DIR_PIN         133
-#define Y_ENABLE_PIN      131
-//#define Y_CS_PIN           22
-
-#define Z_STEP_PIN        135
-#define Z_DIR_PIN         136
-#define Z_ENABLE_PIN      134
-//#define Z_CS_PIN            5 // SS_PIN
-
-#define E0_STEP_PIN       138
-#define E0_DIR_PIN        139
-#define E0_ENABLE_PIN     137
-//#define E0_CS_PIN          21
-
-#define E1_STEP_PIN       141
-#define E1_DIR_PIN        142
-#define E1_ENABLE_PIN     140
-//#define E1_CS_PIN          22
-
-#define Z2_STEP_PIN       141
-#define Z2_DIR_PIN        142
-#define Z2_ENABLE_PIN     140
-//#define Z2_CS_PIN            5
+#define X_STEP_PIN                           129
+#define X_DIR_PIN                            130
+#define X_ENABLE_PIN                         128
+//#define X_CS_PIN                            21
+
+#define Y_STEP_PIN                           132
+#define Y_DIR_PIN                            133
+#define Y_ENABLE_PIN                         131
+//#define Y_CS_PIN                            22
+
+#define Z_STEP_PIN                           135
+#define Z_DIR_PIN                            136
+#define Z_ENABLE_PIN                         134
+//#define Z_CS_PIN                             5  // SS_PIN
+
+#define E0_STEP_PIN                          138
+#define E0_DIR_PIN                           139
+#define E0_ENABLE_PIN                        137
+//#define E0_CS_PIN                           21
+
+#define E1_STEP_PIN                          141
+#define E1_DIR_PIN                           142
+#define E1_ENABLE_PIN                        140
+//#define E1_CS_PIN                           22
+
+#define Z2_STEP_PIN                          141
+#define Z2_DIR_PIN                           142
+#define Z2_ENABLE_PIN                        140
+//#define Z2_CS_PIN                            5
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_1_PIN         34   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_1_PIN                            34  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN      145 // 2
-#define FAN_PIN           146 // 15
-#define HEATER_BED_PIN    144 // 4
+#define HEATER_0_PIN                         145  // 2
+#define FAN_PIN                              146  // 15
+#define HEATER_BED_PIN                       144  // 4
 
-#define CONTROLLER_FAN_PIN 147
-//#define E0_AUTO_FAN_PIN 148 // need to update Configuration_adv.h @section extruder
-//#define E1_AUTO_FAN_PIN 149 // need to update Configuration_adv.h @section extruder
-#define FAN1_PIN 149
+#define CONTROLLER_FAN_PIN                   147
+//#define E0_AUTO_FAN_PIN                    148  // need to update Configuration_adv.h @section extruder
+//#define E1_AUTO_FAN_PIN                    149  // need to update Configuration_adv.h @section extruder
+#define FAN1_PIN                             149
 
 //
 // MicroSD card
 //
-#define MOSI_PIN           23
-#define MISO_PIN           19
-#define SCK_PIN            18
-#define SDSS                5
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN                              23
+#define MISO_PIN                              19
+#define SCK_PIN                               18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 //////////////////////////
 // LCDs and Controllers //
@@ -126,21 +126,21 @@
 
 #if HAS_GRAPHICAL_LCD
 
-  #define LCD_PINS_RS        13
-  #define LCD_PINS_ENABLE    17
-  #define LCD_PINS_D4        16
+  #define LCD_PINS_RS                         13
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         16
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN      151
+    #define BEEPER_PIN                       151
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      151
+    #define BEEPER_PIN                       151
 
-    //#define LCD_PINS_D5     150
-    //#define LCD_PINS_D6     152
-    //#define LCD_PINS_D7     153
+    //#define LCD_PINS_D5                    150
+    //#define LCD_PINS_D6                    152
+    //#define LCD_PINS_D7                    153
 
   #else
 
@@ -148,9 +148,9 @@
 
   #endif
 
-  #define BTN_EN1             0
-  #define BTN_EN2            12
-  #define BTN_ENC            14
+  #define BTN_EN1                              0
+  #define BTN_EN2                             12
+  #define BTN_ENC                             14
 
 #endif // HAS_GRAPHICAL_LCD
 
@@ -159,7 +159,7 @@
 // specific pins to hardware Serial1 and Serial2.
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
 // MRR ESPA does not have enough spare pins for such reassignment.
-//#define HARDWARE_SERIAL1_RX 21
-//#define HARDWARE_SERIAL1_TX 22
-//#define HARDWARE_SERIAL2_RX  2
-//#define HARDWARE_SERIAL2_TX  4
+//#define HARDWARE_SERIAL1_RX                 21
+//#define HARDWARE_SERIAL1_TX                 22
+//#define HARDWARE_SERIAL2_RX                  2
+//#define HARDWARE_SERIAL2_TX                  4
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index b1f7ecee387d..0bfbaabdcd6a 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -49,7 +49,7 @@
   #define BOARD_INFO_NAME "RAMPS 1.4"
 #endif
 
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 #define IS_RAMPS_EFB
 
@@ -57,85 +57,85 @@
 // Servos
 //
 #ifdef IS_RAMPS_13
-  #define SERVO0_PIN        7   // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
+  #define SERVO0_PIN                           7  // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
 #else
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
 #endif
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -159,72 +159,72 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                        -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN      8
+  #define RAMPS_D8_PIN                         8
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN      9
+  #define RAMPS_D9_PIN                         9
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    10
+  #define RAMPS_D10_PIN                       10
 #endif
 
-#define HEATER_0_PIN     RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN   RAMPS_D9_PIN
-  #define FAN_PIN        RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN   RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define FAN1_PIN       RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
-  #define FAN_PIN        RAMPS_D8_PIN
-#else                                          // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define FAN_PIN                   RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_SF)                        // Spindle, Fan
+  #define FAN_PIN                   RAMPS_D8_PIN
+#else                                             // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN     MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // IO pin. Buffer needed
+  #define FAN_PIN                              4  // IO pin. Buffer needed
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
-  #elif HAS_FREE_AUX2_PINS        // try to use AUX 2
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -232,14 +232,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif HAS_FREE_AUX2_PINS                // try to use AUX 2
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -247,13 +247,13 @@
 // Průša i3 MK2 Multiplexer Support
 //
 #ifndef E_MUX0_PIN
-  #define E_MUX0_PIN 40   // Z_CS_PIN
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
 #endif
 #ifndef E_MUX1_PIN
-  #define E_MUX1_PIN 42   // E0_CS_PIN
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
 #endif
 #ifndef E_MUX2_PIN
-  #define E_MUX2_PIN 44   // E1_CS_PIN
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
 #endif
 
 /**
@@ -261,13 +261,13 @@
  */
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
@@ -295,91 +295,91 @@
    */
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -394,62 +394,62 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS         40
-    #define LCD_PINS_ENABLE     42
-    #define LCD_PINS_D4         65
-    #define LCD_PINS_D5         66
-    #define LCD_PINS_D6         44
-    #define LCD_PINS_D7         64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS       27
-      #define LCD_PINS_ENABLE   29
-      #define LCD_PINS_D4       25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      37
+        #define BEEPER_PIN                    37
       #endif
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define LCD_PINS_RS       64
-      #define LCD_PINS_ENABLE   44
-      #define LCD_PINS_D4       63
-      #define LCD_PINS_D5       40
-      #define LCD_PINS_D6       42
-      #define LCD_PINS_D7       65
+      #define LCD_PINS_RS                     64
+      #define LCD_PINS_ENABLE                 44
+      #define LCD_PINS_D4                     63
+      #define LCD_PINS_D5                     40
+      #define LCD_PINS_D6                     42
+      #define LCD_PINS_D7                     65
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC     25   // Set as output on init
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS       16
-        #define DOGLCD_MOSI     17
-        #define DOGLCD_SCK      23
-        #define DOGLCD_A0       LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS     16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     23
-        #define LCD_PINS_D5     25
-        #define LCD_PINS_D6     27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7       29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -457,10 +457,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -472,85 +472,85 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1         17
-        #define BTN_EN2         23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC           35
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          SDSS
-      #define KILL_PIN          41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                      SDSS
+      #define KILL_PIN                        41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-      #define BTN_ENC           -1
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS         45
-      #define DOGLCD_A0         44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN        33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
-      #define KILL_PIN          31
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display sd interface, 72 for easy adapter board
+      #define KILL_PIN                        31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN        23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
     #elif ENABLED(MKS_MINI_12864)
 
-      #define DOGLCD_A0         27
-      #define DOGLCD_CS         25
+      #define DOGLCD_A0                       27
+      #define DOGLCD_CS                       25
 
       // GLCD features
       // Uncomment screen orientation
@@ -558,25 +558,25 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1                         31
+      #define BTN_EN2                         33
+      #define BTN_ENC                         35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
       // Uncomment screen orientation
@@ -584,16 +584,16 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define ADC_KEYPAD_PIN    12
+      #define ADC_KEYPAD_PIN                  12
 
     #elif ENABLED(AZSMZ_12864)
 
@@ -602,29 +602,29 @@
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
+        #define SHIFT_OUT                     40
+        #define SHIFT_CLK                     44
+        #define SHIFT_LD                      42
+        #define BTN_EN1                       64
+        #define BTN_EN2                       59
+        #define BTN_ENC                       63
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN                 49
+        #define KILL_PIN                      41
       #endif
 
     #endif
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index ef064694abad..1417fb7d9915 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -40,84 +40,84 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define Y_MIN_PIN          P1_26
-#define Z_MIN_PIN          P1_28
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define Y_MIN_PIN                          P1_26
+#define Z_MIN_PIN                          P1_28
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (TH1)
-#define TEMP_BED_PIN        P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
+#define TEMP_0_PIN                      P0_23_A0  // A0 (TH1)
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 // EFB
-#define HEATER_0_PIN       P2_04
-#define HEATER_BED_PIN     P2_05
+#define HEATER_0_PIN                       P2_04
+#define HEATER_BED_PIN                     P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_07
+  #define FAN_PIN                          P2_07
 #endif
-#define FAN1_PIN           P0_26
+#define FAN1_PIN                           P0_26
 
-#define LCD_SDSS           P0_16   // LCD SD chip select
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define LCD_SDSS                           P0_16  // LCD SD chip select
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if ENABLED(AZSMZ_12864)
-  #define BEEPER_PIN       P1_30
-  #define DOGLCD_A0        P2_06
-  #define DOGLCD_CS        P1_22
-  #define BTN_EN1          P4_28
-  #define BTN_EN2          P1_27
-  #define BTN_ENC          P3_26
+  #define BEEPER_PIN                       P1_30
+  #define DOGLCD_A0                        P2_06
+  #define DOGLCD_CS                        P1_22
+  #define BTN_EN1                          P4_28
+  #define BTN_EN2                          P1_27
+  #define BTN_ENC                          P3_26
   #ifndef SDCARD_CONNECTION
-    #define SDCARD_CONNECTION LCD
+    #define SDCARD_CONNECTION                LCD
   #endif
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           LCD_SDSS
-  #define SD_DETECT_PIN    P3_25
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                        LCD_SDSS
+  #define SD_DETECT_PIN                    P3_25
 #elif SD_CONNECTION_IS(ONBOARD)
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -125,16 +125,16 @@
 //
 // Ethernet pins
 //
-#define ENET_MDIO          P1_17
-#define ENET_RX_ER         P1_14
-#define ENET_RXD1          P1_10
-#define ENET_MOC           P1_16
-#define REF_CLK            P1_15
-#define ENET_RXD0          P1_09
-#define ENET_CRS           P1_08
-#define ENET_TX_EN         P1_04
-#define ENET_TXD0          P1_00
-#define ENET_TXD1          P1_01
+#define ENET_MDIO                          P1_17
+#define ENET_RX_ER                         P1_14
+#define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
+#define ENET_TXD0                          P1_00
+#define ENET_TXD1                          P1_01
 
 /**
  *  PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
index a4800dcc73d5..d710138b956e 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -47,42 +47,42 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_15   // ETH
+  #define X_CS_PIN                         P1_15  // ETH
 #endif
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_14   // ETH
+  #define Y_CS_PIN                         P1_14  // ETH
 #endif
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_16   // ETH
+  #define Z_CS_PIN                         P1_16  // ETH
 #endif
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_17   // ETH
+  #define E0_CS_PIN                        P1_17  // ETH
 #endif
 
 //
@@ -90,13 +90,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P0_18   // ETH
+    #define TMC_SW_MOSI                    P0_18  // ETH
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_17   // ETH
+    #define TMC_SW_MISO                    P0_17  // ETH
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_15   // ETH
+    #define TMC_SW_SCK                     P0_15  // ETH
   #endif
 #endif
 
@@ -104,23 +104,23 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_24_A1   // A0 (T0)
-#define TEMP_BED_PIN        P0_23_A0   // A1 (T1)
+#define TEMP_0_PIN                      P0_24_A1  // A0 (T0)
+#define TEMP_BED_PIN                    P0_23_A0  // A1 (T1)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       P2_07
-#define HEATER_BED_PIN     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_BED_PIN                     P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
 // Unused
 //
-//#define PIN_P2_10        P2_10   // IBOOT-1
-//#define PIN_P0_27        P0_27   // Onboard SD Detect
+//#define PIN_P2_10                        P2_10  // IBOOT-1
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
 
 /**
  * LCD / Controller
@@ -134,16 +134,16 @@
  */
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       P1_31   // EXP1-1
+  #define BEEPER_PIN                       P1_31  // EXP1-1
 
-  #define BTN_EN1          P3_26   // EXP2-3
-  #define BTN_EN2          P3_25   // EXP2-5
-  #define BTN_ENC          P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-3
+  #define BTN_EN2                          P3_25  // EXP2-5
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define SD_DETECT_PIN    P0_27   // EXP2-7
-  #define LCD_PINS_RS      P0_16   // EXP1-4
-  #define LCD_PINS_ENABLE  P0_18   // (MOSI) EXP1-3
-  #define LCD_PINS_D4      P0_15   // (SCK)  EXP1-5
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
@@ -162,11 +162,11 @@
  * Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
  */
 #if ENABLED(SDSUPPORT)
-  #define SCK_PIN          P0_15   // EXP1-5
-  #define MISO_PIN         P0_16   // EXP1-4
-  #define MOSI_PIN         P0_18   // EXP1-3
-  #define SS_PIN           P1_30   // EXP1-2
-  #define SDSS             SS_PIN
+  #define SCK_PIN                          P0_15  // EXP1-5
+  #define MISO_PIN                         P0_16  // EXP1-4
+  #define MOSI_PIN                         P0_18  // EXP1-3
+  #define SS_PIN                           P1_30  // EXP1-2
+  #define SDSS                            SS_PIN
 #endif
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index 549b44019a42..041235d49352 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -45,56 +45,53 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN         P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN         P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN         P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN         P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN         P1_28   // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN         P1_29   // 10k pullup to 3.3V, 1K series
-
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_0
-#define X_DIR_PIN          P0_5
-#define X_ENABLE_PIN       P0_4
-
-#define Y_STEP_PIN         P2_1
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_0
+#define X_DIR_PIN                          P0_5
+#define X_ENABLE_PIN                       P0_4
 
-#define Z_STEP_PIN         P2_2
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_1
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define E0_STEP_PIN        P2_3
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define Z_STEP_PIN                         P2_2
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
+#define E0_STEP_PIN                        P2_3
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
 //
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0)
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1)
-
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0)
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       P2_7
-#define HEATER_BED_PIN     P2_5
+#define HEATER_0_PIN                       P2_7
+#define HEATER_BED_PIN                     P2_5
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_4
+  #define FAN_PIN                          P2_4
 #endif
 
 //
 // Unused
 //
-//#define PIN_P2_10         P2_10   // IBOOT-1
-//#define PIN_P0_27         P0_27   // Onboard SD Detect
+//#define PIN_P2_10                        P2_10  // IBOOT-1
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
 
 /**
  * LCD / Controller
@@ -108,16 +105,16 @@
  */
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN          P1_31   // EXP1-1
+  #define BEEPER_PIN                       P1_31  // EXP1-1
 
-  #define BTN_EN1             P3_26   // EXP2-3
-  #define BTN_EN2             P3_25   // EXP2-5
-  #define BTN_ENC             P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-3
+  #define BTN_EN2                          P3_25  // EXP2-5
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define SD_DETECT_PIN       P0_27   // EXP2-7
-  #define LCD_PINS_RS         P0_16   // EXP1-4
-  #define LCD_PINS_ENABLE     P0_18   // (MOSI) EXP1-3
-  #define LCD_PINS_D4         P0_15   // (SCK)  EXP1-5
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
@@ -129,7 +126,6 @@
 
 #endif // HAS_SPI_LCD
 
-
 /**
  * SD Card Reader
  *
@@ -138,15 +134,14 @@
  */
 #if ENABLED(SDSUPPORT)
 
-  #define SCK_PIN   P0_15   // EXP1-5
-  #define MISO_PIN  P0_16   // EXP1-4
-  #define MOSI_PIN  P0_18   // EXP1-3
-  #define SS_PIN    P1_30   // EXP1-2
-  #define SDSS      SS_PIN
+  #define SCK_PIN                          P0_15  // EXP1-5
+  #define MISO_PIN                         P0_16  // EXP1-4
+  #define MOSI_PIN                         P0_18  // EXP1-3
+  #define SS_PIN                           P1_30  // EXP1-2
+  #define SDSS                            SS_PIN
 
 #endif // SDSUPPORT
 
-
 /**
  *  PWMS
  *
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index feadafa5922d..4dae2dc5d630 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -33,31 +33,31 @@
 // Limit Switches
 //
 
-#define X_MIN_PIN          P1_29
-#define X_MAX_PIN          P1_28
-#define Y_MIN_PIN          P1_27
-#define Y_MAX_PIN          P1_26
-#define Z_MIN_PIN          P1_25
-#define Z_MAX_PIN          P1_24
+#define X_MIN_PIN                          P1_29
+#define X_MAX_PIN                          P1_28
+#define Y_MIN_PIN                          P1_27
+#define Y_MAX_PIN                          P1_26
+#define Z_MIN_PIN                          P1_25
+#define Z_MAX_PIN                          P1_24
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P0_04
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P4_28
+#define X_STEP_PIN                         P0_04
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P4_28
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P2_02
-#define Y_ENABLE_PIN       P2_00
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P2_02
+#define Y_ENABLE_PIN                       P2_00
 
-#define Z_STEP_PIN         P0_20
-#define Z_DIR_PIN          P0_21
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P0_20
+#define Z_DIR_PIN                          P0_21
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P0_11
-#define E0_DIR_PIN         P2_13
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P0_11
+#define E0_DIR_PIN                         P2_13
+#define E0_ENABLE_PIN                      P2_12
 
 /**
  * LCD / Controller
@@ -73,19 +73,19 @@
  */
 
 #if HAS_SPI_LCD
-  #define BTN_EN1          P3_26
-  #define BTN_EN2          P3_25
-  #define BTN_ENC          P2_11
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P2_11
 
-  #define SD_DETECT_PIN    P1_31
-  #define LCD_SDSS         P1_23
-  #define LCD_PINS_RS      P0_16
-  #define LCD_PINS_ENABLE  P0_18
-  #define LCD_PINS_D4      P0_15
+  #define SD_DETECT_PIN                    P1_31
+  #define LCD_SDSS                         P1_23
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      P2_06
-    #define DOGLCD_A0      P0_16
+    #define DOGLCD_CS                      P2_06
+    #define DOGLCD_A0                      P0_16
   #endif
 #endif
 
@@ -97,14 +97,14 @@
 // https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
 #ifndef SDCARD_CONNECTION
   #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
-    #define SDCARD_CONNECTION LCD
+    #define SDCARD_CONNECTION                LCD
   #else
-    #define SDCARD_CONNECTION ONBOARD
+    #define SDCARD_CONNECTION            ONBOARD
   #endif
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P1_23
+  #define SS_PIN                           P1_23
 #endif
 
 // Trinamic driver support
@@ -137,49 +137,48 @@
   // When using any TMC SPI-based drivers, software SPI is used
   // because pins may be shared with the display or SD card.
   #define TMC_USE_SW_SPI
-  #define TMC_SW_MOSI       P0_18
-  #define TMC_SW_MISO       P0_17
+  #define TMC_SW_MOSI                      P0_18
+  #define TMC_SW_MISO                      P0_17
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
-  #define TMC_SW_SCK        P0_15
+  #define TMC_SW_SCK                       P0_15
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
-  //#define TMC_SW_SCK        P2_06
+  //#define TMC_SW_SCK                     P2_06
 
   #if ENABLED(SOFTWARE_DRIVER_ENABLE)
 
     // Software enable allows the enable pins to be repurposed as chip-select pins.
     // Note: Requires the driver modules to be modified to always be enabled with the enable pin removed.
     #if AXIS_DRIVER_TYPE_X(TMC2130)
-      #define X_CS_PIN         P4_28
-      #undef  X_ENABLE_PIN
-      #define X_ENABLE_PIN     -1
+      #define X_CS_PIN                     P4_28
+      #undef X_ENABLE_PIN
+      #define X_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_Y(TMC2130)
-      #define Y_CS_PIN         P2_00
-      #undef  Y_ENABLE_PIN
-      #define Y_ENABLE_PIN     -1
+      #define Y_CS_PIN                     P2_00
+      #undef Y_ENABLE_PIN
+      #define Y_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_Z(TMC2130)
-      #define Z_CS_PIN         P0_19
-      #undef  Z_ENABLE_PIN
-      #define Z_ENABLE_PIN     -1
+      #define Z_CS_PIN                     P0_19
+      #undef Z_ENABLE_PIN
+      #define Z_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_E0(TMC2130)
-      #define E0_CS_PIN        P2_12
-      #undef  E0_ENABLE_PIN
-      #define E0_ENABLE_PIN    -1
+      #define E0_CS_PIN                    P2_12
+      #undef E0_ENABLE_PIN
+      #define E0_ENABLE_PIN                -1
     #endif
 
-
     #if AXIS_DRIVER_TYPE_E1(TMC2130)
-      #define E1_CS_PIN        P0_10
-      #undef  E1_ENABLE_PIN
-      #define E1_ENABLE_PIN    -1
+      #define E1_CS_PIN                    P0_10
+      #undef E1_ENABLE_PIN
+      #define E1_ENABLE_PIN                -1
     #endif
 
-  #else // !SOFTWARE_DRIVER_ENABLE
+  #else                                           // !SOFTWARE_DRIVER_ENABLE
 
     // A chip-select pin is needed for each driver.
 
@@ -192,11 +191,11 @@
       #if SD_CONNECTION_IS(LCD)
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
       #endif
-      #define X_CS_PIN      P1_23
-      #define Y_CS_PIN      P3_26
-      #define Z_CS_PIN      P2_11
-      #define E0_CS_PIN     P3_25
-      #define E1_CS_PIN     P1_31
+      #define X_CS_PIN                     P1_23
+      #define Y_CS_PIN                     P3_26
+      #define Z_CS_PIN                     P2_11
+      #define E0_CS_PIN                    P3_25
+      #define E1_CS_PIN                    P1_31
     #endif
 
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -207,16 +206,16 @@
       #if SD_CONNECTION_IS(LCD)
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
       #endif
-      #define X_CS_PIN      P0_02
-      #define Y_CS_PIN      P0_03
-      #define Z_CS_PIN      P2_06
+      #define X_CS_PIN                     P0_02
+      #define Y_CS_PIN                     P0_03
+      #define Z_CS_PIN                     P2_06
       // We use SD_DETECT_PIN for E0
       #undef SD_DETECT_PIN
-      #define E0_CS_PIN     P1_31
+      #define E0_CS_PIN                    P1_31
       // We use LCD_SDSS pin for E1
-      #undef  LCD_SDSS
-      #define LCD_SDSS      -1
-      #define E1_CS_PIN     P1_23
+      #undef LCD_SDSS
+      #define LCD_SDSS                     -1
+      #define E1_CS_PIN                    P1_23
     #endif
 
     // Example 3: Use the driver enable pins for chip-select.
@@ -224,11 +223,11 @@
     //            advanced features (like driver monitoring) will not be available.
     //#define SKR_USE_ENABLE_CS
     #if ENABLED(SKR_USE_ENABLE_FOR_CS)
-      #define X_CS_PIN      X_ENABLE_PIN
-      #define Y_CS_PIN      Y_ENABLE_PIN
-      #define Z_CS_PIN      Z_ENABLE_PIN
-      #define E0_CS_PIN     E0_ENABLE_PIN
-      #define E1_CS_PIN     E1_ENABLE_PIN
+      #define X_CS_PIN              X_ENABLE_PIN
+      #define Y_CS_PIN              Y_ENABLE_PIN
+      #define Z_CS_PIN              Z_ENABLE_PIN
+      #define E0_CS_PIN            E0_ENABLE_PIN
+      #define E1_CS_PIN            E1_ENABLE_PIN
     #endif
 
   #endif // SOFTWARE_DRIVER_ENABLE
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index adf726f02455..1d1ad60f2474 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -32,107 +32,107 @@
 /**
  * Trinamic Stallguard pins
  */
-#define X_DIAG_PIN           P1_29   // X-
-#define Y_DIAG_PIN           P1_27   // Y-
-#define Z_DIAG_PIN           P1_25   // Z-
-#define E0_DIAG_PIN          P1_28   // X+
-#define E1_DIAG_PIN          P1_26   // Y+
+#define X_DIAG_PIN                         P1_29  // X-
+#define Y_DIAG_PIN                         P1_27  // Y-
+#define Z_DIAG_PIN                         P1_25  // Z-
+#define E0_DIAG_PIN                        P1_28  // X+
+#define E1_DIAG_PIN                        P1_26  // Y+
 
 /**
  * Limit Switches
  */
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN         X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN        P1_28   // X+
+    #define X_MAX_PIN                      P1_28  // X+
   #else
-    #define X_MIN_PIN        P1_28   // X+
+    #define X_MIN_PIN                      P1_28  // X+
   #endif
 #else
-  #define X_MIN_PIN          P1_29   // X-
-  #define X_MAX_PIN          P1_28   // X+
+  #define X_MIN_PIN                        P1_29  // X-
+  #define X_MAX_PIN                        P1_28  // X+
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN         Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN        P1_26   // Y+
+    #define Y_MAX_PIN                      P1_26  // Y+
   #else
-    #define Y_MIN_PIN        P1_26   // Y+
+    #define Y_MIN_PIN                      P1_26  // Y+
   #endif
 #else
-  #define Y_MIN_PIN          P1_27   // Y-
-  #define Y_MAX_PIN          P1_26   // Y+
+  #define Y_MIN_PIN                        P1_27  // Y-
+  #define Y_MAX_PIN                        P1_26  // Y+
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN         Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN        P1_24   // Z+
+    #define Z_MAX_PIN                      P1_24  // Z+
   #else
-    #define Z_MIN_PIN        P1_24   // Z+
+    #define Z_MIN_PIN                      P1_24  // Z+
   #endif
 #else
-  #define Z_MIN_PIN          P1_25   // Z-
-  #define Z_MAX_PIN          P1_24   // Z+
+  #define Z_MIN_PIN                        P1_25  // Z-
+  #define Z_MAX_PIN                        P1_24  // Z+
 #endif
 
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
 
 //
 // Servos
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN       P2_00
+  #define SERVO0_PIN                       P2_00
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_24
+  #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_28
+  #define FIL_RUNOUT_PIN                   P1_28
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_06
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_06
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_17
+  #define X_CS_PIN                         P1_17
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_15
+  #define Y_CS_PIN                         P1_15
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10
+  #define Z_CS_PIN                         P1_10
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_08
+  #define E0_CS_PIN                        P1_08
 #endif
 
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN                        P1_01
 #endif
 
 //
@@ -140,13 +140,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P4_28
+    #define TMC_SW_MOSI                    P4_28
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
@@ -172,20 +172,20 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P4_29
-  #define X_SERIAL_RX_PIN  P1_17
+  #define X_SERIAL_TX_PIN                  P4_29
+  #define X_SERIAL_RX_PIN                  P1_17
 
-  #define Y_SERIAL_TX_PIN  P1_16
-  #define Y_SERIAL_RX_PIN  P1_15
+  #define Y_SERIAL_TX_PIN                  P1_16
+  #define Y_SERIAL_RX_PIN                  P1_15
 
-  #define Z_SERIAL_TX_PIN  P1_14
-  #define Z_SERIAL_RX_PIN  P1_10
+  #define Z_SERIAL_TX_PIN                  P1_14
+  #define Z_SERIAL_RX_PIN                  P1_10
 
-  #define E0_SERIAL_TX_PIN P1_09
-  #define E0_SERIAL_RX_PIN P1_08
+  #define E0_SERIAL_TX_PIN                 P1_09
+  #define E0_SERIAL_RX_PIN                 P1_08
 
-  #define E1_SERIAL_TX_PIN P1_04
-  #define E1_SERIAL_RX_PIN P1_01
+  #define E1_SERIAL_TX_PIN                 P1_04
+  #define E1_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -202,23 +202,23 @@
  *               EXP2                                               EXP1
  */
 
-#define EXPA1_03_PIN        P1_23
-#define EXPA1_04_PIN        P1_22
-#define EXPA1_05_PIN        P1_21
-#define EXPA1_06_PIN        P1_20
-#define EXPA1_07_PIN        P1_19
-#define EXPA1_08_PIN        P1_18
-#define EXPA1_09_PIN        P0_28
-#define EXPA1_10_PIN        P1_30
-
-#define EXPA2_03_PIN        -1
-#define EXPA2_04_PIN        P1_31
-#define EXPA2_05_PIN        P0_18
-#define EXPA2_06_PIN        P3_25
-#define EXPA2_07_PIN        P0_16
-#define EXPA2_08_PIN        P3_26
-#define EXPA2_09_PIN        P0_15
-#define EXPA2_10_PIN        P0_17
+#define EXPA1_03_PIN                       P1_23
+#define EXPA1_04_PIN                       P1_22
+#define EXPA1_05_PIN                       P1_21
+#define EXPA1_06_PIN                       P1_20
+#define EXPA1_07_PIN                       P1_19
+#define EXPA1_08_PIN                       P1_18
+#define EXPA1_09_PIN                       P0_28
+#define EXPA1_10_PIN                       P1_30
+
+#define EXPA2_03_PIN                       -1
+#define EXPA2_04_PIN                       P1_31
+#define EXPA2_05_PIN                       P0_18
+#define EXPA2_06_PIN                       P3_25
+#define EXPA2_07_PIN                       P0_16
+#define EXPA2_08_PIN                       P3_26
+#define EXPA2_09_PIN                       P0_15
+#define EXPA2_10_PIN                       P0_17
 
 #if HAS_SPI_LCD
 
@@ -247,75 +247,75 @@
     *                   LCD                             LCD
     */
 
-    #define LCD_PINS_RS    EXPA1_03_PIN
+    #define LCD_PINS_RS             EXPA1_03_PIN
 
-    #define BTN_EN1        EXPA1_06_PIN
-    #define BTN_EN2        EXPA1_04_PIN
-    #define BTN_ENC        EXPA1_08_PIN
+    #define BTN_EN1                 EXPA1_06_PIN
+    #define BTN_EN2                 EXPA1_04_PIN
+    #define BTN_ENC                 EXPA1_08_PIN
 
-    #define LCD_PINS_ENABLE EXPA1_05_PIN
-    #define LCD_PINS_D4    EXPA1_07_PIN
+    #define LCD_PINS_ENABLE         EXPA1_05_PIN
+    #define LCD_PINS_D4             EXPA1_07_PIN
 
   #elif ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    EXPA1_04_PIN
+    #define LCD_PINS_RS             EXPA1_04_PIN
 
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
 
-  #else // !CR10_STOCKDISPLAY
+  #else                                           // !CR10_STOCKDISPLAY
 
-    #define LCD_PINS_RS    EXPA1_07_PIN
+    #define LCD_PINS_RS             EXPA1_07_PIN
 
-    #define BTN_EN1        EXPA2_08_PIN   // (31) J3-2 & AUX-4
-    #define BTN_EN2        EXPA2_06_PIN   // (33) J3-4 & AUX-4
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
+    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
+    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXPA1_08_PIN
-    #define LCD_PINS_D4    EXPA1_06_PIN
+    #define LCD_PINS_ENABLE         EXPA1_08_PIN
+    #define LCD_PINS_D4             EXPA1_06_PIN
 
-    #define LCD_SDSS       EXPA2_07_PIN   // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN  EXPA2_04_PIN   // (49) (NOT 5V tolerant)
+    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
+    #define SD_DETECT_PIN           EXPA2_04_PIN  // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    EXPA1_08_PIN
-      #define DOGLCD_A0    EXPA1_07_PIN
-      #define DOGLCD_SCK   EXPA2_09_PIN
-      #define DOGLCD_MOSI  EXPA2_05_PIN
+      #define DOGLCD_CS             EXPA1_08_PIN
+      #define DOGLCD_A0             EXPA1_07_PIN
+      #define DOGLCD_SCK            EXPA2_09_PIN
+      #define DOGLCD_MOSI           EXPA2_05_PIN
 
-      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_BACKLIGHT_PIN            -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN EXPA1_06_PIN   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN EXPA1_05_PIN
+          #define RGB_LED_R_PIN     EXPA1_05_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN EXPA1_04_PIN
+          #define RGB_LED_G_PIN     EXPA1_04_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN EXPA1_03_PIN
+          #define RGB_LED_B_PIN     EXPA1_03_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    EXPA1_05_PIN
+        #define NEOPIXEL_PIN        EXPA1_05_PIN
       #endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_CS    EXPA1_05_PIN
-        #define DOGLCD_A0    EXPA1_04_PIN
-        #define DOGLCD_SCK   EXPA2_09_PIN
-        #define DOGLCD_MOSI  EXPA2_05_PIN
+        #define DOGLCD_CS           EXPA1_05_PIN
+        #define DOGLCD_A0           EXPA1_04_PIN
+        #define DOGLCD_SCK          EXPA2_09_PIN
+        #define DOGLCD_MOSI         EXPA2_05_PIN
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 
@@ -331,21 +331,21 @@
          *                    EXP1
          */
 
-        #define BTN_EN1      EXPA1_08_PIN
-        #define BTN_EN2      EXPA1_06_PIN
-        #define BTN_ENC      EXPA1_09_PIN
-        #define DOGLCD_CS    EXPA1_04_PIN
-        #define DOGLCD_A0    EXPA1_05_PIN
-        #define DOGLCD_SCK   EXPA1_10_PIN
-        #define DOGLCD_MOSI  EXPA1_03_PIN
+        #define BTN_EN1             EXPA1_08_PIN
+        #define BTN_EN2             EXPA1_06_PIN
+        #define BTN_ENC             EXPA1_09_PIN
+        #define DOGLCD_CS           EXPA1_04_PIN
+        #define DOGLCD_A0           EXPA1_05_PIN
+        #define DOGLCD_SCK          EXPA1_10_PIN
+        #define DOGLCD_MOSI         EXPA1_03_PIN
         #define FORCE_SOFT_SPI
-        #define LCD_BACKLIGHT_PIN -1
+        #define LCD_BACKLIGHT_PIN          -1
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 EXPA1_05_PIN
-        #define LCD_PINS_D6 EXPA1_04_PIN
-        #define LCD_PINS_D7 EXPA1_03_PIN
+        #define LCD_PINS_D5         EXPA1_05_PIN
+        #define LCD_PINS_D6         EXPA1_04_PIN
+        #define LCD_PINS_D7         EXPA1_03_PIN
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -359,11 +359,11 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           EXPA2_07_PIN
+  #define SS_PIN                    EXPA2_07_PIN
 #endif
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 00c66521e645..7e722ea45f86 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -37,58 +37,58 @@
 // SD Connection
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 //
 // Servos
 //
-#define SERVO0_PIN         P2_00
+#define SERVO0_PIN                         P2_00
 
 //
 // TMC StallGuard DIAG pins
 //
-#define X_DIAG_PIN         P1_29   // X-STOP
-#define Y_DIAG_PIN         P1_28   // Y-STOP
-#define Z_DIAG_PIN         P1_27   // Z-STOP
-#define E0_DIAG_PIN        P1_26   // E0DET
-#define E1_DIAG_PIN        P1_25   // E1DET
+#define X_DIAG_PIN                         P1_29  // X-STOP
+#define Y_DIAG_PIN                         P1_28  // Y-STOP
+#define Z_DIAG_PIN                         P1_27  // Z-STOP
+#define E0_DIAG_PIN                        P1_26  // E0DET
+#define E1_DIAG_PIN                        P1_25  // E1DET
 
 //
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN       X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN      P1_26   // E0DET
+    #define X_MAX_PIN                      P1_26  // E0DET
   #else
-    #define X_MIN_PIN      P1_26   // E0DET
+    #define X_MIN_PIN                      P1_26  // E0DET
   #endif
 #else
-  #define X_STOP_PIN       P1_29   // X-STOP
+  #define X_STOP_PIN                       P1_29  // X-STOP
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN      P1_25   // E1DET
+    #define Y_MAX_PIN                      P1_25  // E1DET
   #else
-    #define Y_MIN_PIN      P1_25   // E1DET
+    #define Y_MIN_PIN                      P1_25  // E1DET
   #endif
 #else
-  #define Y_STOP_PIN       P1_28   // Y-STOP
+  #define Y_STOP_PIN                       P1_28  // Y-STOP
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN       Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_00   // PWRDET
+    #define Z_MAX_PIN                      P1_00  // PWRDET
   #else
-    #define Z_MIN_PIN      P1_00   // PWRDET
+    #define Z_MIN_PIN                      P1_00  // PWRDET
   #endif
 #else
   #ifndef Z_STOP_PIN
-    #define Z_STOP_PIN     P1_27   // Z-STOP
+    #define Z_STOP_PIN                     P1_27  // Z-STOP
   #endif
 #endif
 
@@ -96,82 +96,82 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P0_10
+  #define Z_MIN_PROBE_PIN                  P0_10
 #endif
 
 //
 // Filament Runout Sensor
 //
-#define FIL_RUNOUT_PIN     P1_26   // E0DET
-#define FIL_RUNOUT2_PIN    P1_25   // E1DET
+#define FIL_RUNOUT_PIN                     P1_26  // E0DET
+#define FIL_RUNOUT2_PIN                    P1_25  // E1DET
 
 //
 // Power Supply Control
 //
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        P1_00   // PWRDET
+  #define PS_ON_PIN                        P1_00  // PWRDET
 #endif
 
 //
 // Power Loss Detection
 //
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN   P1_00   // PWRDET
+  #define POWER_LOSS_PIN                   P1_00  // PWRDET
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_06
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_06
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_10
+  #define X_CS_PIN                         P1_10
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_09
+  #define Y_CS_PIN                         P1_09
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_08
+  #define Z_CS_PIN                         P1_08
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_04
+  #define E0_CS_PIN                        P1_04
 #endif
 
-#define E1_STEP_PIN        P1_15
-#define E1_DIR_PIN         P1_14
-#define E1_ENABLE_PIN      P1_16
+#define E1_STEP_PIN                        P1_15
+#define E1_DIR_PIN                         P1_14
+#define E1_ENABLE_PIN                      P1_16
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN                        P1_01
 #endif
 
-#define TEMP_1_PIN         P0_23_A0   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_BED_PIN       P0_25_A2   // A0 (T0) - (67) - TEMP_BED_PIN
+#define TEMP_1_PIN                      P0_23_A0  // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_BED_PIN                    P0_25_A2  // A0 (T0) - (67) - TEMP_BED_PIN
 
 //
 // Software SPI pins for TMC2130 stepper drivers
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_17
+    #define TMC_SW_MOSI                    P1_17
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
@@ -197,23 +197,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P1_10
-  #define X_SERIAL_RX_PIN  P1_10
+  #define X_SERIAL_TX_PIN                  P1_10
+  #define X_SERIAL_RX_PIN                  P1_10
 
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_09
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_09
 
-  #define Z_SERIAL_TX_PIN  P1_08
-  #define Z_SERIAL_RX_PIN  P1_08
+  #define Z_SERIAL_TX_PIN                  P1_08
+  #define Z_SERIAL_RX_PIN                  P1_08
 
-  #define E0_SERIAL_TX_PIN P1_04
-  #define E0_SERIAL_RX_PIN P1_04
+  #define E0_SERIAL_TX_PIN                 P1_04
+  #define E0_SERIAL_RX_PIN                 P1_04
 
-  #define E1_SERIAL_TX_PIN P1_01
-  #define E1_SERIAL_RX_PIN P1_01
+  #define E1_SERIAL_TX_PIN                 P1_01
+  #define E1_SERIAL_RX_PIN                 P1_01
 
-  #define Z2_SERIAL_TX_PIN P1_01
-  #define Z2_SERIAL_RX_PIN P1_01
+  #define Z2_SERIAL_TX_PIN                 P1_01
+  #define Z2_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -223,7 +223,7 @@
 // SD Connection
 //
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P0_16
+  #define SS_PIN                           P0_16
 #endif
 
 /**
@@ -239,82 +239,82 @@
 #if HAS_SPI_LCD
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
 
-    #define LCD_PINS_RS    P1_23
+    #define LCD_PINS_RS                    P1_23
 
-    #define BTN_EN1        P1_20
-    #define BTN_EN2        P1_22
-    #define BTN_ENC        P1_18
+    #define BTN_EN1                        P1_20
+    #define BTN_EN2                        P1_22
+    #define BTN_ENC                        P1_18
 
-    #define LCD_PINS_ENABLE P1_21
-    #define LCD_PINS_D4    P1_19
+    #define LCD_PINS_ENABLE                P1_21
+    #define LCD_PINS_D4                    P1_19
 
   #elif ENABLED(CR10_STOCKDISPLAY)
-    #define BTN_ENC        P0_28   // (58) open-drain
-    #define LCD_PINS_RS    P1_22
+    #define BTN_ENC                        P0_28  // (58) open-drain
+    #define LCD_PINS_RS                    P1_22
 
-    #define BTN_EN1        P1_18
-    #define BTN_EN2        P1_20
+    #define BTN_EN1                        P1_18
+    #define BTN_EN2                        P1_20
 
-    #define LCD_PINS_ENABLE P1_23
-    #define LCD_PINS_D4    P1_21
+    #define LCD_PINS_ENABLE                P1_23
+    #define LCD_PINS_D4                    P1_21
 
   #else
-    #define BTN_ENC        P0_28   // (58) open-drain
-    #define LCD_PINS_RS    P1_19
+    #define BTN_ENC                        P0_28  // (58) open-drain
+    #define LCD_PINS_RS                    P1_19
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
 
-    #define LCD_PINS_ENABLE P1_18
-    #define LCD_PINS_D4    P1_20
+    #define LCD_PINS_ENABLE                P1_18
+    #define LCD_PINS_D4                    P1_20
 
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
 
     #if SD_CONNECTION_IS(LCD)
-      #define SD_DETECT_PIN P1_31  // (49) (NOT 5V tolerant)
+      #define SD_DETECT_PIN                P1_31  // (49) (NOT 5V tolerant)
     #endif
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    P1_18
-      #define DOGLCD_A0    P1_19
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_CS                    P1_18
+      #define DOGLCD_A0                    P1_19
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_BACKLIGHT_PIN            -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                P1_20  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_21
+          #define RGB_LED_R_PIN            P1_21
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_22
+          #define RGB_LED_G_PIN            P1_22
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_23
+          #define RGB_LED_B_PIN            P1_23
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    P1_21
+        #define NEOPIXEL_PIN               P1_21
       #endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
-        #define DOGLCD_CS   P1_21
-        #define DOGLCD_A0   P1_22
-        #define DOGLCD_SCK  P0_15
-        #define DOGLCD_MOSI P0_18
+        #define DOGLCD_CS                  P1_21
+        #define DOGLCD_A0                  P1_22
+        #define DOGLCD_SCK                 P0_15
+        #define DOGLCD_MOSI                P0_18
         #define FORCE_SOFT_SPI
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_21
-        #define LCD_PINS_D6 P1_22
-        #define LCD_PINS_D7 P1_23
+        #define LCD_PINS_D5                P1_21
+        #define LCD_PINS_D6                P1_22
+        #define LCD_PINS_D7                P1_23
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -327,7 +327,7 @@
 // Neopixel LED
 //
 #ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN      P1_24
+  #define NEOPIXEL_PIN                     P1_24
 #endif
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 2844fb3cdab8..63e160d8a076 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -40,13 +40,13 @@
 // Steppers
 //
 #ifndef E1_STEP_PIN
-  #define E1_STEP_PIN      P0_01
+  #define E1_STEP_PIN                      P0_01
 #endif
 #ifndef E1_DIR_PIN
-  #define E1_DIR_PIN       P0_00
+  #define E1_DIR_PIN                       P0_00
 #endif
 #ifndef E1_ENABLE_PIN
-  #define E1_ENABLE_PIN    P0_10
+  #define E1_ENABLE_PIN                    P0_10
 #endif
 
 //
@@ -54,64 +54,64 @@
 //  3.3V max when defined as an analog input
 //
 #ifndef TEMP_0_PIN
-  #define TEMP_0_PIN       P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
+  #define TEMP_0_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_0_PIN
 #endif
 #ifndef TEMP_1_PIN
-  #define TEMP_1_PIN       P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
+  #define TEMP_1_PIN                    P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
 #endif
 #ifndef TEMP_BED_PIN
-  #define TEMP_BED_PIN     P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
+  #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
 
 #if HOTENDS == 1 && TEMP_SENSOR_PROBE
-  #define TEMP_PROBE_PIN   TEMP_1_PIN
+  #define TEMP_PROBE_PIN              TEMP_1_PIN
 #endif
 
 //
 // Heaters / Fans
 //
 #ifndef HEATER_0_PIN
-  #define HEATER_0_PIN     P2_07
+  #define HEATER_0_PIN                     P2_07
 #endif
 #if HOTENDS == 1
   #ifndef FAN1_PIN
-    #define FAN1_PIN       P2_04
+    #define FAN1_PIN                       P2_04
   #endif
 #else
   #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN   P2_04
+    #define HEATER_1_PIN                   P2_04
   #endif
 #endif
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_03
+  #define FAN_PIN                          P2_03
 #endif
 #ifndef HEATER_BED_PIN
-  #define HEATER_BED_PIN   P2_05
+  #define HEATER_BED_PIN                   P2_05
 #endif
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_30   // (37) not 5V tolerant
+  #define BEEPER_PIN                       P1_30  // (37) not 5V tolerant
 #endif
 
 //
 // SD Support
 //
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 5ebf6ecba16e..32de7bb74082 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -44,63 +44,63 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_26   // PWM1[6]
-#define SERVO1_PIN         P1_18   // PWM1[1]
+#define SERVO0_PIN                         P1_26  // PWM1[6]
+#define SERVO1_PIN                         P1_18  // PWM1[1]
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P0_00
-#define X_MAX_PIN          P0_01
-#define Y_MIN_PIN          P0_10
-#define Y_MAX_PIN          P0_21
-#define Z_MIN_PIN          P2_13
-#define Z_MAX_PIN          P2_22
+#define X_MIN_PIN                          P0_00
+#define X_MAX_PIN                          P0_01
+#define Y_MIN_PIN                          P0_10
+#define Y_MAX_PIN                          P0_21
+#define Z_MIN_PIN                          P2_13
+#define Z_MAX_PIN                          P2_22
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         P1_01
-#define X_DIR_PIN          P1_04
-#define X_ENABLE_PIN       P0_26
+#define X_STEP_PIN                         P1_01
+#define X_DIR_PIN                          P1_04
+#define X_ENABLE_PIN                       P0_26
 
-#define Y_STEP_PIN         P1_10
-#define Y_DIR_PIN          P1_14
-#define Y_ENABLE_PIN       P1_08
+#define Y_STEP_PIN                         P1_10
+#define Y_DIR_PIN                          P1_14
+#define Y_ENABLE_PIN                       P1_08
 
-#define Z_STEP_PIN         P1_17
-#define Z_DIR_PIN          P4_29
-#define Z_ENABLE_PIN       P1_15
+#define Z_STEP_PIN                         P1_17
+#define Z_DIR_PIN                          P4_29
+#define Z_ENABLE_PIN                       P1_15
 
-#define E0_STEP_PIN        P0_05
-#define E0_DIR_PIN         P2_00
-#define E0_ENABLE_PIN      P4_28
+#define E0_STEP_PIN                        P0_05
+#define E0_DIR_PIN                         P2_00
+#define E0_ENABLE_PIN                      P4_28
 
-#define E1_STEP_PIN        P2_03
-#define E1_DIR_PIN         P2_04
-#define E1_ENABLE_PIN      P2_01
+#define E1_STEP_PIN                        P2_03
+#define E1_DIR_PIN                         P2_04
+#define E1_ENABLE_PIN                      P2_01
 
-#define E2_STEP_PIN        P2_07
-#define E2_DIR_PIN         P2_08
-#define E2_ENABLE_PIN      P2_05
+#define E2_STEP_PIN                        P2_07
+#define E2_DIR_PIN                         P2_08
+#define E2_ENABLE_PIN                      P2_05
 
 //
 // TMC2208 UART pins
 //
 #if HAS_TMC_UART
-  #define X_SERIAL_TX_PIN  P1_00
-  #define X_SERIAL_RX_PIN  P1_00
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_09
-  #define Z_SERIAL_TX_PIN  P1_16
-  #define Z_SERIAL_RX_PIN  P1_16
-  #define E0_SERIAL_TX_PIN P0_04
-  #define E0_SERIAL_RX_PIN P0_04
-  #define E1_SERIAL_TX_PIN P2_02
-  #define E1_SERIAL_RX_PIN P2_02
-  #define E2_SERIAL_TX_PIN P2_06
-  #define E2_SERIAL_RX_PIN P2_06
+  #define X_SERIAL_TX_PIN                  P1_00
+  #define X_SERIAL_RX_PIN                  P1_00
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_09
+  #define Z_SERIAL_TX_PIN                  P1_16
+  #define Z_SERIAL_RX_PIN                  P1_16
+  #define E0_SERIAL_TX_PIN                 P0_04
+  #define E0_SERIAL_RX_PIN                 P0_04
+  #define E1_SERIAL_TX_PIN                 P2_02
+  #define E1_SERIAL_RX_PIN                 P2_02
+  #define E2_SERIAL_TX_PIN                 P2_06
+  #define E2_SERIAL_RX_PIN                 P2_06
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -112,36 +112,36 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_24_A1   // AD0[0] on P0_23
-#define TEMP_BED_PIN        P0_23_A0   // AD0[1] on P0_24
+#define TEMP_0_PIN                      P0_24_A1  // AD0[0] on P0_23
+#define TEMP_BED_PIN                    P0_23_A0  // AD0[1] on P0_24
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P1_19 // Not a PWM pin, software PWM required
-#define HEATER_0_PIN       P3_26 // PWM1[3]
-#define FAN_PIN            P3_25 // Part cooling fan - connected to PWM1[2]
-#define E0_AUTO_FAN_PIN    P0_27 // Extruder cooling fan
+#define HEATER_BED_PIN                     P1_19  // Not a PWM pin, software PWM required
+#define HEATER_0_PIN                       P3_26  // PWM1[3]
+#define FAN_PIN                            P3_25  // Part cooling fan - connected to PWM1[2]
+#define E0_AUTO_FAN_PIN                    P0_27  // Extruder cooling fan
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P1_31
+#define LED_PIN                            P1_31
 
 //
 // LCD
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define BEEPER_PIN       P0_19
-  #define BTN_EN1          P1_23
-  #define BTN_EN2          P1_24
-  #define BTN_ENC          P1_25
-  #define LCD_PINS_RS      P0_20
-  #define LCD_PINS_ENABLE  P0_21
-  #define LCD_PINS_D4      P2_11
-  #define LCD_PINS_D5      P0_22
-  #define LCD_PINS_D6      P1_29
-  #define LCD_PINS_D7      P1_28
+  #define BEEPER_PIN                       P0_19
+  #define BTN_EN1                          P1_23
+  #define BTN_EN2                          P1_24
+  #define BTN_ENC                          P1_25
+  #define LCD_PINS_RS                      P0_20
+  #define LCD_PINS_ENABLE                  P0_21
+  #define LCD_PINS_D4                      P2_11
+  #define LCD_PINS_D5                      P0_22
+  #define LCD_PINS_D6                      P1_29
+  #define LCD_PINS_D7                      P1_28
 #endif
 
 //
@@ -149,21 +149,21 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           P0_16
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                           P0_16
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 28b94f019af4..0cd10ebc0500 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -46,73 +46,73 @@
   //#define SDCARD_EEPROM_EMULATION
 #endif
 
-#define LED_PIN            P1_18   // Used as a status indicator
-#define LED2_PIN           P1_19
-#define LED3_PIN           P1_20
-#define LED4_PIN           P1_21
+#define LED_PIN                            P1_18  // Used as a status indicator
+#define LED2_PIN                           P1_19
+#define LED3_PIN                           P1_20
+#define LED4_PIN                           P1_21
 
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23   // J8-3 (low jitter)
-#define SERVO1_PIN         P2_12   // J8-4
-#define SERVO2_PIN         P2_11   // J8-5
-#define SERVO3_PIN         P4_28   // J8-6
+#define SERVO0_PIN                         P1_23  // J8-3 (low jitter)
+#define SERVO1_PIN                         P2_12  // J8-4
+#define SERVO2_PIN                         P2_11  // J8-5
+#define SERVO3_PIN                         P4_28  // J8-6
 
 //
 // Limit Switches - Not Interrupt Capable
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_28   // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P4_28   // Connector J8
+  #define Z_MIN_PROBE_PIN                  P4_28  // Connector J8
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-#define TEMP_2_PIN          P0_26_A3   // A3 (TH4)
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
+#define TEMP_2_PIN                      P0_26_A3  // A3 (TH4)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P2_06
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P2_06
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
@@ -124,56 +124,56 @@
 // 5V
 // NC
 // GND
-#define PIN_P0_17          P0_17
-#define PIN_P0_16          P0_16
-#define PIN_P0_15          P0_15
+#define PIN_P0_17                          P0_17
+#define PIN_P0_16                          P0_16
+#define PIN_P0_15                          P0_15
 
 //
 // Connector J8
 //
 
 // GND
-#define PIN_P1_22          P1_22
-#define PIN_P1_23          P1_23   // PWM Capable
-#define PIN_P2_12          P2_12   // Interrupt Capable
-#define PIN_P2_11          P2_11   // Interrupt Capable
+#define PIN_P1_22                          P1_22
+#define PIN_P1_23                          P1_23  // PWM Capable
+#define PIN_P2_12                          P2_12  // Interrupt Capable
+#define PIN_P2_11                          P2_11  // Interrupt Capable
 
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
 #if ENABLED(MK2_MULTIPLEXER)
-  #define E_MUX0_PIN       P1_23   // J8-3
-  #define E_MUX1_PIN       P2_12   // J8-4
-  #define E_MUX2_PIN       P2_11   // J8-5
+  #define E_MUX0_PIN                       P1_23  // J8-3
+  #define E_MUX1_PIN                       P2_12  // J8-4
+  #define E_MUX2_PIN                       P2_11  // J8-5
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          P0_25   // TH3 Connector
+#define PS_ON_PIN                          P0_25  // TH3 Connector
 
 //
 // Ethernet pins
 //
 #ifndef ULTIPANEL
-  #define ENET_MDIO        P1_17   // J12-4
-  #define ENET_RX_ER       P1_14   // J12-6
-  #define ENET_RXD1        P1_10   // J12-8
+  #define ENET_MDIO                        P1_17  // J12-4
+  #define ENET_RX_ER                       P1_14  // J12-6
+  #define ENET_RXD1                        P1_10  // J12-8
 #endif
 
-#define ENET_MOC           P1_16   // J12-3
-#define REF_CLK            P1_15   // J12-5
-#define ENET_RXD0          P1_09   // J12-7
-#define ENET_CRS           P1_08   // J12-9
-#define ENET_TX_EN         P1_04   // J12-10
-#define ENET_TXD0          P1_00   // J12-11
-#define ENET_TXD1          P1_01   // J12-12
+#define ENET_MOC                           P1_16  // J12-3
+#define REF_CLK                            P1_15  // J12-5
+#define ENET_RXD0                          P1_09  // J12-7
+#define ENET_CRS                           P1_08  // J12-9
+#define ENET_TX_EN                         P1_04  // J12-10
+#define ENET_TXD0                          P1_00  // J12-11
+#define ENET_TXD1                          P1_01  // J12-12
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
 
@@ -189,27 +189,27 @@
    * If you can't find a pin to use for the LCD's SD_DETECT then comment out
    * SD_DETECT_PIN entirely and remove that wire from the the custom cable.
    */
-  #define SD_DETECT_PIN    P2_11   // J8-5 (moved from EXP2 P0.27)
-  #define SCK_PIN          P1_22   // J8-2 (moved from EXP2 P0.7)
-  #define MISO_PIN         P1_23   // J8-3 (moved from EXP2 P0.8)
-  #define MOSI_PIN         P2_12   // J8-4 (moved from EXP2 P0.9)
-  #define SS_PIN           P0_28
-  #define LPC_SOFTWARE_SPI  // With a custom cable we need software SPI because the
-                            // selected pins are not on a hardware SPI controller
+  #define SD_DETECT_PIN                    P2_11  // J8-5 (moved from EXP2 P0.27)
+  #define SCK_PIN                          P1_22  // J8-2 (moved from EXP2 P0.7)
+  #define MISO_PIN                         P1_23  // J8-3 (moved from EXP2 P0.8)
+  #define MOSI_PIN                         P2_12  // J8-4 (moved from EXP2 P0.9)
+  #define SS_PIN                           P0_28
+  #define LPC_SOFTWARE_SPI                        // With a custom cable we need software SPI because the
+                                                  // selected pins are not on a hardware SPI controller
 #elif SD_CONNECTION_IS(LCD)
   // use standard cable and header, SPI and SD detect sre shared with on-board SD card
   // hardware SPI is used for both SD cards. The detect pin is shred between the
   // LCD and onboard SD readers so we disable it.
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           P0_28
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN                           P0_28
 #elif SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #endif
 
 /**
@@ -226,17 +226,17 @@
  */
 
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_31   // EXP1.1
-  #define BTN_ENC          P1_30   // EXP1.2
-  #define BTN_EN1          P3_26   // EXP2.5
-  #define BTN_EN2          P3_25   // EXP2.3
-  #define LCD_PINS_RS      P0_16   // EXP1.4
-  #define LCD_SDSS         P0_28   // EXP2.4
-  #define LCD_PINS_ENABLE  P0_18   // EXP1.3
-  #define LCD_PINS_D4      P0_15   // EXP1.5
+  #define BEEPER_PIN                       P1_31  // EXP1.1
+  #define BTN_ENC                          P1_30  // EXP1.2
+  #define BTN_EN1                          P3_26  // EXP2.5
+  #define BTN_EN2                          P3_25  // EXP2.3
+  #define LCD_PINS_RS                      P0_16  // EXP1.4
+  #define LCD_SDSS                         P0_28  // EXP2.4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1.3
+  #define LCD_PINS_D4                      P0_15  // EXP1.5
   #if ANY(VIKI2, miniVIKI)
-    #define DOGLCD_SCK     SCK_PIN
-    #define DOGLCD_MOSI    MOSI_PIN
+    #define DOGLCD_SCK                   SCK_PIN
+    #define DOGLCD_MOSI                 MOSI_PIN
   #endif
 
   #if ENABLED(FYSETC_MINI_12864)
@@ -251,26 +251,26 @@
      * Pins 6, 7 & 8 on EXP2 are no connects. That means a second special
      * cable will be needed if the RGB LEDs are to be active.
      */
-    #define DOGLCD_CS      LCD_PINS_ENABLE // EXP1.3  (LCD_EN on FYSETC schematic)
-    #define DOGLCD_A0      LCD_PINS_RS     // EXP1.4  (LCD_A0 on FYSETC schematic)
-    #define DOGLCD_SCK     P2_11           // J8-5  (SCK on FYSETC schematic)
-    #define DOGLCD_MOSI    P4_28           // J8-6  (MOSI on FYSETC schematic)
+    #define DOGLCD_CS            LCD_PINS_ENABLE  // EXP1.3  (LCD_EN on FYSETC schematic)
+    #define DOGLCD_A0                LCD_PINS_RS  // EXP1.4  (LCD_A0 on FYSETC schematic)
+    #define DOGLCD_SCK                     P2_11  // J8-5  (SCK on FYSETC schematic)
+    #define DOGLCD_MOSI                    P4_28  // J8-6  (MOSI on FYSETC schematic)
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN P2_12        // J8-4  (LCD_D6 on FYSETC schematic)
+        #define RGB_LED_R_PIN              P2_12  // J8-4  (LCD_D6 on FYSETC schematic)
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN P1_23        // J8-3  (LCD_D5 on FYSETC schematic)
+        #define RGB_LED_G_PIN              P1_23  // J8-3  (LCD_D5 on FYSETC schematic)
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN P1_22        // J8-2  (LCD_D7 on FYSETC schematic)
+        #define RGB_LED_B_PIN              P1_22  // J8-2  (LCD_D7 on FYSETC schematic)
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN P2_12
+      #define NEOPIXEL_PIN                 P2_12
     #endif
 
   #elif ENABLED(MINIPANEL)
@@ -291,24 +291,24 @@
 
 #if HAS_DRIVER(TMC2130)
   // J8
-  #define X_CS_PIN         P1_22
-  #define Y_CS_PIN         P1_23
-  #define Z_CS_PIN         P2_12
-  #define E0_CS_PIN        P2_11
-  #define E1_CS_PIN        P4_28
+  #define X_CS_PIN                         P1_22
+  #define Y_CS_PIN                         P1_23
+  #define Z_CS_PIN                         P2_12
+  #define E0_CS_PIN                        P2_11
+  #define E1_CS_PIN                        P4_28
 
 // Hardware SPI is on EXP2. See if you can make it work:
 // https://github.com/makerbase-mks/MKS-SBASE/issues/25
 #define TMC_USE_SW_SPI
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P0_03   // AUX1
+    #define TMC_SW_MOSI                    P0_03  // AUX1
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_02   // AUX1
+    #define TMC_SW_MISO                    P0_02  // AUX1
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_26   // TH4
+    #define TMC_SW_SCK                     P0_26  // TH4
   #endif
  #endif
 #endif
@@ -322,24 +322,24 @@
    * Worst case you may have to give up the LCD
    * RX pins need to be interrupt capable
    */
-  #define X_SERIAL_TX_PIN  P1_22   // J8-2
-  #define X_SERIAL_RX_PIN  P2_12   // J8-4 Interrupt Capable
-  #define Y_SERIAL_TX_PIN  P1_23   // J8-3
-  #define Y_SERIAL_RX_PIN  P2_11   // J8-5 Interrupt Capable
-  #define Z_SERIAL_TX_PIN  P2_12   // J8-4
-  #define Z_SERIAL_RX_PIN  P0_25   // TH3
-  #define E0_SERIAL_TX_PIN P4_28   // J8-6
-  #define E0_SERIAL_RX_PIN P0_26   // TH4
+  #define X_SERIAL_TX_PIN                  P1_22  // J8-2
+  #define X_SERIAL_RX_PIN                  P2_12  // J8-4 Interrupt Capable
+  #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
+  #define Y_SERIAL_RX_PIN                  P2_11  // J8-5 Interrupt Capable
+  #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
+  #define Z_SERIAL_RX_PIN                  P0_25  // TH3
+  #define E0_SERIAL_TX_PIN                 P4_28  // J8-6
+  #define E0_SERIAL_RX_PIN                 P0_26  // TH4
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
 #endif
 
 // UNUSED
-#define PIN_P0_27          P0_27   // EXP2/Onboard SD
-#define PIN_P0_28          P0_28   // EXP2
-#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_27                          P0_27  // EXP2/Onboard SD
+#define PIN_P0_28                          P0_28  // EXP2
+#define PIN_P0_02                          P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_03                          P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
 
 /**
  *  PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 5dc1db8f3fb3..afbe6d556498 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -41,100 +41,100 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23   // SERVO P1.23
-#define SERVO1_PIN         P2_00   // SERVO P2.0
+#define SERVO0_PIN                         P1_23  // SERVO P1.23
+#define SERVO1_PIN                         P2_00  // SERVO P2.0
 
 //
 // Trinamic Stallguard pins
 //
-#define X_DIAG_PIN         P1_29   // X-
-#define Y_DIAG_PIN         P1_27   // Y-
-#define Z_DIAG_PIN         P1_25   // Z-
-#define E0_DIAG_PIN        P1_28   // X+
-#define E1_DIAG_PIN        P1_26   // Y+
+#define X_DIAG_PIN                         P1_29  // X-
+#define Y_DIAG_PIN                         P1_27  // Y-
+#define Z_DIAG_PIN                         P1_25  // Z-
+#define E0_DIAG_PIN                        P1_28  // X+
+#define E1_DIAG_PIN                        P1_26  // Y+
 
 //
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN       X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN      P1_28   // X+
+    #define X_MAX_PIN                      P1_28  // X+
   #else
-    #define X_MIN_PIN      P1_28   // X+
+    #define X_MIN_PIN                      P1_28  // X+
   #endif
 #else
-  #define X_MIN_PIN        P1_29   // X-
-  #define X_MAX_PIN        P1_28   // X+
+  #define X_MIN_PIN                        P1_29  // X-
+  #define X_MAX_PIN                        P1_28  // X+
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN      P1_26   // Y+
+    #define Y_MAX_PIN                      P1_26  // Y+
   #else
-    #define Y_MIN_PIN      P1_26   // Y+
+    #define Y_MIN_PIN                      P1_26  // Y+
   #endif
 #else
-  #define Y_MIN_PIN        P1_27   // Y-
-  #define Y_MAX_PIN        P1_26   // Y+
+  #define Y_MIN_PIN                        P1_27  // Y-
+  #define Y_MAX_PIN                        P1_26  // Y+
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN       Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_24   // Z+
+    #define Z_MAX_PIN                      P1_24  // Z+
   #else
-    #define Z_MIN_PIN      P1_24   // Z+
+    #define Z_MIN_PIN                      P1_24  // Z+
   #endif
 #else
-  #define Z_MIN_PIN        P1_25   // Z-
-  #define Z_MAX_PIN        P1_24   // Z+
+  #define Z_MIN_PIN                        P1_25  // Z-
+  #define Z_MAX_PIN                        P1_24  // Z+
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_24
+  #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_03
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_03
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_01
+  #define X_CS_PIN                         P1_01
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_08
+  #define Y_CS_PIN                         P1_08
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10
+  #define Z_CS_PIN                         P1_10
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_15
+  #define E0_CS_PIN                        P1_15
 #endif
 
-#define E1_STEP_PIN        P0_01
-#define E1_DIR_PIN         P0_00
-#define E1_ENABLE_PIN      P0_10
+#define E1_STEP_PIN                        P0_01
+#define E1_DIR_PIN                         P0_00
+#define E1_ENABLE_PIN                      P0_10
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_17
+  #define E1_CS_PIN                        P1_17
 #endif
 
 //
@@ -142,13 +142,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P4_28
+    #define TMC_SW_MOSI                    P4_28
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
@@ -175,23 +175,23 @@
   // Software serial
   //
 
-  #define X_SERIAL_TX_PIN  P1_04
-  #define X_SERIAL_RX_PIN  P1_01
+  #define X_SERIAL_TX_PIN                  P1_04
+  #define X_SERIAL_RX_PIN                  P1_01
 
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_08
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_08
 
-  #define Z_SERIAL_TX_PIN  P1_14
-  #define Z_SERIAL_RX_PIN  P1_10
+  #define Z_SERIAL_TX_PIN                  P1_14
+  #define Z_SERIAL_RX_PIN                  P1_10
 
-  #define E0_SERIAL_TX_PIN P1_16
-  #define E0_SERIAL_RX_PIN P1_15
+  #define E0_SERIAL_TX_PIN                 P1_16
+  #define E0_SERIAL_RX_PIN                 P1_15
 
-  #define E1_SERIAL_TX_PIN P4_29
-  #define E1_SERIAL_RX_PIN P1_17
+  #define E1_SERIAL_TX_PIN                 P4_29
+  #define E1_SERIAL_RX_PIN                 P1_17
 
-  #define Z2_SERIAL_TX_PIN P4_29
-  #define Z2_SERIAL_RX_PIN P1_17
+  #define Z2_SERIAL_TX_PIN                 P4_29
+  #define Z2_SERIAL_RX_PIN                 P1_17
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -201,35 +201,35 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN         P0_23_A0   // Analog Input A0 (TH1)
-#define TEMP_BED_PIN       P0_24_A1   // Analog Input A1 (TB)
-#define TEMP_1_PIN         P0_25_A2   // Analog Input A2 (TH2)
+#define TEMP_0_PIN                      P0_23_A0  // Analog Input A0 (TH1)
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input A1 (TB)
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input A2 (TH2)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
 #if HOTENDS == 1
   #ifndef FAN1_PIN
-    #define FAN1_PIN       P2_06
+    #define FAN1_PIN                       P2_06
   #endif
 #else
   #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN   P2_06
+    #define HEATER_1_PIN                   P2_06
   #endif
 #endif
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P1_18   // Used as a status indicator
-#define LED2_PIN           P1_19
-#define LED3_PIN           P1_20
-#define LED4_PIN           P1_21
+#define LED_PIN                            P1_18  // Used as a status indicator
+#define LED2_PIN                           P1_19
+#define LED3_PIN                           P1_20
+#define LED4_PIN                           P1_21
 
 /**
  *                _____                                            _____
@@ -242,83 +242,83 @@
  *                EXP1                                             EXP2
  */
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_31
-  #define BTN_ENC          P1_30
+  #define BEEPER_PIN                       P1_31
+  #define BTN_ENC                          P1_30
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    P1_00
+    #define LCD_PINS_RS                    P1_00
 
-    #define BTN_EN1        P0_18
-    #define BTN_EN2        P0_15
+    #define BTN_EN1                        P0_18
+    #define BTN_EN2                        P0_15
 
-    #define LCD_PINS_ENABLE P1_22
-    #define LCD_PINS_D4    P0_17
+    #define LCD_PINS_ENABLE                P1_22
+    #define LCD_PINS_D4                    P0_17
 
   #else
 
-    #define BTN_EN1        P3_25
-    #define BTN_EN2        P3_26
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
 
-    #define LCD_SDSS       P0_28
+    #define LCD_SDSS                       P0_28
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC  P0_17
-      #define DOGLCD_CS    P0_16
-      #define DOGLCD_A0    LCD_PINS_DC
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define LCD_PINS_DC                  P0_17
+      #define DOGLCD_CS                    P0_16
+      #define DOGLCD_A0              LCD_PINS_DC
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_PINS_RS  P1_00
-      #define LCD_PINS_D7  P1_22
-      #define KILL_PIN     -1 // NC
+      #define LCD_PINS_RS                  P1_00
+      #define LCD_PINS_D7                  P1_22
+      #define KILL_PIN                     -1     // NC
 
-    #else // !MKS_12864OLED_SSD1306
+    #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS  P0_16
+      #define LCD_PINS_RS                  P0_16
 
-      #define LCD_PINS_ENABLE P0_18
-      #define LCD_PINS_D4  P0_15
+      #define LCD_PINS_ENABLE              P0_18
+      #define LCD_PINS_D4                  P0_15
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS  P0_18
-        #define DOGLCD_A0  P0_16
-        #define DOGLCD_SCK P0_07
-        #define DOGLCD_MOSI P1_20
+        #define DOGLCD_CS                  P0_18
+        #define DOGLCD_A0                  P0_16
+        #define DOGLCD_SCK                 P0_07
+        #define DOGLCD_MOSI                P1_20
 
-        #define LCD_BACKLIGHT_PIN -1
+        #define LCD_BACKLIGHT_PIN          -1
 
-        #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN P0_15   // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN P0_17
+            #define RGB_LED_R_PIN          P0_17
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN P1_00
+            #define RGB_LED_G_PIN          P1_00
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN P1_22
+            #define RGB_LED_B_PIN          P1_22
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN    P0_17
+          #define NEOPIXEL_PIN             P0_17
         #endif
 
-      #else // !FYSETC_MINI_12864
+      #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS  P0_17
-          #define DOGLCD_A0  P1_00
+          #define DOGLCD_CS                P0_17
+          #define DOGLCD_A0                P1_00
         #endif
 
         #if ENABLED(ULTIPANEL)
-          #define LCD_PINS_D5 P0_17
-          #define LCD_PINS_D6 P1_00
-          #define LCD_PINS_D7 P1_22
+          #define LCD_PINS_D5              P0_17
+          #define LCD_PINS_D6              P1_00
+          #define LCD_PINS_D7              P1_22
         #endif
 
       #endif // !FYSETC_MINI_12864
@@ -330,20 +330,20 @@
 #endif // HAS_SPI_LCD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
   #if SD_CONNECTION_IS(ONBOARD)
-    #define SS_PIN         ONBOARD_SD_CS_PIN
+    #define SS_PIN             ONBOARD_SD_CS_PIN
   #else
-    #define SS_PIN         P0_28
+    #define SS_PIN                         P0_28
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -352,6 +352,6 @@
 //
 // Other Pins
 //
-//#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PS_ON_PIN          P1_23   // SERVO P1.23
+//#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PS_ON_PIN                        P1_23  // SERVO P1.23
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index 2303c1885c0d..b8b04a348c80 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -51,58 +51,58 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_20   // (11)
-#define SERVO1_PIN         P1_21   // ( 6) also on J5-1
-#define SERVO2_PIN         P1_19   // ( 5)
-#define SERVO3_PIN         P1_18   // ( 4) 5V output
+#define SERVO0_PIN                         P1_20  // (11)
+#define SERVO1_PIN                         P1_21  // ( 6) also on J5-1
+#define SERVO2_PIN                         P1_19  // ( 5)
+#define SERVO3_PIN                         P1_18  // ( 4) 5V output
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // ( 3) 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // ( 2) 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // (14) 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // (15) 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_29   // (18) 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN          P1_28   // (19) 10k pullup to 3.3V, 1K series
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
+#define X_MIN_PIN                          P1_24  // ( 3) 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // ( 2) 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // (14) 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // (15) 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_29  // (18) 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_28  // (19) 10k pullup to 3.3V, 1K series
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01   // (54)
-#define X_DIR_PIN          P0_11   // (55)
-#define X_ENABLE_PIN       P0_10   // (38)
+#define X_STEP_PIN                         P2_01  // (54)
+#define X_DIR_PIN                          P0_11  // (55)
+#define X_ENABLE_PIN                       P0_10  // (38)
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_01   // ETH
+  #define X_CS_PIN                         P1_01  // ETH
 #endif
 
-#define Y_STEP_PIN         P2_02   // (60)
-#define Y_DIR_PIN          P0_20   // (61)
-#define Y_ENABLE_PIN       P0_19   // (56)
+#define Y_STEP_PIN                         P2_02  // (60)
+#define Y_DIR_PIN                          P0_20  // (61)
+#define Y_ENABLE_PIN                       P0_19  // (56)
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_04   // ETH
+  #define Y_CS_PIN                         P1_04  // ETH
 #endif
 
-#define Z_STEP_PIN         P2_03   // (46)
-#define Z_DIR_PIN          P0_22   // (48)
-#define Z_ENABLE_PIN       P0_21   // (62)
+#define Z_STEP_PIN                         P2_03  // (46)
+#define Z_DIR_PIN                          P0_22  // (48)
+#define Z_ENABLE_PIN                       P0_21  // (62)
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10   // ETH
+  #define Z_CS_PIN                         P1_10  // ETH
 #endif
 
-#define E0_STEP_PIN        P2_00   // (26)
-#define E0_DIR_PIN         P0_05   // (28)
-#define E0_ENABLE_PIN      P0_04   // (24)
+#define E0_STEP_PIN                        P2_00  // (26)
+#define E0_DIR_PIN                         P0_05  // (28)
+#define E0_ENABLE_PIN                      P0_04  // (24)
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_14   // ETH
+  #define E0_CS_PIN                        P1_14  // ETH
 #endif
 
-#define E1_STEP_PIN        P2_08   // (36)
-#define E1_DIR_PIN         P2_13   // (34)
-#define E1_ENABLE_PIN      P4_29   // (30)
+#define E1_STEP_PIN                        P2_08  // (36)
+#define E1_DIR_PIN                         P2_13  // (34)
+#define E1_ENABLE_PIN                      P4_29  // (30)
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                        -1
 #endif
 
 //
@@ -110,13 +110,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_00   // ETH
+    #define TMC_SW_MOSI                    P1_00  // ETH
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_08   // ETH
+    #define TMC_SW_MISO                    P1_08  // ETH
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_09   // ETH
+    #define TMC_SW_SCK                     P1_09  // ETH
   #endif
 #endif
 
@@ -136,31 +136,31 @@
   // P2_13 E1-Dir
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  P0_01
+    #define X_SERIAL_TX_PIN                P0_01
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  P0_01
+    #define X_SERIAL_RX_PIN                P0_01
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  P0_00
+    #define Y_SERIAL_TX_PIN                P0_00
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  P0_00
+    #define Y_SERIAL_RX_PIN                P0_00
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  P2_13
+    #define Z_SERIAL_TX_PIN                P2_13
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  P2_13
+    #define Z_SERIAL_RX_PIN                P2_13
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN P2_08
+    #define E0_SERIAL_TX_PIN               P2_08
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN P2_08
+    #define E0_SERIAL_RX_PIN               P2_08
   #endif
 
   // Reduce baud rate to improve software serial reliability
@@ -171,14 +171,14 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0) - (67) - TEMP_0_PIN
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1) - (68) - TEMP_BED_PIN
-#define TEMP_1_PIN          P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_2_PIN          P0_26_A3   // A3 - (63) - J5-3 & AUX-2
-#define TEMP_3_PIN          P1_30_A4   // A4 - (37) - BUZZER_PIN
-//#define TEMP_4_PIN          P1_31_A5   // A5 - (49) - SD_DETECT_PIN
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0) - (67) - TEMP_0_PIN
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_BED_PIN
+#define TEMP_1_PIN                      P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_2_PIN                      P0_26_A3  // A3 - (63) - J5-3 & AUX-2
+#define TEMP_3_PIN                      P1_30_A4  // A4 - (37) - BUZZER_PIN
+//#define TEMP_4_PIN                    P1_31_A5  // A5 - (49) - SD_DETECT_PIN
 //#define ??                  P0_03_A6   // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
-#define FILWIDTH_PIN        P0_02_A7   // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
+#define FILWIDTH_PIN                    P0_02_A7  // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
 
 //
 // Augmentation for auto-assigning RAMPS plugs
@@ -201,69 +201,69 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                     -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN     P2_07   // (8)
+  #define RAMPS_D8_PIN                     P2_07  // (8)
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN     P2_04   // (9)
+  #define RAMPS_D9_PIN                     P2_04  // (9)
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    P2_05   // (10)
+  #define RAMPS_D10_PIN                    P2_05  // (10)
 #endif
 
-#define HEATER_0_PIN       RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN1_PIN         RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN       MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN   MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D9_PIN
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        RAMPS_D8_PIN
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
-    #define FAN_PIN        P1_18               // (4) IO pin. Buffer needed
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D8_PIN
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
+    #define FAN_PIN                        P1_18  // (4) IO pin. Buffer needed
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+    #define FAN_PIN                 RAMPS_D9_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // (13)
+#define LED_PIN                            P4_28  // (13)
 
 // define digital pin 5 for the filament runout sensor. Use the RAMPS 1.4 digital input 5 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_19   // (5)
+  #define FIL_RUNOUT_PIN                   P1_19  // (5)
 #endif
 
-#define PS_ON_PIN          P2_12   // (12)
+#define PS_ON_PIN                          P2_12  // (12)
 
 #if !defined(MAX6675_SS_PIN) && DISABLED(USE_ZMAX_PLUG)
-  #define MAX6675_SS_PIN   P1_28
+  #define MAX6675_SS_PIN                   P1_28
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4   // Try to use servo connector
-    #define CASE_LIGHT_PIN P1_18   // (4) MUST BE HARDWARE PWM
+  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4      // Try to use servo connector
+    #define CASE_LIGHT_PIN                 P1_18  // (4) MUST BE HARDWARE PWM
   #endif
 #endif
 
@@ -279,19 +279,19 @@
       #error "LASER_FEATURE requires 3 free servo pins."
     #endif
   #endif
-  #define SPINDLE_LASER_ENA_PIN SERVO1_PIN   // (6) Pin should have a pullup/pulldown!
-  #define SPINDLE_LASER_PWM_PIN SERVO3_PIN   // (4) MUST BE HARDWARE PWM
-  #define SPINDLE_DIR_PIN       SERVO2_PIN   // (5)
+  #define SPINDLE_LASER_ENA_PIN       SERVO1_PIN  // (6) Pin should have a pullup/pulldown!
+  #define SPINDLE_LASER_PWM_PIN       SERVO3_PIN  // (4) MUST BE HARDWARE PWM
+  #define SPINDLE_DIR_PIN             SERVO2_PIN  // (5)
 #endif
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
 #if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
-  #define E_MUX0_PIN       P0_03   // ( 0) Z_CS_PIN
-  #define E_MUX1_PIN       P0_02   // ( 1) E0_CS_PIN
+  #define E_MUX0_PIN                       P0_03  // ( 0) Z_CS_PIN
+  #define E_MUX1_PIN                       P0_02  // ( 1) E0_CS_PIN
 #endif
-#define E_MUX2_PIN         P0_26   // (63) E1_CS_PIN
+#define E_MUX2_PIN                         P0_26  // (63) E1_CS_PIN
 
 /**
  * LCD / Controller
@@ -322,101 +322,101 @@
   // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
   // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
 
-  #define BEEPER_PIN       P2_11   // J3-3 & AUX-4
+  #define BEEPER_PIN                       P2_11  // J3-3 & AUX-4
 
-  #define BTN_EN1          P0_16   // J3-7 & AUX-4
-  #define BTN_EN2          P1_23   // J3-5 & AUX-4
-  #define BTN_ENC          P3_25   // J3-4 & AUX-4
+  #define BTN_EN1                          P0_16  // J3-7 & AUX-4
+  #define BTN_EN2                          P1_23  // J3-5 & AUX-4
+  #define BTN_ENC                          P3_25  // J3-4 & AUX-4
 
-  #define LCD_PINS_RS      P0_15   // J3-9 & AUX-4 (CS)
-  #define LCD_PINS_ENABLE  P0_18   // J3-10 & AUX-3 (SID, MOSI)
-  #define LCD_PINS_D4      P2_06   // J3-8 & AUX-3 (SCK, CLK)
+  #define LCD_PINS_RS                      P0_15  // J3-9 & AUX-4 (CS)
+  #define LCD_PINS_ENABLE                  P0_18  // J3-10 & AUX-3 (SID, MOSI)
+  #define LCD_PINS_D4                      P2_06  // J3-8 & AUX-3 (SCK, CLK)
 
 #elif HAS_SPI_LCD
 
-  //#define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
-  //#define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
-  //#define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
-  //#define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
+  //#define SCK_PIN                        P0_15  // (52)  system defined J3-9 & AUX-3
+  //#define MISO_PIN                       P0_17  // (50)  system defined J3-10 & AUX-3
+  //#define MOSI_PIN                       P0_18  // (51)  system defined J3-10 & AUX-3
+  //#define SS_PIN                         P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
 
   #if ENABLED(FYSETC_MINI_12864)
-    #define BEEPER_PIN     P1_01
-    #define BTN_ENC        P1_04
+    #define BEEPER_PIN                     P1_01
+    #define BTN_ENC                        P1_04
   #else
-    #define BEEPER_PIN     P1_30   // (37) not 5V tolerant
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
+    #define BEEPER_PIN                     P1_30  // (37) not 5V tolerant
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
   #endif
 
-  #define BTN_EN1          P3_26   // (31) J3-2 & AUX-4
-  #define BTN_EN2          P3_25   // (33) J3-4 & AUX-4
+  #define BTN_EN1                          P3_26  // (31) J3-2 & AUX-4
+  #define BTN_EN2                          P3_25  // (33) J3-4 & AUX-4
 
-  #define SD_DETECT_PIN    P1_31   // (49) J3-1 & AUX-3 (NOT 5V tolerant)
-  #define KILL_PIN         P1_22   // (41) J5-4 & AUX-4
-  #define LCD_PINS_RS      P0_16   // (16) J3-7 & AUX-4
-  #define LCD_SDSS         P0_16   // (16) J3-7 & AUX-4
+  #define SD_DETECT_PIN                    P1_31  // (49) J3-1 & AUX-3 (NOT 5V tolerant)
+  #define KILL_PIN                         P1_22  // (41) J5-4 & AUX-4
+  #define LCD_PINS_RS                      P0_16  // (16) J3-7 & AUX-4
+  #define LCD_SDSS                         P0_16  // (16) J3-7 & AUX-4
 
   #if ENABLED(NEWPANEL)
     #if ENABLED(REPRAPWORLD_KEYPAD)
-      #define SHIFT_OUT    P0_18   // (51) (MOSI) J3-10 & AUX-3
-      #define SHIFT_CLK    P0_15   // (52) (SCK)  J3-9 & AUX-3
-      #define SHIFT_LD     P1_31   // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
+      #define SHIFT_OUT                    P0_18  // (51) (MOSI) J3-10 & AUX-3
+      #define SHIFT_CLK                    P0_15  // (52) (SCK)  J3-9 & AUX-3
+      #define SHIFT_LD                     P1_31  // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
     #endif
   #else
-    //#define SHIFT_CLK      P3_26   // (31)  J3-2 & AUX-4
-    //#define SHIFT_LD       P3_25   // (33)  J3-4 & AUX-4
-    //#define SHIFT_OUT      P2_11   // (35)  J3-3 & AUX-4
-    //#define SHIFT_EN       P1_22   // (41)  J5-4 & AUX-4
+    //#define SHIFT_CLK                    P3_26  // (31)  J3-2 & AUX-4
+    //#define SHIFT_LD                     P3_25  // (33)  J3-4 & AUX-4
+    //#define SHIFT_OUT                    P2_11  // (35)  J3-3 & AUX-4
+    //#define SHIFT_EN                     P1_22  // (41)  J5-4 & AUX-4
   #endif
 
   #if ANY(VIKI2, miniVIKI)
     // #define LCD_SCREEN_ROT_180
 
-    #define DOGLCD_CS      P0_16   // (16)
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
-    #define DOGLCD_SCK     SCK_PIN
-    #define DOGLCD_MOSI    MOSI_PIN
+    #define DOGLCD_CS                      P0_16  // (16)
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
+    #define DOGLCD_SCK                   SCK_PIN
+    #define DOGLCD_MOSI                 MOSI_PIN
 
-    #define STAT_LED_BLUE_PIN P0_26 //(63)  may change if cable changes
-    #define STAT_LED_RED_PIN P1_21 // ( 6)  may change if cable changes
+    #define STAT_LED_BLUE_PIN              P0_26  //(63)  may change if cable changes
+    #define STAT_LED_RED_PIN               P1_21  // ( 6)  may change if cable changes
   #else
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
       // EXP1 on LCD adapter is not usable - using Ethernet connector instead
-      #define DOGLCD_CS    P1_09
-      #define DOGLCD_A0    P1_14
-      //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define DOGLCD_CS                    P1_09
+      #define DOGLCD_A0                    P1_14
+      //#define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P0_16   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                P0_16  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_00
+          #define RGB_LED_R_PIN            P1_00
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_01
+          #define RGB_LED_G_PIN            P1_01
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_08
+          #define RGB_LED_B_PIN            P1_08
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN P1_00
+        #define NEOPIXEL_PIN               P1_00
       #endif
     #else
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
-      #define DOGLCD_A0    P2_06   // (59) J3-8 & AUX-2
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
+      #define DOGLCD_A0                    P2_06  // (59) J3-8 & AUX-2
     #endif
 
-    #define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
+    #define LCD_BACKLIGHT_PIN              P0_16  //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  P1_17   // (71) ENET_MDIO
-      #define LCD_PINS_D6  P1_14   // (73) ENET_RX_ER
-      #define LCD_PINS_D7  P1_10   // (75) ENET_RXD1
+      #define LCD_PINS_D5                  P1_17  // (71) ENET_MDIO
+      #define LCD_PINS_D6                  P1_14  // (73) ENET_RX_ER
+      #define LCD_PINS_D7                  P1_10  // (75) ENET_RXD1
     #endif
   #endif
 
@@ -434,38 +434,38 @@
 // Ethernet pins
 //
 #if DISABLED(ULTIPANEL)
-  #define ENET_MDIO        P1_17   // (71)  J12-4
-  #define ENET_RX_ER       P1_14   // (73)  J12-6
-  #define ENET_RXD1        P1_10   // (75)  J12-8
+  #define ENET_MDIO                        P1_17  // (71)  J12-4
+  #define ENET_RX_ER                       P1_14  // (73)  J12-6
+  #define ENET_RXD1                        P1_10  // (75)  J12-8
 #endif
-#define ENET_MOC           P1_16   // (70)  J12-3
-#define REF_CLK            P1_15   // (72)  J12-5
-#define ENET_RXD0          P1_09   // (74)  J12-7
-#define ENET_CRS           P1_08   // (76)  J12-9
-#define ENET_TX_EN         P1_04   // (77)  J12-10
-#define ENET_TXD0          P1_00   // (78)  J12-11
-#define ENET_TXD1          P1_01   // (79)  J12-12
+#define ENET_MOC                           P1_16  // (70)  J12-3
+#define REF_CLK                            P1_15  // (72)  J12-5
+#define ENET_RXD0                          P1_09  // (74)  J12-7
+#define ENET_CRS                           P1_08  // (76)  J12-9
+#define ENET_TX_EN                         P1_04  // (77)  J12-10
+#define ENET_TXD0                          P1_00  // (78)  J12-11
+#define ENET_TXD1                          P1_01  // (79)  J12-12
 
 //
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
-  #define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
-  #define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+  #define SCK_PIN                          P0_15  // (52)  system defined J3-9 & AUX-3
+  #define MISO_PIN                         P0_17  // (50)  system defined J3-10 & AUX-3
+  #define MOSI_PIN                         P0_18  // (51)  system defined J3-10 & AUX-3
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 3c55ac9be3fe..6f84f87bba88 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -41,80 +41,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN        P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_28
-#define X_MAX_PIN          P1_25
-#define Y_MIN_PIN          P2_11
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          P1_27
-#define Z_MAX_PIN          -1
-#define Z_PROBE            P1_22
+#define X_MIN_PIN                          P1_28
+#define X_MAX_PIN                          P1_25
+#define Y_MIN_PIN                          P2_11
+#define Y_MAX_PIN                          -1
+#define Z_MIN_PIN                          P1_27
+#define Z_MAX_PIN                          -1
+#define Z_PROBE                            P1_22
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_BED_PIN     P2_05
-#define HEATER_BED2_PIN    P2_04
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P2_06
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_BED2_PIN                    P2_04
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P2_06
 #ifndef FAN_PIN
-  #define FAN_PIN          P1_24
+  #define FAN_PIN                          P1_24
 #endif
-#define FAN1_PIN           P1_26
+#define FAN1_PIN                           P1_26
 
 //
 // Display
 //
 
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define LCD_PINS_RS         P0_16
-    #define LCD_PINS_ENABLE     P0_18
-    #define LCD_PINS_D4         P0_15
-    #define LCD_PINS_D5         P1_00
-    #define LCD_PINS_D6         P1_01
-    #define LCD_PINS_D7         P1_04
-    #define BEEPER_PIN          P1_31
-
-    #define BTN_EN1             P3_25
-    #define BTN_EN2             P3_26
-    #define BTN_ENC             P1_30
-
-    #define SD_DETECT_PIN       -1
+    #define LCD_PINS_RS                    P0_16
+    #define LCD_PINS_ENABLE                P0_18
+    #define LCD_PINS_D4                    P0_15
+    #define LCD_PINS_D5                    P1_00
+    #define LCD_PINS_D6                    P1_01
+    #define LCD_PINS_D7                    P1_04
+    #define BEEPER_PIN                     P1_31
+
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
+    #define BTN_ENC                        P1_30
+
+    #define SD_DETECT_PIN                  -1
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 1b91e4f50bb1..95cbd2163e26 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -41,93 +41,92 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define X_MAX_PIN          P1_27
-#define Y_MIN_PIN          P1_25
-#define Y_MAX_PIN          P1_28
-#define Z_MIN_PIN          P1_26
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define X_MAX_PIN                          P1_27
+#define Y_MIN_PIN                          P1_25
+#define Y_MAX_PIN                          P1_28
+#define Z_MIN_PIN                          P1_26
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01
-#define X_DIR_PIN          P0_11
-#define X_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_01
+#define X_DIR_PIN                          P0_11
+#define X_ENABLE_PIN                       P0_10
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P0_10 // BSD2660 default
+  #define X_CS_PIN                         P0_10  // BSD2660 default
 #endif
 
-#define Y_STEP_PIN         P2_02
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_02
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P0_19
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P0_19 // BSD2660 default
+  #define Y_CS_PIN                         P0_19  // BSD2660 default
 #endif
 
-#define Z_STEP_PIN         P2_03
-#define Z_DIR_PIN          P0_22
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P2_03
+#define Z_DIR_PIN                          P0_22
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P0_21 // BSD2660 default
+  #define Z_CS_PIN                         P0_21  // BSD2660 default
 #endif
 
-#define E0_STEP_PIN        P2_00
-#define E0_DIR_PIN         P0_05
-#define E0_ENABLE_PIN      P0_04
+#define E0_STEP_PIN                        P2_00
+#define E0_DIR_PIN                         P0_05
+#define E0_ENABLE_PIN                      P0_04
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P0_04 // BSD2660 default
+  #define E0_CS_PIN                        P0_04  // BSD2660 default
 #endif
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P4_29 // BSD2660 default
+  #define E1_CS_PIN                        P4_29  // BSD2660 default
 #endif
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_BED_PIN     P2_07
-#define HEATER_0_PIN       P2_04
-#define HEATER_1_PIN       P2_05
+#define HEATER_BED_PIN                     P2_07
+#define HEATER_0_PIN                       P2_04
+#define HEATER_1_PIN                       P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P0_26
+  #define FAN_PIN                          P0_26
 #endif
-#define FAN1_PIN           P1_22
+#define FAN1_PIN                           P1_22
 
 //
 // Display
 //
 
 #if ANY(VIKI2, miniVIKI)
-  #define BEEPER_PIN       P1_31
-  #define DOGLCD_A0        P2_06
-  #define DOGLCD_CS        P0_16
+  #define BEEPER_PIN                       P1_31
+  #define DOGLCD_A0                        P2_06
+  #define DOGLCD_CS                        P0_16
 
-  #define BTN_EN1          P3_25
-  #define BTN_EN2          P3_26
-  #define BTN_ENC          P2_11
+  #define BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P2_11
 
-  #define SD_DETECT_PIN    P1_18
-  #define SDSS             P1_21
+  #define SD_DETECT_PIN                    P1_18
+  #define SDSS                             P1_21
 
-  #define STAT_LED_RED_PIN P1_19
-  #define STAT_LED_BLUE_PIN P1_20
+  #define STAT_LED_RED_PIN                 P1_19
+  #define STAT_LED_BLUE_PIN                P1_20
 #endif
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 7559d6ad509a..ba1351e6f40d 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -37,74 +37,74 @@
 //
 // LED
 //
-#define LED_PIN            P1_18
+#define LED_PIN                            P1_18
 
 //
 // Servos
 //
-#define SERVO0_PIN         P1_29
+#define SERVO0_PIN                         P1_29
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_24
-#define Y_STOP_PIN         P1_26
-#define Z_STOP_PIN         P1_28
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_26
+#define Z_STOP_PIN                         P1_28
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P2_04
+  #define FIL_RUNOUT_PIN                   P2_04
 #endif
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN         P0_25_A2   // Analog Input (P0_25)
+  #define FILWIDTH_PIN                  P0_25_A2  // Analog Input (P0_25)
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01
-#define X_DIR_PIN          P0_11
-#define X_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_01
+#define X_DIR_PIN                          P0_11
+#define X_ENABLE_PIN                       P0_10
 
-#define Y_STEP_PIN         P2_02
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_02
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P0_19
 
-#define Z_STEP_PIN         P2_03
-#define Z_DIR_PIN          P0_22
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P2_03
+#define Z_DIR_PIN                          P0_22
+#define Z_ENABLE_PIN                       P0_21
 
-#define E0_STEP_PIN        P2_00
-#define E0_DIR_PIN         P0_05
-#define E0_ENABLE_PIN      P0_04
+#define E0_STEP_PIN                        P2_00
+#define E0_DIR_PIN                         P0_05
+#define E0_ENABLE_PIN                      P0_04
 
 //
 // DIGIPOT slave addresses
 //
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT
 #endif
 
 #ifndef DIGIPOT_I2C_ADDRESS_B
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT
 #endif
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_07
-#define HEATER_0_PIN       P2_05
+#define HEATER_BED_PIN                     P2_07
+#define HEATER_0_PIN                       P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P0_26
+  #define FAN_PIN                          P0_26
 #endif
-#define FAN1_PIN           P1_25
+#define FAN1_PIN                           P1_25
 
 //
 // Display
@@ -118,61 +118,61 @@
     // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
     // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
 
-    #define BEEPER_PIN     P2_11   // J3-3 & AUX-4
+    #define BEEPER_PIN                     P2_11  // J3-3 & AUX-4
 
-    #define BTN_EN1        P0_16   // J3-7 & AUX-4
-    #define BTN_EN2        P1_23   // J3-5 & AUX-4
-    #define BTN_ENC        P3_25   // J3-4 & AUX-4
+    #define BTN_EN1                        P0_16  // J3-7 & AUX-4
+    #define BTN_EN2                        P1_23  // J3-5 & AUX-4
+    #define BTN_ENC                        P3_25  // J3-4 & AUX-4
 
-    #define LCD_PINS_RS    P0_15   // J3-9 & AUX-4 (CS)
-    #define LCD_PINS_ENABLE P0_18  // J3-10 & AUX-3 (SID, MOSI)
-    #define LCD_PINS_D4    P2_06   // J3-8 & AUX-3 (SCK, CLK)
+    #define LCD_PINS_RS                    P0_15  // J3-9 & AUX-4 (CS)
+    #define LCD_PINS_ENABLE                P0_18  // J3-10 & AUX-3 (SID, MOSI)
+    #define LCD_PINS_D4                    P2_06  // J3-8 & AUX-3 (SCK, CLK)
 
   #else
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
 
-    #define SD_DETECT_PIN  P1_31   // (49) not 5V tolerant   J3-1 & AUX-3
-    #define KILL_PIN       P1_22   // (41) J5-4 & AUX-4
-    #define LCD_PINS_RS    P0_16   // (16) J3-7 & AUX-4
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
-    #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
+    #define SD_DETECT_PIN                  P1_31  // (49) not 5V tolerant   J3-1 & AUX-3
+    #define KILL_PIN                       P1_22  // (41) J5-4 & AUX-4
+    #define LCD_PINS_RS                    P0_16  // (16) J3-7 & AUX-4
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
+    #define LCD_BACKLIGHT_PIN              P0_16  // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
 
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
 
     #if ENABLED(REPRAPWORLD_KEYPAD)
-      #define SHIFT_OUT    P0_18   // (51)  (MOSI) J3-10 & AUX-3
-      #define SHIFT_CLK    P0_15   // (52)  (SCK)  J3-9 & AUX-3
-      #define SHIFT_LD     P1_31   // (49)  not 5V tolerant   J3-1 & AUX-3
+      #define SHIFT_OUT                    P0_18  // (51)  (MOSI) J3-10 & AUX-3
+      #define SHIFT_CLK                    P0_15  // (52)  (SCK)  J3-9 & AUX-3
+      #define SHIFT_LD                     P1_31  // (49)  not 5V tolerant   J3-1 & AUX-3
     #elif DISABLED(NEWPANEL)
-      //#define SHIFT_OUT  P2_11   // (35)  J3-3 & AUX-4
-      //#define SHIFT_CLK  P3_26   // (31)  J3-2 & AUX-4
-      //#define SHIFT_LD   P3_25   // (33)  J3-4 & AUX-4
-      //#define SHIFT_EN   P1_22   // (41)  J5-4 & AUX-4
+      //#define SHIFT_OUT                  P2_11  // (35)  J3-3 & AUX-4
+      //#define SHIFT_CLK                  P3_26  // (31)  J3-2 & AUX-4
+      //#define SHIFT_LD                   P3_25  // (33)  J3-4 & AUX-4
+      //#define SHIFT_EN                   P1_22  // (41)  J5-4 & AUX-4
     #endif
 
     #if ANY(VIKI2, miniVIKI)
       //#define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN   P1_30   // (37) may change if cable changes
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
-      #define DOGLCD_SCK   SCK_PIN
-      #define DOGLCD_MOSI  MOSI_PIN
+      #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
+      #define DOGLCD_SCK                 SCK_PIN
+      #define DOGLCD_MOSI               MOSI_PIN
 
-      #define STAT_LED_BLUE_PIN P0_26   // (63)  may change if cable changes
-      #define STAT_LED_RED_PIN  P1_21   // ( 6)  may change if cable changes
+      #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
+      #define STAT_LED_RED_PIN             P1_21  // ( 6)  may change if cable changes
     #else
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_17   // (71) ENET_MDIO
-        #define LCD_PINS_D6 P1_14   // (73) ENET_RX_ER
-        #define LCD_PINS_D7 P1_10   // (75) ENET_RXD1
+        #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
+        #define LCD_PINS_D6                P1_14  // (73) ENET_RX_ER
+        #define LCD_PINS_D7                P1_10  // (75) ENET_RXD1
       #endif
-      #define BEEPER_PIN   P1_30   // (37) not 5V tolerant
-      #define DOGLCD_CS    P0_16   // (16)
+      #define BEEPER_PIN                   P1_30  // (37) not 5V tolerant
+      #define DOGLCD_CS                    P0_16  // (16)
     #endif
 
     #if ENABLED(MINIPANEL)
@@ -199,22 +199,22 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           P1_23
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                           P1_23
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 3556ff83f004..87d3cb459c30 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -40,53 +40,53 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
 
 //
 // Default pins for TMC software SPI
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
   #endif
 #endif
 
@@ -94,42 +94,42 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // P0_23
-#define TEMP_BED_PIN        P0_24_A1   // P0_24
+#define TEMP_0_PIN                      P0_23_A0  // P0_23
+#define TEMP_BED_PIN                    P0_24_A1  // P0_24
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07   // FET 1
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07  // FET 1
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06   // FET 3
+  #define FAN_PIN                          P2_06  // FET 3
 #endif
 
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN       P2_04   // FET 4
+#define AUTO_FAN_PIN                       P2_04  // FET 4
 
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // Play LED
+#define LED_PIN                            P4_28  // Play LED
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
   #undef HEATER_0_PIN
-  #define SPINDLE_LASER_ENA_PIN     P2_07   // FET 1
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
   #undef HEATER_BED_PIN
-  #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
   #undef FAN_PIN
-  #define SPINDLE_DIR_PIN           P2_06   // FET 3
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 3
 #endif
 
 //
@@ -144,18 +144,18 @@
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       P0_27   // EXP2-7 - open drain
+  #define BEEPER_PIN                       P0_27  // EXP2-7 - open drain
 
-  #define BTN_EN1          P3_26   // EXP2-5
-  #define BTN_EN2          P3_25   // EXP2-3
-  #define BTN_ENC          P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-5
+  #define BTN_EN2                          P3_25  // EXP2-3
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define LCD_PINS_RS      P0_16   // EXP1-4
-  #define LCD_SDSS         P0_28   // EXP2-4
-  #define LCD_PINS_ENABLE  P0_18   // EXP1-3
-  #define LCD_PINS_D4      P0_15   // EXP1-5
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
 
-  #define KILL_PIN         P2_11   // EXP2-10
+  #define KILL_PIN                         P2_11  // EXP2-10
 
   #if ENABLED(SDSUPPORT)
     #error "SDSUPPORT is not currently supported by the Cohesion3D boards"
@@ -166,13 +166,13 @@
 //
 // Ethernet pins
 //
-#define ENET_MDIO          P1_17
-#define ENET_RX_ER         P1_14
-#define ENET_RXD1          P1_10
-#define ENET_MOC           P1_16
-#define REF_CLK            P1_15
-#define ENET_RXD0          P1_09
-#define ENET_CRS           P1_08
-#define ENET_TX_EN         P1_04
-#define ENET_TXD0          P1_00
-#define ENET_TXD1          P1_01
+#define ENET_MDIO                          P1_17
+#define ENET_RX_ER                         P1_14
+#define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
+#define ENET_TXD0                          P1_00
+#define ENET_TXD1                          P1_01
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index 2502c765801d..fa55a8adae04 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -40,70 +40,70 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P2_04
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_29
+  #define Z_MIN_PROBE_PIN                  P1_29
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
-
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
-
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
-
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
-
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
-#define E1_CS_PIN          P1_01   // Ethernet Expansion - Pin 14
-
-#define E2_STEP_PIN        P1_20
-#define E2_DIR_PIN         P1_19
-#define E2_ENABLE_PIN      P1_21
-#define E2_CS_PIN          P1_18   // FET 6
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
+
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
+
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
+
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
+
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
+#define E1_CS_PIN                          P1_01  // Ethernet Expansion - Pin 14
+
+#define E2_STEP_PIN                        P1_20
+#define E2_DIR_PIN                         P1_19
+#define E2_ENABLE_PIN                      P1_21
+#define E2_CS_PIN                          P1_18  // FET 6
 
 //
 // Default pins for TMC software SPI
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
   #endif
 #endif
 
@@ -111,42 +111,42 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0
-#define TEMP_BED_PIN        P0_24_A1
-#define TEMP_1_PIN          P0_25_A2
+#define TEMP_0_PIN                      P0_23_A0
+#define TEMP_BED_PIN                    P0_24_A1
+#define TEMP_1_PIN                      P0_25_A2
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      P0_26_A3
+  #define FILWIDTH_PIN                  P0_26_A3
 #else
-  #define TEMP_2_PIN        P0_26_A3
+  #define TEMP_2_PIN                    P0_26_A3
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07   // FET 1
-#define HEATER_1_PIN       P1_23   // FET 2
-#define HEATER_2_PIN       P1_22   // FET 3
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07  // FET 1
+#define HEATER_1_PIN                       P1_23  // FET 2
+#define HEATER_2_PIN                       P1_22  // FET 3
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06   // FET 4
+  #define FAN_PIN                          P2_06  // FET 4
 #endif
 
 //
 // Auto fans
 //
 #if HOTENDS == 3
-  #define AUTO_FAN_PIN     P1_18   // FET 6
+  #define AUTO_FAN_PIN                     P1_18  // FET 6
 #else
-  #define AUTO_FAN_PIN     P1_22   // FET 3
+  #define AUTO_FAN_PIN                     P1_22  // FET 3
 #endif
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // Play LED
+#define LED_PIN                            P4_28  // Play LED
 
 //
 // M3/M4/M5 - Spindle/Laser Control
@@ -155,9 +155,9 @@
   #undef HEATER_0_PIN
   #undef HEATER_BED_PIN
   #undef FAN_PIN
-  #define SPINDLE_LASER_ENA_PIN P2_07   // FET 1
-  #define SPINDLE_LASER_PWM_PIN P2_05   // Bed FET
-  #define SPINDLE_DIR_PIN       P2_06   // FET 4
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 4
 #endif
 
 //
@@ -173,54 +173,54 @@
 
 #if ENABLED(FYSETC_MINI_12864)
 
-  #define FORCE_SOFT_SPI    // REQUIRED - results in LCD soft SPI mode 3
+  #define FORCE_SOFT_SPI                          // REQUIRED - results in LCD soft SPI mode 3
 
-  #define BEEPER_PIN      P1_31   // EXP1-1
-  #define BTN_ENC         P1_30   // EXP1-2
-  #define DOGLCD_CS       P0_18   // EXP1-3
-  #define DOGLCD_A0       P0_16   // EXP1-4
-  #define LCD_RESET_PIN   P0_15   // EXP1-5
+  #define BEEPER_PIN                       P1_31  // EXP1-1
+  #define BTN_ENC                          P1_30  // EXP1-2
+  #define DOGLCD_CS                        P0_18  // EXP1-3
+  #define DOGLCD_A0                        P0_16  // EXP1-4
+  #define LCD_RESET_PIN                    P0_15  // EXP1-5
 
   // A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated
   // to the onboard SD card.  All required EXP2 signals come from the Ethernet connector.  Pin 1 of this
   // connector is the one nearest the motor power connector.
-  #define DOGLCD_SCK      P1_17   // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
-  #define BTN_EN2         P1_09   // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
-  #define BTN_EN1         P1_04   // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
-  #define DOGLCD_MOSI     P1_01   // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
+  #define DOGLCD_SCK                       P1_17  // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
+  #define BTN_EN2                          P1_09  // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
+  #define BTN_EN1                          P1_04  // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
+  #define DOGLCD_MOSI                      P1_01  // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
 
   // A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10
   // on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector.
   // Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB.
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN P1_16 // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
+      #define RGB_LED_R_PIN                P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN P1_10 // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
+      #define RGB_LED_G_PIN                P1_10  // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN P1_00 // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
+      #define RGB_LED_B_PIN                P1_00  // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN  P1_16   // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
+    #define NEOPIXEL_PIN                   P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
   #endif
 
 #elif HAS_SPI_LCD
 
-  #define BEEPER_PIN      P1_31   // EXP1-1
-  //#define SD_DETECT_PIN P0_27   // EXP2-7
+  #define BEEPER_PIN                       P1_31  // EXP1-1
+  //#define SD_DETECT_PIN                  P0_27  // EXP2-7
 
-  #define BTN_EN1         P3_26   // EXP2-5
-  #define BTN_EN2         P3_25   // EXP2-3
-  #define BTN_ENC         P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-5
+  #define BTN_EN2                          P3_25  // EXP2-3
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define LCD_PINS_RS     P0_16   // EXP1-4
-  #define LCD_SDSS        P0_28   // EXP2-4
-  #define LCD_PINS_ENABLE P0_18   // EXP1-3
-  #define LCD_PINS_D4     P0_15   // EXP1-5
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
 
-  #define KILL_PIN        P2_11   // EXP2-10
+  #define KILL_PIN                         P2_11  // EXP2-10
 
 #endif // HAS_SPI_LCD
 
@@ -228,22 +228,22 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_07   // (52)  system defined J3-9 & AUX-3
-  #define MISO_PIN         P0_08   // (50)  system defined J3-10 & AUX-3
-  #define MOSI_PIN         P0_09   // (51)  system defined J3-10 & AUX-3
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+  #define SCK_PIN                          P0_07  // (52)  system defined J3-9 & AUX-3
+  #define MISO_PIN                         P0_08  // (50)  system defined J3-10 & AUX-3
+  #define MOSI_PIN                         P0_09  // (51)  system defined J3-10 & AUX-3
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -251,16 +251,16 @@
 //
 // Ethernet pins
 //
-//#define ENET_MDIO          P1_17   // Ethernet pin  5 (bottom, 3 from left)
-//#define ENET_RX_ER         P1_14
-//#define ENET_RXD1          P1_10   // Ethernet pin 10 (top row, 5 from left)
-//#define ENET_MOC           P1_16   // Ethernet pin  6 (top row, 3 from left)
-//#define REF_CLK            P1_15
-//#define ENET_RXD0          P1_09   // Ethernet pin  9 (bottom, 5 from left)
-//#define ENET_CRS           P1_08   // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
-//#define ENET_TX_EN         P1_04   // Ethernet pin 11 (bottom, 6 from left)
-//#define ENET_TXD0          P1_00   // Ethernet pin 12 (top row, 6 from left)
-//#define ENET_TXD1          P1_01   // Ethernet pin 13 (bottom, 7 from left)
+//#define ENET_MDIO                        P1_17  // Ethernet pin  5 (bottom, 3 from left)
+//#define ENET_RX_ER                       P1_14
+//#define ENET_RXD1                        P1_10  // Ethernet pin 10 (top row, 5 from left)
+//#define ENET_MOC                         P1_16  // Ethernet pin  6 (top row, 3 from left)
+//#define REF_CLK                          P1_15
+//#define ENET_RXD0                        P1_09  // Ethernet pin  9 (bottom, 5 from left)
+//#define ENET_CRS                         P1_08  // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
+//#define ENET_TX_EN                       P1_04  // Ethernet pin 11 (bottom, 6 from left)
+//#define ENET_TXD0                        P1_00  // Ethernet pin 12 (top row, 6 from left)
+//#define ENET_TXD1                        P1_01  // Ethernet pin 13 (bottom, 7 from left)
 
 /**
  *  EXP1 pins
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index 7a6d283fb45e..fd98b5ef1309 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -47,8 +47,8 @@
 
 //#undef BTN_EN1
 //#undef BTN_EN2
-//#define BTN_EN1            P1_23   // EXP2.5
-//#define BTN_EN2            P1_22   // EXP2.3
+//#define BTN_EN1                          P1_23  // EXP2.5
+//#define BTN_EN2                          P1_22  // EXP2.3
 
 #if HAS_TMC_UART
   /**
@@ -58,16 +58,16 @@
    * In the worst case you may have to give up the LCD.
    * RX pins must be interrupt-capable.
    */
-  #define X_SERIAL_TX_PIN  P4_29   // J8-2
-  #define X_SERIAL_RX_PIN  P4_29   // J8-2
+  #define X_SERIAL_TX_PIN                  P4_29  // J8-2
+  #define X_SERIAL_RX_PIN                  P4_29  // J8-2
 
-  #define Y_SERIAL_TX_PIN  P2_08   // J8-3
-  #define Y_SERIAL_RX_PIN  P2_08   // J8-3
+  #define Y_SERIAL_TX_PIN                  P2_08  // J8-3
+  #define Y_SERIAL_RX_PIN                  P2_08  // J8-3
 
-  #define Z_SERIAL_TX_PIN  P2_11   // J8-4
-  #define Z_SERIAL_RX_PIN  P2_11   // J8-4
-  #define E0_SERIAL_TX_PIN P2_13   // J8-5
-  #define E0_SERIAL_RX_PIN P2_13   // J8-5
+  #define Z_SERIAL_TX_PIN                  P2_11  // J8-4
+  #define Z_SERIAL_RX_PIN                  P2_11  // J8-4
+  #define E0_SERIAL_TX_PIN                 P2_13  // J8-5
+  #define E0_SERIAL_RX_PIN                 P2_13  // J8-5
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 3db8a994036d..43db07ea5e08 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -41,79 +41,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define X_MAX_PIN          P1_25
-#define Y_MIN_PIN          P1_26
-#define Y_MAX_PIN          P1_27
-#define Z_MIN_PIN          P1_28
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define X_MAX_PIN                          P1_25
+#define Y_MIN_PIN                          P1_26
+#define Y_MAX_PIN                          P1_27
+#define Z_MIN_PIN                          P1_28
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // (T1)
-#define TEMP_BED_PIN        P0_24_A1   // (T2)
-#define TEMP_1_PIN          P0_25_A2   // (T3)
-#define TEMP_2_PIN          P0_26_A3   // (T4)
+#define TEMP_0_PIN                      P0_23_A0  // (T1)
+#define TEMP_BED_PIN                    P0_24_A1  // (T2)
+#define TEMP_1_PIN                      P0_25_A2  // (T3)
+#define TEMP_2_PIN                      P0_26_A3  // (T4)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P1_23
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P1_23
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06
+  #define FAN_PIN                          P2_06
 #endif
-#define FAN1_PIN           P2_04
+#define FAN1_PIN                           P2_04
 
 //
 // LCD / Controller
 //
 #if ANY(VIKI2, miniVIKI)
 
-  #define BEEPER_PIN       P1_31
-  #define DOGLCD_A0        P2_11
-  #define DOGLCD_CS        P0_16
+  #define BEEPER_PIN                       P1_31
+  #define DOGLCD_A0                        P2_11
+  #define DOGLCD_CS                        P0_16
 
-  #define BTN_EN1          P3_25
-  #define BTN_EN2          P3_26
-  #define BTN_ENC          P1_30
+  #define BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P1_30
 
-  #define SD_DETECT_PIN    P1_18
-  #define SDSS             P1_21
+  #define SD_DETECT_PIN                    P1_18
+  #define SDSS                             P1_21
 
-  #define STAT_LED_RED_PIN  P1_19
-  #define STAT_LED_BLUE_PIN P1_20
+  #define STAT_LED_RED_PIN                 P1_19
+  #define STAT_LED_BLUE_PIN                P1_20
 
 #elif HAS_SPI_LCD
 
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 9f28c2d94e74..d4030ed7900c 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -41,58 +41,58 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P2_04
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_24
-#define Y_STOP_PIN         P1_25
-#define Z_STOP_PIN         P1_26
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_25
+#define Z_STOP_PIN                         P1_26
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_27
+  #define FIL_RUNOUT_PIN                   P1_27
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P1_16
-#define X_ENABLE_PIN       P1_17
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P1_16
+#define X_ENABLE_PIN                       P1_17
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P1_10
-#define Y_ENABLE_PIN       P1_09
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P1_10
+#define Y_ENABLE_PIN                       P1_09
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P1_15
-#define Z_ENABLE_PIN       P1_14
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P1_15
+#define Z_ENABLE_PIN                       P1_14
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P1_04
-#define E0_ENABLE_PIN      P1_08
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P1_04
+#define E0_ENABLE_PIN                      P1_08
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 #if HAS_TMC_UART
   //
   // TMC220x stepper drivers
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P0_04
-  #define X_SERIAL_RX_PIN  P0_05
-  #define Y_SERIAL_TX_PIN  P0_10
-  #define Y_SERIAL_RX_PIN  P0_11
-  #define Z_SERIAL_TX_PIN  P0_19
-  #define Z_SERIAL_RX_PIN  P0_20
-  #define E0_SERIAL_TX_PIN P0_22
-  #define E0_SERIAL_RX_PIN P0_21
+  #define X_SERIAL_TX_PIN                  P0_04
+  #define X_SERIAL_RX_PIN                  P0_05
+  #define Y_SERIAL_TX_PIN                  P0_10
+  #define Y_SERIAL_RX_PIN                  P0_11
+  #define Z_SERIAL_TX_PIN                  P0_19
+  #define Z_SERIAL_RX_PIN                  P0_20
+  #define E0_SERIAL_TX_PIN                 P0_22
+  #define E0_SERIAL_RX_PIN                 P0_21
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -102,50 +102,50 @@
 // Temp Sensors
 //  3.3V max when defined as an Analog Input!
 //
-#if TEMP_SENSOR_0 == 20         // PT100 Adapter
-  #define TEMP_0_PIN        P0_02_A7   // Analog Input
+#if TEMP_SENSOR_0 == 20                           // PT100 Adapter
+  #define TEMP_0_PIN                    P0_02_A7  // Analog Input
 #else
-  #define TEMP_0_PIN        P0_23_A0   // Analog Input P0_23
+  #define TEMP_0_PIN                    P0_23_A0  // Analog Input P0_23
 #endif
 
-#define TEMP_BED_PIN        P0_24_A1   // Analog Input P0_24
-#define TEMP_1_PIN          P0_25_A2   // Analog Input P0_25
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input P0_24
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input P0_25
 
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      P0_26_A3   // Analog Input P0_26
+  #define FILWIDTH_PIN                  P0_26_A3  // Analog Input P0_26
 #else
-  #define TEMP_2_PIN        P0_26_A3   // Analog Input P0_26
+  #define TEMP_2_PIN                    P0_26_A3  // Analog Input P0_26
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06
+  #define FAN_PIN                          P2_06
 #endif
-#define FAN1_PIN           P1_22
+#define FAN1_PIN                           P1_22
 
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN       P1_22   // FET 3
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
+#define AUTO_FAN_PIN                       P1_22  // FET 3
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // SD Card
 //
 
-#define SDCARD_CONNECTION ONBOARD
+#define SDCARD_CONNECTION                ONBOARD
 
-#define SCK_PIN            P0_07
-#define MISO_PIN           P0_08
-#define MOSI_PIN           P0_09
-#define ONBOARD_SD_CS_PIN  P0_06
-#define SS_PIN             ONBOARD_SD_CS_PIN
+#define SCK_PIN                            P0_07
+#define MISO_PIN                           P0_08
+#define MOSI_PIN                           P0_09
+#define ONBOARD_SD_CS_PIN                  P0_06
+#define SS_PIN                 ONBOARD_SD_CS_PIN
 
 //
 // LCD / Controller
@@ -170,14 +170,14 @@
  */
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define BEEPER_PIN       P1_31
-  #define BTN_EN1          P3_26
-  #define BTN_EN2          P3_25
-  #define BTN_ENC          P1_30
-  #define LCD_PINS_RS      P0_16
-  #define LCD_PINS_ENABLE  P0_18
-  #define LCD_PINS_D4      P0_15
-  #define KILL_PIN         P2_11
+  #define BEEPER_PIN                       P1_31
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P1_30
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
+  #define KILL_PIN                         P2_11
 #elif HAS_SPI_LCD
   #error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
 #endif
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
index de064559af70..7b0c0010a3b0 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
@@ -33,46 +33,46 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN          2
-#define Z_STOP_PIN          5
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                             2
+#define Z_STOP_PIN                             5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          15
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             15
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         35
-#define Y_DIR_PIN          36
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            35
+#define Y_DIR_PIN                             36
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         40
-#define Z_DIR_PIN          41
-#define Z_ENABLE_PIN       37
+#define Z_STEP_PIN                            40
+#define Z_DIR_PIN                             41
+#define Z_ENABLE_PIN                          37
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      25
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         25
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature sensors
 //
-#define TEMP_0_PIN         15   // Analog Input
-#define TEMP_1_PIN         14   // Analog Input
-#define TEMP_BED_PIN       13   // Analog Input
+#define TEMP_0_PIN                            15  // Analog Input
+#define TEMP_1_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          13  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       19   // EXTRUDER 1
-#define HEATER_1_PIN       23   // EXTRUDER 2
-#define HEATER_BED_PIN     22
+#define HEATER_0_PIN                          19  // EXTRUDER 1
+#define HEATER_1_PIN                          23  // EXTRUDER 2
+#define HEATER_BED_PIN                        22
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
index 5fd5bfdef13f..d56d08c9e0f4 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
@@ -36,101 +36,101 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          30
-#define X_MAX_PIN          31
-#define Y_MIN_PIN          32
-#define Y_MAX_PIN          33
-#define Z_MIN_PIN          34
-#define Z_MAX_PIN          35
+#define X_MIN_PIN                             30
+#define X_MAX_PIN                             31
+#define Y_MIN_PIN                             32
+#define Y_MAX_PIN                             33
+#define Z_MIN_PIN                             34
+#define Z_MAX_PIN                             35
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         54
-#define Y_DIR_PIN          47
-#define Y_ENABLE_PIN       55
+#define Y_STEP_PIN                            54
+#define Y_DIR_PIN                             47
+#define Y_ENABLE_PIN                          55
 
-#define Z_STEP_PIN         57
-#define Z_DIR_PIN          56
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            57
+#define Z_DIR_PIN                             56
+#define Z_ENABLE_PIN                          62
 
-#define E0_STEP_PIN        23
-#define E0_DIR_PIN         22
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           23
+#define E0_DIR_PIN                            22
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         25
-#define E1_ENABLE_PIN      27
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            25
+#define E1_ENABLE_PIN                         27
 
-#define E2_STEP_PIN        29
-#define E2_DIR_PIN         28
-#define E2_ENABLE_PIN      39
+#define E2_STEP_PIN                           29
+#define E2_DIR_PIN                            28
+#define E2_ENABLE_PIN                         39
 
 //
 // Temperature sensors
 //
-#define TEMP_0_PIN         15
-#define TEMP_1_PIN         13
-#define TEMP_2_PIN         14
-#define TEMP_3_PIN         11   // should be used for chamber temperature control
-#define TEMP_BED_PIN       12
+#define TEMP_0_PIN                            15
+#define TEMP_1_PIN                            13
+#define TEMP_2_PIN                            14
+#define TEMP_3_PIN                            11  // should be used for chamber temperature control
+#define TEMP_BED_PIN                          12
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        8
-#define HEATER_BED_PIN      9
+#define HEATER_0_PIN                           6
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           8
+#define HEATER_BED_PIN                         9
 #ifndef FAN_PIN
-  #define FAN_PIN           3
+  #define FAN_PIN                              3
 #endif
-#define FAN2_PIN           58   // additional fan or light control output
+#define FAN2_PIN                              58  // additional fan or light control output
 
 //
 // Other board specific pins
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   37   // board input labeled as F-DET
+  #define FIL_RUNOUT_PIN                      37  // board input labeled as F-DET
 #endif
-#define Z_MIN_PROBE_PIN    36   // additional external board input labeled as E-SENS (should be used for Z-probe)
-#define LED_PIN            13
-#define SPINDLE_ENABLE_PIN  4   // additional PWM pin 1 at JP1 connector - should be used for laser control too
-#define EXT_2               5   // additional PWM pin 2 at JP1 connector
-#define EXT_3               2   // additional PWM pin 3 at JP1 connector
-#define PS_ON_PIN          45
-#define KILL_PIN           46
+#define Z_MIN_PROBE_PIN                       36  // additional external board input labeled as E-SENS (should be used for Z-probe)
+#define LED_PIN                               13
+#define SPINDLE_ENABLE_PIN                     4  // additional PWM pin 1 at JP1 connector - should be used for laser control too
+#define EXT_2                                  5  // additional PWM pin 2 at JP1 connector
+#define EXT_3                                  2  // additional PWM pin 3 at JP1 connector
+#define PS_ON_PIN                             45
+#define KILL_PIN                              46
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN     11   // shared with TEMP_3 analog input
+  #define FILWIDTH_PIN                        11  // shared with TEMP_3 analog input
 #endif
 
 //
 // LCD / Controller
 //
-#define LCD_PINS_RS        19
-#define LCD_PINS_ENABLE    42
-#define LCD_PINS_D4        18
-#define LCD_PINS_D5        38
-#define LCD_PINS_D6        41
-#define LCD_PINS_D7        40
+#define LCD_PINS_RS                           19
+#define LCD_PINS_ENABLE                       42
+#define LCD_PINS_D4                           18
+#define LCD_PINS_D5                           38
+#define LCD_PINS_D6                           41
+#define LCD_PINS_D7                           40
 
 //
 // Beeper, SD Card, Encoder
 //
-#define BEEPER_PIN         44
+#define BEEPER_PIN                            44
 
 #if ENABLED(SDSUPPORT)
-  #define SDSS             53
-  #define SD_DETECT_PIN    49
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       49
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          11
-  #define BTN_EN2          12
-  #define BTN_ENC          43
+  #define BTN_EN1                             11
+  #define BTN_EN2                             12
+  #define BTN_ENC                             43
 #endif
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
index 047dc8ef5afa..833499fe0f85 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -34,115 +34,115 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         43
-#define Y_STOP_PIN         45
-#define Z_STOP_PIN         42
+#define X_STOP_PIN                            43
+#define Y_STOP_PIN                            45
+#define Z_STOP_PIN                            42
 
 //
 // Steppers
 //
-#define X_STEP_PIN         34
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       35
+#define X_STEP_PIN                            34
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          35
 
-#define Y_STEP_PIN         37
-#define Y_DIR_PIN          39
-#define Y_ENABLE_PIN       38
+#define Y_STEP_PIN                            37
+#define Y_DIR_PIN                             39
+#define Y_ENABLE_PIN                          38
 
-#define Z_STEP_PIN         40
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       41
+#define Z_STEP_PIN                            40
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          41
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN       3
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                          3
 
-#define E1_STEP_PIN        61
-#define E1_DIR_PIN         62
-#define E1_ENABLE_PIN      60
+#define E1_STEP_PIN                           61
+#define E1_DIR_PIN                            62
+#define E1_ENABLE_PIN                         60
 
-#define E2_STEP_PIN        15
-#define E2_DIR_PIN         14
-#define E2_ENABLE_PIN      16
+#define E2_STEP_PIN                           15
+#define E2_DIR_PIN                            14
+#define E2_ENABLE_PIN                         16
 
-#define E3_STEP_PIN        44
-#define E3_DIR_PIN         49
-#define E3_ENABLE_PIN      47
+#define E3_STEP_PIN                           44
+#define E3_DIR_PIN                            49
+#define E3_ENABLE_PIN                         47
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          3   // Analog Input.  3 for tool2 -> 2 for chambertemp
-#define TEMP_2_PIN          2   // Analog Input.  9 for tool3 -> 2 for chambertemp
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 2 for chambertemp
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             3  // Analog Input.  3 for tool2 -> 2 for chambertemp
+#define TEMP_2_PIN                             2  // Analog Input.  9 for tool3 -> 2 for chambertemp
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 2 for chambertemp
+#define TEMP_BED_PIN                           1  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 2  // Analog Input
+  //#define TEMP_CHAMBER_PIN                   2  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        5
-#define HEATER_1_PIN       58
-#define HEATER_2_PIN       64
-#define HEATER_3_PIN       46
-#define HEATER_BED_PIN      2
+#define HEATER_0_PIN                           5
+#define HEATER_1_PIN                          58
+#define HEATER_2_PIN                          64
+#define HEATER_3_PIN                          46
+#define HEATER_BED_PIN                         2
 
 #ifndef FAN_PIN
-  //#define FAN_PIN         7   // common PWM pin for all tools
+  //#define FAN_PIN                            7  // common PWM pin for all tools
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                   7
+#define ORIG_E1_AUTO_FAN_PIN                   7
+#define ORIG_E2_AUTO_FAN_PIN                   7
+#define ORIG_E3_AUTO_FAN_PIN                   7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      13
+#define SDSS                                  53
+#define SD_DETECT_PIN                         13
 
 // Tools
 
-//#define TOOL_0_PIN           4
-//#define TOOL_1_PIN          59
-//#define TOOL_2_PIN           8
-//#define TOOL_3_PIN          30
-//#define TOOL_PWM_PIN         7   // common PWM pin for all tools
+//#define TOOL_0_PIN                           4
+//#define TOOL_1_PIN                          59
+//#define TOOL_2_PIN                           8
+//#define TOOL_3_PIN                          30
+//#define TOOL_PWM_PIN                         7  // common PWM pin for all tools
 
 // Common I/O
 
-//#define FIL_RUNOUT_PIN      -1
-//#define PWM_1_PIN           11
-//#define PWM_2_PIN           10
-//#define SPARE_IO            12
+//#define FIL_RUNOUT_PIN                      -1
+//#define PWM_1_PIN                           11
+//#define PWM_2_PIN                           10
+//#define SPARE_IO                            12
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN          6
+#define BEEPER_PIN                             6
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0          26
-#define DOGLCD_CS          24
-#define DOGLCD_MOSI        -1
-#define DOGLCD_SCK         -1
+#define DOGLCD_A0                             26
+#define DOGLCD_CS                             24
+#define DOGLCD_MOSI                           -1
+#define DOGLCD_SCK                            -1
 
-#define BTN_EN1            23
-#define BTN_EN2            25
-#define BTN_ENC            27
+#define BTN_EN1                               23
+#define BTN_EN2                               25
+#define BTN_ENC                               27
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT          19
-#define SHIFT_LD           18
-#define SHIFT_CLK          17
+#define SHIFT_OUT                             19
+#define SHIFT_LD                              18
+#define SHIFT_CLK                             17
 
-//#define UI1                31
-//#define UI2                22
+//#define UI1                                 31
+//#define UI2                                 22
 
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   31
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      31
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
index 246a5964f063..680a5c9a9943 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -34,122 +34,122 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         19
-#define Y_STOP_PIN         22
-#define Z_STOP_PIN         23
+#define X_STOP_PIN                            19
+#define Y_STOP_PIN                            22
+#define Z_STOP_PIN                            23
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          27
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             27
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         28
-#define Y_DIR_PIN          30
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            28
+#define Y_DIR_PIN                             30
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         31
-#define Z_DIR_PIN          33
-#define Z_ENABLE_PIN       32
+#define Z_STEP_PIN                            31
+#define Z_DIR_PIN                             33
+#define Z_ENABLE_PIN                          32
 
-#define E0_STEP_PIN        57
-#define E0_DIR_PIN         55
-#define E0_ENABLE_PIN      58
+#define E0_STEP_PIN                           57
+#define E0_DIR_PIN                            55
+#define E0_ENABLE_PIN                         58
 
-#define E1_STEP_PIN        61
-#define E1_DIR_PIN         62
-#define E1_ENABLE_PIN      60
+#define E1_STEP_PIN                           61
+#define E1_DIR_PIN                            62
+#define E1_ENABLE_PIN                         60
 
-#define E2_STEP_PIN        46
-#define E2_DIR_PIN         66
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           46
+#define E2_DIR_PIN                            66
+#define E2_ENABLE_PIN                         44
 
-#define E3_STEP_PIN        45
-#define E3_DIR_PIN         69
-#define E3_ENABLE_PIN      47
+#define E3_STEP_PIN                           45
+#define E3_DIR_PIN                            69
+#define E3_ENABLE_PIN                         47
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input.  9 for tool2 -> 13 for chambertemp
-#define TEMP_2_PIN         13   // Analog Input. 10 for tool3 -> 13 for chambertemp
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 13 for chambertemp
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input.  9 for tool2 -> 13 for chambertemp
+#define TEMP_2_PIN                            13  // Analog Input. 10 for tool3 -> 13 for chambertemp
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 13 for chambertemp
+#define TEMP_BED_PIN                          14  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 13 // Analog Input
+  //#define TEMP_CHAMBER_PIN                  13  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       11
-#define HEATER_1_PIN        9
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        3
-#define HEATER_BED_PIN     24
+#define HEATER_0_PIN                          11
+#define HEATER_1_PIN                           9
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           3
+#define HEATER_BED_PIN                        24
 
 #ifndef FAN_PIN
-  #define FAN_PIN           5   // 5 is PWMtool3 -> 7 is common PWM pin for all tools
+  #define FAN_PIN                              5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                   7
+#define ORIG_E1_AUTO_FAN_PIN                   7
+#define ORIG_E2_AUTO_FAN_PIN                   7
+#define ORIG_E3_AUTO_FAN_PIN                   7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      15
+#define SDSS                                  53
+#define SD_DETECT_PIN                         15
 
 // Tools
 
-//#define TOOL_0_PIN         56
-//#define TOOL_0_PWM_PIN     10   // red warning led at dual extruder
-//#define TOOL_1_PIN         59
-//#define TOOL_1_PWM_PIN      8   // lights at dual extruder
-//#define TOOL_2_PIN          4
-//#define TOOL_2_PWM_PIN      5
-//#define TOOL_3_PIN         14
-//#define TOOL_3_PWM_PIN      2
+//#define TOOL_0_PIN                          56
+//#define TOOL_0_PWM_PIN                      10  // red warning led at dual extruder
+//#define TOOL_1_PIN                          59
+//#define TOOL_1_PWM_PIN                       8  // lights at dual extruder
+//#define TOOL_2_PIN                           4
+//#define TOOL_2_PWM_PIN                       5
+//#define TOOL_3_PIN                          14
+//#define TOOL_3_PWM_PIN                       2
 
 // Common I/O
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   18
+  #define FIL_RUNOUT_PIN                      18
 #endif
-//#define PWM_1_PIN          12
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
+//#define PWM_1_PIN                           12
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         16
+#define BEEPER_PIN                            16
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0          39
-#define DOGLCD_CS          35
-#define DOGLCD_MOSI        48
-#define DOGLCD_SCK         49
+#define DOGLCD_A0                             39
+#define DOGLCD_CS                             35
+#define DOGLCD_MOSI                           48
+#define DOGLCD_SCK                            49
 #define LCD_SCREEN_ROT_180
 
 // The encoder and click button
-#define BTN_EN1            36
-#define BTN_EN2            34
-#define BTN_ENC            38
+#define BTN_EN1                               36
+#define BTN_EN2                               34
+#define BTN_ENC                               38
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT          42
-#define SHIFT_LD           41
-#define SHIFT_CLK          40
+#define SHIFT_OUT                             42
+#define SHIFT_LD                              41
+#define SHIFT_CLK                             40
 
-//#define UI1              43
-//#define UI2              37
+//#define UI1                                 43
+//#define UI2                                 37
 
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   10   // TOOL_0_PWM_PIN
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
index bf7d65f7e7b0..b4aa8ab815f4 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
@@ -34,79 +34,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN          6
+#define SERVO0_PIN                             6
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         39
-#define Z_STOP_PIN         62
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            39
+#define Z_STOP_PIN                            62
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN          12
-#define Y_ENABLE_PIN       15
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                             12
+#define Y_ENABLE_PIN                          15
 
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          27
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             27
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        64
-#define E0_DIR_PIN         65
-#define E0_ENABLE_PIN      63
+#define E0_STEP_PIN                           64
+#define E0_DIR_PIN                            65
+#define E0_ENABLE_PIN                         63
 
 //
 // Temperature Sensors
 // Analog Inputs
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        4   // Analog Input
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           4  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN  5   // Analog Input
+  #define TEMP_CHAMBER_PIN                     5  // Analog Input
 #endif
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN     32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                        32
+#define HEATER_CHAMBER_PIN                    33
 
 //
 // Fans
 //
-#define FAN_PIN               8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+#define FAN_PIN                                8
+#define ORIG_E0_AUTO_FAN_PIN                  30
+#define ORIG_E1_AUTO_FAN_PIN                  30
+#define ORIG_E2_AUTO_FAN_PIN                  30
+#define ORIG_E3_AUTO_FAN_PIN                  30
+//#define ORIG_CHAMBER_AUTO_FAN_PIN           10
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      40
+#define SDSS                                  53
+#define SD_DETECT_PIN                         40
 
 // Common I/O
 
-#define FIL_RUNOUT_PIN      9
-//#define FIL_RUNOUT_PIN     29  // encoder sensor
-//#define PWM_1_PIN          12
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
-#define BEEPER_PIN         13
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   10 // 31
+#define FIL_RUNOUT_PIN                         9
+//#define FIL_RUNOUT_PIN                      29  // encoder sensor
+//#define PWM_1_PIN                           12
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
+#define BEEPER_PIN                            13
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      10  // 31
diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h
index 45b500363e92..8bb8f081f57e 100644
--- a/Marlin/src/pins/mega/pins_EINSTART-S.h
+++ b/Marlin/src/pins/mega/pins_EINSTART-S.h
@@ -35,48 +35,48 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         44
-#define Y_STOP_PIN         43
-#define Z_STOP_PIN         42
+#define X_STOP_PIN                            44
+#define Y_STOP_PIN                            43
+#define Z_STOP_PIN                            42
 
 //
 // Steppers
 //
-#define X_STEP_PIN         76
-#define X_DIR_PIN          75
-#define X_ENABLE_PIN       73
+#define X_STEP_PIN                            76
+#define X_DIR_PIN                             75
+#define X_ENABLE_PIN                          73
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          32
-#define Y_ENABLE_PIN       72
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                          72
 
-#define Z_STEP_PIN         34
-#define Z_DIR_PIN          35
-#define Z_ENABLE_PIN       33
+#define Z_STEP_PIN                            34
+#define Z_DIR_PIN                             35
+#define Z_ENABLE_PIN                          33
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         37
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            37
+#define E0_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       83
-#define HEATER_BED_PIN     38
+#define HEATER_0_PIN                          83
+#define HEATER_BED_PIN                        38
 
-#define FAN_PIN            82
+#define FAN_PIN                               82
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN             4
+#define SDSS                                  53
+#define LED_PIN                                4
 
 //////////////////////////
 // LCDs and Controllers //
@@ -90,24 +90,24 @@
 // u8glib constructor
 // U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, LCD_PINS_DC, LCD_PINS_RS);
 
-#define LCD_PINS_DC        78
-#define LCD_PINS_RS        79
+#define LCD_PINS_DC                           78
+#define LCD_PINS_RS                           79
 // DOGM SPI LCD Support
-#define DOGLCD_CS           3
-#define DOGLCD_MOSI         2
-#define DOGLCD_SCK          5
-#define DOGLCD_A0           2
+#define DOGLCD_CS                              3
+#define DOGLCD_MOSI                            2
+#define DOGLCD_SCK                             5
+#define DOGLCD_A0                              2
 
 //
 // LCD Display input pins
 //
-#define BTN_UP             25
-#define BTN_DWN            26
-#define BTN_LFT            27
-#define BTN_RT             28
+#define BTN_UP                                25
+#define BTN_DWN                               26
+#define BTN_LFT                               27
+#define BTN_RT                                28
 
 // 'OK' button
-#define BTN_ENC            29
+#define BTN_ENC                               29
 
 // Set Kill to right arrow, same as RIGID_PANEL
-#define KILL_PIN           28
+#define KILL_PIN                              28
diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h
index 30b4ab40af04..3d35a72b1939 100644
--- a/Marlin/src/pins/mega/pins_ELEFU_3.h
+++ b/Marlin/src/pins/mega/pins_ELEFU_3.h
@@ -34,115 +34,115 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          35
-#define X_MAX_PIN          34
-#define Y_MIN_PIN          33
-#define Y_MAX_PIN          32
-#define Z_MIN_PIN          31
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             35
+#define X_MAX_PIN                             34
+#define Y_MIN_PIN                             33
+#define Y_MAX_PIN                             32
+#define Z_MIN_PIN                             31
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         49
-#define X_DIR_PIN          13
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            49
+#define X_DIR_PIN                             13
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN           9
-#define Y_ENABLE_PIN       12
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                              9
+#define Y_ENABLE_PIN                          12
 
-#define Z_STEP_PIN          7
-#define Z_DIR_PIN           6
-#define Z_ENABLE_PIN        8
+#define Z_STEP_PIN                             7
+#define Z_DIR_PIN                              6
+#define Z_ENABLE_PIN                           8
 
-#define E0_STEP_PIN        40
-#define E0_DIR_PIN         41
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           40
+#define E0_DIR_PIN                            41
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        18
-#define E1_DIR_PIN         19
-#define E1_ENABLE_PIN      38
+#define E1_STEP_PIN                           18
+#define E1_DIR_PIN                            19
+#define E1_ENABLE_PIN                         38
 
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         47
-#define E2_ENABLE_PIN      42
+#define E2_STEP_PIN                           43
+#define E2_DIR_PIN                            47
+#define E2_ENABLE_PIN                         42
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          3   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             3  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       45   // 12V PWM1
-#define HEATER_1_PIN       46   // 12V PWM2
-#define HEATER_2_PIN       17   // 12V PWM3
-#define HEATER_BED_PIN     44   // DOUBLE 12V PWM
+#define HEATER_0_PIN                          45  // 12V PWM1
+#define HEATER_1_PIN                          46  // 12V PWM2
+#define HEATER_2_PIN                          17  // 12V PWM3
+#define HEATER_BED_PIN                        44  // DOUBLE 12V PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // 5V PWM
+  #define FAN_PIN                             16  // 5V PWM
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          10   // Set to -1 if using a manual switch on the PWRSW Connector
-#define SLEEP_WAKE_PIN     26   // This feature still needs work
-#define PHOTOGRAPH_PIN     29
+#define PS_ON_PIN                             10  // Set to -1 if using a manual switch on the PWRSW Connector
+#define SLEEP_WAKE_PIN                        26  // This feature still needs work
+#define PHOTOGRAPH_PIN                        29
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         36
+#define BEEPER_PIN                            36
 
 #if ENABLED(RA_CONTROL_PANEL)
 
-  #define SDSS             53
-  #define SD_DETECT_PIN    28
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       28
 
-  #define BTN_EN1          14
-  #define BTN_EN2          39
-  #define BTN_ENC          15
+  #define BTN_EN1                             14
+  #define BTN_EN2                             39
+  #define BTN_ENC                             15
 
 #endif // RA_CONTROL_PANEL
 
 #if ENABLED(RA_DISCO)
   // variables for which pins the TLC5947 is using
-  #define TLC_CLOCK_PIN    25
-  #define TLC_BLANK_PIN    23
-  #define TLC_XLAT_PIN     22
-  #define TLC_DATA_PIN     24
+  #define TLC_CLOCK_PIN                       25
+  #define TLC_BLANK_PIN                       23
+  #define TLC_XLAT_PIN                        22
+  #define TLC_DATA_PIN                        24
 
   // We also need to define pin to port number mapping for the 2560 to match the pins listed above.
   // If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
-  #define TLC_CLOCK_BIT     3
+  #define TLC_CLOCK_BIT                        3
   #define TLC_CLOCK_PORT    &PORTA
 
-  #define TLC_BLANK_BIT     1
+  #define TLC_BLANK_BIT                        1
   #define TLC_BLANK_PORT    &PORTA
 
-  #define TLC_DATA_BIT      2
+  #define TLC_DATA_BIT                         2
   #define TLC_DATA_PORT     &PORTA
 
-  #define TLC_XLAT_BIT      0
+  #define TLC_XLAT_BIT                         0
   #define TLC_XLAT_PORT     &PORTA
 
   // Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
   // Leave it at at least 1 if you have enabled RA_LIGHTING
   // The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
-  #define NUM_TLCS          2
+  #define NUM_TLCS                             2
 
   // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
   // Modify them according to your specific situation.
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index 6590f06d6cb3..e111f2ce4485 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -39,102 +39,102 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             26
+#define Y_MAX_PIN                             28
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             32
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8
-#define TEMP_1_PIN          9
-#define TEMP_BED_PIN       10
+#define TEMP_0_PIN                             8
+#define TEMP_1_PIN                             9
+#define TEMP_BED_PIN                          10
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // Must be enabled at startup to keep power flowing
-#define KILL_PIN           -1
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // Must be enabled at startup to keep power flowing
+#define KILL_PIN                              -1
 
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
     #if ENABLED(MKS_MINI_12864)
-      #define DOGLCD_A0     5
-      #define DOGLCD_CS    21
-      #define BTN_EN1      40
-      #define BTN_EN2      42
+      #define DOGLCD_A0                        5
+      #define DOGLCD_CS                       21
+      #define BTN_EN1                         40
+      #define BTN_EN2                         42
     #else
-      #define LCD_PINS_RS  20
-      #define LCD_PINS_ENABLE 17
-      #define LCD_PINS_D4  16
-      #define LCD_PINS_D5  21
-      #define LCD_PINS_D6   5
-      #define LCD_PINS_D7   6
-      #define BTN_EN1      42
-      #define BTN_EN2      40
+      #define LCD_PINS_RS                     20
+      #define LCD_PINS_ENABLE                 17
+      #define LCD_PINS_D4                     16
+      #define LCD_PINS_D5                     21
+      #define LCD_PINS_D6                      5
+      #define LCD_PINS_D7                      6
+      #define BTN_EN1                         42
+      #define BTN_EN2                         40
     #endif
 
-    #define BTN_ENC        19
-    #define SD_DETECT_PIN  38
+    #define BTN_ENC                           19
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL
+  #else                                           // !NEWPANEL
 
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
 
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
-    #define SD_DETECT_PIN  -1
+    #define SD_DETECT_PIN                     -1
 
   #endif // !NEWPANEL
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index 566e88705dd7..08f9018a29d1 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -36,33 +36,33 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11   //13 untested  3Dtouch
+#define SERVO0_PIN                            11  //13 untested  3Dtouch
 
 //
 // Limit Switches
 //
 #ifndef X_STOP_PIN
   #ifndef X_MIN_PIN
-    #define X_MIN_PIN      24
+    #define X_MIN_PIN                         24
   #endif
   #ifndef X_MAX_PIN
-    #define X_MAX_PIN      22
+    #define X_MAX_PIN                         22
   #endif
 #endif
 #ifndef Y_STOP_PIN
   #ifndef Y_MIN_PIN
-    #define Y_MIN_PIN      28
+    #define Y_MIN_PIN                         28
   #endif
   #ifndef Y_MAX_PIN
-    #define Y_MAX_PIN      26
+    #define Y_MAX_PIN                         26
   #endif
 #endif
 #ifndef Z_STOP_PIN
   #ifndef Z_MIN_PIN
-    #define Z_MIN_PIN      30
+    #define Z_MIN_PIN                         30
   #endif
   #ifndef Z_MAX_PIN
-    #define Z_MAX_PIN      32
+    #define Z_MAX_PIN                         32
   #endif
 #endif
 
@@ -70,116 +70,116 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   66
+  #define FIL_RUNOUT_PIN                      66
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  67
+  #define FIL_RUNOUT2_PIN                     67
 #endif
 
 //
 // Power Recovery
 //
-#define POWER_LOSS_PIN     69   // Pin to detect power loss
-#define POWER_LOSS_STATE   LOW
+#define POWER_LOSS_PIN                        69  // Pin to detect power loss
+#define POWER_LOSS_STATE                     LOW
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          39
-#define X_ENABLE_PIN       35
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             39
+#define X_ENABLE_PIN                          35
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         25
-#define Z_DIR_PIN          23
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            25
+#define Z_DIR_PIN                             23
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        46
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      12
+#define E0_STEP_PIN                           46
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         12
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         45
-#define E2_ENABLE_PIN      41
+#define E2_STEP_PIN                           43
+#define E2_DIR_PIN                            45
+#define E2_ENABLE_PIN                         41
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         11   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_2_PIN          1   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                            11  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_2_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        3
-#define HEATER_2_PIN        1
-#define HEATER_BED_PIN      4
-#define FAN_PIN             9
-#define FAN1_PIN            8
-#define FAN2_PIN            7
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           3
+#define HEATER_2_PIN                           1
+#define HEATER_BED_PIN                         4
+#define FAN_PIN                                9
+#define FAN1_PIN                               8
+#define FAN2_PIN                               7
 
 //
 // Misc. Functions
 //
-#define SD_DETECT_PIN      38
-#define SDSS               53
-#define LED_PIN             6
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // This pin must be enabled at boot to keep power flowing
+#define SD_DETECT_PIN                         38
+#define SDSS                                  53
+#define LED_PIN                                6
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // This pin must be enabled at boot to keep power flowing
 
 #ifndef CASE_LIGHT_PIN
-  #define CASE_LIGHT_PIN    6   // 21
+  #define CASE_LIGHT_PIN                       6  // 21
 #endif
 
 //
 // LCD Controller
 //
-#define BEEPER_PIN         18
+#define BEEPER_PIN                            18
 
 #ifndef LCD_PINS_RS
-  #define LCD_PINS_RS      20
+  #define LCD_PINS_RS                         20
 #endif
 #ifndef LCD_PINS_ENABLE
-  #define LCD_PINS_ENABLE  17
+  #define LCD_PINS_ENABLE                     17
 #endif
 #ifndef LCD_PINS_D4
-  #define LCD_PINS_D4      16
+  #define LCD_PINS_D4                         16
 #endif
 #ifndef LCD_PINS_D5
-  #define LCD_PINS_D5      21
+  #define LCD_PINS_D5                         21
 #endif
 #ifndef LCD_PINS_D6
-  #define LCD_PINS_D6       5
+  #define LCD_PINS_D6                          5
 #endif
 #ifndef LCD_PINS_D7
-  #define LCD_PINS_D7      36
+  #define LCD_PINS_D7                         36
 #endif
 
 #if ENABLED(NEWPANEL)
   #ifndef BTN_EN1
-    #define BTN_EN1        42
+    #define BTN_EN1                           42
   #endif
   #ifndef BTN_EN2
-    #define BTN_EN2        40
+    #define BTN_EN2                           40
   #endif
   #ifndef BTN_ENC
-    #define BTN_ENC        19
+    #define BTN_ENC                           19
   #endif
 #endif
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
index 037ea1324444..06ac9fd9df14 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
@@ -25,15 +25,15 @@
  * Geeetech A20M pin assignment
  */
 
-#define LCD_PINS_RS       5
-#define LCD_PINS_ENABLE  36
-#define LCD_PINS_D4      21
-#define LCD_PINS_D7       6
+#define LCD_PINS_RS                           5
+#define LCD_PINS_ENABLE                      36
+#define LCD_PINS_D4                          21
+#define LCD_PINS_D7                           6
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1        16
-  #define BTN_EN2        17
-  #define BTN_ENC        19
+  #define BTN_EN1                            16
+  #define BTN_EN2                            17
+  #define BTN_ENC                            19
 #endif
 
 #include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
index 7ba9112d4e72..0f06aaf25642 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
@@ -27,9 +27,9 @@
 
 #define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
 
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
+#define X_MIN_PIN                            22
+#define X_MAX_PIN                            24
+#define Y_MIN_PIN                            26
+#define Y_MAX_PIN                            28
 
 #include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index b66756668805..66adfb2fa7d7 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -42,79 +42,79 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         22
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         29
-//#define EXP_STOP_PIN       28
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            29
+//#define EXP_STOP_PIN                        28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         32
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          36
-#define Z_ENABLE_PIN       34
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34
 
-#define E0_STEP_PIN        42
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define MOTOR_CURRENT_PWM_XY_PIN   44
-#define MOTOR_CURRENT_PWM_Z_PIN    45
-#define MOTOR_CURRENT_PWM_E_PIN    46
+#define MOTOR_CURRENT_PWM_XY_PIN              44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE  2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7   //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
+  #define FAN_PIN                              7  //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      39
-//#define LED_PIN           8
-#define CASE_LIGHT_PIN      8           // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+//#define LED_PIN                              8
+#define CASE_LIGHT_PIN                         8  // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
 
-//#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
-//#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+//#define SAFETY_TRIGGERED_PIN                28  // PIN to detect the safety circuit has triggered
+//#define MAIN_VOLTAGE_MEASURE_PIN            14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if ENABLED(SPINDLE_LASER_ENABLE)
-  #define SPINDLE_DIR_PIN           16
-  #define SPINDLE_LASER_ENABLE_PIN  17   // Pin should have a pullup!
-  #define SPINDLE_LASER_PWM_PIN      9   // Hardware PWM
+  #define SPINDLE_DIR_PIN                     16
+  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
 #endif
 
 //
@@ -122,48 +122,48 @@
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS     20   // LCD_CS
-    #define LCD_PINS_ENABLE 15   // LCD_SDA
-    #define LCD_PINS_D4     14   // LCD_SCK
+    #define LCD_PINS_RS                       20  // LCD_CS
+    #define LCD_PINS_ENABLE                   15  // LCD_SDA
+    #define LCD_PINS_D4                       14  // LCD_SCK
 
     #if ENABLED(HJC_LCD_SMART_CONTROLLER)
-      #define LCD_BACKLIGHT_PIN  5   // LCD_Backlight
+      #define LCD_BACKLIGHT_PIN                5  // LCD_Backlight
       //#ifndef LCD_CONTRAST_PIN
       //  #define LCD_CONTRAST_PIN  5   // LCD_Contrast
       //#endif
       #ifndef FIL_RUNOUT_PIN
-        #define FIL_RUNOUT_PIN 24   // Filament runout
+        #define FIL_RUNOUT_PIN                24  // Filament runout
       #endif
     #else
-      #define LCD_PINS_D5  21
-      #define LCD_PINS_D6   5
-      #define LCD_PINS_D7   6
+      #define LCD_PINS_D5                     21
+      #define LCD_PINS_D6                      5
+      #define LCD_PINS_D7                      6
     #endif
 
-    #define BTN_EN1        41
-    #define BTN_EN2        40
-    #define BTN_ENC        19
+    #define BTN_EN1                           41
+    #define BTN_EN2                           40
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN  39
+    #define SD_DETECT_PIN                     39
 
   #else
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
-
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
+
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
   #endif // !NEWPANEL
 
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h
index f04b89d4bcb0..188cbcad3da8 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG.h
@@ -34,59 +34,59 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          47
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          48
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          49
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                             47
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             48
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             49
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28
-#define X_DIR_PIN          63
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            28
+#define X_DIR_PIN                             63
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         14   // A6
-#define Y_DIR_PIN          15   // A0
-#define Y_ENABLE_PIN       39
+#define Y_STEP_PIN                            14  // A6
+#define Y_DIR_PIN                             15  // A0
+#define Y_ENABLE_PIN                          39
 
-#define Z_STEP_PIN         31   // A2
-#define Z_DIR_PIN          32   // A6
-#define Z_ENABLE_PIN       30   // A1
+#define Z_STEP_PIN                            31  // A2
+#define Z_DIR_PIN                             32  // A6
+#define Z_ENABLE_PIN                          30  // A1
 
-#define E0_STEP_PIN        34   // 34
-#define E0_DIR_PIN         35   // 35
-#define E0_ENABLE_PIN      33   // 33
+#define E0_STEP_PIN                           34  // 34
+#define E0_DIR_PIN                            35  // 35
+#define E0_ENABLE_PIN                         33  // 33
 
-#define E1_STEP_PIN        37   // 37
-#define E1_DIR_PIN         40   // 40
-#define E1_ENABLE_PIN      36   // 36
+#define E1_STEP_PIN                           37  // 37
+#define E1_DIR_PIN                            40  // 40
+#define E1_ENABLE_PIN                         36  // 36
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input (D27)
-#define TEMP_1_PIN         15   // Analog Input (1)
-#define TEMP_BED_PIN       14   // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN                            13  // Analog Input (D27)
+#define TEMP_1_PIN                            15  // Analog Input (1)
+#define TEMP_BED_PIN                          14  // Analog Input (1,2 or I2C)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8   // 12
-#define HEATER_2_PIN       11   // 13
-#define HEATER_BED_PIN     10   // 14/15
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8  // 12
+#define HEATER_2_PIN                          11  // 13
+#define HEATER_BED_PIN                        10  // 14/15
 
-#define FAN_PIN             7
+#define FAN_PIN                                7
 
 //
 // Misc. Functions
 //
-#define SDSS               11
-#define LED_PIN            13
-#define SOL1_PIN           16
-#define SOL2_PIN           17
+#define SDSS                                  11
+#define LED_PIN                               13
+#define SOL1_PIN                              16
+#define SOL2_PIN                              17
 
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
index ab6299a9b05c..36cb0e2c142d 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
@@ -38,9 +38,9 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // 'X Min'
-#define Y_STOP_PIN         48   // 'Y Min'
-#define Z_STOP_PIN         49   // 'Z Min'
+#define X_STOP_PIN                            47  // 'X Min'
+#define Y_STOP_PIN                            48  // 'Y Min'
+#define Z_STOP_PIN                            49  // 'Z Min'
 
 //
 // Steppers
@@ -51,65 +51,65 @@
 //
 
 // X-axis signal-level connector
-#define X_STEP_PIN         65
-#define X_DIR_PIN          64
-#define X_ENABLE_PIN       66   // Not actually used on Xeed, could be repurposed
+#define X_STEP_PIN                            65
+#define X_DIR_PIN                             64
+#define X_ENABLE_PIN                          66  // Not actually used on Xeed, could be repurposed
 
 // Y-axis signal-level connector
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24   // Not actually used on Xeed, could be repurposed
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24  // Not actually used on Xeed, could be repurposed
 
 // ZMOT connector (Front Right Z Motor)
-#define Z_STEP_PIN         31
-#define Z_DIR_PIN          32
-#define Z_ENABLE_PIN       30
+#define Z_STEP_PIN                            31
+#define Z_DIR_PIN                             32
+#define Z_ENABLE_PIN                          30
 
 // XMOT connector (Rear Z Motor)
-#define Z2_STEP_PIN        28
-#define Z2_DIR_PIN         63
-#define Z2_ENABLE_PIN      29
+#define Z2_STEP_PIN                           28
+#define Z2_DIR_PIN                            63
+#define Z2_ENABLE_PIN                         29
 
 // YMOT connector (Front Left Z Motor)
-#define Z3_STEP_PIN        14
-#define Z3_DIR_PIN         15
-#define Z3_ENABLE_PIN      39
+#define Z3_STEP_PIN                           14
+#define Z3_DIR_PIN                            15
+#define Z3_ENABLE_PIN                         39
 
 // EMOT2 connector
-#define E0_STEP_PIN        37
-#define E0_DIR_PIN         40
-#define E0_ENABLE_PIN      36
+#define E0_STEP_PIN                           37
+#define E0_DIR_PIN                            40
+#define E0_ENABLE_PIN                         36
 
 // EMOT connector
-#define E1_STEP_PIN        34
-#define E1_DIR_PIN         35
-#define E1_ENABLE_PIN      33
+#define E1_STEP_PIN                           34
+#define E1_DIR_PIN                            35
+#define E1_ENABLE_PIN                         33
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     42   // ROT2 Connector
-#define FIL_RUNOUT2_PIN    44   // ROT1 Connector
+#define FIL_RUNOUT_PIN                        42  // ROT2 Connector
+#define FIL_RUNOUT2_PIN                       44  // ROT1 Connector
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         15   // T3 Connector
-#define TEMP_1_PIN         13   // T1 Connector
-#define TEMP_BED_PIN       14   // BED Connector (Between T1 and T3)
+#define TEMP_0_PIN                            15  // T3 Connector
+#define TEMP_1_PIN                            13  // T1 Connector
+#define TEMP_BED_PIN                          14  // BED Connector (Between T1 and T3)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        8   // Misc Connector, pins 3 and 4 (Out2)
-#define HEATER_1_PIN        9   // Misc Connector, pins 5 and 6 (Out3)
-#define HEATER_BED_PIN      6   // Misc Connector, pins 9(-) and 10(+) (OutA)
+#define HEATER_0_PIN                           8  // Misc Connector, pins 3 and 4 (Out2)
+#define HEATER_1_PIN                           9  // Misc Connector, pins 5 and 6 (Out3)
+#define HEATER_BED_PIN                         6  // Misc Connector, pins 9(-) and 10(+) (OutA)
 
-#define FAN_PIN            10   // Misc Connector, pins 7(-) and 8 (+) (Out4)
+#define FAN_PIN                               10  // Misc Connector, pins 7(-) and 8 (+) (Out4)
 
-#define LED_PIN            13
+#define LED_PIN                               13
 
-#define SOL1_PIN            7   // Misc Connector, pins 1(-) and 2(+) (Out1)
+#define SOL1_PIN                               7  // Misc Connector, pins 1(-) and 2(+) (Out1)
 
 // Door Closed Sensor
-//#define DOOR_PIN           45 // HM1 Connector
+//#define DOOR_PIN                            45  // HM1 Connector
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 8fecc71bac88..2d0db1582511 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -36,89 +36,89 @@
 //
 // Servos
 //
-#define SERVO0_PIN         30
-#define SERVO1_PIN         31
-#define SERVO2_PIN         32
-#define SERVO3_PIN         33
+#define SERVO0_PIN                            30
+#define SERVO1_PIN                            31
+#define SERVO2_PIN                            32
+#define SERVO3_PIN                            33
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          43
-#define X_MAX_PIN          42
-#define Y_MIN_PIN          38
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          40
-#define Z_MAX_PIN          37
+#define X_MIN_PIN                             43
+#define X_MAX_PIN                             42
+#define Y_MIN_PIN                             38
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             40
+#define Z_MAX_PIN                             37
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  37
+  #define Z_MIN_PROBE_PIN                     37
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         62   // A8
-#define X_DIR_PIN          63   // A9
-#define X_ENABLE_PIN       61   // A7
+#define X_STEP_PIN                            62  // A8
+#define X_DIR_PIN                             63  // A9
+#define X_ENABLE_PIN                          61  // A7
 
-#define Y_STEP_PIN         65   // A11
-#define Y_DIR_PIN          66   // A12
-#define Y_ENABLE_PIN       64   // A10
+#define Y_STEP_PIN                            65  // A11
+#define Y_DIR_PIN                             66  // A12
+#define Y_ENABLE_PIN                          64  // A10
 
-#define Z_STEP_PIN         68   // A14
-#define Z_DIR_PIN          69   // A15
-#define Z_ENABLE_PIN       67   // A13
+#define Z_STEP_PIN                            68  // A14
+#define Z_DIR_PIN                             69  // A15
+#define Z_ENABLE_PIN                          67  // A13
 
-#define E0_STEP_PIN        23
-#define E0_DIR_PIN         24
-#define E0_ENABLE_PIN      22
+#define E0_STEP_PIN                           23
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         22
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         27
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            27
+#define E1_ENABLE_PIN                         25
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        4   // Analog Input
+  #define TEMP_0_PIN                           4  // Analog Input
 #else
-  #define TEMP_0_PIN        0   // Analog Input
+  #define TEMP_0_PIN                           0  // Analog Input
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN        5   // Analog Input
+  #define TEMP_1_PIN                           5  // Analog Input
 #else
-  #define TEMP_1_PIN        2   // Analog Input
+  #define TEMP_1_PIN                           2  // Analog Input
 #endif
 
-#define TEMP_2_PIN          3   // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      6   // Analog Input
+  #define TEMP_BED_PIN                         6  // Analog Input
 #else
-  #define TEMP_BED_PIN      1   // Analog Input
+  #define TEMP_BED_PIN                         1  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       29
-#define HEATER_1_PIN       34
-#define HEATER_BED_PIN     28
+#define HEATER_0_PIN                          29
+#define HEATER_1_PIN                          34
+#define HEATER_BED_PIN                        28
 
 #ifndef FAN_PIN
-  #define FAN_PIN          39
+  #define FAN_PIN                             39
 #endif
-#define FAN1_PIN           35
-#define FAN2_PIN           36
+#define FAN1_PIN                              35
+#define FAN2_PIN                              36
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN FAN2_PIN
+  #define CONTROLLER_FAN_PIN            FAN2_PIN
 #endif
 
 #define FAN_SOFT_PWM
@@ -126,39 +126,39 @@
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         2
 
 //
 // LCD / Controller
 //
 #if ENABLED(MINIPANEL)
 
-  #define BEEPER_PIN       46
+  #define BEEPER_PIN                          46
   // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0        47
-  #define DOGLCD_CS        45
-  #define LCD_BACKLIGHT_PIN 44   // backlight LED on PA3
+  #define DOGLCD_A0                           47
+  #define DOGLCD_CS                           45
+  #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
 
-  #define KILL_PIN         12
+  #define KILL_PIN                            12
   // GLCD features
   // Uncomment screen orientation
   //#define LCD_SCREEN_ROT_90
   //#define LCD_SCREEN_ROT_180
   //#define LCD_SCREEN_ROT_270
 
-  #define BTN_EN1          48
-  #define BTN_EN2          11
-  #define BTN_ENC          10
+  #define BTN_EN1                             48
+  #define BTN_EN2                             11
+  #define BTN_ENC                             10
 
-  #define SD_DETECT_PIN    49
+  #define SD_DETECT_PIN                       49
 
 #endif // MINIPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     7   // Pullup!
-#define SPINDLE_DIR_PIN           8
+#define SPINDLE_LASER_PWM_PIN                  6  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  7  // Pullup!
+#define SPINDLE_DIR_PIN                        8
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
index d3015340de09..4d7a98005077 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -33,99 +33,99 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          41
-#define X_MAX_PIN          37
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                             41
+#define X_MAX_PIN                             37
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         60   // A6
-#define Y_DIR_PIN          61   // A7
-#define Y_ENABLE_PIN       22
+#define Y_STEP_PIN                            60  // A6
+#define Y_DIR_PIN                             61  // A7
+#define Y_ENABLE_PIN                          22
 
-#define Z_STEP_PIN         54   // A0
-#define Z_DIR_PIN          55   // A1
-#define Z_ENABLE_PIN       56   // A2
+#define Z_STEP_PIN                            54  // A0
+#define Z_DIR_PIN                             55  // A1
+#define Z_ENABLE_PIN                          56  // A2
 
-#define E0_STEP_PIN        31
-#define E0_DIR_PIN         32
-#define E0_ENABLE_PIN      38
+#define E0_STEP_PIN                           31
+#define E0_DIR_PIN                            32
+#define E0_ENABLE_PIN                         38
 
-#define E1_STEP_PIN        34
-#define E1_DIR_PIN         36
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           34
+#define E1_DIR_PIN                            36
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        8   // Analog Input
+  #define TEMP_0_PIN                           8  // Analog Input
 #else
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7   // IO pin. Buffer needed
+  #define FAN_PIN                              7  // IO pin. Buffer needed
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                         2
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         33
+#define BEEPER_PIN                            33
 
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define LCD_PINS_RS     16
-  #define LCD_PINS_ENABLE 17
-  #define LCD_PINS_D4     23
-  #define LCD_PINS_D5     25
-  #define LCD_PINS_D6     27
-  #define LCD_PINS_D7     29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 
   // Buttons directly attached to AUX-2
-  #define BTN_EN1         59
-  #define BTN_EN2         64
-  #define BTN_ENC         43
+  #define BTN_EN1                             59
+  #define BTN_EN2                             64
+  #define BTN_ENC                             43
 
-  #define SD_DETECT_PIN   -1   // RAMPS doesn't use this
+  #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
+#define SPINDLE_DIR_PIN                       11
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
index 160d9d4b786a..d976e0981682 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
@@ -33,120 +33,120 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37
-#define X_MAX_PIN          40
-#define Y_MIN_PIN          41
-#define Y_MAX_PIN          38
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                             37
+#define X_MAX_PIN                             40
+#define Y_MIN_PIN                             41
+#define Y_MAX_PIN                             38
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          27
-#define X_ENABLE_PIN       25
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             27
+#define X_ENABLE_PIN                          25
 
-#define Y_STEP_PIN          4   // A6
-#define Y_DIR_PIN          54   // A0
-#define Y_ENABLE_PIN        5
+#define Y_STEP_PIN                             4  // A6
+#define Y_DIR_PIN                             54  // A0
+#define Y_ENABLE_PIN                           5
 
-#define Z_STEP_PIN         56   // A2
-#define Z_DIR_PIN          60   // A6
-#define Z_ENABLE_PIN       55   // A1
+#define Z_STEP_PIN                            56  // A2
+#define Z_DIR_PIN                             60  // A6
+#define Z_ENABLE_PIN                          55  // A1
 
-#define E0_STEP_PIN        35
-#define E0_DIR_PIN         36
-#define E0_ENABLE_PIN      34
+#define E0_STEP_PIN                           35
+#define E0_DIR_PIN                            36
+#define E0_ENABLE_PIN                         34
 
-#define E1_STEP_PIN        29
-#define E1_DIR_PIN         39
-#define E1_ENABLE_PIN      28
+#define E1_STEP_PIN                           29
+#define E1_DIR_PIN                            39
+#define E1_ENABLE_PIN                         28
 
-#define E2_STEP_PIN        23   // ? schematic says 24
-#define E2_DIR_PIN         24   // ? schematic says 23
-#define E2_ENABLE_PIN      22
+#define E2_STEP_PIN                           23  // ? schematic says 24
+#define E2_DIR_PIN                            24  // ? schematic says 23
+#define E2_ENABLE_PIN                         22
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        4   // Analog Input
+  #define TEMP_0_PIN                           4  // Analog Input
 #else
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN        8   // Analog Input
+  #define TEMP_1_PIN                           8  // Analog Input
 #else
-  #define TEMP_1_PIN       15   // Analog Input
+  #define TEMP_1_PIN                          15  // Analog Input
 #endif
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      8   // Analog Input
+  #define TEMP_BED_PIN                         8  // Analog Input
 #else
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                         2
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    16   // Pullup!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 16  // Pullup!
+#define SPINDLE_DIR_PIN                       11
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         64
+#define BEEPER_PIN                            64
 
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS      14
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      30
-  #define LCD_PINS_D5      31
-  #define LCD_PINS_D6      32
-  #define LCD_PINS_D7      33
+  #define LCD_PINS_RS                         14
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         30
+  #define LCD_PINS_D5                         31
+  #define LCD_PINS_D6                         32
+  #define LCD_PINS_D7                         33
 
   #if ENABLED(NEWPANEL)
     // Buttons are directly attached using keypad
-    #define BTN_EN1        61
-    #define BTN_EN2        59
-    #define BTN_ENC        43
+    #define BTN_EN1                           61
+    #define BTN_EN2                           59
+    #define BTN_ENC                           43
   #else
     // Buttons attached to shift register of reprapworld keypad v1.1
-    #define SHIFT_CLK      63
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      17
-    #define SHIFT_EN       17
+    #define SHIFT_CLK                         63
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         17
+    #define SHIFT_EN                          17
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
index fe0f4826be32..78dd88809ff0 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -40,132 +40,132 @@
 //
 // Servos
 //
-#define SERVO0_PIN         46   // AUX3-6
-#define SERVO1_PIN         47   // AUX3-5
-#define SERVO2_PIN         48   // AUX3-4
-#define SERVO3_PIN         49   // AUX3-3
+#define SERVO0_PIN                            46  // AUX3-6
+#define SERVO1_PIN                            47  // AUX3-5
+#define SERVO2_PIN                            48  // AUX3-4
+#define SERVO3_PIN                            49  // AUX3-3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37   // No INT
-#define X_MAX_PIN          40   // No INT
-#define Y_MIN_PIN          41   // No INT
-#define Y_MAX_PIN          38   // No INT
-#define Z_MIN_PIN          18   // No INT
-#define Z_MAX_PIN          19   // No INT
+#define X_MIN_PIN                             37  // No INT
+#define X_MAX_PIN                             40  // No INT
+#define Y_MIN_PIN                             41  // No INT
+#define Y_MAX_PIN                             38  // No INT
+#define Z_MIN_PIN                             18  // No INT
+#define Z_MAX_PIN                             19  // No INT
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         58
-#define X_DIR_PIN          57
-#define X_ENABLE_PIN       59
+#define X_STEP_PIN                            58
+#define X_DIR_PIN                             57
+#define X_ENABLE_PIN                          59
 
-#define Y_STEP_PIN          5
-#define Y_DIR_PIN          17
-#define Y_ENABLE_PIN        4
+#define Y_STEP_PIN                             5
+#define Y_DIR_PIN                             17
+#define Y_ENABLE_PIN                           4
 
-#define Z_STEP_PIN         16
-#define Z_DIR_PIN          11
-#define Z_ENABLE_PIN        3
+#define Z_STEP_PIN                            16
+#define Z_DIR_PIN                             11
+#define Z_ENABLE_PIN                           3
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      29
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         29
 
-#define E1_STEP_PIN        25
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           25
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 
-#define E2_STEP_PIN        22
-#define E2_DIR_PIN         60
-#define E2_ENABLE_PIN      23
+#define E2_STEP_PIN                           22
+#define E2_DIR_PIN                            60
+#define E2_ENABLE_PIN                         23
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN       11   // Analog Input
+  #define TEMP_0_PIN                          11  // Analog Input
 #else
-  #define TEMP_0_PIN       15   // Analog Input
+  #define TEMP_0_PIN                          15  // Analog Input
 #endif
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN       10   // Analog Input
+  #define TEMP_1_PIN                          10  // Analog Input
 #else
-  #define TEMP_1_PIN       13   // Analog Input
+  #define TEMP_1_PIN                          13  // Analog Input
 #endif
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN        9   // Analog Input
+  #define TEMP_2_PIN                           9  // Analog Input
 #else
-  #define TEMP_2_PIN       12   // Analog Input
+  #define TEMP_2_PIN                          12  // Analog Input
 #endif
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      8   // Analog Input
+  #define TEMP_BED_PIN                         8  // Analog Input
 #else
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        9
-#define HEATER_2_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           9
+#define HEATER_2_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
-#define FAN1_PIN            7
+#define FAN1_PIN                               7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN     45   // Try the keypad connector
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                        45  // Try the keypad connector
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         61
+#define BEEPER_PIN                            61
 
-#define BTN_EN1            44
-#define BTN_EN2            45
-#define BTN_ENC            33
+#define BTN_EN1                               44
+#define BTN_EN2                               45
+#define BTN_ENC                               33
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      56   // CS chip select / SS chip slave select
-  #define LCD_PINS_ENABLE  51   // SID (MOSI)
-  #define LCD_PINS_D4      52   // SCK (CLK) clock
-  #define SD_DETECT_PIN    35
+  #define LCD_PINS_RS                         56  // CS chip select / SS chip slave select
+  #define LCD_PINS_ENABLE                     51  // SID (MOSI)
+  #define LCD_PINS_D4                         52  // SCK (CLK) clock
+  #define SD_DETECT_PIN                       35
 
 #else
 
-  #define LCD_PINS_RS      32
-  #define LCD_PINS_ENABLE  31
-  #define LCD_PINS_D4      14
-  #define LCD_PINS_D5      30
-  #define LCD_PINS_D6      39
-  #define LCD_PINS_D7      15
+  #define LCD_PINS_RS                         32
+  #define LCD_PINS_ENABLE                     31
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D5                         30
+  #define LCD_PINS_D6                         39
+  #define LCD_PINS_D7                         15
 
-  #define SHIFT_CLK        43
-  #define SHIFT_LD         35
-  #define SHIFT_OUT        34
-  #define SHIFT_EN         44
+  #define SHIFT_CLK                           43
+  #define SHIFT_LD                            35
+  #define SHIFT_OUT                           34
+  #define SHIFT_EN                            44
 
   #if MB(MEGATRONICS_31, MEGATRONICS_32)
-    #define SD_DETECT_PIN  56
+    #define SD_DETECT_PIN                     56
   #endif
 
 #endif
@@ -173,23 +173,23 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if DISABLED(REPRAPWORLD_KEYPAD)        // try to use the keypad connector first
-  #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    43   // Pullup!
-  #define SPINDLE_DIR_PIN          42
+#if DISABLED(REPRAPWORLD_KEYPAD)                  // try to use the keypad connector first
+  #define SPINDLE_LASER_PWM_PIN               44  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               43  // Pullup!
+  #define SPINDLE_DIR_PIN                     42
 #elif EXTRUDERS <= 2
   // Hijack the last extruder so that we can get the PWM signal off the Y breakout
   // Move Y to the E2 plug. This makes dual Y steppers harder
-  #undef Y_ENABLE_PIN  //  4
-  #undef Y_STEP_PIN    //  5
-  #undef Y_DIR_PIN     // 17
-  #undef E2_ENABLE_PIN // 23
-  #undef E2_STEP_PIN   // 22
-  #undef E2_DIR_PIN    // 60
-  #define Y_ENABLE_PIN             23
-  #define Y_STEP_PIN               22
-  #define Y_DIR_PIN                60
-  #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
-  #define SPINDLE_DIR_PIN           5
+  #undef Y_ENABLE_PIN                             //  4
+  #undef Y_STEP_PIN                               //  5
+  #undef Y_DIR_PIN                                // 17
+  #undef E2_ENABLE_PIN                            // 23
+  #undef E2_STEP_PIN                              // 22
+  #undef E2_DIR_PIN                               // 60
+  #define Y_ENABLE_PIN                        23
+  #define Y_STEP_PIN                          22
+  #define Y_DIR_PIN                           60
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
+  #define SPINDLE_DIR_PIN                      5
 #endif
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 6d3102172bb8..3282216819f9 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -47,60 +47,60 @@
 //
 // Servos
 //
-#define SERVO0_PIN         36   // C1 (1280-EX1)
-#define SERVO1_PIN         37   // C0 (1280-EX2)
-#define SERVO2_PIN         40   // G1 (1280-EX3)
-#define SERVO3_PIN         41   // G0 (1280-EX4)
+#define SERVO0_PIN                            36  // C1 (1280-EX1)
+#define SERVO1_PIN                            37  // C0 (1280-EX2)
+#define SERVO2_PIN                            40  // G1 (1280-EX3)
+#define SERVO3_PIN                            41  // G0 (1280-EX4)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          49   // L0
-#define X_MAX_PIN          48   // L1
-#define Y_MIN_PIN          47   // L2
-#define Y_MAX_PIN          46   // L3
-#define Z_MIN_PIN          43   // L6
-#define Z_MAX_PIN          42   // L7
+#define X_MIN_PIN                             49  // L0
+#define X_MAX_PIN                             48  // L1
+#define Y_MIN_PIN                             47  // L2
+#define Y_MAX_PIN                             46  // L3
+#define Z_MIN_PIN                             43  // L6
+#define Z_MAX_PIN                             42  // L7
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  42
+  #define Z_MIN_PROBE_PIN                     42
 #endif
 
 //
 // Filament Runout Pins
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   49
+  #define FIL_RUNOUT_PIN                      49
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  47
+  #define FIL_RUNOUT2_PIN                     47
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         55   // F1
-#define X_DIR_PIN          54   // F0
-#define X_ENABLE_PIN       56   // F2
+#define X_STEP_PIN                            55  // F1
+#define X_DIR_PIN                             54  // F0
+#define X_ENABLE_PIN                          56  // F2
 
-#define Y_STEP_PIN         59   // F5
-#define Y_DIR_PIN          58   // F4
-#define Y_ENABLE_PIN       60   // F6
+#define Y_STEP_PIN                            59  // F5
+#define Y_DIR_PIN                             58  // F4
+#define Y_ENABLE_PIN                          60  // F6
 
-#define Z_STEP_PIN         63   // K1
-#define Z_DIR_PIN          62   // K0
-#define Z_ENABLE_PIN       64   // K2
+#define Z_STEP_PIN                            63  // K1
+#define Z_DIR_PIN                             62  // K0
+#define Z_ENABLE_PIN                          64  // K2
 
-#define E0_STEP_PIN        25   // A3
-#define E0_DIR_PIN         24   // A2
-#define E0_ENABLE_PIN      26   // A4
+#define E0_STEP_PIN                           25  // A3
+#define E0_DIR_PIN                            24  // A2
+#define E0_ENABLE_PIN                         26  // A4
 
-#define E1_STEP_PIN        29   // A7
-#define E1_DIR_PIN         28   // A6
-#define E1_ENABLE_PIN      39   // G2
+#define E1_STEP_PIN                           29  // A7
+#define E1_DIR_PIN                            28  // A6
+#define E1_ENABLE_PIN                         39  // G2
 
 //
 // I2C Digipots - MCP4018
@@ -108,22 +108,22 @@
 // Set from 0 - 127 with stop bit.
 // (Ex. 3F << 1 | 1)
 //
-#define DIGIPOTS_I2C_SCL    76   // J5
-#define DIGIPOTS_I2C_SDA_X  57   // F3
-#define DIGIPOTS_I2C_SDA_Y  61   // F7
-#define DIGIPOTS_I2C_SDA_Z  65   // K3
-#define DIGIPOTS_I2C_SDA_E0 27   // A5
-#define DIGIPOTS_I2C_SDA_E1 77   // J6
+#define DIGIPOTS_I2C_SCL                      76  // J5
+#define DIGIPOTS_I2C_SDA_X                    57  // F3
+#define DIGIPOTS_I2C_SDA_Y                    61  // F7
+#define DIGIPOTS_I2C_SDA_Z                    65  // K3
+#define DIGIPOTS_I2C_SDA_E0                   27  // A5
+#define DIGIPOTS_I2C_SDA_E1                   77  // J6
 
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2F   // unshifted slave address (5E <- 2F << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2F              // unshifted slave address (5E <- 2F << 1)
 #endif
 
 //
 // Temperature Sensors
 //
 // K7 - 69 / ADC15 - 15
-#define TEMP_BED_PIN       15
+#define TEMP_BED_PIN                          15
 
 // SPI for Max6675 or Max31855 Thermocouple
 // Uses a separate SPI bus
@@ -133,15 +133,15 @@
 //  2 E4 CS2
 // 78 E2 SCK
 //
-#define THERMO_SCK_PIN     78   // E2
-#define THERMO_DO_PIN       3   // E5
-#define THERMO_CS1_PIN      5   // E3
-#define THERMO_CS2_PIN      2   // E4
+#define THERMO_SCK_PIN                        78  // E2
+#define THERMO_DO_PIN                          3  // E5
+#define THERMO_CS1_PIN                         5  // E3
+#define THERMO_CS2_PIN                         2  // E4
 
-#define MAX6675_SS_PIN     THERMO_CS1_PIN
-#define MAX6675_SS2_PIN    THERMO_CS2_PIN
-#define MAX6675_SCK_PIN    THERMO_SCK_PIN
-#define MAX6675_DO_PIN     THERMO_DO_PIN
+#define MAX6675_SS_PIN            THERMO_CS1_PIN
+#define MAX6675_SS2_PIN           THERMO_CS2_PIN
+#define MAX6675_SCK_PIN           THERMO_SCK_PIN
+#define MAX6675_DO_PIN             THERMO_DO_PIN
 
 //
 // Augmentation for auto-assigning plugs
@@ -152,12 +152,12 @@
 //
 
 // Labels from the schematic:
-#define EX1_HEAT_PIN        6   // H3
-#define EX1_FAN_PIN         7   // H4
-#define EX2_HEAT_PIN       11   // B5
-#define EX2_FAN_PIN        12   // B6
-#define HBP_PIN            45   // L4
-#define EXTRA_FET_PIN      44   // L5
+#define EX1_HEAT_PIN                           6  // H3
+#define EX1_FAN_PIN                            7  // H4
+#define EX2_HEAT_PIN                          11  // B5
+#define EX2_FAN_PIN                           12  // B6
+#define HBP_PIN                               45  // L4
+#define EXTRA_FET_PIN                         44  // L5
 
 #if HOTENDS > 1
   #if TEMP_SENSOR_BED
@@ -174,35 +174,35 @@
 //
 // Heaters / Fans (24V)
 //
-#define HEATER_0_PIN       EX1_HEAT_PIN
-
-#if ENABLED(IS_EFB)                            // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   HBP_PIN
-#elif ENABLED(IS_EEF)                          // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     EX2_HEAT_PIN
-#elif ENABLED(IS_EEB)                          // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     EX2_HEAT_PIN
-  #define HEATER_BED_PIN   HBP_PIN
-#elif ENABLED(IS_EFF)                          // Hotend, Fan, Fan
-  #define FAN1_PIN         HBP_PIN
+#define HEATER_0_PIN                EX1_HEAT_PIN
+
+#if ENABLED(IS_EFB)                               // Hotend, Fan, Bed
+  #define HEATER_BED_PIN                 HBP_PIN
+#elif ENABLED(IS_EEF)                             // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              EX2_HEAT_PIN
+#elif ENABLED(IS_EEB)                             // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              EX2_HEAT_PIN
+  #define HEATER_BED_PIN                 HBP_PIN
+#elif ENABLED(IS_EFF)                             // Hotend, Fan, Fan
+  #define FAN1_PIN                       HBP_PIN
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_EFB, IS_EFF)                      // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        EX2_HEAT_PIN
+    #define FAN_PIN                 EX2_HEAT_PIN
   #elif EITHER(IS_EEF, IS_SF)                     // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        HBP_PIN
+    #define FAN_PIN                      HBP_PIN
   #else
-    #define FAN_PIN        EXTRA_FET_PIN
+    #define FAN_PIN                EXTRA_FET_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13   // B7
-#define CUTOFF_RESET_PIN   16   // H1
-#define CUTOFF_TEST_PIN    17   // H0
+#define LED_PIN                               13  // B7
+#define CUTOFF_RESET_PIN                      16  // H1
+#define CUTOFF_TEST_PIN                       17  // H0
 
 //
 // LCD / Controller
@@ -211,57 +211,57 @@
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS    33   // C4: LCD-STROBE
-    #define LCD_PINS_ENABLE 72  // J2: LEFT
-    #define LCD_PINS_D4    35   // C2: LCD-CLK
-    #define LCD_PINS_D5    32   // C5: RLED
-    #define LCD_PINS_D6    34   // C3: LCD-DATA
-    #define LCD_PINS_D7    31   // C6: GLED
+    #define LCD_PINS_RS                       33  // C4: LCD-STROBE
+    #define LCD_PINS_ENABLE                   72  // J2: LEFT
+    #define LCD_PINS_D4                       35  // C2: LCD-CLK
+    #define LCD_PINS_D5                       32  // C5: RLED
+    #define LCD_PINS_D6                       34  // C3: LCD-DATA
+    #define LCD_PINS_D7                       31  // C6: GLED
 
-    #define BTN_EN2        75   // J4, UP
-    #define BTN_EN1        73   // J3, DOWN
+    #define BTN_EN2                           75  // J4, UP
+    #define BTN_EN1                           73  // J3, DOWN
     //STOP button connected as KILL_PIN
-    #define KILL_PIN       14   // J1, RIGHT
+    #define KILL_PIN                          14  // J1, RIGHT
     //KILL - not connected
 
-    #define BEEPER_PIN      8   // H5, SD_WP
+    #define BEEPER_PIN                         8  // H5, SD_WP
 
     //on board leds
-    #define STAT_LED_RED_LED  SERVO0_PIN   // C1 (1280-EX1, DEBUG2)
-    #define STAT_LED_BLUE_PIN SERVO1_PIN   // C0 (1280-EX2, DEBUG3)
+    #define STAT_LED_RED_LED          SERVO0_PIN  // C1 (1280-EX1, DEBUG2)
+    #define STAT_LED_BLUE_PIN         SERVO1_PIN  // C0 (1280-EX2, DEBUG3)
 
   #else
     // Replicator uses a 3-wire SR controller with HD44780
-    #define SR_DATA_PIN    34   // C3
-    #define SR_CLK_PIN     35   // C2
-    #define SR_STROBE_PIN  33   // C4
+    #define SR_DATA_PIN                       34  // C3
+    #define SR_CLK_PIN                        35  // C2
+    #define SR_STROBE_PIN                     33  // C4
 
-    #define BTN_UP         75   // J4
-    #define BTN_DWN        73   // J3
-    #define BTN_LFT        72   // J2
-    #define BTN_RT         14   // J1
+    #define BTN_UP                            75  // J4
+    #define BTN_DWN                           73  // J3
+    #define BTN_LFT                           72  // J2
+    #define BTN_RT                            14  // J1
 
     // Disable encoder
     #undef BTN_EN1
     #undef BTN_EN2
 
-    #define BEEPER_PIN      4   // G5
+    #define BEEPER_PIN                         4  // G5
 
-    #define STAT_LED_RED_PIN  32   // C5
-    #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
+    #define STAT_LED_RED_PIN                  32  // C5
+    #define STAT_LED_BLUE_PIN                 31  // C6 (Actually green)
 
   #endif
 
-  #define BTN_CENTER       15   // J0
-  #define BTN_ENC          BTN_CENTER
+  #define BTN_CENTER                          15  // J0
+  #define BTN_ENC                     BTN_CENTER
 
 #endif // HAS_SPI_LCD
 
 //
 // SD Card
 //
-#define SDSS               53   // B0
-#define SD_DETECT_PIN       9   // H6
+#define SDSS                                  53  // B0
+#define SD_DETECT_PIN                          9  // H6
 
 //
 // TMC 220x
@@ -280,19 +280,19 @@
    * Software serial
    */
 
-  #define X_SERIAL_TX_PIN  16
-  #define X_SERIAL_RX_PIN  17
+  #define X_SERIAL_TX_PIN                     16
+  #define X_SERIAL_RX_PIN                     17
 
-  #define Y_SERIAL_TX_PIN  18
-  #define Y_SERIAL_RX_PIN  19
+  #define Y_SERIAL_TX_PIN                     18
+  #define Y_SERIAL_RX_PIN                     19
 
-  #define Z_SERIAL_TX_PIN  41
-  #define Z_SERIAL_RX_PIN  66
+  #define Z_SERIAL_TX_PIN                     41
+  #define Z_SERIAL_RX_PIN                     66
 
-  #define E0_SERIAL_TX_PIN 40
-  #define E0_SERIAL_RX_PIN 67
+  #define E0_SERIAL_TX_PIN                    40
+  #define E0_SERIAL_RX_PIN                    67
 
-  #define E1_SERIAL_TX_PIN 37
-  #define E1_SERIAL_RX_PIN 68
+  #define E1_SERIAL_TX_PIN                    37
+  #define E1_SERIAL_RX_PIN                    68
 
 #endif
diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
index 5b06e3b83590..35d1b59ecbfb 100644
--- a/Marlin/src/pins/mega/pins_MINITRONICS.h
+++ b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -42,102 +42,102 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN           5
-#define X_MAX_PIN           2
-#define Y_MIN_PIN           2
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN           6
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                              5
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                              2
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                              6
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         48
-#define X_DIR_PIN          47
-#define X_ENABLE_PIN       49
+#define X_STEP_PIN                            48
+#define X_DIR_PIN                             47
+#define X_ENABLE_PIN                          49
 
-#define Y_STEP_PIN         39   // A6
-#define Y_DIR_PIN          40   // A0
-#define Y_ENABLE_PIN       38
+#define Y_STEP_PIN                            39  // A6
+#define Y_DIR_PIN                             40  // A0
+#define Y_ENABLE_PIN                          38
 
-#define Z_STEP_PIN         42   // A2
-#define Z_DIR_PIN          43   // A6
-#define Z_ENABLE_PIN       41   // A1
+#define Z_STEP_PIN                            42  // A2
+#define Z_DIR_PIN                             43  // A6
+#define Z_ENABLE_PIN                          41  // A1
 
-#define E0_STEP_PIN        45
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      27
+#define E0_STEP_PIN                           45
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         27
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         35
-#define E1_ENABLE_PIN      37
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            35
+#define E1_ENABLE_PIN                         37
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input
-#define TEMP_1_PIN          6   // Analog Input
-#define TEMP_BED_PIN        6   // Analog Input
+#define TEMP_0_PIN                             7  // Analog Input
+#define TEMP_1_PIN                             6  // Analog Input
+#define TEMP_BED_PIN                           6  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        7   // EXTRUDER 1
-#define HEATER_1_PIN        8   // EXTRUDER 2
-#define HEATER_BED_PIN      3   // BED
+#define HEATER_0_PIN                           7  // EXTRUDER 1
+#define HEATER_1_PIN                           8  // EXTRUDER 2
+#define HEATER_BED_PIN                         3  // BED
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               16
-#define LED_PIN            46
+#define SDSS                                  16
+#define LED_PIN                               46
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
+#define BEEPER_PIN                            -1
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      15   // CS chip select /SS chip slave select
-  #define LCD_PINS_ENABLE  11   // SID (MOSI)
-  #define LCD_PINS_D4      10   // SCK (CLK) clock
+  #define LCD_PINS_RS                         15  // CS chip select /SS chip slave select
+  #define LCD_PINS_ENABLE                     11  // SID (MOSI)
+  #define LCD_PINS_D4                         10  // SCK (CLK) clock
 
-  #define BTN_EN1          18
-  #define BTN_EN2          17
-  #define BTN_ENC          25
+  #define BTN_EN1                             18
+  #define BTN_EN2                             17
+  #define BTN_ENC                             25
 
-  #define SD_DETECT_PIN    30
+  #define SD_DETECT_PIN                       30
 
 #else
 
-  #define LCD_PINS_RS      -1
-  #define LCD_PINS_ENABLE  -1
+  #define LCD_PINS_RS                         -1
+  #define LCD_PINS_ENABLE                     -1
 
   // Buttons are directly attached using keypad
-  #define BTN_EN1          -1
-  #define BTN_EN2          -1
-  #define BTN_ENC          -1
+  #define BTN_EN1                             -1
+  #define BTN_EN2                             -1
+  #define BTN_ENC                             -1
 
-  #define SD_DETECT_PIN    -1   // Minitronics doesn't use this
+  #define SD_DETECT_PIN                       -1  // Minitronics doesn't use this
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if HAS_CUTTER  // assumes we're only doing CNC work (no 3D printing)
+#if HAS_CUTTER                                    // assumes we're only doing CNC work (no 3D printing)
   #undef HEATER_BED_PIN
-  #undef TEMP_BED_PIN             // need to free up some pins but also need to
-  #undef TEMP_0_PIN               // re-assign them (to unused pins) because Marlin
-  #undef TEMP_1_PIN               // requires the presence of certain pins or else it
-  #define HEATER_BED_PIN      4   // won't compile
-  #define TEMP_BED_PIN       50
-  #define TEMP_0_PIN         51
-  #define SPINDLE_LASER_ENA_PIN         52   // using A6 because it already has a pullup
-  #define SPINDLE_LASER_PWM_PIN          3   // WARNING - LED & resistor pull up to +12/+24V stepper voltage
-  #define SPINDLE_DIR_PIN               53
+  #undef TEMP_BED_PIN                             // need to free up some pins but also need to
+  #undef TEMP_0_PIN                               // re-assign them (to unused pins) because Marlin
+  #undef TEMP_1_PIN                               // requires the presence of certain pins or else it
+  #define HEATER_BED_PIN                       4  // won't compile
+  #define TEMP_BED_PIN                        50
+  #define TEMP_0_PIN                          51
+  #define SPINDLE_LASER_ENA_PIN               52  // using A6 because it already has a pullup
+  #define SPINDLE_LASER_PWM_PIN                3  // WARNING - LED & resistor pull up to +12/+24V stepper voltage
+  #define SPINDLE_DIR_PIN                     53
 #endif
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 80f72d04e902..4e02127c1206 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -37,83 +37,83 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         24
-#define Y_STOP_PIN         28
-#define Z_MIN_PIN          46
-#define Z_MAX_PIN          32
+#define X_STOP_PIN                            24
+#define Y_STOP_PIN                            28
+#define Z_MIN_PIN                             46
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  46   // JP4, Tfeed1
+  #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #define FIL_RUNOUT_PIN   44   // JP3, Tfeed2
+  #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input - Redundant temp sensor
-#define TEMP_2_PIN         12   // Analog Input
-#define TEMP_3_PIN         14   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input - Redundant temp sensor
+#define TEMP_2_PIN                            12  // Analog Input
+#define TEMP_3_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
-#define FAN_PIN             7   // material cooling fan
+#define FAN_PIN                                7  // material cooling fan
 
 //
 // SD Card
 //
-#define SDSS               53
-#define SD_DETECT_PIN      38
+#define SDSS                                  53
+#define SD_DETECT_PIN                         38
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13   // On PCB status led
-#define PS_ON_PIN          12   // For stepper/heater/fan power. Active HIGH.
-#define POWER_LOSS_PIN     34   // Power check - whether hotends/steppers/fans have power
+#define LED_PIN                               13  // On PCB status led
+#define PS_ON_PIN                             12  // For stepper/heater/fan power. Active HIGH.
+#define POWER_LOSS_PIN                        34  // Power check - whether hotends/steppers/fans have power
 
 #if ENABLED(BATTERY_STATUS_AVAILABLE)
   #undef BATTERY_STATUS_PIN
-  #define BATTERY_STATUS_PIN 26   // Status of power loss battery, whether it is charged (low) or charging (high)
+  #define BATTERY_STATUS_PIN                  26  // Status of power loss battery, whether it is charged (low) or charging (high)
 #endif
 #if ENABLED(INPUT_VOLTAGE_AVAILABLE)
   #undef VOLTAGE_DETECTION_PIN
-  #define VOLTAGE_DETECTION_PIN 11  // Analog Input - ADC Voltage level of main input
+  #define VOLTAGE_DETECTION_PIN               11  // Analog Input - ADC Voltage level of main input
 #endif
 
 //
@@ -121,24 +121,24 @@
 //
 #if HAS_GRAPHICAL_LCD
   // OVERLORD OLED pins
-  #define LCD_PINS_RS      20
-  #define LCD_PINS_D5      21
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      14
-  #define LCD_PINS_D6       5
-  #define LCD_PINS_D7       6
+  #define LCD_PINS_RS                         20
+  #define LCD_PINS_D5                         21
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D6                          5
+  #define LCD_PINS_D7                          6
   #ifndef LCD_RESET_PIN
-    #define LCD_RESET_PIN   5   // LCD_PINS_D6
+    #define LCD_RESET_PIN                      5  // LCD_PINS_D6
   #endif
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_ENC          16   // Enter Pin
-  #define BTN_UP           19   // Button UP Pin
-  #define BTN_DWN          17   // Button DOWN Pin
+  #define BTN_ENC                             16  // Enter Pin
+  #define BTN_UP                              19  // Button UP Pin
+  #define BTN_DWN                             17  // Button DOWN Pin
 #endif
 
 // Additional connectors/pins on the Overlord V1.X board
-#define PCB_VERSION_PIN    22
-#define APPROACH_PIN       11   // JP7, Tpd
-#define GATE_PIN           36   // Threshold, JP6, Tg
+#define PCB_VERSION_PIN                       22
+#define APPROACH_PIN                          11  // JP7, Tpd
+#define GATE_PIN                              36  // Threshold, JP6, Tg
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 4c618bda4e33..f00d817d6e89 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -49,95 +49,95 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          14
-#define X_MAX_PIN          15
-#define Y_MIN_PIN          16
-#define Y_MAX_PIN          17
-#define Z_MIN_PIN          23
-#define Z_MAX_PIN          22
+#define X_MIN_PIN                             14
+#define X_MAX_PIN                             15
+#define Y_MIN_PIN                             16
+#define Y_MAX_PIN                             17
+#define Z_MIN_PIN                             23
+#define Z_MAX_PIN                             22
 
 //
 // Steppers
 //
-#define X_STEP_PIN         55
-#define X_DIR_PIN          54
-#define X_ENABLE_PIN       60
+#define X_STEP_PIN                            55
+#define X_DIR_PIN                             54
+#define X_ENABLE_PIN                          60
 
-#define Y_STEP_PIN         57
-#define Y_DIR_PIN          56
-#define Y_ENABLE_PIN       61
+#define Y_STEP_PIN                            57
+#define Y_DIR_PIN                             56
+#define Y_ENABLE_PIN                          61
 
-#define Z_STEP_PIN         59
-#define Z_DIR_PIN          58
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            59
+#define Z_DIR_PIN                             58
+#define Z_ENABLE_PIN                          62
 
-#define E0_STEP_PIN        67
-#define E0_DIR_PIN         24
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           67
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         26
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          9   // Analog Input
-#define TEMP_1_PIN         10
-#define TEMP_BED_PIN       10
-#define TEMP_2_PIN         11
-#define TEMP_3_PIN         12
+#define TEMP_0_PIN                             9  // Analog Input
+#define TEMP_1_PIN                            10
+#define TEMP_BED_PIN                          10
+#define TEMP_2_PIN                            11
+#define TEMP_3_PIN                            12
 
 //
 // Heaters / Fans
 //
 #ifndef HEATER_0_PIN
-  #define HEATER_0_PIN     10   // E0
+  #define HEATER_0_PIN                        10  // E0
 #endif
 #ifndef HEATER_1_PIN
-  #define HEATER_1_PIN      2   // E1
+  #define HEATER_1_PIN                         2  // E1
 #endif
-#define HEATER_BED_PIN      8   // HEAT-BED
+#define HEATER_BED_PIN                         8  // HEAT-BED
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 #ifndef FAN_2_PIN
-  #define FAN_2_PIN         7
+  #define FAN_2_PIN                            7
 #endif
 
-#define SDPOWER_PIN        -1
-#define LED_PIN            -1
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
+#define SDPOWER_PIN                           -1
+#define LED_PIN                               -1
+#define PS_ON_PIN                             -1
+#define KILL_PIN                              -1
 
-#define SSR_PIN             6
+#define SSR_PIN                                6
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
 // SD Support
 //
-#define SD_DETECT_PIN      49
-#define SDSS               53
+#define SD_DETECT_PIN                         49
+#define SDSS                                  53
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         29
+#define BEEPER_PIN                            29
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      33
-  #define LCD_PINS_ENABLE  30
-  #define LCD_PINS_D4      35
-  #define LCD_PINS_D5      32
-  #define LCD_PINS_D6      37
-  #define LCD_PINS_D7      36
-
-  #define BTN_EN1          47
-  #define BTN_EN2          48
-  #define BTN_ENC          31
-
-  #define LCD_SDSS         53
+  #define LCD_PINS_RS                         33
+  #define LCD_PINS_ENABLE                     30
+  #define LCD_PINS_D4                         35
+  #define LCD_PINS_D5                         32
+  #define LCD_PINS_D6                         37
+  #define LCD_PINS_D7                         36
+
+  #define BTN_EN1                             47
+  #define BTN_EN2                             48
+  #define BTN_ENC                             31
+
+  #define LCD_SDSS                            53
 #endif
diff --git a/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin/src/pins/mega/pins_PICAOLD.h
index 88fa1ada29c0..34861277a889 100644
--- a/Marlin/src/pins/mega/pins_PICAOLD.h
+++ b/Marlin/src/pins/mega/pins_PICAOLD.h
@@ -20,9 +20,9 @@
  *
  */
 
-#define HEATER_0_PIN        9   // E0
-#define HEATER_1_PIN       10   // E1
-#define FAN_PIN            11
-#define FAN2_PIN           12
+#define HEATER_0_PIN                          9   // E0
+#define HEATER_1_PIN                         10   // E1
+#define FAN_PIN                              11
+#define FAN2_PIN                             12
 
 #include "pins_PICA.h"
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index bde1f8708892..4c79507eab0b 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -27,67 +27,67 @@
 
 #define BOARD_INFO_NAME "Silver Gate"
 
-#define X_STEP_PIN         43
-#define X_DIR_PIN          44
-#define X_ENABLE_PIN       42
-#define X_MIN_PIN          31
-#define X_MAX_PIN          34
-
-#define Y_STEP_PIN         40
-#define Y_DIR_PIN          41
-#define Y_ENABLE_PIN       39
-#define Y_MIN_PIN          32
-#define Y_MAX_PIN          35
-
-#define Z_STEP_PIN         13
-#define Z_DIR_PIN          38
-#define Z_ENABLE_PIN       14
-#define Z_MIN_PIN          33
-#define Z_MAX_PIN          36
-
-#define E0_STEP_PIN        27
-#define E0_DIR_PIN         37
-#define E0_ENABLE_PIN      45
-
-#define SDSS               16
+#define X_STEP_PIN                            43
+#define X_DIR_PIN                             44
+#define X_ENABLE_PIN                          42
+#define X_MIN_PIN                             31
+#define X_MAX_PIN                             34
+
+#define Y_STEP_PIN                            40
+#define Y_DIR_PIN                             41
+#define Y_ENABLE_PIN                          39
+#define Y_MIN_PIN                             32
+#define Y_MAX_PIN                             35
+
+#define Z_STEP_PIN                            13
+#define Z_DIR_PIN                             38
+#define Z_ENABLE_PIN                          14
+#define Z_MIN_PIN                             33
+#define Z_MAX_PIN                             36
+
+#define E0_STEP_PIN                           27
+#define E0_DIR_PIN                            37
+#define E0_ENABLE_PIN                         45
+
+#define SDSS                                  16
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   34   // X_MAX unless overridden
+  #define FIL_RUNOUT_PIN                      34  // X_MAX unless overridden
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           5
+  #define FAN_PIN                              5
 #endif
 
-#define HEATER_0_PIN        7
+#define HEATER_0_PIN                           7
 
-#define ORIG_E0_AUTO_FAN_PIN 3   // Use this by NOT overriding E0_AUTO_FAN_PIN
-#define CONTROLLER_FAN_PIN  2
+#define ORIG_E0_AUTO_FAN_PIN                   3  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define CONTROLLER_FAN_PIN                     2
 
-#define TEMP_0_PIN          7   // Analog Input
+#define TEMP_0_PIN                             7  // Analog Input
 
-#define HEATER_BED_PIN      8
-#define TEMP_BED_PIN        6
+#define HEATER_BED_PIN                         8
+#define TEMP_BED_PIN                           6
 
 #if HAS_GRAPHICAL_LCD
-  #if ENABLED(U8GLIB_ST7920)    // SPI GLCD 12864 ST7920
-    #define LCD_PINS_RS    30
-    #define LCD_PINS_ENABLE 20
-    #define LCD_PINS_D4    25
-    #define BEEPER_PIN     29
-    #define BTN_EN1        19
-    #define BTN_EN2        22
-    #define BTN_ENC        24
-    #define LCD_BACKLIGHT_PIN  6
+  #if ENABLED(U8GLIB_ST7920)                      // SPI GLCD 12864 ST7920
+    #define LCD_PINS_RS                       30
+    #define LCD_PINS_ENABLE                   20
+    #define LCD_PINS_D4                       25
+    #define BEEPER_PIN                        29
+    #define BTN_EN1                           19
+    #define BTN_EN2                           22
+    #define BTN_ENC                           24
+    #define LCD_BACKLIGHT_PIN                  6
     #if ENABLED(SILVER_GATE_GLCD_CONTROLLER)
-      #define KILL_PIN     21
-      #define HOME_PIN     28
+      #define KILL_PIN                        21
+      #define HOME_PIN                        28
     #endif
   #endif
 #endif
 
-#define SD_DETECT_PIN      15
+#define SD_DETECT_PIN                         15
 
-#define STAT_LED_RED_PIN   23
-#define STAT_LED_BLUE_PIN  26
-#define CASE_LIGHT_PIN     51
+#define STAT_LED_RED_PIN                      23
+#define STAT_LED_BLUE_PIN                     26
+#define CASE_LIGHT_PIN                        51
diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
index c011d9daa765..6c53b7ea4e62 100644
--- a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
+++ b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
@@ -36,76 +36,76 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         19
-#define Y_STOP_PIN         18
-#define Z_STOP_PIN         38
+#define X_STOP_PIN                            19
+#define Y_STOP_PIN                            18
+#define Z_STOP_PIN                            38
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  38
+  #define Z_MIN_PROBE_PIN                     38
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         22
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       57
+#define X_STEP_PIN                            22
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          57
 
-#define Y_STEP_PIN         25
-#define Y_DIR_PIN          26
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            25
+#define Y_DIR_PIN                             26
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         29
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            29
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        55
-#define E0_DIR_PIN         56
-#define E0_ENABLE_PIN      54
+#define E0_STEP_PIN                           55
+#define E0_DIR_PIN                            56
+#define E0_ENABLE_PIN                         54
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
-#define TEMP_BED_PIN       14
+#define TEMP_0_PIN                            13
+#define TEMP_BED_PIN                          14
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN     44
-#define FAN_PIN            12   // IO pin. Buffer needed
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                        44
+#define FAN_PIN                               12  // IO pin. Buffer needed
 
 //
 // SD Card
 //
-#define SD_DETECT_PIN      -1
-#define SDSS               53
+#define SD_DETECT_PIN                         -1
+#define SDSS                                  53
 
 //
 // Misc. Functions
 //
-#define BEEPER_PIN         37
-#define KILL_PIN           64
+#define BEEPER_PIN                            37
+#define KILL_PIN                              64
 
 //
 // LCD / Controller (Integrated MINIPANEL)
 //
 #if ENABLED(MINIPANEL)
-  #define DOGLCD_A0        40
-  #define DOGLCD_CS        41
-  #define LCD_BACKLIGHT_PIN 65   // Backlight LED on A11/D65
-  #define LCD_RESET_PIN    27
+  #define DOGLCD_A0                           40
+  #define DOGLCD_CS                           41
+  #define LCD_BACKLIGHT_PIN                   65  // Backlight LED on A11/D65
+  #define LCD_RESET_PIN                       27
 
-  #define BTN_EN1           2
-  #define BTN_EN2           3
-  #define BTN_ENC           5
+  #define BTN_EN1                              2
+  #define BTN_EN2                              3
+  #define BTN_ENC                              5
 
   // This display has adjustable contrast
-  #define LCD_CONTRAST_MIN       0
-  #define LCD_CONTRAST_MAX     255
-  #define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
+  #define LCD_CONTRAST_MIN                     0
+  #define LCD_CONTRAST_MAX                   255
+  #define LCD_CONTRAST_INIT     LCD_CONTRAST_MAX
 #endif
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 4cfa3261655d..430fa170e12a 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -39,10 +39,10 @@
 #endif
 
 // TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN         64
-#define Y_DIAG_PIN         69
-#define Z_DIAG_PIN         68
-#define E0_DIAG_PIN        65
+#define X_DIAG_PIN                            64
+#define Y_DIAG_PIN                            69
+#define Z_DIAG_PIN                            68
+#define E0_DIAG_PIN                           65
 
 //
 // Limit Switches
@@ -55,20 +55,20 @@
 
 #if DISABLED(SENSORLESS_HOMING)
 
-  #define X_STOP_PIN       12
-  #define Y_STOP_PIN       11
-  #define Z_STOP_PIN       10
+  #define X_STOP_PIN                          12
+  #define Y_STOP_PIN                          11
+  #define Z_STOP_PIN                          10
 
 #else
 
-  #define X_STOP_PIN       X_DIAG_PIN
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
 
   #if ENABLED(BLTOUCH)
-    #define Z_STOP_PIN     11   // Y-MIN
-    #define SERVO0_PIN     10   // Z-MIN
+    #define Z_STOP_PIN                        11  // Y-MIN
+    #define SERVO0_PIN                        10  // Z-MIN
   #else
-    #define Z_STOP_PIN     10
+    #define Z_STOP_PIN                        10
   #endif
 
 #endif
@@ -77,104 +77,104 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  10
+  #define Z_MIN_PROBE_PIN                     10
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          49
-#define X_ENABLE_PIN       29
-#define X_CS_PIN           41
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             49
+#define X_ENABLE_PIN                          29
+#define X_CS_PIN                              41
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          48
-#define Y_ENABLE_PIN       28
-#define Y_CS_PIN           39
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             48
+#define Y_ENABLE_PIN                          28
+#define Y_CS_PIN                              39
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
-#define Z_CS_PIN           67
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
+#define Z_CS_PIN                              67
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
-#define E0_CS_PIN          66
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
+#define E0_CS_PIN                             66
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
 
 #ifndef FAN1_PIN
-  #define FAN1_PIN          6
+  #define FAN1_PIN                             6
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               77
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      9
+#define SDSS                                  77
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         9
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+#define SPINDLE_DIR_PIN                       19
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
-#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
+#define E_MUX2_PIN                            78  // 84 in MK2 Firmware, with BEEPER as 78
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
 
-  #define KILL_PIN         32
+  #define KILL_PIN                            32
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
 
     #if ENABLED(CR10_STOCKDISPLAY)
-      #define LCD_PINS_RS     85
-      #define LCD_PINS_ENABLE 71
-      #define LCD_PINS_D4     70
-      #define BTN_EN1         61
-      #define BTN_EN2         59
+      #define LCD_PINS_RS                     85
+      #define LCD_PINS_ENABLE                 71
+      #define LCD_PINS_D4                     70
+      #define BTN_EN1                         61
+      #define BTN_EN2                         59
     #else
-      #define LCD_PINS_RS     82
-      #define LCD_PINS_ENABLE 61
-      #define LCD_PINS_D4     59
-      #define LCD_PINS_D5     70
-      #define LCD_PINS_D6     85
-      #define LCD_PINS_D7     71
-      #define BTN_EN1         14
-      #define BTN_EN2         72
+      #define LCD_PINS_RS                     82
+      #define LCD_PINS_ENABLE                 61
+      #define LCD_PINS_D4                     59
+      #define LCD_PINS_D5                     70
+      #define LCD_PINS_D6                     85
+      #define LCD_PINS_D7                     71
+      #define BTN_EN1                         14
+      #define BTN_EN2                         72
     #endif
 
-    #define BTN_ENC            9   // AUX-2
-    #define BEEPER_PIN        84   // AUX-4
-    #define SD_DETECT_PIN     15
+    #define BTN_ENC                            9  // AUX-2
+    #define BEEPER_PIN                        84  // AUX-4
+    #define SD_DETECT_PIN                     15
 
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 2bc577313ecc..6e8463d0bdcd 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -39,10 +39,10 @@
 #endif
 
 // TMC2130 Diag Pins
-#define X_DIAG_PIN         64
-#define Y_DIAG_PIN         69
-#define Z_DIAG_PIN         68
-#define E0_DIAG_PIN        65
+#define X_DIAG_PIN                            64
+#define Y_DIAG_PIN                            69
+#define Z_DIAG_PIN                            68
+#define E0_DIAG_PIN                           65
 
 //
 // Limit Switches
@@ -55,141 +55,141 @@
 
 #if DISABLED(SENSORLESS_HOMING)
 
-  #define X_MIN_PIN        12   // X-
-  #define Y_MIN_PIN        11   // Y-
-  #define Z_MIN_PIN        10   // Z-
-  #define X_MAX_PIN        81   // X+
-  #define Y_MAX_PIN        57   // Y+
+  #define X_MIN_PIN                           12  // X-
+  #define Y_MIN_PIN                           11  // Y-
+  #define Z_MIN_PIN                           10  // Z-
+  #define X_MAX_PIN                           81  // X+
+  #define Y_MAX_PIN                           57  // Y+
 
 #else
 
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN      X_DIAG_PIN
-    #define X_MAX_PIN      81   // X+
+    #define X_MIN_PIN                 X_DIAG_PIN
+    #define X_MAX_PIN                         81  // X+
   #else
-    #define X_MIN_PIN      12   // X-
-    #define X_MAX_PIN      X_DIAG_PIN
+    #define X_MIN_PIN                         12  // X-
+    #define X_MAX_PIN                 X_DIAG_PIN
   #endif
 
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN      Y_DIAG_PIN
-    #define Y_MAX_PIN      57   // Y+
+    #define Y_MIN_PIN                 Y_DIAG_PIN
+    #define Y_MAX_PIN                         57  // Y+
   #else
-    #define Y_MIN_PIN      11   // Y-
-    #define Y_MAX_PIN      Y_DIAG_PIN
+    #define Y_MIN_PIN                         11  // Y-
+    #define Y_MAX_PIN                 Y_DIAG_PIN
   #endif
 
   #if ENABLED(BLTOUCH)
-    #define Z_MIN_PIN      11   // Y-MIN
-    #define SERVO0_PIN     10   // Z-MIN
+    #define Z_MIN_PIN                         11  // Y-MIN
+    #define SERVO0_PIN                        10  // Z-MIN
   #else
-    #define Z_MIN_PIN      10
+    #define Z_MIN_PIN                         10
   #endif
 
 #endif
 
-#define Z_MAX_PIN           7
+#define Z_MAX_PIN                              7
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  10
+  #define Z_MIN_PROBE_PIN                     10
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          49
-#define X_ENABLE_PIN       29
-#define X_CS_PIN           41
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             49
+#define X_ENABLE_PIN                          29
+#define X_CS_PIN                              41
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          48
-#define Y_ENABLE_PIN       28
-#define Y_CS_PIN           39
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             48
+#define Y_ENABLE_PIN                          28
+#define Y_CS_PIN                              39
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
-#define Z_CS_PIN           67
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
+#define Z_CS_PIN                              67
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
-#define E0_CS_PIN          66
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
+#define E0_CS_PIN                             66
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      9
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         9
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+#define SPINDLE_DIR_PIN                       19
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
-#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
+#define E_MUX2_PIN                            78  // 84 in MK2 Firmware, with BEEPER as 78
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
 
-  #define KILL_PIN         32
+  #define KILL_PIN                            32
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
 
     #if ENABLED(CR10_STOCKDISPLAY)
-      #define LCD_PINS_RS     85
-      #define LCD_PINS_ENABLE 71
-      #define LCD_PINS_D4     70
-      #define BTN_EN1         18
-      #define BTN_EN2         19
+      #define LCD_PINS_RS                     85
+      #define LCD_PINS_ENABLE                 71
+      #define LCD_PINS_D4                     70
+      #define BTN_EN1                         18
+      #define BTN_EN2                         19
     #else
-      #define LCD_PINS_RS     82
-      #define LCD_PINS_ENABLE 18   // On 0.6b, use 61
-      #define LCD_PINS_D4     19   // On 0.6b, use 59
-      #define LCD_PINS_D5     70
-      #define LCD_PINS_D6     85
-      #define LCD_PINS_D7     71
-      #define BTN_EN1         14
-      #define BTN_EN2         72
+      #define LCD_PINS_RS                     82
+      #define LCD_PINS_ENABLE                 18  // On 0.6b, use 61
+      #define LCD_PINS_D4                     19  // On 0.6b, use 59
+      #define LCD_PINS_D5                     70
+      #define LCD_PINS_D6                     85
+      #define LCD_PINS_D7                     71
+      #define BTN_EN1                         14
+      #define BTN_EN2                         72
     #endif
 
-    #define BTN_ENC            9   // AUX-2
-    #define BEEPER_PIN        84   // AUX-4
+    #define BTN_ENC                            9  // AUX-2
+    #define BEEPER_PIN                        84  // AUX-4
 
-    #define SD_DETECT_PIN     15
+    #define SD_DETECT_PIN                     15
 
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 50aec546a633..18bc3ddd1677 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -38,104 +38,104 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          12
-#define X_MAX_PIN          30
-#define Y_MIN_PIN          11
-#define Y_MAX_PIN          24
-#define Z_MIN_PIN          10
-#define Z_MAX_PIN          23
+#define X_MIN_PIN                             12
+#define X_MAX_PIN                             30
+#define Y_MIN_PIN                             11
+#define Y_MAX_PIN                             24
+#define Z_MIN_PIN                             10
+#define Z_MAX_PIN                             23
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  23
+  #define Z_MIN_PROBE_PIN                     23
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          48
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             48
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          49
-#define Y_ENABLE_PIN       28
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             49
+#define Y_ENABLE_PIN                          28
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          40
-#define X_MS2_PIN          41
-#define Y_MS1_PIN          69
-#define Y_MS2_PIN          39
-#define Z_MS1_PIN          68
-#define Z_MS2_PIN          67
-#define E0_MS1_PIN         65
-#define E0_MS2_PIN         66
-
-#define MOTOR_CURRENT_PWM_XY_PIN 46
-#define MOTOR_CURRENT_PWM_Z_PIN  45
-#define MOTOR_CURRENT_PWM_E_PIN  44
+#define X_MS1_PIN                             40
+#define X_MS2_PIN                             41
+#define Y_MS1_PIN                             69
+#define Y_MS2_PIN                             39
+#define Z_MS1_PIN                             68
+#define Z_MS2_PIN                             67
+#define E0_MS1_PIN                            65
+#define E0_MS2_PIN                            66
+
+#define MOTOR_CURRENT_PWM_XY_PIN              46
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               44
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE 2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_1_PIN        7
+#define HEATER_0_PIN                           3
+#define HEATER_1_PIN                           7
 #if !MB(MINIRAMBO_10A)
-  #define HEATER_2_PIN      6
+  #define HEATER_2_PIN                         6
 #endif
-#define HEATER_BED_PIN      4
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 #if !MB(MINIRAMBO_10A)
-  #define CASE_LIGHT_PIN    9
+  #define CASE_LIGHT_PIN                       9
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+#define SPINDLE_DIR_PIN                       19
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
 #if !MB(MINIRAMBO_10A)
-  #define E_MUX2_PIN       78   // 84 in MK2 Firmware, with BEEPER as 78
+  #define E_MUX2_PIN                          78  // 84 in MK2 Firmware, with BEEPER as 78
 #endif
 
 //
@@ -144,46 +144,46 @@
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
 
   #if !MB(MINIRAMBO_10A)
-    #define KILL_PIN       32
+    #define KILL_PIN                          32
   #endif
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
 
     #if MB(MINIRAMBO_10A)
 
-      #define BEEPER_PIN   78
+      #define BEEPER_PIN                      78
 
-      #define BTN_EN1      80
-      #define BTN_EN2      73
-      #define BTN_ENC      21
+      #define BTN_EN1                         80
+      #define BTN_EN2                         73
+      #define BTN_ENC                         21
 
-      #define LCD_PINS_RS  38
-      #define LCD_PINS_ENABLE 5
-      #define LCD_PINS_D4  14
-      #define LCD_PINS_D5  15
-      #define LCD_PINS_D6  32
-      #define LCD_PINS_D7  31
+      #define LCD_PINS_RS                     38
+      #define LCD_PINS_ENABLE                  5
+      #define LCD_PINS_D4                     14
+      #define LCD_PINS_D5                     15
+      #define LCD_PINS_D6                     32
+      #define LCD_PINS_D7                     31
 
-      #define SD_DETECT_PIN  72
+      #define SD_DETECT_PIN                   72
 
-    #else // !MINIRAMBO_10A
+    #else                                         // !MINIRAMBO_10A
 
       // AUX-4
-      #define BEEPER_PIN   84
+      #define BEEPER_PIN                      84
 
       // AUX-2
-      #define BTN_EN1      14
-      #define BTN_EN2      72
-      #define BTN_ENC       9
-
-      #define LCD_PINS_RS  82
-      #define LCD_PINS_ENABLE 18
-      #define LCD_PINS_D4  19
-      #define LCD_PINS_D5  70
-      #define LCD_PINS_D6  85
-      #define LCD_PINS_D7  71
-
-      #define SD_DETECT_PIN  15
+      #define BTN_EN1                         14
+      #define BTN_EN2                         72
+      #define BTN_ENC                          9
+
+      #define LCD_PINS_RS                     82
+      #define LCD_PINS_ENABLE                 18
+      #define LCD_PINS_D4                     19
+      #define LCD_PINS_D5                     70
+      #define LCD_PINS_D6                     85
+      #define LCD_PINS_D7                     71
+
+      #define SD_DETECT_PIN                   15
 
     #endif // !MINIRAMBO_10A
 
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 2e52e9427c28..0a443cc19ac8 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -50,64 +50,64 @@
 //
 // Servos
 //
-#define SERVO0_PIN         22   // Motor header MX1
-#define SERVO1_PIN         23   // Motor header MX2
-#define SERVO2_PIN         24   // Motor header MX3
-#define SERVO3_PIN          5   // PWM header pin 5
+#define SERVO0_PIN                            22  // Motor header MX1
+#define SERVO1_PIN                            23  // Motor header MX2
+#define SERVO2_PIN                            24  // Motor header MX3
+#define SERVO3_PIN                             5  // PWM header pin 5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          12
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          11
-#define Y_MAX_PIN          23
-#define Z_MIN_PIN          10
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             12
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             11
+#define Y_MAX_PIN                             23
+#define Z_MIN_PIN                             10
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          48
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             48
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          49
-#define Y_ENABLE_PIN       28
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             49
+#define Y_ENABLE_PIN                          28
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         42
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            42
+#define E1_ENABLE_PIN                         25
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          40
-#define X_MS2_PIN          41
-#define Y_MS1_PIN          69
-#define Y_MS2_PIN          39
-#define Z_MS1_PIN          68
-#define Z_MS2_PIN          67
-#define E0_MS1_PIN         65
-#define E0_MS2_PIN         66
-#define E1_MS1_PIN         63
-#define E1_MS2_PIN         64
-
-#define DIGIPOTSS_PIN      38
+#define X_MS1_PIN                             40
+#define X_MS2_PIN                             41
+#define Y_MS1_PIN                             69
+#define Y_MS2_PIN                             39
+#define Z_MS1_PIN                             68
+#define Z_MS2_PIN                             67
+#define E0_MS1_PIN                            65
+#define E0_MS2_PIN                            66
+#define E1_MS1_PIN                            63
+#define E1_MS2_PIN                            64
+
+#define DIGIPOTSS_PIN                         38
 #define DIGIPOT_CHANNELS  { 4,5,3,0,1 }   // X Y Z E0 E1 digipot channels to stepper driver mapping
 #ifndef DIGIPOT_MOTOR_CURRENT
   #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 }   // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
@@ -116,122 +116,122 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        6
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           6
+#define HEATER_BED_PIN                         3
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
-#define FAN2_PIN            2
+#define FAN1_PIN                               6
+#define FAN2_PIN                               2
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN           4
-#define CASE_LIGHT_PIN     46
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                              4
+#define CASE_LIGHT_PIN                        46
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      3   // Analog Input
+  #define FILWIDTH_PIN                         3  // Analog Input
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    31   // Pullup!
-#define SPINDLE_DIR_PIN          32
+#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 31  // Pullup!
+#define SPINDLE_DIR_PIN                       32
 
 //
 // M7/M8/M9 - Coolant Control
 //
-#define COOLANT_MIST_PIN   22
-#define COOLANT_FLOOD_PIN  44
+#define COOLANT_MIST_PIN                      22
+#define COOLANT_FLOOD_PIN                     44
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
-#define E_MUX2_PIN         84   // 84 in MK2 Firmware
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
+#define E_MUX2_PIN                            84  // 84 in MK2 Firmware
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
 
-  #define KILL_PIN         80
+  #define KILL_PIN                            80
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
 
-    #define LCD_PINS_RS     70
-    #define LCD_PINS_ENABLE 71
-    #define LCD_PINS_D4     72
-    #define LCD_PINS_D5     73
-    #define LCD_PINS_D6     74
-    #define LCD_PINS_D7     75
+    #define LCD_PINS_RS                       70
+    #define LCD_PINS_ENABLE                   71
+    #define LCD_PINS_D4                       72
+    #define LCD_PINS_D5                       73
+    #define LCD_PINS_D6                       74
+    #define LCD_PINS_D7                       75
 
     #if ANY(VIKI2, miniVIKI)
-      #define BEEPER_PIN   44
+      #define BEEPER_PIN                      44
       // NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
       //     beeper/buzzer is connected to pin 33; however, the pin used in the
       //     diagram is actually pin 44, so this is correct.
 
-      #define DOGLCD_A0    70
-      #define DOGLCD_CS    71
+      #define DOGLCD_A0                       70
+      #define DOGLCD_CS                       71
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1      85
-      #define BTN_EN2      84
-      #define BTN_ENC      83
+      #define BTN_EN1                         85
+      #define BTN_EN2                         84
+      #define BTN_ENC                         83
 
-      #define SD_DETECT_PIN -1   // Pin 72 if using easy adapter board
+      #define SD_DETECT_PIN                   -1  // Pin 72 if using easy adapter board
 
-      #define STAT_LED_RED_PIN 22
-      #define STAT_LED_BLUE_PIN 32
+      #define STAT_LED_RED_PIN                22
+      #define STAT_LED_BLUE_PIN               32
 
-    #else // !VIKI2 && !miniVIKI
+    #else                                         // !VIKI2 && !miniVIKI
 
-      #define BEEPER_PIN   79   // AUX-4
+      #define BEEPER_PIN                      79  // AUX-4
 
       // AUX-2
-      #define BTN_EN1      76
-      #define BTN_EN2      77
-      #define BTN_ENC      78
+      #define BTN_EN1                         76
+      #define BTN_EN2                         77
+      #define BTN_ENC                         78
 
-      #define SD_DETECT_PIN 81
+      #define SD_DETECT_PIN                   81
 
     #endif // !VIKI2 && !miniVIKI
 
-  #else // !NEWPANEL - old style panel with shift register
+  #else                                           // !NEWPANEL - old style panel with shift register
 
     // No Beeper added
-    #define BEEPER_PIN     33
+    #define BEEPER_PIN                        33
 
     // Buttons attached to a shift register
     // Not wired yet
-    //#define SHIFT_CLK 38
-    //#define SHIFT_LD 42
-    //#define SHIFT_OUT 40
-    //#define SHIFT_EN 17
-
-    #define LCD_PINS_RS     75
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4     23
-    #define LCD_PINS_D5     25
-    #define LCD_PINS_D6     27
-    #define LCD_PINS_D7     29
+    //#define SHIFT_CLK                       38
+    //#define SHIFT_LD                        42
+    //#define SHIFT_OUT                       40
+    //#define SHIFT_EN                        17
+
+    #define LCD_PINS_RS                       75
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       23
+    #define LCD_PINS_D5                       25
+    #define LCD_PINS_D6                       27
+    #define LCD_PINS_D7                       29
 
   #endif // !NEWPANEL
 
diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
index 2bb6e9b97925..49237c706247 100644
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -34,126 +34,126 @@
 //
 // Servos
 //
-#define SERVO0_PIN         22   // Motor header MX1
-#define SERVO1_PIN         23   // Motor header MX2
-#define SERVO2_PIN         24   // Motor header MX3
-#define SERVO3_PIN          5   // PWM header pin 5
+#define SERVO0_PIN                            22  // Motor header MX1
+#define SERVO1_PIN                            23  // Motor header MX2
+#define SERVO2_PIN                            24  // Motor header MX3
+#define SERVO3_PIN                             5  // PWM header pin 5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          12
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          11
-#define Y_MAX_PIN          23
-#define Z_MIN_PIN          10
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             12
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             11
+#define Y_MAX_PIN                             23
+#define Z_MIN_PIN                             10
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_IN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          48
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             48
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          49
-#define Y_ENABLE_PIN       28
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             49
+#define Y_ENABLE_PIN                          28
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         42
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            42
+#define E1_ENABLE_PIN                         25
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          40
-#define X_MS2_PIN          41
-#define Y_MS1_PIN          69
-#define Y_MS2_PIN          39
-#define Z_MS1_PIN          68
-#define Z_MS2_PIN          67
-#define E0_MS1_PIN         65
-#define E0_MS2_PIN         66
-#define E1_MS1_PIN         63
-#define E1_MS2_PIN         64
-
-#define DIGIPOTSS_PIN      38
+#define X_MS1_PIN                             40
+#define X_MS2_PIN                             41
+#define Y_MS1_PIN                             69
+#define Y_MS2_PIN                             39
+#define Z_MS1_PIN                             68
+#define Z_MS2_PIN                             67
+#define E0_MS1_PIN                            65
+#define E0_MS2_PIN                            66
+#define E1_MS1_PIN                            63
+#define E1_MS2_PIN                            64
+
+#define DIGIPOTSS_PIN                         38
 #define DIGIPOT_CHANNELS {4,5,3,0,1}   // X Y Z E0 E1 digipot channels to stepper driver mapping
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_BED_PIN        7   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_BED_PIN                           7  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                         3
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
-#define FAN2_PIN            2
+#define FAN1_PIN                               6
+#define FAN2_PIN                               2
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN           4
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                              4
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      3   // Analog Input
+  #define FILWIDTH_PIN                         3  // Analog Input
 #endif
 
 //
 // LCD / Controller
 //
-#define LCD_PINS_RS        70   // Ext2_5
-#define LCD_PINS_ENABLE    71   // Ext2_7
-#define LCD_PINS_D4        72   // Ext2_9 ?
-#define LCD_PINS_D5        73   // Ext2_11 ?
-#define LCD_PINS_D6        74   // Ext2_13
-#define LCD_PINS_D7        75   // Ext2_15 ?
-#define BEEPER_PIN         -1
+#define LCD_PINS_RS                           70  // Ext2_5
+#define LCD_PINS_ENABLE                       71  // Ext2_7
+#define LCD_PINS_D4                           72  // Ext2_9 ?
+#define LCD_PINS_D5                           73  // Ext2_11 ?
+#define LCD_PINS_D6                           74  // Ext2_13
+#define LCD_PINS_D7                           75  // Ext2_15 ?
+#define BEEPER_PIN                            -1
 
-#define BTN_HOME           80   // Ext_16
-#define BTN_CENTER         81   // Ext_14
-#define BTN_ENC            BTN_CENTER
-#define BTN_RIGHT          82   // Ext_12
-#define BTN_LEFT           83   // Ext_10
-#define BTN_UP             84   // Ext2_8
-#define BTN_DOWN           85   // Ext2_6
+#define BTN_HOME                              80  // Ext_16
+#define BTN_CENTER                            81  // Ext_14
+#define BTN_ENC                       BTN_CENTER
+#define BTN_RIGHT                             82  // Ext_12
+#define BTN_LEFT                              83  // Ext_10
+#define BTN_UP                                84  // Ext2_8
+#define BTN_DOWN                              85  // Ext2_6
 
-#define HOME_PIN           BTN_HOME
+#define HOME_PIN                        BTN_HOME
 
 #if ANY(VIKI2, miniVIKI)
-  #define BEEPER_PIN       44
+  #define BEEPER_PIN                          44
   // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0        70
-  #define DOGLCD_CS        71
+  #define DOGLCD_A0                           70
+  #define DOGLCD_CS                           71
   #define LCD_SCREEN_ROT_180
 
-  #define SD_DETECT_PIN    -1   // Pin 72 if using easy adapter board
+  #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board
 
-  #define STAT_LED_RED_PIN  22
-  #define STAT_LED_BLUE_PIN 32
+  #define STAT_LED_RED_PIN                    22
+  #define STAT_LED_BLUE_PIN                   32
 #endif // VIKI2/miniVIKI
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 3f537a6663f1..69d2ac2088ff 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -40,11 +40,11 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D8_PIN        9
-#define RAMPS_D9_PIN        8
-#define MOSFET_D_PIN       12
+#define RAMPS_D8_PIN                           9
+#define RAMPS_D9_PIN                           8
+#define MOSFET_D_PIN                          12
 
-#define CASE_LIGHT_PIN     -1   // Hardware PWM but one is not available on expansion header
+#define CASE_LIGHT_PIN                        -1  // Hardware PWM but one is not available on expansion header
 
 #include "pins_RAMPS.h"
 
@@ -57,21 +57,21 @@
 // Steppers
 //
 #undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN       63
+#define Z_ENABLE_PIN                          63
 
 //
 // Heaters / Fans
 //
-#define HEATER_2_PIN        6
+#define HEATER_2_PIN                           6
 
 //
 // Misc. Functions
 //
 #undef SDSS
-#define SDSS               25
+#define SDSS                                  25
 
 #undef SD_DETECT_PIN
-#define SD_DETECT_PIN      53
+#define SD_DETECT_PIN                         53
 
 //
 // LCD / Controller
@@ -85,24 +85,24 @@
   #undef LCD_PINS_D5
   #undef LCD_PINS_D6
   #undef LCD_PINS_D7
-  #define LCD_PINS_RS      27
-  #define LCD_PINS_ENABLE  29
-  #define LCD_PINS_D4      37
-  #define LCD_PINS_D5      35
-  #define LCD_PINS_D6      33
-  #define LCD_PINS_D7      31
+  #define LCD_PINS_RS                         27
+  #define LCD_PINS_ENABLE                     29
+  #define LCD_PINS_D4                         37
+  #define LCD_PINS_D5                         35
+  #define LCD_PINS_D6                         33
+  #define LCD_PINS_D7                         31
 
   // Buttons
   #undef BTN_EN1
   #undef BTN_EN2
   #undef BTN_ENC
-  #define BTN_EN1          16
-  #define BTN_EN2          17
-  #define BTN_ENC          23
+  #define BTN_EN1                             16
+  #define BTN_EN2                             17
+  #define BTN_ENC                             23
 
 #else
 
-  #define BEEPER_PIN       33
+  #define BEEPER_PIN                          33
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
@@ -137,7 +137,7 @@
  *
  *  Note: Socket names vary from vendor to vendor
  */
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are not good with 3DRAG
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are not good with 3DRAG
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
 
@@ -149,14 +149,14 @@
     #undef Z_DIR_PIN
     #undef Z_ENABLE_PIN
     #undef Z_STEP_PIN
-    #define Z_DIR_PIN                28
-    #define Z_ENABLE_PIN             24
-    #define Z_STEP_PIN               26
-    #define SPINDLE_LASER_PWM_PIN    46   // Hardware PWM
-    #define SPINDLE_LASER_ENA_PIN    62   // Pullup!
-    #define SPINDLE_DIR_PIN          48
-  #elif !BOTH(ULTRA_LCD, NEWPANEL)     // use expansion header if no LCD in use
-    #define SPINDLE_LASER_ENA_PIN    16   // Pullup or pulldown!
-    #define SPINDLE_DIR_PIN          17
+    #define Z_DIR_PIN                         28
+    #define Z_ENABLE_PIN                      24
+    #define Z_STEP_PIN                        26
+    #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
+    #define SPINDLE_DIR_PIN                   48
+  #elif !BOTH(ULTRA_LCD, NEWPANEL)                // use expansion header if no LCD in use
+    #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
+    #define SPINDLE_DIR_PIN                   17
   #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 99b75d5e0024..a38e4e1b43aa 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -32,15 +32,15 @@
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
-  #define CASE_LIGHT_PIN    6   // Define before RAMPS pins include
+  #define CASE_LIGHT_PIN                       6  // Define before RAMPS pins include
 #endif
 #define BOARD_INFO_NAME "Azteeg X3"
 
 //
 // Servos
 //
-#define SERVO0_PIN         44   // SERVO1 port
-#define SERVO1_PIN         55   // SERVO2 port
+#define SERVO0_PIN                            44  // SERVO1 port
+#define SERVO1_PIN                            55  // SERVO2 port
 
 #include "pins_RAMPS_13.h"
 
@@ -55,17 +55,17 @@
   #undef DOGLCD_A0
   #undef DOGLCD_CS
   #undef BTN_ENC
-  #define DOGLCD_A0         31
-  #define DOGLCD_CS         32
-  #define BTN_ENC           12
+  #define DOGLCD_A0                           31
+  #define DOGLCD_CS                           32
+  #define BTN_ENC                             12
 
-  #define STAT_LED_RED_PIN  64
-  #define STAT_LED_BLUE_PIN 63
+  #define STAT_LED_RED_PIN                    64
+  #define STAT_LED_BLUE_PIN                   63
 
 #else
 
-  #define STAT_LED_RED_PIN   6
-  #define STAT_LED_BLUE_PIN 11
+  #define STAT_LED_RED_PIN                     6
+  #define STAT_LED_BLUE_PIN                   11
 
 #endif
 
@@ -79,18 +79,18 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
 
 #if HAS_CUTTER
-  #undef SDA                       // use EXP3 header
+  #undef SDA                                      // use EXP3 header
   #undef SCL
   #if SERVO0_PIN == 7
     #undef SERVO0_PIN
-    #define SERVO0_PIN     11
+    #define SERVO0_PIN                        11
   #endif
-  #define SPINDLE_LASER_PWM_PIN     7   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    20   // Pullup!
-  #define SPINDLE_DIR_PIN          21
+  #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup!
+  #define SPINDLE_DIR_PIN                     21
 #endif
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index 627eaabfd69e..c8e2a6683d98 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -43,21 +43,21 @@
 // Tested this pin with bed leveling on a Delta with 1 servo.
 // Physical wire attachment on EXT1: GND, 5V, D47.
 //
-#define SERVO0_PIN         47
+#define SERVO0_PIN                            47
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN         14
-#define Z_STOP_PIN         18
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                            14
+#define Z_STOP_PIN                            18
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
-  #define CASE_LIGHT_PIN   44
+  #define CASE_LIGHT_PIN                      44
 #endif
 
 //
@@ -67,100 +67,100 @@
 
 // DIGIPOT slave addresses
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
 #endif
 #ifndef DIGIPOT_I2C_ADDRESS_B
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  18
+  #define Z_MIN_PROBE_PIN                     18
 #endif
 
 //
 // Steppers
 //
-#define E2_STEP_PIN        23
-#define E2_DIR_PIN         25
-#define E2_ENABLE_PIN      40
+#define E2_STEP_PIN                           23
+#define E2_DIR_PIN                            25
+#define E2_ENABLE_PIN                         40
 
-#define E3_STEP_PIN        27
-#define E3_DIR_PIN         29
-#define E3_ENABLE_PIN      41
+#define E3_STEP_PIN                           27
+#define E3_DIR_PIN                            29
+#define E3_ENABLE_PIN                         41
 
-#define E4_STEP_PIN        43
-#define E4_DIR_PIN         37
-#define E4_ENABLE_PIN      42
+#define E4_STEP_PIN                           43
+#define E4_DIR_PIN                            37
+#define E4_ENABLE_PIN                         42
 
 //
 // Temperature Sensors
 //
-#define TEMP_2_PIN         12   // Analog Input
-#define TEMP_3_PIN         11   // Analog Input
-#define TEMP_4_PIN         10   // Analog Input
-#define TC1                 4   // Analog Input (Thermo couple on Azteeg X3Pro)
-#define TC2                 5   // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TEMP_2_PIN                            12  // Analog Input
+#define TEMP_3_PIN                            11  // Analog Input
+#define TEMP_4_PIN                            10  // Analog Input
+#define TC1                                    4  // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TC2                                    5  // Analog Input (Thermo couple on Azteeg X3Pro)
 
 //
 // Heaters / Fans
 //
-#define HEATER_2_PIN       16
-#define HEATER_3_PIN       17
-#define HEATER_4_PIN        4
-#define HEATER_5_PIN        5
-#define HEATER_6_PIN        6
-#define HEATER_7_PIN       11
+#define HEATER_2_PIN                          16
+#define HEATER_3_PIN                          17
+#define HEATER_4_PIN                           4
+#define HEATER_5_PIN                           5
+#define HEATER_6_PIN                           6
+#define HEATER_7_PIN                          11
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN 4   // Pin used for the fan to cool motherboard (-1 to disable)
+  #define CONTROLLER_FAN_PIN                   4  // Pin used for the fan to cool motherboard (-1 to disable)
 #endif
 
 // Fans/Water Pump to cool the hotend cool side.
-#define ORIG_E0_AUTO_FAN_PIN 5
-#define ORIG_E1_AUTO_FAN_PIN 5
-#define ORIG_E2_AUTO_FAN_PIN 5
-#define ORIG_E3_AUTO_FAN_PIN 5
+#define ORIG_E0_AUTO_FAN_PIN                   5
+#define ORIG_E1_AUTO_FAN_PIN                   5
+#define ORIG_E2_AUTO_FAN_PIN                   5
+#define ORIG_E3_AUTO_FAN_PIN                   5
 
 //
 // LCD / Controller
 //
 #undef BEEPER_PIN
-#define BEEPER_PIN         33
+#define BEEPER_PIN                            33
 
 #if ANY(VIKI2, miniVIKI)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    49   // For easy adapter board
+  #define SD_DETECT_PIN                       49  // For easy adapter board
   #undef BEEPER_PIN
-  #define  BEEPER_PIN      12   // 33 isn't physically available to the LCD display
+  #define BEEPER_PIN                          12  // 33 isn't physically available to the LCD display
 #else
-  #define STAT_LED_RED_PIN  32
-  #define STAT_LED_BLUE_PIN 35
+  #define STAT_LED_RED_PIN                    32
+  #define STAT_LED_BLUE_PIN                   35
 #endif
 
 //
 // Misc. Functions
 //
 #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
-  #undef DOGLCD_A0              // Steal pin 44 for the case light; if you have a Viki2 and have connected it
-  #define DOGLCD_A0        57   // following the Panucatt wiring diagram, you may need to tweak these pin assignments
+  #undef DOGLCD_A0                                // Steal pin 44 for the case light; if you have a Viki2 and have connected it
+  #define DOGLCD_A0                           57  // following the Panucatt wiring diagram, you may need to tweak these pin assignments
                                 // as the wiring diagram uses pin 44 for DOGLCD_A0
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
 
-#if HAS_CUTTER   // EXP2 header
+#if HAS_CUTTER                                    // EXP2 header
   #if ANY(VIKI2, miniVIKI)
-    #define BTN_EN2        31   // Pin 7 needed for Spindle PWM
+    #define BTN_EN2                           31  // Pin 7 needed for Spindle PWM
   #endif
-  #define SPINDLE_LASER_PWM_PIN  7   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN 20   // Pullup!
-  #define SPINDLE_DIR_PIN       21
+  #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup!
+  #define SPINDLE_DIR_PIN                     21
 #endif
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 9945c94d7627..1aa9b67f7c1b 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -34,9 +34,9 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    66   // Pullup or pulldown!
-#define SPINDLE_DIR_PIN          67
-#define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                66   // Pullup or pulldown!
+#define SPINDLE_DIR_PIN                      67
+#define SPINDLE_LASER_PWM_PIN                44   // Hardware PWM
 
 #include "pins_RAMPS.h"
 
@@ -45,5 +45,5 @@
 //
 #undef TEMP_0_PIN
 #undef TEMP_1_PIN
-#define TEMP_0_PIN          9   // Analog Input
-#define TEMP_1_PIN         11   // Analog Input
+#define TEMP_0_PIN                            9   // Analog Input
+#define TEMP_1_PIN                           11   // Analog Input
diff --git a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index bf75c1a2a2ab..44b6ff1e617e 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -34,30 +34,30 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D8_PIN       10
-#define RAMPS_D9_PIN       12
-#define RAMPS_D10_PIN       9
-#define MOSFET_D_PIN        7
+#define RAMPS_D8_PIN                          10
+#define RAMPS_D9_PIN                          12
+#define RAMPS_D10_PIN                          9
+#define MOSFET_D_PIN                           7
 
 //
 // Auto fans
 //
-#define ORIG_E0_AUTO_FAN_PIN 11
-#define ORIG_E1_AUTO_FAN_PIN  6
-#define ORIG_E2_AUTO_FAN_PIN  6
-#define ORIG_E3_AUTO_FAN_PIN  6
+#define ORIG_E0_AUTO_FAN_PIN                  11
+#define ORIG_E1_AUTO_FAN_PIN                   6
+#define ORIG_E2_AUTO_FAN_PIN                   6
+#define ORIG_E3_AUTO_FAN_PIN                   6
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-#define SPINDLE_DIR_PIN          42
+#define SPINDLE_LASER_ENA_PIN                 40  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
+#define SPINDLE_DIR_PIN                       42
 
 //
 // Limit Switches
 //
-#define X_MAX_PIN          79   // 2
+#define X_MAX_PIN                             79  // 2
 
 //
 // Import RAMPS 1.3 pins
@@ -68,34 +68,33 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #undef Z_MIN_PROBE_PIN
-#define Z_MIN_PROBE_PIN    19   // IND_S_5V
+#define Z_MIN_PROBE_PIN                       19  // IND_S_5V
 
 #undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN       77   // 62
+#define Z_ENABLE_PIN                          77  // 62
 
 //
 // Steppers
 //
-#define DIGIPOTSS_PIN      22
+#define DIGIPOTSS_PIN                         22
 #define DIGIPOT_CHANNELS   { 4, 5, 3, 0, 1 }
 
 //
 // Temperature Sensors
 //
 #undef TEMP_1_PIN
-#define TEMP_1_PIN         14   // Analog Input (15)
+#define TEMP_1_PIN                            14  // Analog Input (15)
 
 #undef TEMP_BED_PIN
-#define TEMP_BED_PIN       15   // Analog Input (14)
+#define TEMP_BED_PIN                          15  // Analog Input (14)
 
 //
 // Misc. Functions
 //
-#undef PS_ON_PIN                // 12
-#define PS_ON_PIN          81   // External Power Supply
-
-#define CASE_LIGHT_PIN     44   // Hardware PWM
+#undef PS_ON_PIN                                  // 12
+#define PS_ON_PIN                             81  // External Power Supply
 
+#define CASE_LIGHT_PIN                        44  // Hardware PWM
 
 // This board has headers for Z-min, Z-max and IND_S_5V *but* as the bq team
 // decided to ship the printer only with the probe and no additional Z-min
@@ -104,8 +103,8 @@
 #ifdef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
   #undef Z_MIN_PIN
   #undef Z_MAX_PIN
-  #define Z_MIN_PIN        19   // IND_S_5V
-  #define Z_MAX_PIN        18   // Z-MIN Label
+  #define Z_MIN_PIN                           19  // IND_S_5V
+  #define Z_MAX_PIN                           18  // Z-MIN Label
 #endif
 
 //
@@ -113,5 +112,5 @@
 //
 #if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
   #undef HEATER_BED_PIN
-  #define HEATER_BED_PIN    8
+  #define HEATER_BED_PIN                       8
 #endif
diff --git a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
index 6a9897334755..9ff9d3be62ed 100644
--- a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
@@ -34,68 +34,68 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         54   // PF0 / A0
-#define Y_STOP_PIN         24   // PA2 / AD2
-#define Z_MIN_PIN          23   // PA1 / AD1
-#define Z_MAX_PIN          25   // PA3 / AD3
-#define SERVO0_PIN         40   // PG1 / !RD
+#define X_STOP_PIN                            54  // PF0 / A0
+#define Y_STOP_PIN                            24  // PA2 / AD2
+#define Z_MIN_PIN                             23  // PA1 / AD1
+#define Z_MAX_PIN                             25  // PA3 / AD3
+#define SERVO0_PIN                            40  // PG1 / !RD
 
 //
 // Steppers
 //
-#define X_STEP_PIN         61   // PF7 / A7
-#define X_DIR_PIN          62   // PK0 / A8
-#define X_ENABLE_PIN       60   // PF6 / A6
+#define X_STEP_PIN                            61  // PF7 / A7
+#define X_DIR_PIN                             62  // PK0 / A8
+#define X_ENABLE_PIN                          60  // PF6 / A6
 
-#define Y_STEP_PIN         64   // PK2 / A10
-#define Y_DIR_PIN          65   // PK3 / A11
-#define Y_ENABLE_PIN       63   // PK1 / A9
+#define Y_STEP_PIN                            64  // PK2 / A10
+#define Y_DIR_PIN                             65  // PK3 / A11
+#define Y_ENABLE_PIN                          63  // PK1 / A9
 
-#define Z_STEP_PIN         67   // PK5 / A13
-#define Z_DIR_PIN          69   // PK7 / A15
-#define Z_ENABLE_PIN       66   // PK4 / A12
-#define Z_MIN_PROBE_PIN    25   // PA3 / AD3
+#define Z_STEP_PIN                            67  // PK5 / A13
+#define Z_DIR_PIN                             69  // PK7 / A15
+#define Z_ENABLE_PIN                          66  // PK4 / A12
+#define Z_MIN_PROBE_PIN                       25  // PA3 / AD3
 
-#define E0_STEP_PIN        58   // PF4 / A4
-#define E0_DIR_PIN         59   // PF5 / A5
-#define E0_ENABLE_PIN      57   // PF3 / A3
+#define E0_STEP_PIN                           58  // PF4 / A4
+#define E0_DIR_PIN                            59  // PF5 / A5
+#define E0_ENABLE_PIN                         57  // PF3 / A3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // PF1 / A1   Analog
-#define TEMP_BED_PIN       14   // PK6 / A14  Analog
+#define TEMP_0_PIN                             1  // PF1 / A1   Analog
+#define TEMP_BED_PIN                          14  // PK6 / A14  Analog
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4   // PG5 / PWM4
-#define HEATER_BED_PIN      3   // PE5 / PWM3
+#define HEATER_0_PIN                           4  // PG5 / PWM4
+#define HEATER_BED_PIN                         3  // PE5 / PWM3
 
-#define FAN_PIN             5   // PE3 / PWM5
+#define FAN_PIN                                5  // PE3 / PWM5
 
 //
 // Misc. Functions
 //
-#define SDSS               53   // PB0 / SS
-#define LED_PIN            13   // PB7 / PWM13
+#define SDSS                                  53  // PB0 / SS
+#define LED_PIN                               13  // PB7 / PWM13
 
-#define MISO_PIN           50   // PB3
-#define MOSI_PIN           51   // PB2
-#define SCK_PIN            52   // PB1
+#define MISO_PIN                              50  // PB3
+#define MOSI_PIN                              51  // PB2
+#define SCK_PIN                               52  // PB1
 
 //
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
   #if ENABLED(ZONESTAR_LCD)
-    #define LCD_PINS_RS        2
-    #define LCD_PINS_ENABLE   36
-    #define LCD_PINS_D4       37
-    #define LCD_PINS_D5       34
-    #define LCD_PINS_D6       35
-    #define LCD_PINS_D7       32
-    #define ADC_KEYPAD_PIN    12   // Analog
+    #define LCD_PINS_RS                        2
+    #define LCD_PINS_ENABLE                   36
+    #define LCD_PINS_D4                       37
+    #define LCD_PINS_D5                       34
+    #define LCD_PINS_D6                       35
+    #define LCD_PINS_D7                       32
+    #define ADC_KEYPAD_PIN                    12  // Analog
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h
index f5a49db53302..bfd341db6d3d 100644
--- a/Marlin/src/pins/ramps/pins_FELIX2.h
+++ b/Marlin/src/pins/ramps/pins_FELIX2.h
@@ -35,29 +35,29 @@
 // Heaters / Fans
 //
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN        7
+#define MOSFET_D_PIN                          7
 
 #include "pins_RAMPS.h"
 
 //
 // Misc. Functions
 //
-#define SDPOWER_PIN         1
+#define SDPOWER_PIN                           1
 
-#define PS_ON_PIN          12
+#define PS_ON_PIN                            12
 
 //
 // LCD / Controller
 //
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define SD_DETECT_PIN     6
+  #define SD_DETECT_PIN                       6
 
 #endif // NEWPANEL && ULTRA_LCD
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#undef SPINDLE_LASER_PWM_PIN     // Definitions in pins_RAMPS.h are not valid with this board
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are not valid with this board
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 3dcd7e57bc08..75d647fed5c2 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -41,83 +41,83 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         43
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            43
+#define E2_ENABLE_PIN                         44
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -140,39 +140,39 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                         8
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   57
+  #define FIL_RUNOUT_PIN                      57
 #endif
 
 #if !HAS_FILAMENT_SENSOR
-  #define FAN1_PIN          4
+  #define FAN1_PIN                             4
 #endif
 
 //
 // Misc. Functions
 //
 #ifndef SDSS
-  #define SDSS             53
+  #define SDSS                                53
 #endif
-#define LED_PIN            13
-#define LED4_PIN            5
+#define LED_PIN                               13
+#define LED4_PIN                               5
 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN        5   // Analog Input
+#define FILWIDTH_PIN                           5  // Analog Input
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
-#define CASE_LIGHT_PIN      5
+#define CASE_LIGHT_PIN                         5
 
 //
 // LCD / Controller
@@ -180,16 +180,16 @@
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define BEEPER_PIN       37
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
-  #define KILL_PIN         41
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
+  #define BEEPER_PIN                          37
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
+  #define KILL_PIN                            41
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
index 3bbff7f8f212..3ed9fb969252 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
@@ -28,10 +28,10 @@
 #define BOARD_INFO_NAME      "Formbot Raptor2"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
-#define FAN_PIN             6
+#define FAN_PIN                                6
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   22
+  #define FIL_RUNOUT_PIN                      22
 #endif
 
 #include "pins_FORMBOT_RAPTOR.h"
@@ -42,22 +42,22 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !NUM_SERVOS                       // Try to use servo connector first
-    #define SPINDLE_LASER_ENA_PIN     6 // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     4 // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif !GREEDY_PANEL                   // Try to use AUX2
-    #define SPINDLE_LASER_ENA_PIN     4 // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44 // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !NUM_SERVOS                                 // Try to use servo connector first
+    #define SPINDLE_LASER_ENA_PIN              6  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif !GREEDY_PANEL                             // Try to use AUX2
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
-  #if NUM_SERVOS <= 1                   // Try to use servo connector first
-    #define CASE_LIGHT_PIN  6           // Hardware PWM
-  #elif !GREEDY_PANEL                   // Try to use AUX2
-    #define CASE_LIGHT_PIN 44           // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Try to use servo connector first
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif !GREEDY_PANEL                             // Try to use AUX2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 1c911cd125df..8fa368651443 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -37,84 +37,84 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN         -1    // was 6
-#define SERVO2_PIN         -1    // was 5
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                            -1  // was 6
+#define SERVO2_PIN                            -1  // was 5
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         43
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            43
+#define E2_ENABLE_PIN                         44
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN        3   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                           3  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -137,36 +137,36 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN     58
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                        58
 
-#define FAN_PIN             9
+#define FAN_PIN                                9
 
 #if HAS_FILAMENT_SENSOR
-  #define FIL_RUNOUT_PIN    4
-  //#define FIL_RUNOUT2_PIN  -1
+  #define FIL_RUNOUT_PIN                       4
+  //#define FIL_RUNOUT2_PIN                   -1
 #else
   // Though defined as a fan pin, it is utilized as a dedicated laser pin by Formbot.
-  #define FAN1_PIN          4
+  #define FAN1_PIN                             4
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
+#define SDSS                                  53
 #ifndef LED_PIN
-  #define LED_PIN          13   // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
+  #define LED_PIN                             13  // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
 #endif                          // is a good place to get a signal to control the Max7219 LED Matrix.
 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN        5   // Analog Input
+#define FILWIDTH_PIN                           5  // Analog Input
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
-#define CASE_LIGHT_PIN      8
+#define CASE_LIGHT_PIN                         8
 
 //
 // LCD / Controller
@@ -175,22 +175,22 @@
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN     37
+    #define BEEPER_PIN                        37
   #endif
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
 
   // Allow MAX7219 to steal the KILL pin
   #if !defined(KILL_PIN) && MAX7219_CLK_PIN != 41 && MAX7219_DIN_PIN != 41 && MAX7219_LOAD_PIN != 41
-    #define KILL_PIN       41
+    #define KILL_PIN                          41
   #endif
 
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index bdcb28dac211..3846a7649e70 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -37,116 +37,114 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN         -1    // was 6
-#define SERVO2_PIN         -1
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                            -1  // was 6
+#define SERVO2_PIN                            -1
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         43
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            43
+#define E2_ENABLE_PIN                         44
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
-
-
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN             9
-#define FAN1_PIN           12
+#define FAN_PIN                                9
+#define FAN1_PIN                              12
 
-#define NUM_RUNOUT_SENSORS  2
-#define FIL_RUNOUT_PIN     22
-#define FIL_RUNOUT2_PIN    21
+#define NUM_RUNOUT_SENSORS                     2
+#define FIL_RUNOUT_PIN                        22
+#define FIL_RUNOUT2_PIN                       21
 
 //
 // Misc. Functions
 //
-#define CASE_LIGHT_PIN      5
-#define SDSS               53
+#define CASE_LIGHT_PIN                         5
+#define SDSS                                  53
 #ifndef LED_PIN
-  #define LED_PIN          13
+  #define LED_PIN                             13
 #endif
 
-#define SPINDLE_LASER_PWM_PIN    -1   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
+#define SPINDLE_LASER_PWM_PIN                 -1  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN        5   // Analog Input
+#define FILWIDTH_PIN                           5  // Analog Input
 
 //
 // LCD / Controller
@@ -154,20 +152,20 @@
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
   #ifndef KILL_PIN
-    #define KILL_PIN       41
+    #define KILL_PIN                          41
   #endif
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN     37
+    #define BEEPER_PIN                        37
   #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 6b7f2d582b40..19238bc5f867 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -33,83 +33,83 @@
   #define BOARD_INFO_NAME "FYSETC F6 1.3"
 #endif
 
-#define RESET_PIN          30
-#define SPI_FLASH_CS       83
+#define RESET_PIN                             30
+#define SPI_FLASH_CS                          83
 
 //
 // Servos
 //
-#define SERVO0_PIN         13
-#define SERVO1_PIN         11    // (PS_ON_PIN)
-#define SERVO2_PIN         10    // (FIL_RUNOUT_PIN)
-#define SERVO3_PIN          4    // (RGB_LED_G_PIN)
+#define SERVO0_PIN                            13
+#define SERVO1_PIN                            11  // (PS_ON_PIN)
+#define SERVO2_PIN                            10  // (FIL_RUNOUT_PIN)
+#define SERVO3_PIN                             4  // (RGB_LED_G_PIN)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          63
-#define X_MAX_PIN          64
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          12
+#define X_MIN_PIN                             63
+#define X_MAX_PIN                             64
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             12
 #ifndef Z_MAX_PIN
-  #define Z_MAX_PIN         9
+  #define Z_MAX_PIN                            9
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   SERVO2_PIN
+  #define FIL_RUNOUT_PIN              SERVO2_PIN
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN   9   // Servos pin
+  #define Z_MIN_PROBE_PIN                      9  // Servos pin
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         70
+  #define X_CS_PIN                            70
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         39
+  #define Y_CS_PIN                            39
 #endif
 
-#define Z_STEP_PIN         43
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       58
+#define Z_STEP_PIN                            43
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          58
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         74
+  #define Z_CS_PIN                            74
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        47
+  #define E0_CS_PIN                           47
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        32
+  #define E1_CS_PIN                           32
 #endif
 
-#define E2_STEP_PIN        59
-#define E2_DIR_PIN         57
-#define E2_ENABLE_PIN      40
+#define E2_STEP_PIN                           59
+#define E2_DIR_PIN                            57
+#define E2_ENABLE_PIN                         40
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        42
+  #define E2_CS_PIN                           42
 #endif
 
 //
@@ -125,76 +125,76 @@
    * At the moment, F6 rx pins are not pc interrupt pins
    */
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  -1   // 71
+    #define X_SERIAL_RX_PIN                   -1  // 71
   #endif
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  72
+    #define X_SERIAL_TX_PIN                   72
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  -1   // 73
+    #define Y_SERIAL_RX_PIN                   -1  // 73
   #endif
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  75
+    #define Y_SERIAL_TX_PIN                   75
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  -1   // 78
+    #define Z_SERIAL_RX_PIN                   -1  // 78
   #endif
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  79
+    #define Z_SERIAL_TX_PIN                   79
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN -1   // 76
+    #define E0_SERIAL_RX_PIN                  -1  // 76
   #endif
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 77
+    #define E0_SERIAL_TX_PIN                  77
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1   // 80
+    #define E1_SERIAL_RX_PIN                  -1  // 80
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN 81
+    #define E1_SERIAL_TX_PIN                  81
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1   // 22
+    #define E2_SERIAL_RX_PIN                  -1  // 22
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN 82
+    #define E2_SERIAL_TX_PIN                  82
   #endif
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         12   // Analog Input
-#define TEMP_1_PIN         13   // Analog Input
-#define TEMP_2_PIN         14   // Analog Input
-#define TEMP_BED_PIN       15   // Analog Input
+#define TEMP_0_PIN                            12  // Analog Input
+#define TEMP_1_PIN                            13  // Analog Input
+#define TEMP_2_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      9   // Analog Input on X+ endstop
+  #define FILWIDTH_PIN                         9  // Analog Input on X+ endstop
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        5
-#define HEATER_1_PIN        6
-#define HEATER_2_PIN        7
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                           5
+#define HEATER_1_PIN                           6
+#define HEATER_2_PIN                           7
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN            44
-#define FAN1_PIN           45
-#define FAN2_PIN           46
+#define FAN_PIN                               44
+#define FAN1_PIN                              45
+#define FAN2_PIN                              46
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define KILL_PIN           41
+#define SDSS                                  53
+#define LED_PIN                               13
+#define KILL_PIN                              41
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        SERVO1_PIN
+  #define PS_ON_PIN                   SERVO1_PIN
 #endif
 
 /**
@@ -211,69 +211,69 @@
 //
 // LCDs and Controllers
 //
-#define BEEPER_PIN         37
-#define SD_DETECT_PIN      49
+#define BEEPER_PIN                            37
+#define SD_DETECT_PIN                         49
 
 #if ENABLED(FYSETC_MINI_12864)
   //
   // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
   //
-  #define DOGLCD_A0        16
-  #define DOGLCD_CS        17
+  #define DOGLCD_A0                           16
+  #define DOGLCD_CS                           17
 
   #if ENABLED(FYSETC_GENERIC_12864_1_1)
-    #define LCD_BACKLIGHT_PIN 27
+    #define LCD_BACKLIGHT_PIN                 27
   #endif
 
-  #define KILL_PIN         41
-  #define LCD_RESET_PIN    23   // Must be high or open for LCD to operate normally.
+  #define KILL_PIN                            41
+  #define LCD_RESET_PIN                       23  // Must be high or open for LCD to operate normally.
                                 // Seems to work best if left open.
 
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN 25
+      #define RGB_LED_R_PIN                   25
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN 27
+      #define RGB_LED_G_PIN                   27
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN 29
+      #define RGB_LED_B_PIN                   29
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN    25
+    #define NEOPIXEL_PIN                      25
   #endif
 
 #elif HAS_GRAPHICAL_LCD
 
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      25
-    #define DOGLCD_A0      27
+    #define DOGLCD_CS                         25
+    #define DOGLCD_A0                         27
   #endif
 
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
 #endif
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN     3
+  #define RGB_LED_R_PIN                        3
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN     4
+  #define RGB_LED_G_PIN                        4
 #endif
 #ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN     9
+  #define RGB_LED_B_PIN                        9
 #endif
 #ifndef RGB_LED_W_PIN
-  #define RGB_LED_W_PIN    -1
+  #define RGB_LED_W_PIN                       -1
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index dff4749fb728..f0eb0bf4c643 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -27,24 +27,24 @@
 
 #define BOARD_NAME "FYSETC F6 1.4"
 
-#define Z_MAX_PIN           2
+#define Z_MAX_PIN                              2
 
 #if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    */
-  #define X_SERIAL_RX_PIN  72
-  #define X_SERIAL_TX_PIN  71
-  #define Y_SERIAL_RX_PIN  73
-  #define Y_SERIAL_TX_PIN  78
-  #define Z_SERIAL_RX_PIN  75
-  #define Z_SERIAL_TX_PIN  79
-  #define E0_SERIAL_RX_PIN 77
-  #define E0_SERIAL_TX_PIN 81
-  #define E1_SERIAL_RX_PIN 76
-  #define E1_SERIAL_TX_PIN 80
-  #define E2_SERIAL_RX_PIN 62
-  #define E2_SERIAL_TX_PIN 82
+  #define X_SERIAL_RX_PIN                     72
+  #define X_SERIAL_TX_PIN                     71
+  #define Y_SERIAL_RX_PIN                     73
+  #define Y_SERIAL_TX_PIN                     78
+  #define Z_SERIAL_RX_PIN                     75
+  #define Z_SERIAL_TX_PIN                     79
+  #define E0_SERIAL_RX_PIN                    77
+  #define E0_SERIAL_TX_PIN                    81
+  #define E1_SERIAL_RX_PIN                    76
+  #define E1_SERIAL_TX_PIN                    80
+  #define E2_SERIAL_RX_PIN                    62
+  #define E2_SERIAL_TX_PIN                    82
 #endif
 
 #include "pins_FYSETC_F6_13.h"
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index f0928b0ed11f..4c5ba7eca198 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -40,8 +40,8 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN  3
-#define Y_STOP_PIN 14
+#define X_STOP_PIN                            3
+#define Y_STOP_PIN                           14
 
 #undef X_MIN_PIN
 #undef X_MAX_PIN
@@ -52,13 +52,13 @@
 // Steppers
 //
 #undef E1_STEP_PIN
-#define E1_STEP_PIN 32
+#define E1_STEP_PIN                          32
 
 //
 // Heaters / Fans
 //
 #undef HEATER_1_PIN
-#define HEATER_1_PIN 11
+#define HEATER_1_PIN                         11
 
 //
 // Misc. Functions
@@ -69,5 +69,5 @@
 
 #if Z_STEP_PIN == 26
   #undef Z_STEP_PIN
-  #define Z_STEP_PIN 32
+  #define Z_STEP_PIN                         32
 #endif
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index 8c426af17c5b..09f35b1fe0f8 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -37,73 +37,73 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN         14
-#define Z_MIN_PIN          68  // Used for bed leveling
-#define Z_MAX_PIN          66
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                            14
+#define Z_MIN_PIN                             68  // Used for bed leveling
+#define Z_MAX_PIN                             66
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       63
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          63
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        32
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           32
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
+#define TEMP_0_PIN                            13
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define FAN_PIN             8
-#define CONTROLLER_FAN_PIN  9
+#define HEATER_0_PIN                          10
+#define FAN_PIN                                8
+#define CONTROLLER_FAN_PIN                     9
 
 //
 // Misc. Functions
 //
-#define SDSS               25
+#define SDSS                                  25
 
-#define FIL_RUNOUT_PIN     69   // PK7
-#define KILL_PIN           20   // PD1
+#define FIL_RUNOUT_PIN                        69  // PK7
+#define KILL_PIN                              20  // PD1
 
 //
 // LCD / Controller
 //
-#define SD_DETECT_PIN      21   // PD0
-#define LCD_SDSS           53
-#define BEEPER_PIN          6
+#define SD_DETECT_PIN                         21  // PD0
+#define LCD_SDSS                              53
+#define BEEPER_PIN                             6
 
-#define DOGLCD_CS          29
-#define DOGLCD_A0          27
+#define DOGLCD_CS                             29
+#define DOGLCD_A0                             27
 
-#define LCD_PINS_RS        27
-#define LCD_PINS_ENABLE    29
-#define LCD_PINS_D4        37
-#define LCD_PINS_D5        35
-#define LCD_PINS_D6        33
-#define LCD_PINS_D7        31
+#define LCD_PINS_RS                           27
+#define LCD_PINS_ENABLE                       29
+#define LCD_PINS_D4                           37
+#define LCD_PINS_D5                           35
+#define LCD_PINS_D6                           33
+#define LCD_PINS_D7                           31
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          17
-  #define BTN_EN2          16
-  #define BTN_ENC          23
+  #define BTN_EN1                             17
+  #define BTN_EN2                             16
+  #define BTN_ENC                             23
 #endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index b1564ea2c326..057b51a5845c 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -30,28 +30,28 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.4"
-#define MKS_BASE_VERSION 14
+#define MKS_BASE_VERSION                      14
 
 //
 // Heaters / Fans
 //
-#define FAN_PIN             9   // PH6 ** Pin18 ** PWM9
+#define FAN_PIN                                9  // PH6 ** Pin18 ** PWM9
 
 // Other Mods
-#define CASE_LIGHT_PIN     11   // PB5 ** Pin24 ** PWM11
-#define SERVO3_PIN         12   // PB6 ** Pin25 ** D12
-#define PS_ON_PIN           2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
-#define FILWIDTH_PIN       15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
-#define FIL_RUNOUT_PIN     19   // Z+ // PD2 ** Pin45 ** USART1_RX
+#define CASE_LIGHT_PIN                        11  // PB5 ** Pin24 ** PWM11
+#define SERVO3_PIN                            12  // PB6 ** Pin25 ** D12
+#define PS_ON_PIN                              2  // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
+#define FILWIDTH_PIN                          15  // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
+#define FIL_RUNOUT_PIN                        19  // Z+ // PD2 ** Pin45 ** USART1_RX
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    50
+  #define RGB_LED_R_PIN                       50
 #endif
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_G_PIN    51
+  #define RGB_LED_G_PIN                       51
 #endif
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_B_PIN    52
+  #define RGB_LED_B_PIN                       52
 #endif
 
 #include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
index 985aa056b81a..b769d655d695 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -30,30 +30,30 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.6"
-#define MKS_BASE_VERSION 16
+#define MKS_BASE_VERSION                     16
 
 //
 // Servos
 //
-#define SERVO1_PIN         12   // Digital 12 / Pin 25
+#define SERVO1_PIN                           12   // Digital 12 / Pin 25
 
 //
 // Omitted RAMPS pins
 //
 #ifndef SERVO2_PIN
-  #define SERVO2_PIN       -1
+  #define SERVO2_PIN                         -1
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN       -1
+  #define SERVO3_PIN                         -1
 #endif
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN     -1
+  #define FILWIDTH_PIN                       -1
 #endif
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   -1
+  #define FIL_RUNOUT_PIN                     -1
 #endif
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        -1
+  #define PS_ON_PIN                          -1
 #endif
 
 #include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
index e859310bf063..2d0617190657 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
@@ -34,19 +34,19 @@
   // Heaters / Fans
   //
   // Power outputs EFBF or EFBE
-  #define MOSFET_D_PIN      7
+  #define MOSFET_D_PIN                         7
 
   //
   // M3/M4/M5 - Spindle/Laser Control
   //
   #if HAS_CUTTER
-    #define SPINDLE_LASER_PWM_PIN  2   // Hardware PWM
-    #define SPINDLE_LASER_ENA_PIN 15   // Pullup!
-    #define SPINDLE_DIR_PIN       19
+    #define SPINDLE_LASER_PWM_PIN              2  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             15  // Pullup!
+    #define SPINDLE_DIR_PIN                   19
   #endif
 
   #ifndef CASE_LIGHT_PIN
-    #define CASE_LIGHT_PIN  2
+    #define CASE_LIGHT_PIN                     2
   #endif
 
 #endif
@@ -54,22 +54,22 @@
 //
 // Microstepping pins
 //
-#if MKS_BASE_VERSION >= 14      //     |===== 1.4 =====|===== 1.5+ =====|
-  #define X_MS1_PIN         5   // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
-  #define X_MS2_PIN         6   // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
-  #define Y_MS1_PIN        59   // PF5 | Pin 92 | A5   |        |       |
-  #define Y_MS2_PIN        58   // PF4 | Pin 93 | A4   |        |       |
-  #define Z_MS1_PIN        22   // PA0 | Pin 78 | D22  |        |       |
-  #define Z_MS2_PIN        39   // PG2 | Pin 70 | D39  |        |       |
+#if MKS_BASE_VERSION >= 14                        //     |===== 1.4 =====|===== 1.5+ =====|
+  #define X_MS1_PIN                            5  // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
+  #define X_MS2_PIN                            6  // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
+  #define Y_MS1_PIN                           59  // PF5 | Pin 92 | A5   |        |       |
+  #define Y_MS2_PIN                           58  // PF4 | Pin 93 | A4   |        |       |
+  #define Z_MS1_PIN                           22  // PA0 | Pin 78 | D22  |        |       |
+  #define Z_MS2_PIN                           39  // PG2 | Pin 70 | D39  |        |       |
   #if MKS_BASE_VERSION == 14
-    #define E0_MS1_PIN     64   // PK2 | Pin 87 | A10  |        |       |
-    #define E0_MS2_PIN     63   // PK1 | Pin 88 | A9   |        |       |
+    #define E0_MS1_PIN                        64  // PK2 | Pin 87 | A10  |        |       |
+    #define E0_MS2_PIN                        63  // PK1 | Pin 88 | A9   |        |       |
   #else
-    #define E0_MS1_PIN     63   // PK1 |        |      | Pin 86 | A9    |
-    #define E0_MS2_PIN     64   // PK2 |        |      | Pin 87 | A10   |
+    #define E0_MS1_PIN                        63  // PK1 |        |      | Pin 86 | A9    |
+    #define E0_MS2_PIN                        64  // PK2 |        |      | Pin 87 | A10   |
   #endif
-  #define E1_MS1_PIN       57   // PF3 | Pin 94 | A3   | Pin 93 | A3    |
-  #define E1_MS2_PIN        4   // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
+  #define E1_MS1_PIN                          57  // PF3 | Pin 94 | A3   | Pin 93 | A3    |
+  #define E1_MS2_PIN                           4  // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
 #endif
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 82a21118100a..c4c90ba6fa03 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -40,7 +40,7 @@
 // Heaters / Fans
 //
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN        7
+#define MOSFET_D_PIN                           7
 
 //
 // PSU / SERVO
@@ -48,8 +48,8 @@
 // If PSU_CONTROL is specified, always hijack Servo 3
 //
 #if ENABLED(PSU_CONTROL)
-  #define SERVO3_PIN       -1
-  #define PS_ON_PIN         4
+  #define SERVO3_PIN                          -1
+  #define PS_ON_PIN                            4
 #endif
 
 #include "pins_RAMPS.h"
@@ -104,44 +104,44 @@
   //
 
   // orange/white          SDCD
-  #define SD_DETECT_PIN    49
+  #define SD_DETECT_PIN                       49
 
   // white                 ENCA
-  #define BTN_EN1          35
+  #define BTN_EN1                             35
 
   // green                 ENCB
-  #define BTN_EN2          37
+  #define BTN_EN2                             37
 
   // purple                ENCBTN
-  #define BTN_ENC          31
+  #define BTN_ENC                             31
 
   // brown                 A0
-  #define DOGLCD_A0        27
+  #define DOGLCD_A0                           27
 
   // green/white           LCS
-  #define DOGLCD_CS        29
+  #define DOGLCD_CS                           29
 
                         // 50    gray   MISO
                         // 51    yellow MOSI
                         // 52    orange SCK
 
   // blue                  SDCS
-  //#define SDSS           53
+  //#define SDSS                              53
 
   //
   // VIKI2 4-wire lead
   //
 
   // blue                  BTN
-  #define KILL_PIN         23
+  #define KILL_PIN                            23
 
   // green                 BUZZER
-  #define BEEPER_PIN       25
+  #define BEEPER_PIN                          25
 
   // yellow                RED-LED
-  #define STAT_LED_RED_PIN 16
+  #define STAT_LED_RED_PIN                    16
 
   // white                 BLUE-LED
-  #define STAT_LED_BLUE_PIN 17
+  #define STAT_LED_BLUE_PIN                   17
 
 #endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
index d56bbd1e45c1..3236627c3b52 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
@@ -35,7 +35,7 @@
 // Heaters / Fans
 //
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN           7
+#define MOSFET_D_PIN                           7
 
 //
 // CS Pins wired to avoid conflict with the LCD
@@ -43,47 +43,47 @@
 //
 
 #ifndef X_CS_PIN
-  #define X_CS_PIN            63
+  #define X_CS_PIN                            63
 #endif
 
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN            64
+  #define Y_CS_PIN                            64
 #endif
 
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN            65
+  #define Z_CS_PIN                            65
 #endif
 
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN           66
+  #define E0_CS_PIN                           66
 #endif
 
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN           21
+  #define E1_CS_PIN                           21
 #endif
 
 // TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN             3
-#define Y_DIAG_PIN            14
-#define Z_DIAG_PIN            18
-#define E0_DIAG_PIN            2
-#define E1_DIAG_PIN           15
+#define X_DIAG_PIN                             3
+#define Y_DIAG_PIN                            14
+#define Z_DIAG_PIN                            18
+#define E0_DIAG_PIN                            2
+#define E1_DIAG_PIN                           15
 
 #ifndef SERVO1_PIN
-  #define SERVO1_PIN          12
+  #define SERVO1_PIN                          12
 #endif
 #ifndef SERVO2_PIN
-  #define SERVO2_PIN          39
+  #define SERVO2_PIN                          39
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN          32
+  #define SERVO3_PIN                          32
 #endif
 
 #ifndef E1_SERIAL_TX_PIN
-  #define E1_SERIAL_TX_PIN    20
+  #define E1_SERIAL_TX_PIN                    20
 #endif
 #ifndef E1_SERIAL_RX_PIN
-  #define E1_SERIAL_RX_PIN    21
+  #define E1_SERIAL_RX_PIN                    21
 #endif
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 272ff5636b60..050932773ea3 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -66,19 +66,19 @@
 //
 #ifndef SERVO0_PIN
   #ifdef IS_RAMPS_13
-    #define SERVO0_PIN      7
+    #define SERVO0_PIN                         7
   #else
-    #define SERVO0_PIN     11
+    #define SERVO0_PIN                        11
   #endif
 #endif
 #ifndef SERVO1_PIN
-  #define SERVO1_PIN        6
+  #define SERVO1_PIN                           6
 #endif
 #ifndef SERVO2_PIN
-  #define SERVO2_PIN        5
+  #define SERVO2_PIN                           5
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
@@ -86,26 +86,26 @@
 //
 #ifndef X_STOP_PIN
   #ifndef X_MIN_PIN
-    #define X_MIN_PIN       3
+    #define X_MIN_PIN                          3
   #endif
   #ifndef X_MAX_PIN
-    #define X_MAX_PIN       2
+    #define X_MAX_PIN                          2
   #endif
 #endif
 #ifndef Y_STOP_PIN
   #ifndef Y_MIN_PIN
-    #define Y_MIN_PIN      14
+    #define Y_MIN_PIN                         14
   #endif
   #ifndef Y_MAX_PIN
-    #define Y_MAX_PIN      15
+    #define Y_MAX_PIN                         15
   #endif
 #endif
 #ifndef Z_STOP_PIN
   #ifndef Z_MIN_PIN
-    #define Z_MIN_PIN      18
+    #define Z_MIN_PIN                         18
   #endif
   #ifndef Z_MAX_PIN
-    #define Z_MAX_PIN      19
+    #define Z_MAX_PIN                         19
   #endif
 #endif
 
@@ -113,67 +113,67 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
 #ifndef Z_STEP_PIN
-  #define Z_STEP_PIN       46
+  #define Z_STEP_PIN                          46
 #endif
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
 //
 // Temperature Sensors
 //
 #ifndef TEMP_0_PIN
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
 #ifndef TEMP_1_PIN
-  #define TEMP_1_PIN       15   // Analog Input
+  #define TEMP_1_PIN                          15  // Analog Input
 #endif
 #ifndef TEMP_BED_PIN
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -197,74 +197,74 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                        -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN      8
+  #define RAMPS_D8_PIN                         8
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN      9
+  #define RAMPS_D9_PIN                         9
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    10
-#endif
-
-#define HEATER_0_PIN       RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN1_PIN         RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
+  #define RAMPS_D10_PIN                       10
+#endif
+
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN       MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN   MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D9_PIN
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        RAMPS_D8_PIN
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
-    #define FAN_PIN         4                  // IO pin. Buffer needed
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D8_PIN
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
+    #define FAN_PIN                            4  // IO pin. Buffer needed
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+    #define FAN_PIN                 RAMPS_D9_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #elif HAS_FREE_AUX2_PINS
-    #define CASE_LIGHT_PIN 44   // Hardware PWM
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -272,14 +272,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !NUM_SERVOS                         // Use servo connector if possible
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
+  #if !NUM_SERVOS                                 // Use servo connector if possible
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #else
     #error "No auto-assignable Spindle/Laser pins available."
   #endif
@@ -290,13 +290,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
@@ -307,11 +307,11 @@
    * Hardware serial communication ports.
    * If undefined software serial is used according to the pins below
    */
-  //#define X_HARDWARE_SERIAL  Serial1
+  //#define X_HARDWARE_SERIAL Serial1
   //#define X2_HARDWARE_SERIAL Serial1
-  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y_HARDWARE_SERIAL Serial1
   //#define Y2_HARDWARE_SERIAL Serial1
-  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z_HARDWARE_SERIAL Serial1
   //#define Z2_HARDWARE_SERIAL Serial1
   //#define E0_HARDWARE_SERIAL Serial1
   //#define E1_HARDWARE_SERIAL Serial1
@@ -324,91 +324,91 @@
   //
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -416,13 +416,13 @@
 // Průša i3 MK2 Multiplexer Support
 //
 #ifndef E_MUX0_PIN
-  #define E_MUX0_PIN 40   // Z_CS_PIN
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
 #endif
 #ifndef E_MUX1_PIN
-  #define E_MUX1_PIN 42   // E0_CS_PIN
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
 #endif
 #ifndef E_MUX2_PIN
-  #define E_MUX2_PIN 44   // E1_CS_PIN
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
 #endif
 
 //////////////////////////
@@ -436,62 +436,62 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS         40
-    #define LCD_PINS_ENABLE     42
-    #define LCD_PINS_D4         65
-    #define LCD_PINS_D5         66
-    #define LCD_PINS_D6         44
-    #define LCD_PINS_D7         64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS       27
-      #define LCD_PINS_ENABLE   29
-      #define LCD_PINS_D4       25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      37
+        #define BEEPER_PIN                    37
       #endif
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define LCD_PINS_RS       64
-      #define LCD_PINS_ENABLE   44
-      #define LCD_PINS_D4       63
-      #define LCD_PINS_D5       40
-      #define LCD_PINS_D6       42
-      #define LCD_PINS_D7       65
+      #define LCD_PINS_RS                     64
+      #define LCD_PINS_ENABLE                 44
+      #define LCD_PINS_D4                     63
+      #define LCD_PINS_D5                     40
+      #define LCD_PINS_D6                     42
+      #define LCD_PINS_D7                     65
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC     25   // Set as output on init
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS       16
-        #define DOGLCD_MOSI     17
-        #define DOGLCD_SCK      23
-        #define DOGLCD_A0       LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS     16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     23
-        #define LCD_PINS_D5     25
-        #define LCD_PINS_D6     27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7       29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -499,10 +499,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -514,99 +514,99 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1         17
-        #define BTN_EN2         23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC           35
+      #define BTN_ENC                         35
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN   49
+        #define SD_DETECT_PIN                 49
       #endif
       #ifndef KILL_PIN
-        #define KILL_PIN        41
+        #define KILL_PIN                      41
       #endif
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          SDSS
-      #define KILL_PIN          41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                      SDSS
+      #define KILL_PIN                        41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           40   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2           42
-      #define BTN_ENC           -1
+      #define BTN_EN1                         40  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                         42
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS         45
-      #define DOGLCD_A0         44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN        33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SD_DETECT_PIN     -1   // Pin 49 for display SD interface, 72 for easy adapter board
-      #define KILL_PIN          31
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
+      #define KILL_PIN                        31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN        23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
-      #define BEEPER_PIN        37
-      #define BTN_ENC           35
-      #define SD_DETECT_PIN     49
+      #define BEEPER_PIN                      37
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
 
       #ifndef KILL_PIN
-        #define KILL_PIN        41
+        #define KILL_PIN                      41
       #endif
 
-      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
+      #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
 
-        #define DOGLCD_A0       27
-        #define DOGLCD_CS       25
+        #define DOGLCD_A0                     27
+        #define DOGLCD_CS                     25
 
         // GLCD features
         // Uncomment screen orientation
@@ -615,50 +615,50 @@
         //#define LCD_SCREEN_ROT_270
 
         // not connected to a pin
-        #define LCD_BACKLIGHT_PIN -1  // 65 (MKS mini12864 can't adjust backlight by software!)
+        #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
 
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
 
       #elif ENABLED(FYSETC_MINI_12864)
 
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
 
-        #define DOGLCD_A0       16
-        #define DOGLCD_CS       17
+        #define DOGLCD_A0                     16
+        #define DOGLCD_CS                     17
 
-        #define BTN_EN1         33
-        #define BTN_EN2         31
+        #define BTN_EN1                       33
+        #define BTN_EN2                       31
 
-        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN                 23  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN 25
+            #define RGB_LED_R_PIN             25
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN 27
+            #define RGB_LED_G_PIN             27
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN 29
+            #define RGB_LED_B_PIN             29
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN    25
+          #define NEOPIXEL_PIN                25
         #endif
 
       #endif
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
       // Uncomment screen orientation
@@ -666,16 +666,16 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define ADC_KEYPAD_PIN    12
+      #define ADC_KEYPAD_PIN                  12
 
     #elif ENABLED(AZSMZ_12864)
 
@@ -684,22 +684,22 @@
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #if ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN                 49
+        #define KILL_PIN                      41
       #endif
 
     #endif
@@ -708,16 +708,16 @@
 #endif // HAS_SPI_LCD
 
 #if ENABLED(REPRAPWORLD_KEYPAD)
-  #define SHIFT_OUT        40
-  #define SHIFT_CLK        44
-  #define SHIFT_LD         42
+  #define SHIFT_OUT                           40
+  #define SHIFT_CLK                           44
+  #define SHIFT_LD                            42
   #ifndef BTN_EN1
-    #define BTN_EN1        64
+    #define BTN_EN1                           64
   #endif
   #ifndef BTN_EN2
-    #define BTN_EN2        59
+    #define BTN_EN2                           59
   #endif
   #ifndef BTN_ENC
-    #define BTN_ENC        63
+    #define BTN_ENC                           63
   #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index ea2ace7e86fd..f6847feb4bf5 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -32,31 +32,31 @@
 //
 
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
+#define MOSFET_D_PIN                           7
 
-#define FIL_RUNOUT_PIN 2
+#define FIL_RUNOUT_PIN                         2
 #if NUM_RUNOUT_SENSORS > 1
-  #define FIL_RUNOUT2_PIN  15 // Creality CR-X can use dual runout sensors
+  #define FIL_RUNOUT2_PIN                     15  // Creality CR-X can use dual runout sensors
 #endif
 
-#define SD_DETECT_PIN      49  // Always define onboard SD detect
+#define SD_DETECT_PIN                         49  // Always define onboard SD detect
 
-#define PS_ON_PIN          40 // Used by CR2020 Industrial series
+#define PS_ON_PIN                             40  // Used by CR2020 Industrial series
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN)
-  #define CASE_LIGHT_PIN   65
+  #define CASE_LIGHT_PIN                      65
 #endif
 
 #include "pins_RAMPS.h"
 
 #ifndef BEEPER_PIN
-  #define BEEPER_PIN       37  // Always define beeper pin so Play Tone works with ExtUI
+  #define BEEPER_PIN                          37  // Always define beeper pin so Play Tone works with ExtUI
 #endif
 
-#define EXP1_PIN           65   // A11 - Used by CR2020 Industrial series for case
-#define EXP2_PIN           66   // A12
-#define EXP3_PIN           11   // SERVO0_PIN
-#define EXP4_PIN           12   // PS_ON_PIN
+#define EXP1_PIN                              65  // A11 - Used by CR2020 Industrial series for case
+#define EXP2_PIN                              66  // A12
+#define EXP3_PIN                              11  // SERVO0_PIN
+#define EXP4_PIN                              12  // PS_ON_PIN
 
-#define SUICIDE_PIN        12 // Used by CR2020 Industrial series
-#define SUICIDE_PIN_INVERTING true // Used by CR2020 Industrial series
+#define SUICIDE_PIN                           12  // Used by CR2020 Industrial series
+#define SUICIDE_PIN_INVERTING true                // Used by CR2020 Industrial series
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
index 39aecb0bc77a..b0ba7822ef62 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
@@ -27,12 +27,12 @@
 
 #define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
 
-#define X_STOP_PIN          2
-#define Y_STOP_PIN          3
-#define Z_STOP_PIN         15
-#define FIL_RUNOUT_PIN     39
+#define X_STOP_PIN                            2
+#define Y_STOP_PIN                            3
+#define Z_STOP_PIN                           15
+#define FIL_RUNOUT_PIN                       39
 
-#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                  7
 
 //
 // Import RAMPS 1.4 pins
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
index aa45370e6a07..0323366944d4 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
@@ -37,80 +37,80 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          16
-#define Y_MAX_PIN          17
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             16
+#define Y_MAX_PIN                             17
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         38
-#define Y_DIR_PIN          40
-#define Y_ENABLE_PIN       36
+#define Y_STEP_PIN                            38
+#define Y_DIR_PIN                             40
+#define Y_ENABLE_PIN                          36
 
-#define Z_STEP_PIN         44
-#define Z_DIR_PIN          46
-#define Z_ENABLE_PIN       42
+#define Z_STEP_PIN                            44
+#define Z_DIR_PIN                             46
+#define Z_ENABLE_PIN                          42
 
-#define E0_STEP_PIN        32
-#define E0_DIR_PIN         34
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           32
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
 // Heaters / Fans
 //
 #if ENABLED(RAMPS_V_1_0)
-  #define HEATER_0_PIN     12
-  #define HEATER_BED_PIN   -1
+  #define HEATER_0_PIN                        12
+  #define HEATER_BED_PIN                      -1
   #ifndef FAN_PIN
-    #define FAN_PIN        11
+    #define FAN_PIN                           11
   #endif
-#else // RAMPS_V_1_1 or RAMPS_V_1_2
-  #define HEATER_0_PIN     10
-  #define HEATER_BED_PIN    8
+#else                                             // RAMPS_V_1_1 or RAMPS_V_1_2
+  #define HEATER_0_PIN                        10
+  #define HEATER_BED_PIN                       8
   #ifndef FAN_PIN
-    #define FAN_PIN         9
+    #define FAN_PIN                            9
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define SDPOWER_PIN        48
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN     45   // Hardware PWM
+#define SDPOWER_PIN                           48
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                        45  // Hardware PWM
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    41   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
-#define SPINDLE_DIR_PIN          43
+#define SPINDLE_LASER_ENA_PIN                 41  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
+#define SPINDLE_DIR_PIN                       43
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 24aa7b9c9032..f93b6dcc86fe 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -44,8 +44,8 @@
 
 #define BOARD_INFO_NAME "RAMPS 1.4 Plus"
 
-#define RAMPS_D8_PIN  10
-#define RAMPS_D10_PIN  8
+#define RAMPS_D8_PIN                          10
+#define RAMPS_D10_PIN                          8
 
 #include "pins_RAMPS.h"
 
@@ -60,13 +60,13 @@
 #undef E1_DIR_PIN
 #undef E1_ENABLE_PIN
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         34
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         28
-#define E1_ENABLE_PIN      24
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         24
 
 #undef X_CS_PIN
 #undef Y_CS_PIN
@@ -77,10 +77,10 @@
 #if ENABLED(ULTRA_LCD, REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
     #undef LCD_PINS_RS
-    #define LCD_PINS_RS     42   // 3DYMY boards pin 16 -> 42
+    #define LCD_PINS_RS                       42  // 3DYMY boards pin 16 -> 42
     #undef LCD_PINS_ENABLE
-    #define LCD_PINS_ENABLE 44   // 3DYMY boards pin 17 -> 44
+    #define LCD_PINS_ENABLE                   44  // 3DYMY boards pin 17 -> 44
   #endif
   #undef LCD_PINS_D7
-  #define LCD_PINS_D7       53   // 3DYMY boards pin 29 -> 53
+  #define LCD_PINS_D7                         53  // 3DYMY boards pin 29 -> 53
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index da6b6e4187fb..8e8428175484 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -33,15 +33,15 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops
+  #define Z_MIN_PROBE_PIN                     19  // Z-MAX pin J14 End Stops
 #endif
 
 //
 // MOSFET changes
 //
-#define RAMPS_D9_PIN        8   // FAN (by default)
-#define RAMPS_D10_PIN       9   // EXTRUDER 1
-#define MOSFET_D_PIN       12   // EXTRUDER 2 or FAN
+#define RAMPS_D9_PIN                           8  // FAN (by default)
+#define RAMPS_D10_PIN                          9  // EXTRUDER 1
+#define MOSFET_D_PIN                          12  // EXTRUDER 2 or FAN
 
 #include "pins_RAMPS.h"
 
@@ -52,18 +52,18 @@
 #undef E0_STEP_PIN
 #undef E0_DIR_PIN
 #undef E0_ENABLE_PIN
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         34
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 
 #undef E1_STEP_PIN
 #undef E1_DIR_PIN
 #undef E1_ENABLE_PIN
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         28
-#define E1_ENABLE_PIN      24
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         24
 
-#define STEPPER_RESET_PIN  41   // Stepper drivers have a reset on RigidBot
+#define STEPPER_RESET_PIN                     41  // Stepper drivers have a reset on RigidBot
 
 //
 // Temperature Sensors
@@ -71,33 +71,33 @@
 #undef TEMP_0_PIN
 #undef TEMP_1_PIN
 #undef TEMP_BED_PIN
-#define TEMP_0_PIN         14   // Analog Input
-#define TEMP_1_PIN         13   // Analog Input
-#define TEMP_BED_PIN       15   // Analog Input
+#define TEMP_0_PIN                            14  // Analog Input
+#define TEMP_1_PIN                            13  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53   // Don't use pin 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN                      53  // Don't use pin 53 if there is even the remote possibility of using Display/SD card
 #else
-  #define MAX6675_SS_PIN   49   // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN                      49  // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
 #endif
 
 //
 // Heaters / Fans
 //
 #undef HEATER_BED_PIN
-#define HEATER_BED_PIN     10
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8   // Same as RAMPS_13_EEF
+  #define FAN_PIN                              8  // Same as RAMPS_13_EEF
 #endif
 
 //
 // Misc. Functions
 //
 #undef PS_ON_PIN
-#define PS_ON_PIN          -1
+#define PS_ON_PIN                             -1
 
 //
 // LCD / Controller
@@ -106,33 +106,33 @@
 #if ENABLED(RIGIDBOT_PANEL)
 
   #undef BEEPER_PIN
-  #define BEEPER_PIN -1
+  #define BEEPER_PIN                          -1
 
   // Direction buttons
-  #define BTN_UP           37
-  #define BTN_DWN          35
-  #define BTN_LFT          33
-  #define BTN_RT           32
+  #define BTN_UP                              37
+  #define BTN_DWN                             35
+  #define BTN_LFT                             33
+  #define BTN_RT                              32
 
   // 'R' button
   #undef BTN_ENC
-  #define BTN_ENC 31
+  #define BTN_ENC                             31
 
   // Disable encoder
   #undef BTN_EN1
-  #define BTN_EN1 -1
+  #define BTN_EN1                             -1
   #undef BTN_EN2
-  #define BTN_EN2 -1
+  #define BTN_EN2                             -1
 
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN 22
+  #define SD_DETECT_PIN                       22
 
 #elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN 22
+  #define SD_DETECT_PIN                       22
 
   #undef KILL_PIN
-  #define KILL_PIN 32
+  #define KILL_PIN                            32
 
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
index eb46ec9eaafc..d56ab1bb7f27 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
@@ -40,12 +40,12 @@
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
 
 #define DAC_STEPPER_SENSE    0.05   // sense resistors on rigidboard stepper chips are .05 value
-#define DAC_STEPPER_ADDRESS  0
-#define DAC_STEPPER_MAX   4096   // was 5000 but max allowable value is actually 4096
-#define DAC_STEPPER_VREF     1   // internal Vref, gain 2x = 4.096V
-#define DAC_STEPPER_GAIN     1   // value of 1 here sets gain of 2
-#define DAC_DISABLE_PIN     42   // set low to enable DAC
-#define DAC_OR_ADDRESS    0x01
+#define DAC_STEPPER_ADDRESS                   0
+#define DAC_STEPPER_MAX                     4096  // was 5000 but max allowable value is actually 4096
+#define DAC_STEPPER_VREF                      1   // internal Vref, gain 2x = 4.096V
+#define DAC_STEPPER_GAIN                      1   // value of 1 here sets gain of 2
+#define DAC_DISABLE_PIN                      42   // set low to enable DAC
+#define DAC_OR_ADDRESS 0x01
 
 #ifndef DAC_MOTOR_CURRENT_DEFAULT
   #define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
diff --git a/Marlin/src/pins/ramps/pins_RL200.h b/Marlin/src/pins/ramps/pins_RL200.h
index 570a9c26f94b..7b0303476b08 100644
--- a/Marlin/src/pins/ramps/pins_RL200.h
+++ b/Marlin/src/pins/ramps/pins_RL200.h
@@ -37,16 +37,16 @@
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
 #endif
 
-#define E0_STEP_PIN        26   // (RUMBA E1 pins)
-#define E0_DIR_PIN         25
-#define E0_ENABLE_PIN      27
+#define E0_STEP_PIN                          26   // (RUMBA E1 pins)
+#define E0_DIR_PIN                           25
+#define E0_ENABLE_PIN                        27
 
-#define E1_STEP_PIN        29   // (RUMBA E2 pins)
-#define E1_DIR_PIN         28
-#define E1_ENABLE_PIN      39
+#define E1_STEP_PIN                          29   // (RUMBA E2 pins)
+#define E1_DIR_PIN                           28
+#define E1_ENABLE_PIN                        39
 
-#define Z2_STEP_PIN        23   // (RUMBA E0 pins)
-#define Z2_DIR_PIN         22
-#define Z2_ENABLE_PIN      24
+#define Z2_STEP_PIN                          23   // (RUMBA E0 pins)
+#define Z2_DIR_PIN                           22
+#define Z2_ENABLE_PIN                        24
 
 #include "pins_RUMBA.h"
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index e613b9cb6c03..4bf10d73994e 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -41,56 +41,56 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
+#define SERVO0_PIN                             5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37
-#define X_MAX_PIN          36
-#define Y_MIN_PIN          35
-#define Y_MAX_PIN          34
-#define Z_MIN_PIN          33
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             37
+#define X_MAX_PIN                             36
+#define Y_MIN_PIN                             35
+#define Y_MAX_PIN                             34
+#define Z_MIN_PIN                             33
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         54
-#define Y_DIR_PIN          47
-#define Y_ENABLE_PIN       55
+#define Y_STEP_PIN                            54
+#define Y_DIR_PIN                             47
+#define Y_ENABLE_PIN                          55
 
-#define Z_STEP_PIN         57
-#define Z_DIR_PIN          56
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            57
+#define Z_DIR_PIN                             56
+#define Z_ENABLE_PIN                          62
 
 #ifndef E0_STEP_PIN
-  #define E0_STEP_PIN      23
-  #define E0_DIR_PIN       22
-  #define E0_ENABLE_PIN    24
+  #define E0_STEP_PIN                         23
+  #define E0_DIR_PIN                          22
+  #define E0_ENABLE_PIN                       24
 #endif
 
 #ifndef E1_STEP_PIN
-  #define E1_STEP_PIN      26
-  #define E1_DIR_PIN       25
-  #define E1_ENABLE_PIN    27
+  #define E1_STEP_PIN                         26
+  #define E1_DIR_PIN                          25
+  #define E1_ENABLE_PIN                       27
 #endif
 
 #if E1_STEP_PIN != 29
-  #define E2_STEP_PIN      29
-  #define E2_DIR_PIN       28
-  #define E2_ENABLE_PIN    39
+  #define E2_STEP_PIN                         29
+  #define E2_DIR_PIN                          28
+  #define E2_ENABLE_PIN                       39
 #endif
 
 //
@@ -98,134 +98,134 @@
 //
 #ifndef TEMP_0_PIN
   #if TEMP_SENSOR_0 == -1
-    #define TEMP_0_PIN      6   // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
+    #define TEMP_0_PIN                         6  // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
   #else
-    #define TEMP_0_PIN     15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
+    #define TEMP_0_PIN                        15  // Analog Input (default connector for thermistor *T0* on rumba board is used)
   #endif
 #endif
 
 #ifndef TEMP_1_PIN
   #if TEMP_SENSOR_1 == -1
-    #define TEMP_1_PIN      5   // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
+    #define TEMP_1_PIN                         5  // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
   #else
-    #define TEMP_1_PIN     14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
+    #define TEMP_1_PIN                        14  // Analog Input (default connector for thermistor *T1* on rumba board is used)
   #endif
 #endif
 
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN        7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
+  #define TEMP_2_PIN                           7  // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
 #else
-  #define TEMP_2_PIN       13   // Analog Input (default connector for thermistor *T2* on rumba board is used)
+  #define TEMP_2_PIN                          13  // Analog Input (default connector for thermistor *T2* on rumba board is used)
 #endif
 
 // Optional for extruder 4 or chamber:
-//#define TEMP_X_PIN         12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
+//#define TEMP_X_PIN                          12  // Analog Input (default connector for thermistor *T3* on rumba board is used)
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
+  //#define TEMP_CHAMBER_PIN                  12  // Analog Input (default connector for thermistor *T3* on rumba board is used)
 #endif
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
+  #define TEMP_BED_PIN                         7  // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
 #else
-  #define TEMP_BED_PIN     11   // Analog Input (default connector for thermistor *THB* on rumba board is used)
+  #define TEMP_BED_PIN                        11  // Analog Input (default connector for thermistor *THB* on rumba board is used)
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        8
-#define HEATER_BED_PIN      9
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           8
+#define HEATER_BED_PIN                         9
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 #ifndef FAN1_PIN
-  #define FAN1_PIN          8
+  #define FAN1_PIN                             8
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13
-#define PS_ON_PIN          45
-#define KILL_PIN           46
-#define CASE_LIGHT_PIN     45
+#define LED_PIN                               13
+#define PS_ON_PIN                             45
+#define KILL_PIN                              46
+#define CASE_LIGHT_PIN                        45
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #ifndef SPINDLE_LASER_PWM_PIN
-  #define SPINDLE_LASER_PWM_PIN 4   // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
 #endif
 #ifndef SPINDLE_LASER_ENA_PIN
-  #define SPINDLE_LASER_ENA_PIN 14   // Pullup!
+  #define SPINDLE_LASER_ENA_PIN               14  // Pullup!
 #endif
 #ifndef SPINDLE_DIR_PIN
-  #define SPINDLE_DIR_PIN  15
+  #define SPINDLE_DIR_PIN                     15
 #endif
 
 //
 // LCD / Controller
 //
 #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-  #define LCD_PINS_DC      38   // Set as output on init
-  #define LCD_PINS_RS      41   // Pull low for 1s to init
+  #define LCD_PINS_DC                         38  // Set as output on init
+  #define LCD_PINS_RS                         41  // Pull low for 1s to init
   // DOGM SPI LCD Support
-  #define DOGLCD_CS        19
-  #define DOGLCD_MOSI      42
-  #define DOGLCD_SCK       18
-  #define DOGLCD_A0        LCD_PINS_DC
+  #define DOGLCD_CS                           19
+  #define DOGLCD_MOSI                         42
+  #define DOGLCD_SCK                          18
+  #define DOGLCD_A0                  LCD_PINS_DC
 #elif ENABLED(FYSETC_MINI_12864)
-  #define DOGLCD_CS        42
-  #define DOGLCD_A0        19
-  #define DOGLCD_MOSI      51
-  #define DOGLCD_SCK       52
+  #define DOGLCD_CS                           42
+  #define DOGLCD_A0                           19
+  #define DOGLCD_MOSI                         51
+  #define DOGLCD_SCK                          52
 
-  //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                              //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+  //#define FORCE_SOFT_SPI                        // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-  #define LCD_RESET_PIN  18   // Must be high or open for LCD to operate normally.
+  #define LCD_RESET_PIN                       18  // Must be high or open for LCD to operate normally.
 
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN 41
+      #define RGB_LED_R_PIN                   41
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN 38
+      #define RGB_LED_G_PIN                   38
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN 40
+      #define RGB_LED_B_PIN                   40
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN   25
+    #define NEOPIXEL_PIN                      25
   #endif
 
 #else
-  #define LCD_PINS_RS      19
-  #define LCD_PINS_ENABLE  42
-  #define LCD_PINS_D4      18
-  #define LCD_PINS_D5      38
-  #define LCD_PINS_D6      41
+  #define LCD_PINS_RS                         19
+  #define LCD_PINS_ENABLE                     42
+  #define LCD_PINS_D4                         18
+  #define LCD_PINS_D5                         38
+  #define LCD_PINS_D6                         41
 #endif
 
-#define LCD_PINS_D7        40
+#define LCD_PINS_D7                           40
 
 //
 // Beeper, SD Card, Encoder
 //
-#define BEEPER_PIN         44
+#define BEEPER_PIN                            44
 
 #if ENABLED(SDSUPPORT)
-  #define SDSS             53
-  #define SD_DETECT_PIN    49
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       49
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          11
-  #define BTN_EN2          12
-  #define BTN_ENC          43
+  #define BTN_EN1                             11
+  #define BTN_EN2                             12
+  #define BTN_ENC                             43
 #endif
diff --git a/Marlin/src/pins/ramps/pins_TANGO.h b/Marlin/src/pins/ramps/pins_TANGO.h
index d3b7413fa282..221b30b0cb8f 100644
--- a/Marlin/src/pins/ramps/pins_TANGO.h
+++ b/Marlin/src/pins/ramps/pins_TANGO.h
@@ -27,24 +27,24 @@
 
 #define BOARD_INFO_NAME "Tango"
 
-#define FAN_PIN             8
-#define FAN1_PIN           -1
+#define FAN_PIN                               8
+#define FAN1_PIN                             -1
 
-#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                  7
 
 #ifndef TEMP_0_PIN
   #if TEMP_SENSOR_0 == -1
-    #define TEMP_0_PIN     10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
+    #define TEMP_0_PIN                       10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
   #else
-    #define TEMP_0_PIN     15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
+    #define TEMP_0_PIN                       15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
   #endif
 #endif
 
 #ifndef TEMP_1_PIN
   #if TEMP_SENSOR_1 == -1
-    #define TEMP_1_PIN      9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
+    #define TEMP_1_PIN                        9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
   #else
-    #define TEMP_1_PIN     14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
+    #define TEMP_1_PIN                       14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 1c5ea39279d5..dcf5ff5a0a76 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -31,10 +31,10 @@
 // Servos
 //
 #if MB(TRIGORILLA_14_11)
-  #define SERVO0_PIN        5
-  #define SERVO1_PIN        4
-  #define SERVO2_PIN       11
-  #define SERVO3_PIN        6
+  #define SERVO0_PIN                           5
+  #define SERVO1_PIN                           4
+  #define SERVO2_PIN                          11
+  #define SERVO3_PIN                           6
 #endif
 
 //
@@ -42,48 +42,48 @@
 //
 //#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
 #if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
-  #define X_MAX_PIN        43
-  #define Y_MIN_PIN        19
+  #define X_MAX_PIN                           43
+  #define Y_MIN_PIN                           19
 #endif
 
 // Labeled pins
-#define TRIGORILLA_HEATER_BED_PIN  8
-#define TRIGORILLA_HEATER_0_PIN   10
-#define TRIGORILLA_HEATER_1_PIN   45   // Anycubic Kossel: Unused
+#define TRIGORILLA_HEATER_BED_PIN              8
+#define TRIGORILLA_HEATER_0_PIN               10
+#define TRIGORILLA_HEATER_1_PIN               45  // Anycubic Kossel: Unused
 
-#define TRIGORILLA_FAN0_PIN        9   // Anycubic Kossel: Usually the part cooling fan
-#define TRIGORILLA_FAN1_PIN        7   // Anycubic Kossel: Unused
-#define TRIGORILLA_FAN2_PIN       44   // Anycubic Kossel: Hotend fan
+#define TRIGORILLA_FAN0_PIN                    9  // Anycubic Kossel: Usually the part cooling fan
+#define TRIGORILLA_FAN1_PIN                    7  // Anycubic Kossel: Unused
+#define TRIGORILLA_FAN2_PIN                   44  // Anycubic Kossel: Hotend fan
 
 // Remap MOSFET pins to common usages:
 
-#define RAMPS_D10_PIN    TRIGORILLA_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
+#define RAMPS_D10_PIN    TRIGORILLA_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
 
-#if HOTENDS > 1   // EEF and EEB
+#if HOTENDS > 1                                   // EEF and EEB
   #define RAMPS_D9_PIN   TRIGORILLA_HEATER_1_PIN
   #if !TEMP_SENSOR_BED
     // EEF
-    #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
+    #define RAMPS_D8_PIN     TRIGORILLA_FAN0_PIN
   #else
     // EEB
-    #define RAMPS_D8_PIN TRIGORILLA_HEATER_BED_PIN
-    #define FAN_PIN      TRIGORILLA_FAN0_PIN    // Override pin 4 in pins_RAMPS.h
+    #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
+    #define FAN_PIN          TRIGORILLA_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
   #endif
 #elif TEMP_SENSOR_BED
   // EFB (Anycubic Kossel default)
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN0_PIN
-  #define RAMPS_D8_PIN   TRIGORILLA_HEATER_BED_PIN
+  #define RAMPS_D9_PIN       TRIGORILLA_FAN0_PIN
+  #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
 #else
   // EFF
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN1_PIN
-  #define RAMPS_D8_PIN   TRIGORILLA_FAN0_PIN
+  #define RAMPS_D9_PIN       TRIGORILLA_FAN1_PIN
+  #define RAMPS_D8_PIN       TRIGORILLA_FAN0_PIN
 #endif
 
-#if HOTENDS > 1 || TEMP_SENSOR_BED      // EEF, EEB, EFB
-  #define FAN1_PIN       TRIGORILLA_FAN1_PIN
+#if HOTENDS > 1 || TEMP_SENSOR_BED                // EEF, EEB, EFB
+  #define FAN1_PIN           TRIGORILLA_FAN1_PIN
 #endif
-#define FAN2_PIN         TRIGORILLA_FAN2_PIN
-#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN  // Used in Anycubic Kossel example config
+#define FAN2_PIN             TRIGORILLA_FAN2_PIN
+#define ORIG_E0_AUTO_FAN_PINTRIGORILLA_FAN2_PIN   // Used in Anycubic Kossel example config
 
 #include "pins_RAMPS.h"
 
@@ -96,25 +96,25 @@
   // LCD Display output pins
   #if BOTH(NEWPANEL, PANEL_ONE)
     #undef LCD_PINS_D6
-    #define LCD_PINS_D6    57
+    #define LCD_PINS_D6                       57
   #endif
 
   // LCD Display input pins
   #if ENABLED(NEWPANEL)
     #if ANY(VIKI2, miniVIKI)
       #undef DOGLCD_A0
-      #define DOGLCD_A0    23
+      #define DOGLCD_A0                       23
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
       #undef BEEPER_PIN
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN                      33
       #undef LCD_BACKLIGHT_PIN
-      #define LCD_BACKLIGHT_PIN 67
+      #define LCD_BACKLIGHT_PIN               67
     #endif
   #elif ENABLED(MINIPANEL)
     #undef BEEPER_PIN
-    #define BEEPER_PIN     33
+    #define BEEPER_PIN                        33
     #undef DOGLCD_A0
-    #define DOGLCD_A0      42
+    #define DOGLCD_A0                         42
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 9fc53379d5c4..f5c79d0b574b 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -34,70 +34,70 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN         12
-#define SERVO2_PIN          5
-#define SERVO3_PIN          4
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                            12
+#define SERVO2_PIN                             5
+#define SERVO3_PIN                             4
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  SERVO3_PIN
+  #define Z_MIN_PROBE_PIN             SERVO3_PIN
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
-#define X_CS_PIN           57
-
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
-#define Y_CS_PIN           58
-
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
-#define Z_CS_PIN           53
-
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
-#define E0_CS_PIN          49
-
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
-#define E1_CS_PIN          E0_CS_PIN
-
-#define E2_STEP_PIN        63
-#define E2_DIR_PIN         22
-#define E2_ENABLE_PIN      59
-#define E2_CS_PIN          E0_CS_PIN
-
-#define E3_STEP_PIN        32
-#define E3_DIR_PIN         40
-#define E3_ENABLE_PIN      39
-#define E3_CS_PIN          E0_CS_PIN
-
-#define E4_STEP_PIN        43
-#define E4_DIR_PIN         42
-#define E4_ENABLE_PIN      47
-#define E4_CS_PIN          E0_CS_PIN
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
+#define X_CS_PIN                              57
+
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
+#define Y_CS_PIN                              58
+
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
+#define Z_CS_PIN                              53
+
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
+#define E0_CS_PIN                             49
+
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
+#define E1_CS_PIN                      E0_CS_PIN
+
+#define E2_STEP_PIN                           63
+#define E2_DIR_PIN                            22
+#define E2_ENABLE_PIN                         59
+#define E2_CS_PIN                      E0_CS_PIN
+
+#define E3_STEP_PIN                           32
+#define E3_DIR_PIN                            40
+#define E3_ENABLE_PIN                         39
+#define E3_CS_PIN                      E0_CS_PIN
+
+#define E4_STEP_PIN                           43
+#define E4_DIR_PIN                            42
+#define E4_ENABLE_PIN                         47
+#define E4_CS_PIN                      E0_CS_PIN
 
 #if HAS_TMC_UART
   /**
@@ -122,34 +122,34 @@
   // Software serial
   //
 
-  #define X_SERIAL_TX_PIN  -1   // 59
-  #define X_SERIAL_RX_PIN  -1   // 63
-  #define X2_SERIAL_TX_PIN -1
-  #define X2_SERIAL_RX_PIN -1
-
-  #define Y_SERIAL_TX_PIN  -1   // 64
-  #define Y_SERIAL_RX_PIN  -1   // 40
-  #define Y2_SERIAL_TX_PIN -1
-  #define Y2_SERIAL_RX_PIN -1
-
-  #define Z_SERIAL_TX_PIN  -1   // 44
-  #define Z_SERIAL_RX_PIN  -1   // 42
-  #define Z2_SERIAL_TX_PIN -1
-  #define Z2_SERIAL_RX_PIN -1
-
-  #define E0_SERIAL_TX_PIN -1   // 66
-  #define E0_SERIAL_RX_PIN -1   // 65
-  #define E1_SERIAL_TX_PIN -1
-  #define E1_SERIAL_RX_PIN -1
-  #define E2_SERIAL_TX_PIN -1
-  #define E2_SERIAL_RX_PIN -1
-  #define E3_SERIAL_TX_PIN -1
-  #define E3_SERIAL_RX_PIN -1
-  #define E4_SERIAL_TX_PIN -1
-  #define E4_SERIAL_RX_PIN -1
-  #define E5_SERIAL_RX_PIN -1
-  #define E6_SERIAL_RX_PIN -1
-  #define E7_SERIAL_RX_PIN -1
+  #define X_SERIAL_TX_PIN                     -1  // 59
+  #define X_SERIAL_RX_PIN                     -1  // 63
+  #define X2_SERIAL_TX_PIN                    -1
+  #define X2_SERIAL_RX_PIN                    -1
+
+  #define Y_SERIAL_TX_PIN                     -1  // 64
+  #define Y_SERIAL_RX_PIN                     -1  // 40
+  #define Y2_SERIAL_TX_PIN                    -1
+  #define Y2_SERIAL_RX_PIN                    -1
+
+  #define Z_SERIAL_TX_PIN                     -1  // 44
+  #define Z_SERIAL_RX_PIN                     -1  // 42
+  #define Z2_SERIAL_TX_PIN                    -1
+  #define Z2_SERIAL_RX_PIN                    -1
+
+  #define E0_SERIAL_TX_PIN                    -1  // 66
+  #define E0_SERIAL_RX_PIN                    -1  // 65
+  #define E1_SERIAL_TX_PIN                    -1
+  #define E1_SERIAL_RX_PIN                    -1
+  #define E2_SERIAL_TX_PIN                    -1
+  #define E2_SERIAL_RX_PIN                    -1
+  #define E3_SERIAL_TX_PIN                    -1
+  #define E3_SERIAL_RX_PIN                    -1
+  #define E4_SERIAL_TX_PIN                    -1
+  #define E4_SERIAL_RX_PIN                    -1
+  #define E5_SERIAL_RX_PIN                    -1
+  #define E6_SERIAL_RX_PIN                    -1
+  #define E7_SERIAL_RX_PIN                    -1
 #endif
 
 //
@@ -170,16 +170,16 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
-#define TEMP_1_PIN         15
-#define TEMP_2_PIN         10
-#define TEMP_3_PIN         11
-#define TEMP_BED_PIN       14
+#define TEMP_0_PIN                            13
+#define TEMP_1_PIN                            15
+#define TEMP_2_PIN                            10
+#define TEMP_3_PIN                            11
+#define TEMP_BED_PIN                          14
 
 #if TEMP_SENSOR_CHAMBER > 0
-  #define TEMP_CHAMBER_PIN 12
+  #define TEMP_CHAMBER_PIN                    12
 #else
-  #define TEMP_4_PIN       12
+  #define TEMP_4_PIN                          12
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
@@ -192,50 +192,50 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN       44
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                          44
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN             9
+#define FAN_PIN                                9
 
 #if EXTRUDERS >= 5
-  #define HEATER_4_PIN      6
+  #define HEATER_4_PIN                         6
 #else
-  #define FAN1_PIN          6
+  #define FAN1_PIN                             6
 #endif
 
 #if EXTRUDERS >= 4
-  #define HEATER_3_PIN     45
+  #define HEATER_3_PIN                        45
 #else
-  #define FAN2_PIN         45
+  #define FAN2_PIN                            45
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 //#ifndef FILWIDTH_PIN
 //  #define FILWIDTH_PIN      5   // Analog Input
 //#endif
 
 // DIO 4 (Servos plug) for the runout sensor.
-//#define FIL_RUNOUT_PIN   SERVO3_PIN
+//#define FIL_RUNOUT_PIN              SERVO3_PIN
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 //
 // Case Light
 //
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
-  #if !NUM_SERVOS               // Prefer the servo connector
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
-  #elif HAS_FREE_AUX2_PINS      // Try to use AUX 2
-    #define CASE_LIGHT_PIN 44   // Hardware PWM
+  #if !NUM_SERVOS                                 // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -243,14 +243,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
-  #if !NUM_SERVOS                         // Prefer the servo connector
-    #define SPINDLE_LASER_ENABLE_PIN  4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif HAS_FREE_AUX2_PINS                // Try to use AUX 2
-    #define SPINDLE_LASER_ENABLE_PIN 40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !NUM_SERVOS                                 // Prefer the servo connector
+    #define SPINDLE_LASER_ENABLE_PIN           4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
+    #define SPINDLE_LASER_ENABLE_PIN          40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -278,63 +278,63 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS    49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE 51  // SID (MOSI)
-    #define LCD_PINS_D4    52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS    40
-    #define LCD_PINS_ENABLE 42
-    #define LCD_PINS_D4    65
-    #define LCD_PINS_D5    66
-    #define LCD_PINS_D6    44
-    #define LCD_PINS_D7    64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #elif ENABLED(ZONESTAR_LCD)
 
-    #define LCD_PINS_RS    64
-    #define LCD_PINS_ENABLE 44
-    #define LCD_PINS_D4    63
-    #define LCD_PINS_D5    40
-    #define LCD_PINS_D6    42
-    #define LCD_PINS_D7    65
-    #define ADC_KEYPAD_PIN 12
+    #define LCD_PINS_RS                       64
+    #define LCD_PINS_ENABLE                   44
+    #define LCD_PINS_D4                       63
+    #define LCD_PINS_D5                       40
+    #define LCD_PINS_D6                       42
+    #define LCD_PINS_D7                       65
+    #define ADC_KEYPAD_PIN                    12
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS  27
-      #define LCD_PINS_ENABLE 29
-      #define LCD_PINS_D4  25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN 37
+        #define BEEPER_PIN                    37
       #endif
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC 25   // Set as output on init
-        #define LCD_PINS_RS 27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS  16
-        #define DOGLCD_MOSI 17
-        #define DOGLCD_SCK 23
-        #define DOGLCD_A0  LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS 16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4 23
-        #define LCD_PINS_D5 25
-        #define LCD_PINS_D6 27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7  29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN 33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -342,10 +342,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK    38
-      //#define SHIFT_LD     42
-      //#define SHIFT_OUT    40
-      //#define SHIFT_EN     17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -357,155 +357,155 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN   37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1    17
-        #define BTN_EN2    23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1    31
-        #define BTN_EN2    33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC      35
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     41
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1      64
-      #define BTN_EN2      59
-      #define BTN_ENC      63
-      #define SD_DETECT_PIN 42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1      47
-      #define BTN_EN2      43
-      #define BTN_ENC      32
-      #define LCD_SDSS     53
-      //#define KILL_PIN     41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                        53
+      //#define KILL_PIN                      41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1      22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2       7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-      #define BTN_ENC      -1
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN 49
+      #define LCD_SDSS                        53
+      #define SD_DETECT_PIN                   49
 
     #elif EITHER(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS    45
-      #define DOGLCD_A0    44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN   33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1      22
-      #define BTN_EN2       7
-      #define BTN_ENC      39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SDSS         53
-      #define SD_DETECT_PIN -1   // Pin 49 for display SD interface, 72 for easy adapter board
-      //#define KILL_PIN     31
+      #define SDSS                            53
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
+      //#define KILL_PIN                      31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS    29
-      #define DOGLCD_A0    27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN   23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1      35
-      #define BTN_EN2      37
-      #define BTN_ENC      31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     41
+      #define LCD_SDSS                        53
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      41
 
     #elif ENABLED(MKS_MINI_12864)
 
-      #define DOGLCD_A0    27
-      #define DOGLCD_CS    25
+      #define DOGLCD_A0                       27
+      #define DOGLCD_CS                       25
 
       // GLCD features
-      //#define LCD_CONTRAST_INIT 190
+      //#define LCD_CONTRAST_INIT            190
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BEEPER_PIN   37
+      #define BEEPER_PIN                      37
 
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define BTN_EN1      31
-      #define BTN_EN2      33
-      #define BTN_ENC      35
-      //#define SDSS         53
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     64
+      #define BTN_EN1                         31
+      #define BTN_EN2                         33
+      #define BTN_ENC                         35
+      //#define SDSS                          53
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      64
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN   42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
-      //#define LCD_CONTRAST_INIT 190
+      //#define LCD_CONTRAST_INIT            190
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1      40
-      #define BTN_EN2      63
-      #define BTN_ENC      59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SDSS         53
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     64
+      #define SDSS                            53
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      64
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT  40
-        #define SHIFT_CLK  44
-        #define SHIFT_LD   42
-        #define BTN_EN1    64
-        #define BTN_EN2    59
-        #define BTN_ENC    63
+        #define SHIFT_OUT                     40
+        #define SHIFT_CLK                     44
+        #define SHIFT_LD                      42
+        #define BTN_EN1                       64
+        #define BTN_EN2                       59
+        #define BTN_ENC                       63
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1    59   // AUX2 PIN 3
-        #define BTN_EN2    63   // AUX2 PIN 4
-        #define BTN_ENC    49   // AUX3 PIN 7
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1    37
-        #define BTN_EN2    35
-        #define BTN_ENC    31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN 49
-        //#define KILL_PIN     41
+        #define SD_DETECT_PIN                 49
+        //#define KILL_PIN                    41
       #endif
 
     #endif
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 2af64bb2a065..776dfcc3da34 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -44,97 +44,97 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         22
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         29
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         32
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          36
-#define Z_ENABLE_PIN       34
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34
 
-#define E0_STEP_PIN        42
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define MOTOR_CURRENT_PWM_XY_PIN 44
-#define MOTOR_CURRENT_PWM_Z_PIN 45
-#define MOTOR_CURRENT_PWM_E_PIN 46
+#define MOTOR_CURRENT_PWM_XY_PIN              44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE 2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 77
+#define ORIG_E0_AUTO_FAN_PIN                  77
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      39
-#define LED_PIN             8
-#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
-#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+#define LED_PIN                                8
+#define SAFETY_TRIGGERED_PIN                  28  // PIN to detect the safety circuit has triggered
+#define MAIN_VOLTAGE_MEASURE_PIN              14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         18
+#define BEEPER_PIN                            18
 
-#define LCD_PINS_RS        20
-#define LCD_PINS_ENABLE    15
-#define LCD_PINS_D4        14
-#define LCD_PINS_D5        21
-#define LCD_PINS_D6         5
-#define LCD_PINS_D7         6
+#define LCD_PINS_RS                           20
+#define LCD_PINS_ENABLE                       15
+#define LCD_PINS_D4                           14
+#define LCD_PINS_D5                           21
+#define LCD_PINS_D6                            5
+#define LCD_PINS_D7                            6
 
 // Buttons are directly attached
-#define BTN_EN1            40
-#define BTN_EN2            41
-#define BTN_ENC            19
+#define BTN_EN1                               40
+#define BTN_EN2                               41
+#define BTN_ENC                               19
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if HAS_CUTTER   // use the LED_PIN for spindle speed control or case light
+#if HAS_CUTTER                                    // use the LED_PIN for spindle speed control or case light
   #undef LED_PIN
-  #define SPINDLE_DIR_PIN          16
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
-  #define SPINDLE_LASER_PWM_PIN     8   // Hardware PWM
+  #define SPINDLE_DIR_PIN                     16
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                8  // Hardware PWM
 #else
   #undef LED_PIN
-  #define CASE_LIGHT_PIN            8
+  #define CASE_LIGHT_PIN                       8
 #endif
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
index 8a48b07de76b..8cc588a2f991 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
@@ -44,114 +44,114 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
+#define SERVO0_PIN                            11
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             26
+#define Y_MAX_PIN                             28
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // PIN that has to be turned on right after start, to keep power flowing.
-#define CASE_LIGHT_PIN      8
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // PIN that has to be turned on right after start, to keep power flowing.
+#define CASE_LIGHT_PIN                         8
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN 18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS    20
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4    16
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6     5
-    #define LCD_PINS_D7     6
+    #define LCD_PINS_RS                       20
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       16
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                        5
+    #define LCD_PINS_D7                        6
 
     // Buttons directly attached
-    #define BTN_EN1 40
-    #define BTN_EN2 42
-    #define BTN_ENC 19
+    #define BTN_EN1                           40
+    #define BTN_EN2                           42
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN 38
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL - Old style panel with shift register
+  #else                                           // !NEWPANEL - Old style panel with shift register
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK 38
-    #define SHIFT_LD 42
-    #define SHIFT_OUT 40
-    #define SHIFT_EN 17
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
 
-    #define LCD_PINS_RS 16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4 6
-    #define LCD_PINS_D5 21
-    #define LCD_PINS_D6 20
-    #define LCD_PINS_D7 19
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
-    #define SD_DETECT_PIN -1
+    #define SD_DETECT_PIN                     -1
 
   #endif // !NEWPANEL
 
@@ -160,6 +160,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    10   // Pullup!
-#define SPINDLE_DIR_PIN          11   // use the EXP3 PWM header
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 10  // Pullup!
+#define SPINDLE_DIR_PIN                       11  // use the EXP3 PWM header
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index e128dc98d276..dc1244222465 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -80,134 +80,134 @@
 // Limit Switches
 //
 #if ENABLED(BOARD_REV_1_1_TO_1_3)
-  #define X_MIN_PIN        15   // SW1
-  #define X_MAX_PIN        14   // SW2
-  #define Y_MIN_PIN        17   // SW3
-  #define Y_MAX_PIN        16   // SW4
-  #define Z_MIN_PIN        19   // SW5
-  #define Z_MAX_PIN        18   // SW6
+  #define X_MIN_PIN                           15  // SW1
+  #define X_MAX_PIN                           14  // SW2
+  #define Y_MIN_PIN                           17  // SW3
+  #define Y_MAX_PIN                           16  // SW4
+  #define Z_MIN_PIN                           19  // SW5
+  #define Z_MAX_PIN                           18  // SW6
 #endif
 
 #if ENABLED(BOARD_REV_1_0)
   #if HAS_CUTTER
-    #define X_STOP_PIN     13   // SW1  (didn't change) - also has a useable hardware PWM
-    #define Y_STOP_PIN     12   // SW2
-    #define Z_STOP_PIN     11   // SW3
+    #define X_STOP_PIN                        13  // SW1  (didn't change) - also has a useable hardware PWM
+    #define Y_STOP_PIN                        12  // SW2
+    #define Z_STOP_PIN                        11  // SW3
   #else
-    #define X_MIN_PIN      13   // SW1
-    #define X_MAX_PIN      12   // SW2
-    #define Y_MIN_PIN      11   // SW3
-    #define Y_MAX_PIN      10   // SW4
-    #define Z_MIN_PIN       9   // SW5
-    #define Z_MAX_PIN       8   // SW6
+    #define X_MIN_PIN                         13  // SW1
+    #define X_MAX_PIN                         12  // SW2
+    #define Y_MIN_PIN                         11  // SW3
+    #define Y_MAX_PIN                         10  // SW4
+    #define Z_MIN_PIN                          9  // SW5
+    #define Z_MAX_PIN                          8  // SW6
   #endif
 #endif
 
 #if ENABLED(BOARD_REV_1_5)
-  #define X_MIN_PIN        22
-  #define X_MAX_PIN        24
-  #define Y_MIN_PIN        26
-  #define Y_MAX_PIN        28
-  #define Z_MIN_PIN        30
-  #define Z_MAX_PIN        32
+  #define X_MIN_PIN                           22
+  #define X_MAX_PIN                           24
+  #define Y_MIN_PIN                           26
+  #define Y_MAX_PIN                           28
+  #define Z_MIN_PIN                           30
+  #define Z_MAX_PIN                           32
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #if !defined(Z_MIN_PROBE_PIN) && !(HAS_CUTTER && ENABLED(BOARD_REV_1_0))
-  #define Z_MIN_PROBE_PIN  Z_MAX_PIN
+  #define Z_MIN_PROBE_PIN              Z_MAX_PIN
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
 #if HAS_CUTTER && ENABLED(BOARD_REV_1_1_TO_1_3) && EXTRUDERS == 1
   // Move E0 to the spare and get Spindle/Laser signals from E0
-  #define E0_STEP_PIN      49
-  #define E0_DIR_PIN       47
-  #define E0_ENABLE_PIN    48
+  #define E0_STEP_PIN                         49
+  #define E0_DIR_PIN                          47
+  #define E0_ENABLE_PIN                       48
 #else
-  #define E0_STEP_PIN      43
-  #define E0_DIR_PIN       45
-  #define E0_ENABLE_PIN    41
+  #define E0_STEP_PIN                         43
+  #define E0_DIR_PIN                          45
+  #define E0_ENABLE_PIN                       41
 
-  #define E1_STEP_PIN      49
-  #define E1_DIR_PIN       47
-  #define E1_ENABLE_PIN    48
+  #define E1_STEP_PIN                         49
+  #define E1_DIR_PIN                          47
+  #define E1_ENABLE_PIN                       48
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-//#define HEATER_1_PIN        3   // used for case light   Rev A said "1"
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+//#define HEATER_1_PIN                         3  // used for case light   Rev A said "1"
+#define HEATER_BED_PIN                         4
 
 //
 // LCD / Controller
 //
 #if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
 
-  #define LCD_PINS_RS      24
-  #define LCD_PINS_ENABLE  22
-  #define LCD_PINS_D4      36
-  #define LCD_PINS_D5      34
-  #define LCD_PINS_D6      32
-  #define LCD_PINS_D7      30
+  #define LCD_PINS_RS                         24
+  #define LCD_PINS_ENABLE                     22
+  #define LCD_PINS_D4                         36
+  #define LCD_PINS_D5                         34
+  #define LCD_PINS_D6                         32
+  #define LCD_PINS_D7                         30
 
 #elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS    20
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4    16
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6     5
-    #define LCD_PINS_D7     6
+    #define LCD_PINS_RS                       20
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       16
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                        5
+    #define LCD_PINS_D7                        6
 
     // Buttons directly attached
-    #define BTN_EN1        40
-    #define BTN_EN2        42
-    #define BTN_ENC        19
+    #define BTN_EN1                           40
+    #define BTN_EN2                           42
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN  38
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL - Old style panel with shift register
+  #else                                           // !NEWPANEL - Old style panel with shift register
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
-
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
+
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
   #endif // !NEWPANEL
 
@@ -217,17 +217,17 @@
 // case light  - see spindle section for more info on available hardware PWMs
 //
 #if !PIN_EXISTS(CASE_LIGHT) && ENABLED(BOARD_REV_1_5)
-  #define CASE_LIGHT_PIN        7   // use PWM -  MUST BE HARDWARE PWM
+  #define CASE_LIGHT_PIN                       7  // use PWM -  MUST BE HARDWARE PWM
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
-  #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5) // Use the last three SW positions
-    #define SPINDLE_DIR_PIN          10   // 1.0: SW4  1.5: EXP3-6 ("10")
-    #define SPINDLE_LASER_PWM_PIN     9   // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
-    #define SPINDLE_LASER_ENA_PIN     8   // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
+  #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5)        // Use the last three SW positions
+    #define SPINDLE_DIR_PIN                   10  // 1.0: SW4  1.5: EXP3-6 ("10")
+    #define SPINDLE_LASER_PWM_PIN              9  // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENA_PIN              8  // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
   #elif ENABLED(BOARD_REV_1_1_TO_1_3)
     /**
      * Only four hardware PWMs physically connected to anything on these boards:
@@ -241,14 +241,14 @@
      * They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
      */
     #if EXTRUDERS == 1
-      #define SPINDLE_DIR_PIN          43
-      #define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
-      #define SPINDLE_LASER_ENA_PIN    41   // Pullup!
-    #elif TEMP_SENSOR_BED == 0  // Can't use E0 so see if HEATER_BED_PIN is available
+      #define SPINDLE_DIR_PIN                 43
+      #define SPINDLE_LASER_PWM_PIN           45  // Hardware PWM
+      #define SPINDLE_LASER_ENA_PIN           41  // Pullup!
+    #elif TEMP_SENSOR_BED == 0                    // Can't use E0 so see if HEATER_BED_PIN is available
       #undef HEATER_BED_PIN
-      #define SPINDLE_DIR_PIN          38   // Probably pin 4 on 10 pin connector closest to the E0 socket
-      #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM - Special precautions usually needed.
-      #define SPINDLE_LASER_ENA_PIN    40   // Pullup! (Probably pin 6 on the 10-pin
+      #define SPINDLE_DIR_PIN                 38  // Probably pin 4 on 10 pin connector closest to the E0 socket
+      #define SPINDLE_LASER_PWM_PIN            4  // Hardware PWM - Special precautions usually needed.
+      #define SPINDLE_LASER_ENA_PIN           40  // Pullup! (Probably pin 6 on the 10-pin
                                             // connector closest to the E0 socket)
     #endif
   #endif
diff --git a/Marlin/src/pins/ramps/pins_VORON.h b/Marlin/src/pins/ramps/pins_VORON.h
index a6cb05928aa4..12c0a36db1d4 100644
--- a/Marlin/src/pins/ramps/pins_VORON.h
+++ b/Marlin/src/pins/ramps/pins_VORON.h
@@ -28,7 +28,7 @@
 
 #define BOARD_INFO_NAME "VORON Design v2"
 
-#define RAMPS_D8_PIN       11
+#define RAMPS_D8_PIN                         11
 
 #include "pins_RAMPS.h"
 
@@ -36,10 +36,10 @@
 // Heaters / Fans
 //
 #undef FAN_PIN
-#define FAN_PIN             5   // Using the pin for the controller fan since controller fan is always on.
-#define CONTROLLER_FAN_PIN  8
-#define ORIG_E0_AUTO_FAN_PIN 6  // Servo pin 6 for E3D Fan
-#define ORIG_E1_AUTO_FAN_PIN 6  // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
+#define FAN_PIN                               5   // Using the pin for the controller fan since controller fan is always on.
+#define CONTROLLER_FAN_PIN                    8
+#define ORIG_E0_AUTO_FAN_PIN                  6   // Servo pin 6 for E3D Fan
+#define ORIG_E1_AUTO_FAN_PIN                  6   // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
 
 //
 // LCDs and Controllers
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index 450ad1f82548..5aee07c96f75 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -28,24 +28,24 @@
 
 #include "pins_MKS_GEN_13.h"
 
-#define ZRIB_V20_D6_PIN      6   // Fan
-#define ZRIB_V20_D9_PIN      9   // Fan2
-#define ZRIB_V20_A10_PIN    10
-#define ZRIB_V20_D16_PIN    16
-#define ZRIB_V20_D17_PIN    17
-#define ZRIB_V20_D23_PIN    23
-#define ZRIB_V20_D25_PIN    25
-#define ZRIB_V20_D27_PIN    27
-#define ZRIB_V20_D29_PIN    29
-#define ZRIB_V20_D37_PIN    37
+#define ZRIB_V20_D6_PIN                        6  // Fan
+#define ZRIB_V20_D9_PIN                        9  // Fan2
+#define ZRIB_V20_A10_PIN                      10
+#define ZRIB_V20_D16_PIN                      16
+#define ZRIB_V20_D17_PIN                      17
+#define ZRIB_V20_D23_PIN                      23
+#define ZRIB_V20_D25_PIN                      25
+#define ZRIB_V20_D27_PIN                      27
+#define ZRIB_V20_D29_PIN                      29
+#define ZRIB_V20_D37_PIN                      37
 
-#define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
+#define ORIG_E0_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
+#define ORIG_E1_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
+#define ORIG_E2_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
+#define ORIG_E3_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      11   // Analog Input
+  #define FILWIDTH_PIN                        11  // Analog Input
 #endif
 
 #if ENABLED(ZONESTAR_LCD)
@@ -58,12 +58,12 @@
   #undef ADC_KEYPAD_PIN
   #undef BEEPER_PIN
 
-  #define LCD_PINS_RS     ZRIB_V20_D16_PIN
-  #define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
-  #define LCD_PINS_D4     ZRIB_V20_D23_PIN
-  #define LCD_PINS_D5     ZRIB_V20_D25_PIN
-  #define LCD_PINS_D6     ZRIB_V20_D27_PIN
-  #define LCD_PINS_D7     ZRIB_V20_D29_PIN
-  #define ADC_KEYPAD_PIN  ZRIB_V20_A10_PIN
-  #define BEEPER_PIN      ZRIB_V20_D37_PIN
+  #define LCD_PINS_RS           ZRIB_V20_D16_PIN
+  #define LCD_PINS_ENABLE       ZRIB_V20_D17_PIN
+  #define LCD_PINS_D4           ZRIB_V20_D23_PIN
+  #define LCD_PINS_D5           ZRIB_V20_D25_PIN
+  #define LCD_PINS_D6           ZRIB_V20_D27_PIN
+  #define LCD_PINS_D7           ZRIB_V20_D29_PIN
+  #define ADC_KEYPAD_PIN        ZRIB_V20_A10_PIN
+  #define BEEPER_PIN            ZRIB_V20_D37_PIN
 #endif
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index 9808646d32db..f55ec51567a3 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -37,129 +37,129 @@
 // Servos
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         -1
+  #define X_CS_PIN                            -1
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         -1
+  #define Y_CS_PIN                            -1
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         -1
+  #define Z_CS_PIN                            -1
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        -1
+  #define E0_CS_PIN                           -1
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                           -1
 #endif
 
 // Red
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         40
-#define E2_ENABLE_PIN      65
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            40
+#define E2_ENABLE_PIN                         65
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        -1
+  #define E2_CS_PIN                           -1
 #endif
 
 // Black
-#define E3_STEP_PIN        44
-#define E3_DIR_PIN         64
-#define E3_ENABLE_PIN      66
+#define E3_STEP_PIN                           44
+#define E3_DIR_PIN                            64
+#define E3_ENABLE_PIN                         66
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        -1
+  #define E3_CS_PIN                           -1
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_2_PIN          5   // Analog Input (BLACK)
-#define TEMP_3_PIN          9   // Analog Input (RED)
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_2_PIN                             5  // Analog Input (BLACK)
+#define TEMP_3_PIN                             9  // Analog Input (RED)
+#define TEMP_BED_PIN                          14  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        5
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           5
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN             9
+#define FAN_PIN                                9
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // Оn the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #elif HAS_FREE_AUX2_PINS
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -167,14 +167,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -183,13 +183,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
@@ -217,90 +217,90 @@
   //
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
diff --git a/Marlin/src/pins/sam/pins_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h
index 3a38e5ce1668..61c2e1b494e6 100644
--- a/Marlin/src/pins/sam/pins_ADSK.h
+++ b/Marlin/src/pins/sam/pins_ADSK.h
@@ -81,55 +81,55 @@ A stepper for E0 extruder
 //
 // Servos
 //
-#define SERVO0_PIN         61   // Analog pin 7, Digital pin 61
+#define SERVO0_PIN                            61  // Analog pin 7, Digital pin 61
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           9
-#define Y_MIN_PIN          10
-#define Z_MIN_PIN          11
+#define X_MIN_PIN                              9
+#define Y_MIN_PIN                             10
+#define Z_MIN_PIN                             11
 
-#define Z_MIN_PROBE_PIN    62   // Analog pin 8, Digital pin 62
+#define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
 
 //
 // Steppers
 //
-#define X_STEP_PIN          2
-#define X_DIR_PIN           5
-#define X_ENABLE_PIN        8
+#define X_STEP_PIN                             2
+#define X_DIR_PIN                              5
+#define X_ENABLE_PIN                           8
 
-#define Y_STEP_PIN          3
-#define Y_DIR_PIN           6
-#define Y_ENABLE_PIN        8
+#define Y_STEP_PIN                             3
+#define Y_DIR_PIN                              6
+#define Y_ENABLE_PIN                           8
 
-#define Z_STEP_PIN          4
-#define Z_DIR_PIN           7
-#define Z_ENABLE_PIN        8
+#define Z_STEP_PIN                             4
+#define Z_DIR_PIN                              7
+#define Z_ENABLE_PIN                           8
 
-#define E0_STEP_PIN        12
-#define E0_DIR_PIN         13
-#define E0_ENABLE_PIN       8
+#define E0_STEP_PIN                           12
+#define E0_DIR_PIN                            13
+#define E0_ENABLE_PIN                          8
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       55   // "Hold":   Analog pin 1, Digital pin 55
-#define HEATER_BED_PIN     57   // "CoolEn": Analog pin 3, Digital pin 57
-#define FAN_PIN            54   // "Abort":  Analog pin 0, Digital pin 54
+#define HEATER_0_PIN                          55  // "Hold":   Analog pin 1, Digital pin 55
+#define HEATER_BED_PIN                        57  // "CoolEn": Analog pin 3, Digital pin 57
+#define FAN_PIN                               54  // "Abort":  Analog pin 0, Digital pin 54
 #undef E0_AUTO_FAN_PIN
-#define E0_AUTO_FAN_PIN    56   // "Resume": Analog pin 2, Digital pin 56
+#define E0_AUTO_FAN_PIN                       56  // "Resume": Analog pin 2, Digital pin 56
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          4   // "SDA":    Analog pin 4, Digital pin 58
-#define TEMP_BED_PIN        5   // "SCL":    Analog pin 5, Digital pin 59
+#define TEMP_0_PIN                             4  // "SDA":    Analog pin 4, Digital pin 58
+#define TEMP_BED_PIN                           5  // "SCL":    Analog pin 5, Digital pin 59
 
 //
 // Misc. Functions
 //
-#define SDSS               52
+#define SDSS                                  52
 
 #if ENABLED(ZONESTAR_LCD)
 
@@ -160,13 +160,13 @@ A stepper for E0 extruder
   //
   // LCD / Controller
   //
-  #define LCD_PINS_ENABLE  14
-  #define LCD_PINS_RS      15
-  #define LCD_PINS_D4      16
-  #define LCD_PINS_D5      17
-  #define LCD_PINS_D6      18
-  #define LCD_PINS_D7      19
-  #define ADC_KEYPAD_PIN    6   //60 // Analog pin 6, Digital pin 60
+  #define LCD_PINS_ENABLE                     14
+  #define LCD_PINS_RS                         15
+  #define LCD_PINS_D4                         16
+  #define LCD_PINS_D5                         17
+  #define LCD_PINS_D6                         18
+  #define LCD_PINS_D7                         19
+  #define ADC_KEYPAD_PIN                       6  //60 // Analog pin 6, Digital pin 60
 
   /**
    * The below defines will scale all the values to work properly on both
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index 619d7f62c747..8b035e887604 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -35,126 +35,126 @@
 //
 // Servos
 //
-#define SERVO0_PIN         36
-#define SERVO1_PIN         40
-#define SERVO2_PIN         41
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                            36
+#define SERVO1_PIN                            40
+#define SERVO2_PIN                            41
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          33   // PC1
-#define X_MAX_PIN          34   // PC2
-#define Y_MIN_PIN          35   // PC3
-#define Y_MAX_PIN          37   // PC5
-#define Z_MIN_PIN          38   // PC6
-#define Z_MAX_PIN          39   // PC7
+#define X_MIN_PIN                             33  // PC1
+#define X_MAX_PIN                             34  // PC2
+#define Y_MIN_PIN                             35  // PC3
+#define Y_MAX_PIN                             37  // PC5
+#define Z_MIN_PIN                             38  // PC6
+#define Z_MAX_PIN                             39  // PC7
 
 //
 // Steppers
 //
-#define X_STEP_PIN         96   // PB24
-#define X_DIR_PIN           2   // PB25
-#define X_ENABLE_PIN       24   // PA15, motor RESET pin
+#define X_STEP_PIN                            96  // PB24
+#define X_DIR_PIN                              2  // PB25
+#define X_ENABLE_PIN                          24  // PA15, motor RESET pin
 
-#define Y_STEP_PIN         94   // PB22
-#define Y_DIR_PIN          95   // PB23
-#define Y_ENABLE_PIN       24   // PA15, motor RESET pin
+#define Y_STEP_PIN                            94  // PB22
+#define Y_DIR_PIN                             95  // PB23
+#define Y_ENABLE_PIN                          24  // PA15, motor RESET pin
 
-#define Z_STEP_PIN         98   // PC27
-#define Z_DIR_PIN           3   // PC28
-#define Z_ENABLE_PIN       24   // PA15, motor RESET pin
+#define Z_STEP_PIN                            98  // PC27
+#define Z_DIR_PIN                              3  // PC28
+#define Z_ENABLE_PIN                          24  // PA15, motor RESET pin
 
-#define E0_STEP_PIN         5   // PC25
-#define E0_DIR_PIN          4   // PC26
-#define E0_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E0_STEP_PIN                            5  // PC25
+#define E0_DIR_PIN                             4  // PC26
+#define E0_ENABLE_PIN                         24  // PA15, motor RESET pin
 
-#define E1_STEP_PIN        28   // PD3 on piggy
-#define E1_DIR_PIN         27   // PD2 on piggy
-#define E1_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E1_STEP_PIN                           28  // PD3 on piggy
+#define E1_DIR_PIN                            27  // PD2 on piggy
+#define E1_ENABLE_PIN                         24  // PA15, motor RESET pin
 
-#define E2_STEP_PIN        11   // PD7 on piggy
-#define E2_DIR_PIN         29   // PD6 on piggy
-#define E2_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E2_STEP_PIN                           11  // PD7 on piggy
+#define E2_DIR_PIN                            29  // PD6 on piggy
+#define E2_ENABLE_PIN                         24  // PA15, motor RESET pin
 
-#define E3_STEP_PIN        30   // PD9 on piggy
-#define E3_DIR_PIN         12   // PD8 on piggy
-#define E3_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E3_STEP_PIN                           30  // PD9 on piggy
+#define E3_DIR_PIN                            12  // PD8 on piggy
+#define E3_ENABLE_PIN                         24  // PA15, motor RESET pin
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          99   // PC10
-#define Y_MS1_PIN          10   // PC29
-#define Z_MS1_PIN          44   // PC19
-#define E0_MS1_PIN         45   // PC18
+#define X_MS1_PIN                             99  // PC10
+#define Y_MS1_PIN                             10  // PC29
+#define Z_MS1_PIN                             44  // PC19
+#define E0_MS1_PIN                            45  // PC18
 
-//#define MOTOR_FAULT_PIN  22   // PB26 , motor X-Y-Z-E0 motor FAULT
+//#define MOTOR_FAULT_PIN                     22  // PB26 , motor X-Y-Z-E0 motor FAULT
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input (PA24)
-#define TEMP_1_PIN          2   // Analog Input (PA23 on piggy)
-#define TEMP_2_PIN          3   // Analog Input (PA22 on piggy)
-#define TEMP_3_PIN          4   // Analog Input (PA6 on piggy)
-#define TEMP_BED_PIN        0   // Analog Input (PA16)
+#define TEMP_0_PIN                             1  // Analog Input (PA24)
+#define TEMP_1_PIN                             2  // Analog Input (PA23 on piggy)
+#define TEMP_2_PIN                             3  // Analog Input (PA22 on piggy)
+#define TEMP_3_PIN                             4  // Analog Input (PA6 on piggy)
+#define TEMP_BED_PIN                           0  // Analog Input (PA16)
 
 //
 // Heaters / Fans
 //
 // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
-#define HEATER_0_PIN       68   // PA1
-#define HEATER_1_PIN        8   // PC22 on piggy
-#define HEATER_2_PIN        9   // PC21 on piggy
-#define HEATER_3_PIN       97   // PC20 on piggy
-#define HEATER_BED_PIN     69   // PA0
+#define HEATER_0_PIN                          68  // PA1
+#define HEATER_1_PIN                           8  // PC22 on piggy
+#define HEATER_2_PIN                           9  // PC21 on piggy
+#define HEATER_3_PIN                          97  // PC20 on piggy
+#define HEATER_BED_PIN                        69  // PA0
 
 #ifndef FAN_PIN
-  #define FAN_PIN          92   // PA5
+  #define FAN_PIN                             92  // PA5
 #endif
-#define FAN1_PIN           31   // PA7
+#define FAN1_PIN                              31  // PA7
 
 //
 // Misc. Functions
 //
-#define SDSS               77   // PA28
-#define SD_DETECT_PIN      87   // PA29
-#define LED_RED_PIN        40   // PC8
-#define LED_GREEN_PIN      41   // PC9
+#define SDSS                                  77  // PA28
+#define SD_DETECT_PIN                         87  // PA29
+#define LED_RED_PIN                           40  // PC8
+#define LED_GREEN_PIN                         41  // PC9
 
-#define EXP_VOLTAGE_LEVEL_PIN 65
+#define EXP_VOLTAGE_LEVEL_PIN                 65
 
-#define SPI_CHAN_DAC        1
+#define SPI_CHAN_DAC                           1
 
-#define DAC0_SYNC          53   // PB14
-#define DAC1_SYNC           6   // PC24
+#define DAC0_SYNC                             53  // PB14
+#define DAC1_SYNC                              6  // PC24
 
 // 64K SPI EEPROM
 #define SPI_EEPROM
-#define SPI_CHAN_EEPROM1    2
-#define SPI_EEPROM1_CS     25   // PD0
+#define SPI_CHAN_EEPROM1                       2
+#define SPI_EEPROM1_CS                        25  // PD0
 
 // 2K SPI EEPROM
-#define SPI_EEPROM2_CS     26   // PD1
+#define SPI_EEPROM2_CS                        26  // PD1
 
 // FLASH SPI
 // 32Mb
-#define SPI_FLASH_CS       23   // PA14
+#define SPI_FLASH_CS                          23  // PA14
 
 //
 // LCD / Controller
 //
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-  #define LCD_PINS_RS      18
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      19
-  #define BEEPER_PIN       64
+  #define LCD_PINS_RS                         18
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         19
+  #define BEEPER_PIN                          64
 
-  #define BTN_EN1          14
-  #define BTN_EN2          16
-  #define BTN_ENC          17
+  #define BTN_EN1                             14
+  #define BTN_EN2                             16
+  #define BTN_ENC                             17
 
   #undef UI_VOLTAGE_LEVEL
-  #define UI_VOLTAGE_LEVEL 1
+  #define UI_VOLTAGE_LEVEL                     1
 
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin/src/pins/sam/pins_ARCHIM1.h
index ddc9f407ecd6..606e0246978f 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM1.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM1.h
@@ -46,7 +46,7 @@
 //
 // Timers
 //
-#define STEP_TIMER_NUM 3
+#define STEP_TIMER_NUM                         3
 #define HAL_STEP_TIMER_ISR()  void TC3_Handler()
 
 //
@@ -56,147 +56,145 @@
 //
 // Servos
 //
-#define SERVO0_PIN         20   // D20 PB12 (Header J20 20)
-#define SERVO1_PIN         21   // D21 PB13 (Header J20 19)
-
+#define SERVO0_PIN                            20  // D20 PB12 (Header J20 20)
+#define SERVO1_PIN                            21  // D21 PB13 (Header J20 19)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          14   // PD4 MIN ES1
-#define X_MAX_PIN          32   // PD10 MAX ES1
-#define Y_MIN_PIN          29   // PD6 MIN ES2
-#define Y_MAX_PIN          15   // PD5 MAX ES2
-#define Z_MIN_PIN          31   // PA7 MIN ES3
-#define Z_MAX_PIN          30   // PD9 MAX ES3
+#define X_MIN_PIN                             14  // PD4 MIN ES1
+#define X_MAX_PIN                             32  // PD10 MAX ES1
+#define Y_MIN_PIN                             29  // PD6 MIN ES2
+#define Y_MAX_PIN                             15  // PD5 MAX ES2
+#define Z_MIN_PIN                             31  // PA7 MIN ES3
+#define Z_MAX_PIN                             30  // PD9 MAX ES3
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   66   // D66 PB15 (Header J20 15)
+  #define FIL_RUNOUT_PIN                      66  // D66 PB15 (Header J20 15)
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  67   // D67 PB16 (Header J20 16)
+  #define FIL_RUNOUT2_PIN                     67  // D67 PB16 (Header J20 16)
 #endif
 
-
 //
 // Steppers
 //
-#define X_STEP_PIN         40   // PC8 STEP1 *
-#define X_DIR_PIN          59   // PA4 DIR1 *
-#define X_ENABLE_PIN       41   // PC9 EN1
+#define X_STEP_PIN                            40  // PC8 STEP1 *
+#define X_DIR_PIN                             59  // PA4 DIR1 *
+#define X_ENABLE_PIN                          41  // PC9 EN1
 
-#define Y_STEP_PIN         49   // PC14 STEP2 *
-#define Y_DIR_PIN          47   // PC16 DIR2 *
-#define Y_ENABLE_PIN       48   // PC15 EN2 *
+#define Y_STEP_PIN                            49  // PC14 STEP2 *
+#define Y_DIR_PIN                             47  // PC16 DIR2 *
+#define Y_ENABLE_PIN                          48  // PC15 EN2 *
 
-#define Z_STEP_PIN         36   // PC4 STEP Z *
-#define Z_DIR_PIN         107   // PB10 DIR Z *
-#define Z_ENABLE_PIN       96   // PC10 EN Z -AddOns *
+#define Z_STEP_PIN                            36  // PC4 STEP Z *
+#define Z_DIR_PIN                            107  // PB10 DIR Z *
+#define Z_ENABLE_PIN                          96  // PC10 EN Z -AddOns *
 
-#define E0_STEP_PIN        78   // PB23 STEP3 *
-#define E0_DIR_PIN         22   // PB26 DIR3 *
-#define E0_ENABLE_PIN      97   // PB24 EN3 -Addons *
+#define E0_STEP_PIN                           78  // PB23 STEP3 *
+#define E0_DIR_PIN                            22  // PB26 DIR3 *
+#define E0_ENABLE_PIN                         97  // PB24 EN3 -Addons *
 
-#define E1_STEP_PIN        26   // PD1 STEP4 *
-#define E1_DIR_PIN         27   // PD2 DIR4 *
-#define E1_ENABLE_PIN      28   // PD3 EN4 *
+#define E1_STEP_PIN                           26  // PD1 STEP4 *
+#define E1_DIR_PIN                            27  // PD2 DIR4 *
+#define E1_ENABLE_PIN                         28  // PD3 EN4 *
 
 // Microstepping mode pins *
-#define X_MS1_PIN          39   // PC7 MOD0E1 - As listed in schematic
-#define X_MS2_PIN          38   // PC6 MOD1E1
-#define X_MS3_PIN          37   // PC5 MOD2E1
+#define X_MS1_PIN                             39  // PC7 MOD0E1 - As listed in schematic
+#define X_MS2_PIN                             38  // PC6 MOD1E1
+#define X_MS3_PIN                             37  // PC5 MOD2E1
 
-#define Y_MS1_PIN          50   // PC13 MODE0E2
-#define Y_MS2_PIN          51   // PC12 MODE1E2
-#define Y_MS3_PIN          92   // PC11 MODE2E2 - AddOns
+#define Y_MS1_PIN                             50  // PC13 MODE0E2
+#define Y_MS2_PIN                             51  // PC12 MODE1E2
+#define Y_MS3_PIN                             92  // PC11 MODE2E2 - AddOns
 
-#define Z_MS1_PIN          44   // PC19 MOD0E Z
-#define Z_MS2_PIN          45   // PC18 MOD1E Z
-#define Z_MS3_PIN          46   // PC17 MOD2E Z
+#define Z_MS1_PIN                             44  // PC19 MOD0E Z
+#define Z_MS2_PIN                             45  // PC18 MOD1E Z
+#define Z_MS3_PIN                             46  // PC17 MOD2E Z
 
-#define E0_MS1_PIN        105   // PB22 MOD0E3 - AddOns
-#define E0_MS2_PIN        106   // PC27 MOD1E3 - AddOns
-#define E0_MS3_PIN        104   // PC20 MOD2E3 - AddOns
+#define E0_MS1_PIN                           105  // PB22 MOD0E3 - AddOns
+#define E0_MS2_PIN                           106  // PC27 MOD1E3 - AddOns
+#define E0_MS3_PIN                           104  // PC20 MOD2E3 - AddOns
 
-#define E1_MS1_PIN         25   // PD0 MOD0E4
-#define E1_MS2_PIN         18   // PA11 MOD1E4
-#define E1_MS3_PIN         19   // PA10 MOD2E4
+#define E1_MS1_PIN                            25  // PD0 MOD0E4
+#define E1_MS2_PIN                            18  // PA11 MOD1E4
+#define E1_MS3_PIN                            19  // PA10 MOD2E4
 
 // Motor current PWM pins *
-#define MOTOR_CURRENT_PWM_X_PIN   58   // PA6   X-REF TIOB2
-#define MOTOR_CURRENT_PWM_Y_PIN   12   // PD8   Y-REF TIOB8
-#define MOTOR_CURRENT_PWM_Z_PIN   10   // PC29  Z-REF TIOB7
-#define MOTOR_CURRENT_PWM_E0_PIN   3   // PC28 E1-REF TIOA7
-#define MOTOR_CURRENT_PWM_E1_PIN  11   // PD7  E2-REF TIOA8
+#define MOTOR_CURRENT_PWM_X_PIN               58  // PA6   X-REF TIOB2
+#define MOTOR_CURRENT_PWM_Y_PIN               12  // PD8   Y-REF TIOB8
+#define MOTOR_CURRENT_PWM_Z_PIN               10  // PC29  Z-REF TIOB7
+#define MOTOR_CURRENT_PWM_E0_PIN               3  // PC28 E1-REF TIOA7
+#define MOTOR_CURRENT_PWM_E1_PIN              11  // PD7  E2-REF TIOA8
 
-#define MOTOR_CURRENT_PWM_RANGE 2750   // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
+#define MOTOR_CURRENT_PWM_RANGE              2750 // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1000, 1000, 1000 } //, 1000, 1000}   // X Y Z E0 E1, 1000 = 1000mAh
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         10   // D10 PB19 THERM AN1 *
-#define TEMP_1_PIN          9   // D9 PB18 THERM AN2 *
-#define TEMP_2_PIN          8   // D8 PB17 THERM AN4 *
-#define TEMP_BED_PIN       11   // D11 PB20 THERM AN3 *
+#define TEMP_0_PIN                            10  // D10 PB19 THERM AN1 *
+#define TEMP_1_PIN                             9  // D9 PB18 THERM AN2 *
+#define TEMP_2_PIN                             8  // D8 PB17 THERM AN4 *
+#define TEMP_BED_PIN                          11  // D11 PB20 THERM AN3 *
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6   // D6 PC24 FET_PWM3
-#define HEATER_1_PIN        7   // D7 PC23 FET_PWM4
-#define HEATER_2_PIN        8   // D8 PC22 FET_PWM5
-#define HEATER_BED_PIN      9   // D9 PC21 BED_PWM
+#define HEATER_0_PIN                           6  // D6 PC24 FET_PWM3
+#define HEATER_1_PIN                           7  // D7 PC23 FET_PWM4
+#define HEATER_2_PIN                           8  // D8 PC22 FET_PWM5
+#define HEATER_BED_PIN                         9  // D9 PC21 BED_PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // D4 PC26 FET_PWM1
+  #define FAN_PIN                              4  // D4 PC26 FET_PWM1
 #endif
-#define FAN1_PIN            5   // D5 PC25 FET_PWM2
+#define FAN1_PIN                               5  // D5 PC25 FET_PWM2
 
 //
 // Misc. Functions
 //
 
 // Internal MicroSD card reader on the PCB
-#define INT_SCK_PIN        42   // D42 PA19/MCCK
-#define INT_MISO_PIN       43   // D43 PA20/MCCDA
-#define INT_MOSI_PIN       73   // D73 PA21/MCDA0
-#define INT_SDSS           55   // D55 PA24/MCDA3
+#define INT_SCK_PIN                           42  // D42 PA19/MCCK
+#define INT_MISO_PIN                          43  // D43 PA20/MCCDA
+#define INT_MOSI_PIN                          73  // D73 PA21/MCDA0
+#define INT_SDSS                              55  // D55 PA24/MCDA3
 
 // External SD card reader on SC2
-#define SCK_PIN            76   // D76 PA27
-#define MISO_PIN           74   // D74 PA25
-#define MOSI_PIN           75   // D75 PA26
-#define SDSS               87   // D87 PA29
+#define SCK_PIN                               76  // D76 PA27
+#define MISO_PIN                              74  // D74 PA25
+#define MOSI_PIN                              75  // D75 PA26
+#define SDSS                                  87  // D87 PA29
 
 // 2MB SPI Flash
-#define SPI_FLASH_SS       52   // D52 PB21
+#define SPI_FLASH_SS                          52  // D52 PB21
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       23   // D24 PA15_CTS1
-  #define LCD_PINS_RS      17   // D17 PA12_RXD1
-  #define LCD_PINS_ENABLE  24   // D23 PA14_RTS1
-  #define LCD_PINS_D4      69   // D69 PA0_CANTX0
-  #define LCD_PINS_D5      54   // D54 PA16_SCK1
-  #define LCD_PINS_D6      68   // D68 PA1_CANRX0
-  #define LCD_PINS_D7      34   // D34 PC2_PWML0
+  #define BEEPER_PIN                          23  // D24 PA15_CTS1
+  #define LCD_PINS_RS                         17  // D17 PA12_RXD1
+  #define LCD_PINS_ENABLE                     24  // D23 PA14_RTS1
+  #define LCD_PINS_D4                         69  // D69 PA0_CANTX0
+  #define LCD_PINS_D5                         54  // D54 PA16_SCK1
+  #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
+  #define LCD_PINS_D7                         34  // D34 PC2_PWML0
 
-  #define SD_DETECT_PIN     2   // D2  PB25_TIOA0
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
 
   #if ENABLED(NEWPANEL)
     // Buttons on AUX-2
-    #define BTN_EN1        60   // D60 PA3_TIOB1
-    #define BTN_EN2        13   // D13 PB27_TIOB0
-    #define BTN_ENC        16   // D16 PA13_TXD1
+    #define BTN_EN1                           60  // D60 PA3_TIOB1
+    #define BTN_EN2                           13  // D13 PB27_TIOB0
+    #define BTN_ENC                           16  // D16 PA13_TXD1
   #endif // NEWPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
index acd515d8c156..d2114ea4333f 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM2.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -52,8 +52,8 @@
 //
 // Servos
 //
-#define SERVO0_PIN         20   // D20 PB12 (Header J20 20)
-#define SERVO1_PIN         21   // D21 PB13 (Header J20 19)
+#define SERVO0_PIN                            20  // D20 PB12 (Header J20 20)
+#define SERVO1_PIN                            21  // D21 PB13 (Header J20 19)
 
 //
 // Limit Switches
@@ -65,83 +65,83 @@
   // Otherwise use a physical endstop based configuration.
 
   // TMC2130 Diag Pins
-  #define X_DIAG_PIN       59   // PA4
-  #define Y_DIAG_PIN       48   // PC15
-  #define Z_DIAG_PIN       36   // PC4
-  #define E0_DIAG_PIN      78   // PB23
-  #define E1_DIAG_PIN      25   // PD0
+  #define X_DIAG_PIN                          59  // PA4
+  #define Y_DIAG_PIN                          48  // PC15
+  #define Z_DIAG_PIN                          36  // PC4
+  #define E0_DIAG_PIN                         78  // PB23
+  #define E1_DIAG_PIN                         25  // PD0
 
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN      X_DIAG_PIN
-    #define X_MAX_PIN      32
+    #define X_MIN_PIN                 X_DIAG_PIN
+    #define X_MAX_PIN                         32
   #else
-    #define X_MIN_PIN      14
-    #define X_MAX_PIN      X_DIAG_PIN
+    #define X_MIN_PIN                         14
+    #define X_MAX_PIN                 X_DIAG_PIN
   #endif
 
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN      Y_DIAG_PIN
-    #define Y_MAX_PIN      15
+    #define Y_MIN_PIN                 Y_DIAG_PIN
+    #define Y_MAX_PIN                         15
   #else
-    #define Y_MIN_PIN      29
-    #define Y_MAX_PIN      Y_DIAG_PIN
+    #define Y_MIN_PIN                         29
+    #define Y_MAX_PIN                 Y_DIAG_PIN
   #endif
 
 #else
 
-  #define X_MIN_PIN        14   // PD4 MIN ES1
-  #define X_MAX_PIN        32   // PD10 MAX ES1
-  #define Y_MIN_PIN        29   // PD6 MIN ES2
-  #define Y_MAX_PIN        15   // PD5 MAX ES2
+  #define X_MIN_PIN                           14  // PD4 MIN ES1
+  #define X_MAX_PIN                           32  // PD10 MAX ES1
+  #define Y_MIN_PIN                           29  // PD6 MIN ES2
+  #define Y_MAX_PIN                           15  // PD5 MAX ES2
 
 #endif
 
-#define Z_MIN_PIN          31   // PA7 MIN ES3
-#define Z_MAX_PIN          30   // PD9 MAX ES3
+#define Z_MIN_PIN                             31  // PA7 MIN ES3
+#define Z_MAX_PIN                             30  // PD9 MAX ES3
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         38   // PC6 X-STEP *
-#define X_DIR_PIN          37   // PC5 X-DIR *
-#define X_ENABLE_PIN       41   // PC9 EN1
+#define X_STEP_PIN                            38  // PC6 X-STEP *
+#define X_DIR_PIN                             37  // PC5 X-DIR *
+#define X_ENABLE_PIN                          41  // PC9 EN1
 #ifndef X_CS_PIN
-  #define X_CS_PIN         39   // PC7 X_nCS
+  #define X_CS_PIN                            39  // PC7 X_nCS
 #endif
 
-#define Y_STEP_PIN         51   // PC12 Y-STEP *
-#define Y_DIR_PIN          92   // PC11 Y-DIR -AddOns *
-#define Y_ENABLE_PIN       49   // PC14 Y-EN *
+#define Y_STEP_PIN                            51  // PC12 Y-STEP *
+#define Y_DIR_PIN                             92  // PC11 Y-DIR -AddOns *
+#define Y_ENABLE_PIN                          49  // PC14 Y-EN *
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         50   // PC13 Y_nCS
+  #define Y_CS_PIN                            50  // PC13 Y_nCS
 #endif
 
-#define Z_STEP_PIN         46   // PC17 Z-STEP *
-#define Z_DIR_PIN          47   // PC16 Z-DIR *
-#define Z_ENABLE_PIN       44   // PC19 Z-END *
+#define Z_STEP_PIN                            46  // PC17 Z-STEP *
+#define Z_DIR_PIN                             47  // PC16 Z-DIR *
+#define Z_ENABLE_PIN                          44  // PC19 Z-END *
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         45   // PC18 Z_nCS
+  #define Z_CS_PIN                            45  // PC18 Z_nCS
 #endif
 
-#define E0_STEP_PIN       107   // PB10 E1-STEP -AddOns *
-#define E0_DIR_PIN         96   // PC10 E1-DIR -AddOns *
-#define E0_ENABLE_PIN     105   // PB22 E1-EN -AddOns *
+#define E0_STEP_PIN                          107  // PB10 E1-STEP -AddOns *
+#define E0_DIR_PIN                            96  // PC10 E1-DIR -AddOns *
+#define E0_ENABLE_PIN                        105  // PB22 E1-EN -AddOns *
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN       104   // PC20 E1_nCS -AddOns *
+  #define E0_CS_PIN                          104  // PC20 E1_nCS -AddOns *
 #endif
 
-#define E1_STEP_PIN        22   // PB26 E2_STEP *
-#define E1_DIR_PIN         97   // PB24 E2_DIR -AddOns *
-#define E1_ENABLE_PIN      18   // PA11 E2-EN
+#define E1_STEP_PIN                           22  // PB26 E2_STEP *
+#define E1_DIR_PIN                            97  // PB24 E2_DIR -AddOns *
+#define E1_ENABLE_PIN                         18  // PA11 E2-EN
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        19   // PA10 E2_nCS
+  #define E1_CS_PIN                           19  // PA10 E2_nCS
 #endif
 
 //
@@ -150,106 +150,106 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    28   // PD3
+    #define TMC_SW_MOSI                       28  // PD3
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    26   // PD1
+    #define TMC_SW_MISO                       26  // PD1
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     27   // PD2
+    #define TMC_SW_SCK                        27  // PD2
   #endif
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         10   // D10 PB19 THERM AN1 *
-#define TEMP_1_PIN          9   // D9 PB18 THERM AN2 *
-#define TEMP_2_PIN          8   // D8 PB17 THERM AN4 *
-#define TEMP_BED_PIN       11   // D11 PB20 THERM AN3 *
+#define TEMP_0_PIN                            10  // D10 PB19 THERM AN1 *
+#define TEMP_1_PIN                             9  // D9 PB18 THERM AN2 *
+#define TEMP_2_PIN                             8  // D8 PB17 THERM AN4 *
+#define TEMP_BED_PIN                          11  // D11 PB20 THERM AN3 *
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6   // D6 PC24 FET_PWM3
-#define HEATER_1_PIN        7   // D7 PC23 FET_PWM4
-#define HEATER_2_PIN        8   // D8 PC22 FET_PWM5
-#define HEATER_BED_PIN      9   // D9 PC21 BED_PWM
+#define HEATER_0_PIN                           6  // D6 PC24 FET_PWM3
+#define HEATER_1_PIN                           7  // D7 PC23 FET_PWM4
+#define HEATER_2_PIN                           8  // D8 PC22 FET_PWM5
+#define HEATER_BED_PIN                         9  // D9 PC21 BED_PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // D4 PC26 FET_PWM1
+  #define FAN_PIN                              4  // D4 PC26 FET_PWM1
 #endif
-#define FAN1_PIN            5   // D5 PC25 FET_PWM2
+#define FAN1_PIN                               5  // D5 PC25 FET_PWM2
 
 //
 // Misc. Functions
 //
 
 // Internal MicroSD card reader on the PCB
-#define INT_SCK_PIN        42   // D42 PA19/MCCK
-#define INT_MISO_PIN       43   // D43 PA20/MCCDA
-#define INT_MOSI_PIN       73   // D73 PA21/MCDA0
-#define INT_SDSS           55   // D55 PA24/MCDA3
+#define INT_SCK_PIN                           42  // D42 PA19/MCCK
+#define INT_MISO_PIN                          43  // D43 PA20/MCCDA
+#define INT_MOSI_PIN                          73  // D73 PA21/MCDA0
+#define INT_SDSS                              55  // D55 PA24/MCDA3
 
 // External SD card reader on SC2
-#define SCK_PIN            76   // D76 PA27
-#define MISO_PIN           74   // D74 PA25
-#define MOSI_PIN           75   // D75 PA26
-#define SDSS               87   // D87 PA29
+#define SCK_PIN                               76  // D76 PA27
+#define MISO_PIN                              74  // D74 PA25
+#define MOSI_PIN                              75  // D75 PA26
+#define SDSS                                  87  // D87 PA29
 
 // Unused Digital GPIO J20 Pins
-#define GPIO_PB1_J20_5     94   // D94 PB1 (Header J20 5)
-#define GPIO_PB0_J20_6     95   // D95 PB0 (Header J20 6)
-#define GPIO_PB3_J20_7    103   // D103 PB3 (Header J20 7)
-#define GPIO_PB2_J20_8     93   // D93 PB2 (Header J20 8)
-#define GPIO_PB6_J20_9     99   // D99 PB6 (Header J20 9)
-#define GPIO_PB5_J20_10   101   // D101 PB5 (Header J20 10)
-#define GPIO_PB8_J20_11   100   // D100 PB8 (Header J20 11)
-#define GPIO_PB4_J20_12   102   // D102 PB4 (Header J20 12)
-#define GPIO_PB9_J20_13   108   // D108 PB9 (Header J20 13)
-#define GPIO_PB7_J20_14    98   // D98 PB7 (Header J20 14)
-#define GPIO_PB15_J20_15   66   // D66 PB15 (Header J20 15)
-#define GPIO_PB16_J20_16   67   // D67 PB16 (Header J20 16)
-#define GPIO_PB14_J20_17   53   // D53 PB14 (Header J20 17)
-#define GPIO_PA18_J20_21   71   // D71 PA17 (Header J20 21)
-#define GPIO_PA17_J20_22   70   // D70 PA17 (Header J20 22)
+#define GPIO_PB1_J20_5                        94  // D94 PB1 (Header J20 5)
+#define GPIO_PB0_J20_6                        95  // D95 PB0 (Header J20 6)
+#define GPIO_PB3_J20_7                       103  // D103 PB3 (Header J20 7)
+#define GPIO_PB2_J20_8                        93  // D93 PB2 (Header J20 8)
+#define GPIO_PB6_J20_9                        99  // D99 PB6 (Header J20 9)
+#define GPIO_PB5_J20_10                      101  // D101 PB5 (Header J20 10)
+#define GPIO_PB8_J20_11                      100  // D100 PB8 (Header J20 11)
+#define GPIO_PB4_J20_12                      102  // D102 PB4 (Header J20 12)
+#define GPIO_PB9_J20_13                      108  // D108 PB9 (Header J20 13)
+#define GPIO_PB7_J20_14                       98  // D98 PB7 (Header J20 14)
+#define GPIO_PB15_J20_15                      66  // D66 PB15 (Header J20 15)
+#define GPIO_PB16_J20_16                      67  // D67 PB16 (Header J20 16)
+#define GPIO_PB14_J20_17                      53  // D53 PB14 (Header J20 17)
+#define GPIO_PA18_J20_21                      71  // D71 PA17 (Header J20 21)
+#define GPIO_PA17_J20_22                      70  // D70 PA17 (Header J20 22)
 
 // Case Light
 
-#define CASE_LIGHT_PIN     GPIO_PB1_J20_5
+#define CASE_LIGHT_PIN            GPIO_PB1_J20_5
 
 // 2MB SPI Flash
-#define SPI_FLASH_SS       52   // D52 PB21
+#define SPI_FLASH_SS                          52  // D52 PB21
 
 //
 // Filament Runout Sensor
 //
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN GPIO_PB15_J20_15
+  #define FIL_RUNOUT_PIN        GPIO_PB15_J20_15
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN GPIO_PB16_J20_16
+  #define FIL_RUNOUT2_PIN       GPIO_PB16_J20_16
 #endif
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
-  #define BEEPER_PIN       23   // D24 PA15_CTS1
-  #define LCD_PINS_RS      17   // D17 PA12_RXD1
-  #define LCD_PINS_ENABLE  24   // D23 PA14_RTS1
-  #define LCD_PINS_D4      69   // D69 PA0_CANTX0
-  #define LCD_PINS_D5      54   // D54 PA16_SCK1
-  #define LCD_PINS_D6      68   // D68 PA1_CANRX0
-  #define LCD_PINS_D7      34   // D34 PC2_PWML0
+  #define BEEPER_PIN                          23  // D24 PA15_CTS1
+  #define LCD_PINS_RS                         17  // D17 PA12_RXD1
+  #define LCD_PINS_ENABLE                     24  // D23 PA14_RTS1
+  #define LCD_PINS_D4                         69  // D69 PA0_CANTX0
+  #define LCD_PINS_D5                         54  // D54 PA16_SCK1
+  #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
+  #define LCD_PINS_D7                         34  // D34 PC2_PWML0
 
-  #define SD_DETECT_PIN     2   // D2  PB25_TIOA0
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
     // Buttons on AUX-2
-    #define BTN_EN1        60   // D60 PA3_TIOB1
-    #define BTN_EN2        13   // D13 PB27_TIOB0
-    #define BTN_ENC        16   // D16 PA13_TXD1 // the click
+    #define BTN_EN1                           60  // D60 PA3_TIOB1
+    #define BTN_EN2                           13  // D13 PB27_TIOB0
+    #define BTN_ENC                           16  // D16 PA13_TXD1 // the click
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
index 69fb2a3dfc52..f23d008bec50 100644
--- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
+++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
@@ -33,91 +33,91 @@
 //
 // Servos
 //
-#define SERVO0_PIN          6
+#define SERVO0_PIN                             6
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         39
-#define Z_STOP_PIN         62
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            39
+#define Z_STOP_PIN                            62
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN          12
-#define Y_ENABLE_PIN       15
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                             12
+#define Y_ENABLE_PIN                          15
 
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          27
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             27
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        64
-#define E0_DIR_PIN         65
-#define E0_ENABLE_PIN      63
+#define E0_STEP_PIN                           64
+#define E0_DIR_PIN                            65
+#define E0_ENABLE_PIN                         63
 
-#define E1_STEP_PIN         8
-#define E1_DIR_PIN          7
-#define E1_ENABLE_PIN      29
+#define E1_STEP_PIN                            8
+#define E1_DIR_PIN                             7
+#define E1_ENABLE_PIN                         29
 
 //
 // Temperature Sensors
 // Analog Inputs
 //
-#define TEMP_0_PIN          1
-#define TEMP_1_PIN          2
-#define TEMP_BED_PIN        4
+#define TEMP_0_PIN                             1
+#define TEMP_1_PIN                             2
+#define TEMP_BED_PIN                           4
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN  5
+  #define TEMP_CHAMBER_PIN                     5
 #endif
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        3
-#define HEATER_1_PIN        4
-#define HEATER_BED_PIN     32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN                           3
+#define HEATER_1_PIN                           4
+#define HEATER_BED_PIN                        32
+#define HEATER_CHAMBER_PIN                    33
 
 //
 // Fans
 //
-//#define FAN0_PIN              8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+//#define FAN0_PIN                             8
+#define ORIG_E0_AUTO_FAN_PIN                  30
+#define ORIG_E1_AUTO_FAN_PIN                  30
+#define ORIG_E2_AUTO_FAN_PIN                  30
+#define ORIG_E3_AUTO_FAN_PIN                  30
+#define ORIG_CHAMBER_AUTO_FAN_PIN             10
 
 //
 // SD card
 //
-#define SCK_PIN            76
-#define MISO_PIN           74
-#define MOSI_PIN           75
-#define SDSS               53
-#define SD_DETECT_PIN      40
+#define SCK_PIN                               76
+#define MISO_PIN                              74
+#define MOSI_PIN                              75
+#define SDSS                                  53
+#define SD_DETECT_PIN                         40
 
 // Common I/O
 
-//#define PWM_1_PIN           6 // probe
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
-#define BEEPER_PIN         13
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   31
+//#define PWM_1_PIN                            6  // probe
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
+#define BEEPER_PIN                            13
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      31
 
 // G425 CALIBRATION_GCODE default pin
 #ifndef CALIBRATION_PIN
-  #define CALIBRATION_PIN  66
+  #define CALIBRATION_PIN                     66
 #endif
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
index 4f352ff1523e..8f1fb750122f 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -34,138 +34,138 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          6
-#define SERVO2_PIN         13
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                            13
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          38
-#define X_MAX_PIN          36
-#define Y_MIN_PIN          34
-#define Y_MAX_PIN          32
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          28
+#define X_MIN_PIN                             38
+#define X_MAX_PIN                             36
+#define Y_MIN_PIN                             34
+#define Y_MAX_PIN                             32
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             28
 
 //
 // Steppers
 //
-#define X_STEP_PIN          2
-#define X_DIR_PIN           3
-#define X_ENABLE_PIN       22
+#define X_STEP_PIN                             2
+#define X_DIR_PIN                              3
+#define X_ENABLE_PIN                          22
 
-#define Y_STEP_PIN         17
-#define Y_DIR_PIN          16
-#define Y_ENABLE_PIN       26
+#define Y_STEP_PIN                            17
+#define Y_DIR_PIN                             16
+#define Y_ENABLE_PIN                          26
 
-#define Z_STEP_PIN         61   // Z1 STP
-#define Z_DIR_PIN          60   // Z1 DIR
-#define Z_ENABLE_PIN       15   // Z1 ENA
+#define Z_STEP_PIN                            61  // Z1 STP
+#define Z_DIR_PIN                             60  // Z1 DIR
+#define Z_ENABLE_PIN                          15  // Z1 ENA
 
-#define E0_STEP_PIN        64   // Z2 STP
-#define E0_DIR_PIN         63   // Z2 DIR
-#define E0_ENABLE_PIN      62   // Z2 ENA
+#define E0_STEP_PIN                           64  // Z2 STP
+#define E0_DIR_PIN                            63  // Z2 DIR
+#define E0_ENABLE_PIN                         62  // Z2 ENA
 
-#define E1_STEP_PIN        51   // E1 STP
-#define E1_DIR_PIN         53   // E1 DIR
-#define E1_ENABLE_PIN      65   // E1 ENA
+#define E1_STEP_PIN                           51  // E1 STP
+#define E1_DIR_PIN                            53  // E1 DIR
+#define E1_ENABLE_PIN                         65  // E1 ENA
 
-#define E2_STEP_PIN        24   // E2 STP
-#define E2_DIR_PIN         23   // E2 DIR
-#define E2_ENABLE_PIN      49   // E2 ENA
+#define E2_STEP_PIN                           24  // E2 STP
+#define E2_DIR_PIN                            23  // E2 DIR
+#define E2_ENABLE_PIN                         49  // E2 ENA
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (HOTEND0 thermistor)
-#define TEMP_1_PIN          2   // Analog Input (HOTEND1 thermistor)
-#define TEMP_2_PIN          5   // Analog Input (unused)
-#define TEMP_BED_PIN        1   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
+#define TEMP_1_PIN                             2  // Analog Input (HOTEND1 thermistor)
+#define TEMP_2_PIN                             5  // Analog Input (unused)
+#define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   -1
+  #define MAX6675_SS_PIN                      -1
 #else
-  #define MAX6675_SS_PIN   -1
+  #define MAX6675_SS_PIN                      -1
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        7   // HOTEND0 MOSFET
-#define HEATER_1_PIN        8   // HOTEND1 MOSFET
-#define HEATER_BED_PIN     39   // BED MOSFET
+#define HEATER_0_PIN                           7  // HOTEND0 MOSFET
+#define HEATER_1_PIN                           8  // HOTEND1 MOSFET
+#define HEATER_BED_PIN                        39  // BED MOSFET
 
 #ifndef FAN_PIN
-  #define FAN_PIN          11   // FAN1 header on board - PRINT FAN
+  #define FAN_PIN                             11  // FAN1 header on board - PRINT FAN
 #endif
-#define FAN1_PIN            9   // FAN2 header on board - CONTROLLER FAN
-#define FAN2_PIN           12   // FAN3 header on board - EXTRUDER0 FAN
+#define FAN1_PIN                               9  // FAN2 header on board - CONTROLLER FAN
+#define FAN2_PIN                              12  // FAN3 header on board - EXTRUDER0 FAN
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define PS_ON_PIN          40
+#define SDSS                                   4
+#define PS_ON_PIN                             40
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS       42
-  #define LCD_PINS_ENABLE   43
-  #define LCD_PINS_D4       44
-  #define LCD_PINS_D5       45
-  #define LCD_PINS_D6       46
-  #define LCD_PINS_D7       47
+  #define LCD_PINS_RS                         42
+  #define LCD_PINS_ENABLE                     43
+  #define LCD_PINS_D4                         44
+  #define LCD_PINS_D5                         45
+  #define LCD_PINS_D6                         46
+  #define LCD_PINS_D7                         47
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(RADDS_DISPLAY)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define BTN_BACK        71
+    #define BTN_BACK                          71
 
     #undef SDSS
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
-    #define BEEPER_PIN      41
-    #define LCD_SDSS         4
-    #define SD_DETECT_PIN   14
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
+    #define BEEPER_PIN                        41
+    #define LCD_SDSS                           4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
-    #define LCD_PINS_D4     29
-    #define LCD_PINS_ENABLE 27
-    #define LCD_PINS_RS     25
+    #define LCD_PINS_D4                       29
+    #define LCD_PINS_ENABLE                   27
+    #define LCD_PINS_RS                       25
 
-    #define BTN_EN1         35
-    #define BTN_EN2         33
-    #define BTN_ENC         37
+    #define BTN_EN1                           35
+    #define BTN_EN2                           33
+    #define BTN_ENC                           37
 
-    #define BEEPER_PIN      -1
+    #define BEEPER_PIN                        -1
   #endif // SPARK_FULL_GRAPHICS
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index 240204ced958..34706d5e90ac 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -34,141 +34,141 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          6
-#define SERVO2_PIN          8   // 4-pin header FAN0
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             8  // 4-pin header FAN0
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          38
-#define X_MAX_PIN          -1
-#define Y_MIN_PIN          34
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                             38
+#define X_MAX_PIN                             -1
+#define Y_MIN_PIN                             34
+#define Y_MAX_PIN                             -1
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       22
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          22
 
-#define Y_STEP_PIN          2
-#define Y_DIR_PIN           3
-#define Y_ENABLE_PIN       26
+#define Y_STEP_PIN                             2
+#define Y_DIR_PIN                              3
+#define Y_ENABLE_PIN                          26
 
-#define Z_STEP_PIN         64
-#define Z_DIR_PIN          63
-#define Z_ENABLE_PIN       15
+#define Z_STEP_PIN                            64
+#define Z_DIR_PIN                             63
+#define Z_ENABLE_PIN                          15
 
-#define E0_STEP_PIN        61
-#define E0_DIR_PIN         60
-#define E0_ENABLE_PIN      62
+#define E0_STEP_PIN                           61
+#define E0_DIR_PIN                            60
+#define E0_ENABLE_PIN                         62
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (HOTEND0 thermistor)
-#define TEMP_1_PIN          2   // Analog Input (unused)
-#define TEMP_2_PIN          5   // Analog Input (OnBoard thermistor beta 3950)
-#define TEMP_BED_PIN        1   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
+#define TEMP_1_PIN                             2  // Analog Input (unused)
+#define TEMP_2_PIN                             5  // Analog Input (OnBoard thermistor beta 3950)
+#define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13   // HOTEND0 MOSFET
-#define HEATER_BED_PIN      7   // BED MOSFET
+#define HEATER_0_PIN                          13  // HOTEND0 MOSFET
+#define HEATER_BED_PIN                         7  // BED MOSFET
 
 #ifndef FAN_PIN
-  #define FAN_PIN          11   // FAN1 header on board - PRINT FAN
+  #define FAN_PIN                             11  // FAN1 header on board - PRINT FAN
 #endif
-#define FAN1_PIN           12   // FAN2 header on board - CONTROLLER FAN
-#define FAN2_PIN            9   // FAN3 header on board - EXTRUDER0 FAN
-//#define FAN3_PIN          8   // FAN0 4-pin header on board
+#define FAN1_PIN                              12  // FAN2 header on board - CONTROLLER FAN
+#define FAN2_PIN                               9  // FAN3 header on board - EXTRUDER0 FAN
+//#define FAN3_PIN                             8  // FAN0 4-pin header on board
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define PS_ON_PIN          40
+#define SDSS                                   4
+#define PS_ON_PIN                             40
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS       42
-  #define LCD_PINS_ENABLE   43
-  #define LCD_PINS_D4       44
-  #define LCD_PINS_D5       45
-  #define LCD_PINS_D6       46
-  #define LCD_PINS_D7       47
+  #define LCD_PINS_RS                         42
+  #define LCD_PINS_ENABLE                     43
+  #define LCD_PINS_D4                         44
+  #define LCD_PINS_D5                         45
+  #define LCD_PINS_D6                         46
+  #define LCD_PINS_D7                         47
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(RADDS_DISPLAY)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define BTN_BACK        71
+    #define BTN_BACK                          71
 
     #undef SDSS
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
-    #define BEEPER_PIN      41
-    #define LCD_SDSS         4
-    #define SD_DETECT_PIN   14
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
+    #define BEEPER_PIN                        41
+    #define LCD_SDSS                           4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
-    #define LCD_PINS_D4     29
-    #define LCD_PINS_ENABLE 27
-    #define LCD_PINS_RS     25
+    #define LCD_PINS_D4                       29
+    #define LCD_PINS_ENABLE                   27
+    #define LCD_PINS_RS                       25
 
-    #define BTN_EN1         35
-    #define BTN_EN2         33
-    #define BTN_ENC         37
+    #define BTN_EN1                           35
+    #define BTN_EN2                           33
+    #define BTN_ENC                           37
 
-    #define BEEPER_PIN      -1
+    #define BEEPER_PIN                        -1
 
    #elif ENABLED(MINIPANEL)
-    #define BTN_EN1         52
-    #define BTN_EN2         50
-    #define BTN_ENC         48
-    #define LCD_SDSS        4
-    #define SD_DETECT_PIN   14
-    #define BEEPER_PIN      41
-    #define DOGLCD_A0       46
-    #define DOGLCD_CS       45
+    #define BTN_EN1                           52
+    #define BTN_EN2                           50
+    #define BTN_ENC                           48
+    #define LCD_SDSS                           4
+    #define SD_DETECT_PIN                     14
+    #define BEEPER_PIN                        41
+    #define DOGLCD_A0                         46
+    #define DOGLCD_CS                         45
 
   #endif // SPARK_FULL_GRAPHICS
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
index c05c6169d6d3..b3a9e456a29e 100644
--- a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
+++ b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
@@ -36,38 +36,38 @@
 //
 // Servos
 //
-//#define SERVO0_PIN       -1
-//#define SERVO1_PIN       -1
+//#define SERVO0_PIN                          -1
+//#define SERVO1_PIN                          -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22   // PB26
-#define Y_MAX_PIN          18   // PA11
-#define Z_MIN_PIN          19   // PA10
+#define X_MIN_PIN                             22  // PB26
+#define Y_MAX_PIN                             18  // PA11
+#define Z_MIN_PIN                             19  // PA10
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  22
+  #define Z_MIN_PROBE_PIN                     22
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  //#define FIL_RUNOUT_PIN 57   // PA22
+  //#define FIL_RUNOUT_PIN                    57  // PA22
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  //#define FIL_RUNOUT2_PIN 21  // PB13
+  //#define FIL_RUNOUT2_PIN                   21  // PB13
 #endif
 
 //
 // LED defines
 //
-//#define NEOPIXEL_TYPE    NEO_GRBW   // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
-//#define NEOPIXEL_PIN     20   // LED driving pin on motherboard
-//#define NEOPIXEL_PIXELS   3   // Number of LEDs in the strip
-//#define SDA0             20   // PB12 NeoPixel pin I2C data
-//#define SCL0             21   // PB13              I2C clock
+//#define NEOPIXEL_TYPE                 NEO_GRBW  // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
+//#define NEOPIXEL_PIN                        20  // LED driving pin on motherboard
+//#define NEOPIXEL_PIXELS                      3  // Number of LEDs in the strip
+//#define SDA0                                20  // PB12 NeoPixel pin I2C data
+//#define SCL0                                21  // PB13              I2C clock
 
 // D0_12 #REF! (INDICATOR_LED)
 // B28 JTAG-CLK
@@ -79,82 +79,82 @@
 //A15 UART_CTS
 //PB2 Unassigned
 //PB4 to PB9 Unassigned
-//#define UART_RX_PIN         0   // PA8    "RX0"
-//#define UART_TX_PIN         1   // PA9    "TX0"
-//#define UART_RTS_PIN       23   // PA14
-//#define UART_CTS_PIN       24   // PA15
+//#define UART_RX_PIN                          0  // PA8    "RX0"
+//#define UART_TX_PIN                          1  // PA9    "TX0"
+//#define UART_RTS_PIN                        23  // PA14
+//#define UART_CTS_PIN                        24  // PA15
 
 //
 // Steppers
 //
-#define Z_STEP_PIN         73   // PA21      MOTOR 1
-#define Z_DIR_PIN          75   // PA26
-#define Z_ENABLE_PIN       74   // PA25
+#define Z_STEP_PIN                            73  // PA21      MOTOR 1
+#define Z_DIR_PIN                             75  // PA26
+#define Z_ENABLE_PIN                          74  // PA25
 
-#define X_STEP_PIN         66   // PB15      MOTOR 2
-#define X_DIR_PIN          54   // PA16
-#define X_ENABLE_PIN       67   // PB16
+#define X_STEP_PIN                            66  // PB15      MOTOR 2
+#define X_DIR_PIN                             54  // PA16
+#define X_ENABLE_PIN                          67  // PB16
 
-#define Y_STEP_PIN         34   // PA29      MOTOR 3
-#define Y_DIR_PIN          35   // PB1
-#define Y_ENABLE_PIN       36   // PB0
+#define Y_STEP_PIN                            34  // PA29      MOTOR 3
+#define Y_DIR_PIN                             35  // PB1
+#define Y_ENABLE_PIN                          36  // PB0
 
-#define E0_STEP_PIN        53   // PB14      MOTOR 4
-#define E0_DIR_PIN         78   // PB23
-#define E0_ENABLE_PIN      37   // PB22
+#define E0_STEP_PIN                           53  // PB14      MOTOR 4
+#define E0_DIR_PIN                            78  // PB23
+#define E0_ENABLE_PIN                         37  // PB22
 
 // Microstepping mode pins
-#define Z_MS1_PIN          52   // PB21 MODE0     MOTOR 1
-#define Z_MS2_PIN          52   // PB21 MODE1
-#define Z_MS3_PIN          65   // PB20 MODE2
+#define Z_MS1_PIN                             52  // PB21 MODE0     MOTOR 1
+#define Z_MS2_PIN                             52  // PB21 MODE1
+#define Z_MS3_PIN                             65  // PB20 MODE2
 
-#define X_MS1_PIN          43   // PA20 MODE0     MOTOR 2
-#define X_MS2_PIN          43   // PA20 MODE1
-#define X_MS3_PIN          42   // PA19 MODE2
+#define X_MS1_PIN                             43  // PA20 MODE0     MOTOR 2
+#define X_MS2_PIN                             43  // PA20 MODE1
+#define X_MS3_PIN                             42  // PA19 MODE2
 
-#define Y_MS1_PIN          77   // PA28 MODE0     MOTOR 3
-#define Y_MS2_PIN          77   // PA28 MODE1
-#define Y_MS3_PIN          76   // PA27 MODE2
+#define Y_MS1_PIN                             77  // PA28 MODE0     MOTOR 3
+#define Y_MS2_PIN                             77  // PA28 MODE1
+#define Y_MS3_PIN                             76  // PA27 MODE2
 
-#define E0_MS1_PIN         38   // PB11 MODE0     MOTOR 4
-#define E0_MS2_PIN         38   // PB11 MODE1
-#define E0_MS3_PIN         39   // PB10 MODE2
+#define E0_MS1_PIN                            38  // PB11 MODE0     MOTOR 4
+#define E0_MS2_PIN                            38  // PB11 MODE1
+#define E0_MS3_PIN                            39  // PB10 MODE2
 
 // Motor current PWM pins
-#define MOTOR_CURRENT_PWM_X_PIN 62 // PB17        MOTOR 1
-#define MOTOR_CURRENT_PWM_Z_PIN 63 // PB18        MOTOR 2
-#define MOTOR_CURRENT_PWM_Y_PIN 64 // PB19        MOTOR 3
-#define MOTOR_CURRENT_PWM_E_PIN 61 // PA2         MOTOR 4
+#define MOTOR_CURRENT_PWM_X_PIN               62  // PB17        MOTOR 1
+#define MOTOR_CURRENT_PWM_Z_PIN               63  // PB18        MOTOR 2
+#define MOTOR_CURRENT_PWM_Y_PIN               64  // PB19        MOTOR 3
+#define MOTOR_CURRENT_PWM_E_PIN               61  // PA2         MOTOR 4
 
 #define DEFAULT_PWM_MOTOR_CURRENT { 300, 400, 1000}  // XY Z E0, 1000 = 1000mAh
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // digital 56 PA23
-#define TEMP_BED_PIN        5   // digital 59 PA4
+#define TEMP_0_PIN                             2  // digital 56 PA23
+#define TEMP_BED_PIN                           5  // digital 59 PA4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       40   // PA5
-#define HEATER_BED_PIN     41   // PB24
+#define HEATER_0_PIN                          40  // PA5
+#define HEATER_BED_PIN                        41  // PB24
 
 #ifndef FAN_PIN
-  #define FAN_PIN          13   //  PB27 Fan1A
+  #define FAN_PIN                             13  //  PB27 Fan1A
 #endif
-#define FAN1_PIN           58   //  PA6  Fan1B
+#define FAN1_PIN                              58  //  PA6  Fan1B
 
-#define FET_SAFETY_PIN     31   // PA7  must be pulsed low every 50 mS or FETs are turned off
-#define FET_SAFETY_DELAY   50   // 50 mS delay between pulses
-#define FET_SAFETY_INVERTED true // true - negative going pulse of 2 uS
+#define FET_SAFETY_PIN                        31  // PA7  must be pulsed low every 50 mS or FETs are turned off
+#define FET_SAFETY_DELAY                      50  // 50 mS delay between pulses
+#define FET_SAFETY_INVERTED true                  // true - negative going pulse of 2 uS
 
 /////////////////////////////////////////////////////////
 
-#define MISO_PIN           68   // set to unused pins for now
-#define MOSI_PIN           69   // set to unused pins for now
-#define SCK_PIN            70   // set to unused pins for now
-#define SDSS               71   // set to unused pins for now
+#define MISO_PIN                              68  // set to unused pins for now
+#define MOSI_PIN                              69  // set to unused pins for now
+#define SCK_PIN                               70  // set to unused pins for now
+#define SDSS                                  71  // set to unused pins for now
 
 /**
  * G2 uses 8 pins that are not available in the DUE environment:
diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index 41daba4e8e03..3bc52e9387df 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -35,187 +35,187 @@
 // Servos
 //
 #if !HAS_CUTTER
-  #define SERVO0_PIN        5
+  #define SERVO0_PIN                           5
 #endif
-#define SERVO1_PIN          6
-#define SERVO2_PIN         39
-#define SERVO3_PIN         40
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                            39
+#define SERVO3_PIN                            40
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          28
-#define X_MAX_PIN          34
-#define Y_MIN_PIN          30
-#define Y_MAX_PIN          36
-#define Z_MIN_PIN          32
-#define Z_MAX_PIN          38
+#define X_MIN_PIN                             28
+#define X_MAX_PIN                             34
+#define Y_MIN_PIN                             30
+#define Y_MAX_PIN                             36
+#define Z_MIN_PIN                             32
+#define Z_MAX_PIN                             38
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  38
+  #define Z_MIN_PROBE_PIN                     38
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         24
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            24
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          26
 #ifndef X_CS_PIN
-  #define X_CS_PIN         25
+  #define X_CS_PIN                            25
 #endif
 
-#define Y_STEP_PIN         17
-#define Y_DIR_PIN          16
-#define Y_ENABLE_PIN       22
+#define Y_STEP_PIN                            17
+#define Y_DIR_PIN                             16
+#define Y_ENABLE_PIN                          22
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         27
+  #define Y_CS_PIN                            27
 #endif
 
-#define Z_STEP_PIN          2
-#define Z_DIR_PIN           3
-#define Z_ENABLE_PIN       15
+#define Z_STEP_PIN                             2
+#define Z_DIR_PIN                              3
+#define Z_ENABLE_PIN                          15
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         29
+  #define Z_CS_PIN                            29
 #endif
 
-#define E0_STEP_PIN        61
-#define E0_DIR_PIN         60
-#define E0_ENABLE_PIN      62
+#define E0_STEP_PIN                           61
+#define E0_DIR_PIN                            60
+#define E0_ENABLE_PIN                         62
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        31
+  #define E0_CS_PIN                           31
 #endif
 
-#define E1_STEP_PIN        64
-#define E1_DIR_PIN         63
-#define E1_ENABLE_PIN      65
+#define E1_STEP_PIN                           64
+#define E1_DIR_PIN                            63
+#define E1_ENABLE_PIN                         65
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        33
+  #define E1_CS_PIN                           33
 #endif
 
-#define E2_STEP_PIN        51
-#define E2_DIR_PIN         53
-#define E2_ENABLE_PIN      49
+#define E2_STEP_PIN                           51
+#define E2_DIR_PIN                            53
+#define E2_ENABLE_PIN                         49
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        35
+  #define E2_CS_PIN                           35
 #endif
 
 /**
  * RADDS Extension Board V2 / V3
  * http://doku.radds.org/dokumentation/extension-board
  */
-//#define RADDS_EXTENSION 2
+//#define RADDS_EXTENSION                      2
 #if RADDS_EXTENSION >= 2
-  #define E3_DIR_PIN       33
-  #define E3_STEP_PIN      35
-  #define E3_ENABLE_PIN    37
+  #define E3_DIR_PIN                          33
+  #define E3_STEP_PIN                         35
+  #define E3_ENABLE_PIN                       37
   #ifndef E3_CS_PIN
-    #define E3_CS_PIN       6
+    #define E3_CS_PIN                          6
   #endif
 
   #if RADDS_EXTENSION == 3
 
-    #define E4_DIR_PIN     27
-    #define E4_STEP_PIN    29
-    #define E4_ENABLE_PIN  31
+    #define E4_DIR_PIN                        27
+    #define E4_STEP_PIN                       29
+    #define E4_ENABLE_PIN                     31
     #ifndef E4_CS_PIN
-      #define E4_CS_PIN    39
+      #define E4_CS_PIN                       39
     #endif
 
-    #define E5_DIR_PIN     66
-    #define E5_STEP_PIN    67
-    #define E5_ENABLE_PIN  68
+    #define E5_DIR_PIN                        66
+    #define E5_STEP_PIN                       67
+    #define E5_ENABLE_PIN                     68
     #ifndef E5_CS_PIN
-      #define E5_CS_PIN     6
+      #define E5_CS_PIN                        6
     #endif
 
-    #define RADDS_EXT_MSI_PIN 69
+    #define RADDS_EXT_MSI_PIN                 69
 
     #define BOARD_INIT() OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH)
 
   #else
 
-    #define E4_DIR_PIN     27
-    #define E4_STEP_PIN    29
-    #define E4_ENABLE_PIN  31
+    #define E4_DIR_PIN                        27
+    #define E4_STEP_PIN                       29
+    #define E4_ENABLE_PIN                     31
     #ifndef E4_CS_PIN
-      #define E4_CS_PIN    39
+      #define E4_CS_PIN                       39
     #endif
 
     // E3 and E4 share the same MSx pins
-    #define E3_MS1_PIN     67
-    #define E4_MS1_PIN     67
-    #define E3_MS2_PIN     68
-    #define E4_MS2_PIN     68
-    #define E3_MS3_PIN     69
-    #define E4_MS3_PIN     69
+    #define E3_MS1_PIN                        67
+    #define E4_MS1_PIN                        67
+    #define E3_MS2_PIN                        68
+    #define E4_MS2_PIN                        68
+    #define E3_MS3_PIN                        69
+    #define E4_MS3_PIN                        69
 
-    #define RADDS_EXT_VDD2_PIN 66
+    #define RADDS_EXT_VDD2_PIN                66
 
     #define BOARD_INIT() do{ OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH); OUT_WRITE(RADDS_EXT_VDD2_PIN, HIGH); }while(0)
 
   #endif
 
-  #define RADDS_EXT_VDD_PIN 25
+  #define RADDS_EXT_VDD_PIN                   25
 
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_2_PIN          2   // Analog Input
-#define TEMP_3_PIN          3   // Analog Input
-#define TEMP_4_PIN          5   // dummy so will compile when PINS_DEBUGGING is enabled
-#define TEMP_BED_PIN        4   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_2_PIN                             2  // Analog Input
+#define TEMP_3_PIN                             3  // Analog Input
+#define TEMP_4_PIN                             5  // dummy so will compile when PINS_DEBUGGING is enabled
+#define TEMP_BED_PIN                           4  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13
-#define HEATER_1_PIN       12
-#define HEATER_2_PIN       11
+#define HEATER_0_PIN                          13
+#define HEATER_1_PIN                          12
+#define HEATER_2_PIN                          11
 #if !HAS_CUTTER
-  #define HEATER_BED_PIN    7   // BED
+  #define HEATER_BED_PIN                       7  // BED
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
-#define FAN1_PIN            8
+#define FAN1_PIN                               8
 
 //
 // Misc. Functions
 //
-#define SD_DETECT_PIN      14
-#define PS_ON_PIN          40   // SERVO3_PIN
+#define SD_DETECT_PIN                         14
+#define PS_ON_PIN                             40  // SERVO3_PIN
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   39   // SERVO2_PIN
+  #define FIL_RUNOUT_PIN                      39  // SERVO2_PIN
 #endif
 
 #define I2C_EEPROM
-#define E2END 0x1FFF // 8KB
+#define E2END 0x1FFF                              // 8KB
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
   #if !NUM_SERVOS
-    #define SPINDLE_LASER_PWM_PIN  5   // SERVO0_PIN
+    #define SPINDLE_LASER_PWM_PIN              5  // SERVO0_PIN
   #endif
-  #define SPINDLE_LASER_ENA_PIN    7   // HEATER_BED_PIN - Pullup/down!
+  #define SPINDLE_LASER_ENA_PIN                7  // HEATER_BED_PIN - Pullup/down!
 #endif
 
 //
@@ -225,65 +225,65 @@
 
   #if ENABLED(RADDS_DISPLAY)
 
-    #define LCD_PINS_RS     42
-    #define LCD_PINS_ENABLE 43
-    #define LCD_PINS_D4     44
-    #define LCD_PINS_D5     45
-    #define LCD_PINS_D6     46
-    #define LCD_PINS_D7     47
+    #define LCD_PINS_RS                       42
+    #define LCD_PINS_ENABLE                   43
+    #define LCD_PINS_D4                       44
+    #define LCD_PINS_D5                       45
+    #define LCD_PINS_D6                       46
+    #define LCD_PINS_D7                       47
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define BTN_BACK        71
+    #define BTN_BACK                          71
 
-    #define SDSS            10
-    #define SD_DETECT_PIN   14
+    #define SDSS                              10
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
     // The REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER requires
     // an adapter such as https://www.thingiverse.com/thing:1740725
 
-    #define LCD_PINS_RS     42
-    #define LCD_PINS_ENABLE 43
-    #define LCD_PINS_D4     44
+    #define LCD_PINS_RS                       42
+    #define LCD_PINS_ENABLE                   43
+    #define LCD_PINS_D4                       44
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define SDSS            10
-    #define SD_DETECT_PIN   14
+    #define SDSS                              10
+    #define SD_DETECT_PIN                     14
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
-    #define BEEPER_PIN      41
-    #define LCD_SDSS        10
-    #define SD_DETECT_PIN   14
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
+    #define BEEPER_PIN                        41
+    #define LCD_SDSS                          10
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
-    #define LCD_PINS_D4     29
-    #define LCD_PINS_ENABLE 27
-    #define LCD_PINS_RS     25
+    #define LCD_PINS_D4                       29
+    #define LCD_PINS_ENABLE                   27
+    #define LCD_PINS_RS                       25
 
-    #define BTN_EN1         35
-    #define BTN_EN2         33
-    #define BTN_ENC         37
+    #define BTN_EN1                           35
+    #define BTN_EN2                           33
+    #define BTN_ENC                           37
 
   #endif // SPARK_FULL_GRAPHICS
 
 #endif // HAS_SPI_LCD
 
 #ifndef SDSS
-  #define SDSS              4
+  #define SDSS                                 4
 #endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
index d25ef9e059ff..916dbf64309e 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_DUO.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
@@ -56,20 +56,20 @@
 // Temperature Sensors
 //
 #undef TEMP_0_PIN
-#define TEMP_0_PIN          9   // Analog Input
+#define TEMP_0_PIN                             9  // Analog Input
 
 #undef TEMP_1_PIN
-#define TEMP_1_PIN         11   // Analog Input
+#define TEMP_1_PIN                            11  // Analog Input
 
 #undef TEMP_BED_PIN
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   69   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      69  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   69   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      69  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -79,13 +79,13 @@
 
   #if BOTH(NEWPANEL, PANEL_ONE)
     #undef LCD_PINS_D4
-    #define LCD_PINS_D4  68
+    #define LCD_PINS_D4                       68
 
     #undef LCD_PINS_D5
-    #define LCD_PINS_D5  69
+    #define LCD_PINS_D5                       69
 
     #undef LCD_PINS_D7
-    #define LCD_PINS_D7  67
+    #define LCD_PINS_D7                       67
   #endif
 
   #if ENABLED(NEWPANEL)
@@ -93,36 +93,36 @@
     #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
       #undef BTN_EN1
-      #define BTN_EN1 67
+      #define BTN_EN1                         67
 
       #undef BTN_ENC
-      #define BTN_ENC 66
+      #define BTN_ENC                         66
 
     #elif ENABLED(MINIPANEL)
 
       #undef DOGLCD_CS
-      #define DOGLCD_CS    69
+      #define DOGLCD_CS                       69
 
       #undef LCD_BACKLIGHT_PIN
-      #define LCD_BACKLIGHT_PIN 68   // backlight LED on A14/D68
+      #define LCD_BACKLIGHT_PIN               68  // backlight LED on A14/D68
 
       #undef KILL_PIN
-      #define KILL_PIN     67
+      #define KILL_PIN                        67
 
       #undef BTN_EN2
-      #define BTN_EN2      66
+      #define BTN_EN2                         66
 
     #else
 
       #if ENABLED(REPRAPWORLD_KEYPAD)
         #undef BTN_EN1
-        #define BTN_EN1    67   // encoder
+        #define BTN_EN1                       67  // encoder
 
         #undef BTN_ENC
-        #define BTN_ENC    66   // enter button
+        #define BTN_ENC                       66  // enter button
       #elif ENABLED(PANEL_ONE)
         #undef BTN_EN2
-        #define BTN_EN2    66   // AUX2 PIN 4
+        #define BTN_EN2                       66  // AUX2 PIN 4
       #endif
     #endif
 
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index ee44dd795000..297aaa9cb82c 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -43,98 +43,98 @@
 //
 // Servos
 //
-#define SERVO0_PIN          7
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
-#define SERVO3_PIN          3
+#define SERVO0_PIN                             7
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
+#define SERVO3_PIN                             3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          30
-#define Y_MIN_PIN          24
-#define Y_MAX_PIN          38
-#define Z_MIN_PIN          26
-#define Z_MAX_PIN          34
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             30
+#define Y_MIN_PIN                             24
+#define Y_MAX_PIN                             38
+#define Z_MIN_PIN                             26
+#define Z_MAX_PIN                             34
 
 //
 // Steppers
 //
-#define X_STEP_PIN         63
-#define X_DIR_PIN          62
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            63
+#define X_DIR_PIN                             62
+#define X_ENABLE_PIN                          48
 #ifndef X_CS_PIN
-  #define X_CS_PIN         68
+  #define X_CS_PIN                            68
 #endif
 
-#define Y_STEP_PIN         65
-#define Y_DIR_PIN          64
-#define Y_ENABLE_PIN       46
+#define Y_STEP_PIN                            65
+#define Y_DIR_PIN                             64
+#define Y_ENABLE_PIN                          46
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         60
+  #define Y_CS_PIN                            60
 #endif
 
-#define Z_STEP_PIN         67
-#define Z_DIR_PIN          66
-#define Z_ENABLE_PIN       44
+#define Z_STEP_PIN                            67
+#define Z_DIR_PIN                             66
+#define Z_ENABLE_PIN                          44
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         58
+  #define Z_CS_PIN                            58
 #endif
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      42
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         42
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        67
+  #define E0_CS_PIN                           67
 #endif
 
-#define E1_STEP_PIN        43
-#define E1_DIR_PIN         41
-#define E1_ENABLE_PIN      39
+#define E1_STEP_PIN                           43
+#define E1_DIR_PIN                            41
+#define E1_ENABLE_PIN                         39
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        61
+  #define E1_CS_PIN                           61
 #endif
 
-#define E2_STEP_PIN        32
-#define E2_DIR_PIN         47
-#define E2_ENABLE_PIN      45
+#define E2_STEP_PIN                           32
+#define E2_DIR_PIN                            47
+#define E2_ENABLE_PIN                         45
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        59
+  #define E2_CS_PIN                           59
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          3   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN       10
-#define HEATER_2_PIN       11
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                          10
+#define HEATER_2_PIN                          11
+#define HEATER_BED_PIN                         8
 
 #ifndef FAN_PIN
-  #define FAN_PIN          12
+  #define FAN_PIN                             12
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define LED_PIN            13
+#define SDSS                                   4
+#define LED_PIN                               13
 
 //
 // LCD / Controller
@@ -142,65 +142,65 @@
 #if HAS_SPI_LCD
   // ramps-fd lcd adaptor
 
-  #define BEEPER_PIN       37
-  #define BTN_EN1          33
-  #define BTN_EN2          31
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
+  #define BEEPER_PIN                          37
+  #define BTN_EN1                             33
+  #define BTN_EN2                             31
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
 
   #if ENABLED(NEWPANEL)
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 17
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                   17
   #endif
 
   #if ENABLED(FYSETC_MINI_12864)
-    #define DOGLCD_CS      LCD_PINS_ENABLE
-    #define DOGLCD_A0      LCD_PINS_RS
-    #define DOGLCD_SCK     76
-    #define DOGLCD_MOSI    75
+    #define DOGLCD_CS            LCD_PINS_ENABLE
+    #define DOGLCD_A0                LCD_PINS_RS
+    #define DOGLCD_SCK                        76
+    #define DOGLCD_MOSI                       75
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-    #define LCD_RESET_PIN  23   // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN                     23  // Must be high or open for LCD to operate normally.
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN 25
+        #define RGB_LED_R_PIN                 25
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN 27
+        #define RGB_LED_G_PIN                 27
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN 29
+        #define RGB_LED_B_PIN                 29
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN    25
+      #define NEOPIXEL_PIN                    25
     #endif
 
   #elif ENABLED(NEWPANEL)
 
-    #define LCD_PINS_D4    23
-    #define LCD_PINS_D5    25
-    #define LCD_PINS_D6    27
-    #define LCD_PINS_D7    29
+    #define LCD_PINS_D4                       23
+    #define LCD_PINS_D5                       25
+    #define LCD_PINS_D6                       27
+    #define LCD_PINS_D7                       29
 
     #if ENABLED(MINIPANEL)
-      #define DOGLCD_CS    25
-      #define DOGLCD_A0    27
+      #define DOGLCD_CS                       25
+      #define DOGLCD_A0                       27
     #endif
 
   #endif
 
   #if ANY(VIKI2, miniVIKI)
-    #define DOGLCD_A0      16
-    #define KILL_PIN       51
-    #define STAT_LED_BLUE_PIN 29
-    #define STAT_LED_RED_PIN 23
-    #define DOGLCD_CS      17
-    #define DOGLCD_SCK     76   // SCK_PIN   - Required for DUE Hardware SPI
-    #define DOGLCD_MOSI    75   // MOSI_PIN
-    #define DOGLCD_MISO    74   // MISO_PIN
+    #define DOGLCD_A0                         16
+    #define KILL_PIN                          51
+    #define STAT_LED_BLUE_PIN                 29
+    #define STAT_LED_RED_PIN                  23
+    #define DOGLCD_CS                         17
+    #define DOGLCD_SCK                        76  // SCK_PIN   - Required for DUE Hardware SPI
+    #define DOGLCD_MOSI                       75  // MOSI_PIN
+    #define DOGLCD_MISO                       74  // MISO_PIN
   #endif
 
 #endif // HAS_SPI_LCD
@@ -229,7 +229,7 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HOTENDS < 3 && HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #define SPINDLE_LASER_ENA_PIN 45   // Use E2 ENA
-  #define SPINDLE_LASER_PWM_PIN 12   // Hardware PWM
-  #define SPINDLE_DIR_PIN       47   // Use E2 DIR
+  #define SPINDLE_LASER_ENA_PIN               45  // Use E2 ENA
+  #define SPINDLE_LASER_PWM_PIN               12  // Hardware PWM
+  #define SPINDLE_DIR_PIN                     47  // Use E2 DIR
 #endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 455d40a99969..0fd4a6b3ead4 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -73,26 +73,26 @@
 #define I2C_EEPROM
 #define E2END 0xFFF
 
-#define RESET_PIN          42   // Resets the board if the jumper is attached
+#define RESET_PIN                             42  // Resets the board if the jumper is attached
 
 //
 // Temperature Sensors
 //
 #undef TEMP_0_PIN
-#define TEMP_0_PIN          9   // Analog Input
+#define TEMP_0_PIN                             9  // Analog Input
 
 #undef TEMP_1_PIN
-#define TEMP_1_PIN         10   // Analog Input
+#define TEMP_1_PIN                            10  // Analog Input
 
 #undef TEMP_BED_PIN
-#define TEMP_BED_PIN       11   // Analog Input
+#define TEMP_BED_PIN                          11  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   67   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      67  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   67   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      67  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -100,12 +100,12 @@
 //
 // Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
 #if ENABLED(AZSMZ_12864)
-  #define BEEPER_PIN       66   // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
-  #define DOGLCD_A0        59
-  #define DOGLCD_CS        44
-  #define BTN_EN1          58
-  #define BTN_EN2          40
-  #define BTN_ENC          67   // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
-  #define SD_DETECT_PIN    49   // Pin 49 for display sd interface, 72 for easy adapter board
-  #define KILL_PIN         42
+  #define BEEPER_PIN                          66  // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
+  #define DOGLCD_A0                           59
+  #define DOGLCD_CS                           44
+  #define BTN_EN1                             58
+  #define BTN_EN2                             40
+  #define BTN_ENC                             67  // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
+  #define SD_DETECT_PIN                       49  // Pin 49 for display sd interface, 72 for easy adapter board
+  #define KILL_PIN                            42
 #endif
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 6963a164bbfe..7b844b5be0b5 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -41,76 +41,76 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          3
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          45
-#define X_MAX_PIN          39
-#define Y_MIN_PIN          46
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          47
-#define Z_MAX_PIN          43
+#define X_MIN_PIN                             45
+#define X_MAX_PIN                             39
+#define Y_MIN_PIN                             46
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             47
+#define Z_MAX_PIN                             43
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  43
+  #define Z_MIN_PROBE_PIN                     43
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37   // Support Extension Board
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            37  // Support Extension Board
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         -1
+  #define X_CS_PIN                            -1
 #endif
 
-#define Y_STEP_PIN         32   // Support Extension Board
-#define Y_DIR_PIN          35
-#define Y_ENABLE_PIN       34
+#define Y_STEP_PIN                            32  // Support Extension Board
+#define Y_DIR_PIN                             35
+#define Y_ENABLE_PIN                          34
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         -1
+  #define Y_CS_PIN                            -1
 #endif
 
-#define Z_STEP_PIN         30   // Support Extension Board
-#define Z_DIR_PIN           2
-#define Z_ENABLE_PIN       33
+#define Z_STEP_PIN                            30  // Support Extension Board
+#define Z_DIR_PIN                              2
+#define Z_ENABLE_PIN                          33
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         -1
+  #define Z_CS_PIN                            -1
 #endif
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      31
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         31
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        -1
+  #define E0_CS_PIN                           -1
 #endif
 
-#define E1_STEP_PIN        22
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           22
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                           -1
 #endif
 
-#define E2_STEP_PIN        25
-#define E2_DIR_PIN         23
-#define E2_ENABLE_PIN      27
+#define E2_STEP_PIN                           25
+#define E2_DIR_PIN                            23
+#define E2_ENABLE_PIN                         27
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        -1
+  #define E2_CS_PIN                           -1
 #endif
 
-#define E3_STEP_PIN        15   // Only For Extension Board
-#define E3_DIR_PIN         14
-#define E3_ENABLE_PIN      61
+#define E3_STEP_PIN                           15  // Only For Extension Board
+#define E3_DIR_PIN                            14
+#define E3_ENABLE_PIN                         61
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        -1
+  #define E3_CS_PIN                           -1
 #endif
 
 // For Future: Microstepping pins - Mapping not from fastio.h (?)
@@ -119,77 +119,77 @@
 //#define E3_MS3_PIN         ?
 
 #if HAS_CUSTOM_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 #if HAS_FILAMENT_SENSOR
   #ifndef FIL_RUNOUT_PIN
-    #define FIL_RUNOUT_PIN   Y_MIN_PIN
+    #define FIL_RUNOUT_PIN             Y_MIN_PIN
   #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13
-#define HEATER_1_PIN       12
-#define HEATER_2_PIN       11
-#define HEATER_BED_PIN      7   // BED H1
+#define HEATER_0_PIN                          13
+#define HEATER_1_PIN                          12
+#define HEATER_2_PIN                          11
+#define HEATER_BED_PIN                         7  // BED H1
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
-#define FAN1_PIN            8
-#define CONTROLLER_FAN_PIN -1
+#define FAN1_PIN                               8
+#define CONTROLLER_FAN_PIN                    -1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // ANALOG A0
-#define TEMP_1_PIN          1   // ANALOG A1
-#define TEMP_2_PIN          2   // ANALOG A2
-#define TEMP_3_PIN          3   // ANALOG A3
-#define TEMP_BED_PIN        4   // ANALOG A4
+#define TEMP_0_PIN                             0  // ANALOG A0
+#define TEMP_1_PIN                             1  // ANALOG A1
+#define TEMP_2_PIN                             2  // ANALOG A2
+#define TEMP_3_PIN                             3  // ANALOG A3
+#define TEMP_BED_PIN                           4  // ANALOG A4
 
 // The thermocouple uses Analog pins
-#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
-  #define TEMP_4_PIN        5   // A5
-  #define TEMP_5_PIN        6   // A6 (Marlin 2.0 not support)
+#if ENABLED(VER_WITH_THERMOCOUPLE)                // Defined in Configuration.h
+  #define TEMP_4_PIN                           5  // A5
+  #define TEMP_5_PIN                           6  // A6 (Marlin 2.0 not support)
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 */
 
 //
 // Misc. Functions
 //
-#define SDSS                4   // 4,10,52 if using HW SPI.
-#define LED_PIN            -1   // 13 - HEATER_0_PIN
-#define PS_ON_PIN          -1   // 65
+#define SDSS                                   4  // 4,10,52 if using HW SPI.
+#define LED_PIN                               -1  // 13 - HEATER_0_PIN
+#define PS_ON_PIN                             -1  // 65
 
 // MKS TFT / Nextion Use internal USART-1
-#define TFT_LCD_MODULE_COM        1
-#define TFT_LCD_MODULE_BAUDRATE   115600
+#define TFT_LCD_MODULE_COM                     1
+#define TFT_LCD_MODULE_BAUDRATE              115600
 
 // ESP WiFi Use internal USART-2
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115600
-#define ESP_WIFI_MODULE_RESET_PIN -1
-#define PIGGY_GPIO_PIN            -1
+#define ESP_WIFI_MODULE_COM                    2
+#define ESP_WIFI_MODULE_BAUDRATE             115600
+#define ESP_WIFI_MODULE_RESET_PIN             -1
+#define PIGGY_GPIO_PIN                        -1
 
 //
 // EEPROM
 //
-#define E2END 0x7FFF  // 32Kb (24lc256)
-#define I2C_EEPROM    // EEPROM on I2C-0
-//#define EEPROM_SD   // EEPROM on SDCARD
-//#define SPI_EEPROM  // EEPROM on SPI-0
+#define E2END 0x7FFF                              // 32Kb (24lc256)
+#define I2C_EEPROM                                // EEPROM on I2C-0
+//#define EEPROM_SD                               // EEPROM on SDCARD
+//#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
 //#define SPI_EEPROM1_CS          ?
 // 2K EEPROM
@@ -203,72 +203,72 @@
 #if HAS_SPI_LCD
 
   #if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BEEPER_PIN      62
-    #define LCD_PINS_D4     48
-    #define LCD_PINS_D5     50
-    #define LCD_PINS_D6     52
-    #define LCD_PINS_D7     53
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_PINS_D4                       48
+    #define LCD_PINS_D5                       50
+    #define LCD_PINS_D6                       52
+    #define LCD_PINS_D7                       53
+    #define SD_DETECT_PIN                     51
   #endif
 
   #if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     63
-    #define LCD_PINS_ENABLE 64
+    #define LCD_PINS_RS                       63
+    #define LCD_PINS_ENABLE                   64
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     52
-    #define LCD_PINS_ENABLE 53
+    #define LCD_PINS_RS                       52
+    #define LCD_PINS_ENABLE                   53
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BEEPER_PIN      62
-    #define LCD_SDSS        10
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_SDSS                          10
+    #define SD_DETECT_PIN                     51
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN      62
-    #define DOGLCD_CS       64
-    #define DOGLCD_A0       63
+    #define BEEPER_PIN                        62
+    #define DOGLCD_CS                         64
+    #define DOGLCD_A0                         63
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-    #define LCD_RESET_PIN   48   // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN                     48  // Must be high or open for LCD to operate normally.
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN 50   // D5
+        #define RGB_LED_R_PIN                 50  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN 52   // D6
+        #define RGB_LED_G_PIN                 52  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN 53   // D7
+        #define RGB_LED_B_PIN                 53  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN    50   // D5
+      #define NEOPIXEL_PIN                    50  // D5
     #endif
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
     //http://doku.radds.org/dokumentation/other-electronics/sparklcd/
     #error "Oops! SPARK_FULL_GRAPHICS not supported with RURAMPS4D."
-    //#define LCD_PINS_D4     29   //?
-    //#define LCD_PINS_ENABLE 27   //?
-    //#define LCD_PINS_RS     25   //?
-    //#define BTN_EN1         35   //?
-    //#define BTN_EN2         33   //?
-    //#define BTN_ENC         37   //?
+    //#define LCD_PINS_D4                     29  //?
+    //#define LCD_PINS_ENABLE                 27  //?
+    //#define LCD_PINS_RS                     25  //?
+    //#define BTN_EN1                         35  //?
+    //#define BTN_EN2                         33  //?
+    //#define BTN_ENC                         37  //?
 
   #endif // SPARK_FULL_GRAPHICS
 
   #if ENABLED(NEWPANEL)
-    #define BTN_EN1         44
-    #define BTN_EN2         42
-    #define BTN_ENC         40
+    #define BTN_EN1                           44
+    #define BTN_EN2                           42
+    #define BTN_ENC                           40
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index d0c24e68a358..3ba6fd17cf74 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -41,141 +41,141 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          3
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          45
-#define X_MAX_PIN          39
-#define Y_MIN_PIN          46
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          47
-#define Z_MAX_PIN          43
+#define X_MIN_PIN                             45
+#define X_MAX_PIN                             39
+#define Y_MIN_PIN                             46
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             47
+#define Z_MAX_PIN                             43
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37   // Support Extension Board
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       31
+#define X_STEP_PIN                            37  // Support Extension Board
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          31
 #ifndef X_CS_PIN
-  #define X_CS_PIN         38
+  #define X_CS_PIN                            38
 #endif
 
-#define Y_STEP_PIN         32   // Support Extension Board
-#define Y_DIR_PIN          35
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32  // Support Extension Board
+#define Y_DIR_PIN                             35
+#define Y_ENABLE_PIN                          31
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         34
+  #define Y_CS_PIN                            34
 #endif
 
-#define Z_STEP_PIN         30   // Support Extension Board
-#define Z_DIR_PIN           2
-#define Z_ENABLE_PIN       31
+#define Z_STEP_PIN                            30  // Support Extension Board
+#define Z_DIR_PIN                              2
+#define Z_ENABLE_PIN                          31
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         10
+  #define Z_CS_PIN                            10
 #endif
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      33
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         33
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        14
+  #define E0_CS_PIN                           14
 #endif
 
-#define E1_STEP_PIN        22
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           22
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        15
+  #define E1_CS_PIN                           15
 #endif
 
-#define E2_STEP_PIN        25
-#define E2_DIR_PIN         23
-#define E2_ENABLE_PIN      27
+#define E2_STEP_PIN                           25
+#define E2_DIR_PIN                            23
+#define E2_ENABLE_PIN                         27
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        61
+  #define E2_CS_PIN                           61
 #endif
 
 #if HAS_CUSTOM_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 #if HAS_FILAMENT_SENSOR
   #ifndef FIL_RUNOUT_PIN
-    #define FIL_RUNOUT_PIN   Y_MIN_PIN
+    #define FIL_RUNOUT_PIN             Y_MIN_PIN
   #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13
-#define HEATER_1_PIN       12
-#define HEATER_2_PIN       11
-#define HEATER_BED_PIN      7   // BED H1
+#define HEATER_0_PIN                          13
+#define HEATER_1_PIN                          12
+#define HEATER_2_PIN                          11
+#define HEATER_BED_PIN                         7  // BED H1
 
-#define FAN_PIN             9
-#define FAN1_PIN            8
-#define CONTROLLER_FAN_PIN -1
+#define FAN_PIN                                9
+#define FAN1_PIN                               8
+#define CONTROLLER_FAN_PIN                    -1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // ANALOG A0
-#define TEMP_1_PIN          1   // ANALOG A1
-#define TEMP_2_PIN          2   // ANALOG A2
-#define TEMP_3_PIN          3   // ANALOG A3
-#define TEMP_BED_PIN        4   // ANALOG A4
+#define TEMP_0_PIN                             0  // ANALOG A0
+#define TEMP_1_PIN                             1  // ANALOG A1
+#define TEMP_2_PIN                             2  // ANALOG A2
+#define TEMP_3_PIN                             3  // ANALOG A3
+#define TEMP_BED_PIN                           4  // ANALOG A4
 
 // The thermocouple uses Analog pins
-#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
-  #define TEMP_4_PIN        5   // A5
-  #define TEMP_5_PIN        6   // A6 (Marlin 2.0 not support)
+#if ENABLED(VER_WITH_THERMOCOUPLE)                // Defined in Configuration.h
+  #define TEMP_4_PIN                           5  // A5
+  #define TEMP_5_PIN                           6  // A6 (Marlin 2.0 not support)
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 */
 
 //
 // Misc. Functions
 //
-#define SDSS                4   // 4,10,52 if using HW SPI.
-#define LED_PIN            -1   // 13 - HEATER_0_PIN
-#define PS_ON_PIN          -1   // 65
+#define SDSS                                   4  // 4,10,52 if using HW SPI.
+#define LED_PIN                               -1  // 13 - HEATER_0_PIN
+#define PS_ON_PIN                             -1  // 65
 
 // MKS TFT / Nextion Use internal USART-1
-#define TFT_LCD_MODULE_COM        1
-#define TFT_LCD_MODULE_BAUDRATE   115200
+#define TFT_LCD_MODULE_COM                     1
+#define TFT_LCD_MODULE_BAUDRATE              115200
 
 // ESP WiFi Use internal USART-2
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
-#define PIGGY_GPIO_PIN            -1
+#define ESP_WIFI_MODULE_COM                    2
+#define ESP_WIFI_MODULE_BAUDRATE             115200
+#define ESP_WIFI_MODULE_RESET_PIN             -1
+#define PIGGY_GPIO_PIN                        -1
 
 //
 // EEPROM
 //
-#define E2END 0x7FFF  // 32Kb (24lc256)
-#define I2C_EEPROM    // EEPROM on I2C-0
-//#define EEPROM_SD   // EEPROM on SDCARD
-//#define SPI_EEPROM  // EEPROM on SPI-0
+#define E2END 0x7FFF                              // 32Kb (24lc256)
+#define I2C_EEPROM                                // EEPROM on I2C-0
+//#define EEPROM_SD                               // EEPROM on SDCARD
+//#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
 //#define SPI_EEPROM1_CS          ?
 // 2K EEPROM
@@ -189,70 +189,70 @@
 #if HAS_SPI_LCD
 
   #if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BEEPER_PIN      62
-    #define LCD_PINS_D4     48
-    #define LCD_PINS_D5     50
-    #define LCD_PINS_D6     52
-    #define LCD_PINS_D7     53
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_PINS_D4                       48
+    #define LCD_PINS_D5                       50
+    #define LCD_PINS_D6                       52
+    #define LCD_PINS_D7                       53
+    #define SD_DETECT_PIN                     51
   #endif
 
   #if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     63
-    #define LCD_PINS_ENABLE 64
+    #define LCD_PINS_RS                       63
+    #define LCD_PINS_ENABLE                   64
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     52
-    #define LCD_PINS_ENABLE 53
+    #define LCD_PINS_RS                       52
+    #define LCD_PINS_ENABLE                   53
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BEEPER_PIN      62
-    #define LCD_SDSS        10
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_SDSS                          10
+    #define SD_DETECT_PIN                     51
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN      62
-    #define DOGLCD_CS       64
-    #define DOGLCD_A0       63
+    #define BEEPER_PIN                        62
+    #define DOGLCD_CS                         64
+    #define DOGLCD_A0                         63
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-    #define LCD_RESET_PIN   48   // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN                     48  // Must be high or open for LCD to operate normally.
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN 50   // D5
+        #define RGB_LED_R_PIN                 50  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN 52   // D6
+        #define RGB_LED_G_PIN                 52  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN 53   // D7
+        #define RGB_LED_B_PIN                 53  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN    50   // D5
+      #define NEOPIXEL_PIN                    50  // D5
     #endif
 
   #elif ENABLED(MKS_MINI_12864)
 
-    #define ORIG_BEEPER_PIN 62
+    #define ORIG_BEEPER_PIN                   62
 
-    #define DOGLCD_A0       52
-    #define DOGLCD_CS       50
+    #define DOGLCD_A0                         52
+    #define DOGLCD_CS                         50
 
-    #define SD_DETECT_PIN   51
+    #define SD_DETECT_PIN                     51
 
   #endif
 
   #if ENABLED(NEWPANEL)
-    #define BTN_EN1         44
-    #define BTN_EN2         42
-    #define BTN_ENC         40
+    #define BTN_EN1                           44
+    #define BTN_EN2                           42
+    #define BTN_ENC                           40
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index db0826e7c9d7..ae01d5da4c1c 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -35,140 +35,140 @@
 // Servos
 //
 #if NUM_SERVOS > 0
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
   #if NUM_SERVOS > 1
-    #define SERVO1_PIN     12
+    #define SERVO1_PIN                        12
   #endif
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          31
-#define X_MAX_PIN          30
-#define Y_MIN_PIN          12
-#define Y_MAX_PIN          11
-#define Z_MIN_PIN          29
-#define Z_MAX_PIN          28
+#define X_MIN_PIN                             31
+#define X_MAX_PIN                             30
+#define Y_MIN_PIN                             12
+#define Y_MAX_PIN                             11
+#define Z_MIN_PIN                             29
+#define Z_MAX_PIN                             28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         35
-#define X_DIR_PIN          34
-#define X_ENABLE_PIN       37
+#define X_STEP_PIN                            35
+#define X_DIR_PIN                             34
+#define X_ENABLE_PIN                          37
 #ifndef X_CS_PIN
-  #define X_CS_PIN         18
+  #define X_CS_PIN                            18
 #endif
 
-#define Y_STEP_PIN         22
-#define Y_DIR_PIN          23
-#define Y_ENABLE_PIN       33
+#define Y_STEP_PIN                            22
+#define Y_DIR_PIN                             23
+#define Y_ENABLE_PIN                          33
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         19
+  #define Y_CS_PIN                            19
 #endif
 
-#define Z_STEP_PIN         25
-#define Z_DIR_PIN          26
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            25
+#define Z_DIR_PIN                             26
+#define Z_ENABLE_PIN                          24
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         16
+  #define Z_CS_PIN                            16
 #endif
 
-#define E0_STEP_PIN        47
-#define E0_DIR_PIN         46
-#define E0_ENABLE_PIN      48
+#define E0_STEP_PIN                           47
+#define E0_DIR_PIN                            46
+#define E0_ENABLE_PIN                         48
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        17
+  #define E0_CS_PIN                           17
 #endif
 
-#define E1_STEP_PIN        44
-#define E1_DIR_PIN         36
-#define E1_ENABLE_PIN      45
+#define E1_STEP_PIN                           44
+#define E1_DIR_PIN                            36
+#define E1_ENABLE_PIN                         45
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                           -1
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         41
-#define E2_ENABLE_PIN      43
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            41
+#define E2_ENABLE_PIN                         43
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        -1
+  #define E2_CS_PIN                           -1
 #endif
 
-#define E3_STEP_PIN        39
-#define E3_DIR_PIN         38
-#define E3_ENABLE_PIN      40
+#define E3_STEP_PIN                           39
+#define E3_DIR_PIN                            38
+#define E3_ENABLE_PIN                         40
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        -1
+  #define E3_CS_PIN                           -1
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          3   // Analog Input
-#define TEMP_3_PIN          4   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
+#define TEMP_3_PIN                             4  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_1_PIN        8
-#define HEATER_2_PIN        7
-#define HEATER_3_PIN        9
-#define HEATER_BED_PIN      2
+#define HEATER_0_PIN                           3
+#define HEATER_1_PIN                           8
+#define HEATER_2_PIN                           7
+#define HEATER_3_PIN                           9
+#define HEATER_BED_PIN                         2
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
-#define FAN2_PIN            5
+#define FAN2_PIN                               5
 
 //
 // Misc. Functions
 //
-#define SDSS               59
-#define SD_DETECT_PIN      60
-#define LED_PIN            13
-#define PS_ON_PIN          32
+#define SDSS                                  59
+#define SD_DETECT_PIN                         60
+#define LED_PIN                               13
+#define PS_ON_PIN                             32
 
 //
 // SPI Buses
 //
 
-#define DAC0_SYNC          53   // PB14
-#define SPI_CHAN_DAC        1
+#define DAC0_SYNC                             53  // PB14
+#define SPI_CHAN_DAC                           1
 
-#define SPI_CHAN_EEPROM1   -1
-#define SPI_EEPROM1_CS     -1
-#define SPI_EEPROM2_CS     -1
-#define SPI_FLASH_CS       -1
+#define SPI_CHAN_EEPROM1                      -1
+#define SPI_EEPROM1_CS                        -1
+#define SPI_EEPROM2_CS                        -1
+#define SPI_FLASH_CS                          -1
 
 // SPI for Max6675 or Max31855 Thermocouple
-#define MAX6675_SS_PIN     65
-#define MAX31855_SS0       65
-#define MAX31855_SS1       52
-#define MAX31855_SS2       50
-#define MAX31855_SS3       51
+#define MAX6675_SS_PIN                        65
+#define MAX31855_SS0                          65
+#define MAX31855_SS1                          52
+#define MAX31855_SS2                          50
+#define MAX31855_SS3                          51
 
-#define ENC424_SS          61
+#define ENC424_SS                             61
 
 //
 // LCD / Controller
 //
 
-#define BEEPER_PIN         27
+#define BEEPER_PIN                            27
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      A8     // CS chip select / SS chip slave select
-  #define LCD_PINS_ENABLE  MOSI   // SID (MOSI)
-  #define LCD_PINS_D4      SCK    // SCK (CLK) clock
+  #define LCD_PINS_RS                         A8  // CS chip select / SS chip slave select
+  #define LCD_PINS_ENABLE                   MOSI  // SID (MOSI)
+  #define LCD_PINS_D4                        SCK  // SCK (CLK) clock
 
-  #define BTN_EN1          20
-  #define BTN_EN2          21
-  #define BTN_ENC          64
+  #define BTN_EN1                             20
+  #define BTN_EN2                             21
+  #define BTN_ENC                             64
 
 #endif // REPRAPWORLD_GRAPHICAL_LCD
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 20da59e39592..b7d5172e0d94 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -36,110 +36,110 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
-#define SERVO3_PIN          4
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
+#define SERVO3_PIN                             4
 
 //
 // EEPROM
 //
-#define E2END 0x7FFF  // 32Kb (24lc256)
-#define I2C_EEPROM    // EEPROM on I2C-0
+#define E2END 0x7FFF                              // 32Kb (24lc256)
+#define I2C_EEPROM                                // EEPROM on I2C-0
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  18
+  #define Z_MIN_PROBE_PIN                     18
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         67     // Mega/Due:54 - AGCM4:67
-#define X_DIR_PIN          68     // Mega/Due:55 - AGCM4:68
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            67  // Mega/Due:54 - AGCM4:67
+#define X_DIR_PIN                             68  // Mega/Due:55 - AGCM4:68
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         47
+  #define X_CS_PIN                            47
 #endif
 
-#define Y_STEP_PIN         73     // Mega/Due:60 - AGCM4:73
-#define Y_DIR_PIN          74     // Mega/Due:61 - AGCM4:74
-#define Y_ENABLE_PIN       69     // Mega/Due:56 - AGCM4:69
+#define Y_STEP_PIN                            73  // Mega/Due:60 - AGCM4:73
+#define Y_DIR_PIN                             74  // Mega/Due:61 - AGCM4:74
+#define Y_ENABLE_PIN                          69  // Mega/Due:56 - AGCM4:69
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         45
+  #define Y_CS_PIN                            45
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       54     // Mega/Due:62 - AGCM4:54
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          54  // Mega/Due:62 - AGCM4:54
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         32
+  #define Z_CS_PIN                            32
 #endif
 
-#define Z2_STEP_PIN        36
-#define Z2_DIR_PIN         34
-#define Z2_ENABLE_PIN      30
+#define Z2_STEP_PIN                           36
+#define Z2_DIR_PIN                            34
+#define Z2_ENABLE_PIN                         30
 #ifndef Z2_CS_PIN
-  #define Z2_CS_PIN        22
+  #define Z2_CS_PIN                           22
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        43
+  #define E0_CS_PIN                           43
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
-#define TEMP_BED_PIN       14
-#define TEMP_CHAMBER_PIN   15
+#define TEMP_0_PIN                            13
+#define TEMP_BED_PIN                          14
+#define TEMP_CHAMBER_PIN                      15
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_BED_PIN      8
-#define FAN_PIN             9
-#define FAN1_PIN            7
-#define FAN2_PIN           12
+#define HEATER_0_PIN                          10
+#define HEATER_BED_PIN                         8
+#define FAN_PIN                                9
+#define FAN1_PIN                               7
+#define FAN2_PIN                              12
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        39
+  #define PS_ON_PIN                           39
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #endif
 #endif
 
@@ -147,10 +147,10 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !NUM_SERVOS                      // Use servo connector if possible
-    #define SPINDLE_LASER_ENA_PIN  4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN  6   // Hardware PWM
-    #define SPINDLE_DIR_PIN        5
+  #if !NUM_SERVOS                                 // Use servo connector if possible
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
   #else
     #error "No auto-assignable Spindle/Laser pins available."
   #endif
@@ -161,13 +161,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    58     // Mega/Due:66 - AGCM4:58
+    #define TMC_SW_MOSI                       58  // Mega/Due:66 - AGCM4:58
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     56     // Mega/Due:64 - AGCM4:56
+    #define TMC_SW_SCK                        56  // Mega/Due:64 - AGCM4:56
   #endif
 #endif
 
@@ -195,91 +195,91 @@
   //
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  47
+    #define X_SERIAL_TX_PIN                   47
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  47
+    #define X_SERIAL_RX_PIN                   47
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  45
+    #define Y_SERIAL_TX_PIN                   45
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  45
+    #define Y_SERIAL_RX_PIN                   45
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  32
+    #define Z_SERIAL_TX_PIN                   32
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  32
+    #define Z_SERIAL_RX_PIN                   32
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN 22
+    #define Z2_SERIAL_TX_PIN                  22
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN 22
+    #define Z2_SERIAL_RX_PIN                  22
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 43
+    #define E0_SERIAL_TX_PIN                  43
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 43
+    #define E0_SERIAL_RX_PIN                  43
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -345,17 +345,17 @@
         // #define DOGLCD_SCK      23
         // #define DOGLCD_A0       LCD_PINS_DC
       #else
-        #define LCD_PINS_RS        16
-        #define LCD_PINS_ENABLE    17
-        #define LCD_PINS_D4        23
-        #define LCD_PINS_D5        25
-        #define LCD_PINS_D6        27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7          29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN         33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -363,10 +363,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK          38
-      //#define SHIFT_LD           42
-      //#define SHIFT_OUT          40
-      //#define SHIFT_EN           17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -378,22 +378,22 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN           37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
         // TO TEST
         // #define BTN_EN1         17
         // #define BTN_EN2         23
       #else
-        #define BTN_EN1            31
-        #define BTN_EN2            33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC              35
+      #define BTN_ENC                         35
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN      49
+        #define SD_DETECT_PIN                 49
       #endif
-      #define KILL_PIN             41
+      #define KILL_PIN                        41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         // TO TEST
@@ -465,15 +465,15 @@
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
       // TO TEST
-      //#define BEEPER_PIN         37
-      //#define BTN_ENC            35
-      //#define SD_DETECT_PIN      49
+      //#define BEEPER_PIN                    37
+      //#define BTN_ENC                       35
+      //#define SD_DETECT_PIN                 49
 
       //#ifndef KILL_PIN
       //  #define KILL_PIN         41
       //#endif
 
-      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
+      #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
 
         // TO TEST
         // #define DOGLCD_A0       27
@@ -502,8 +502,8 @@
         // #define BTN_EN1         33
         // #define BTN_EN2         31
 
-        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
         // #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
 
@@ -600,12 +600,12 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(ONBOARD)
   #undef SDSS
-  #define SDSS             83
+  #define SDSS                                83
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    95
+  #define SD_DETECT_PIN                       95
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index ebd050371231..73145a3cdbb7 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -98,50 +98,50 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         18
-#define Y_STOP_PIN         19
-#define Z_STOP_PIN         20
+#define X_STOP_PIN                            18
+#define Y_STOP_PIN                            19
+#define Z_STOP_PIN                            20
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          21
-#define X_ENABLE_PIN       14
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             21
+#define X_ENABLE_PIN                          14
 
-#define Y_STEP_PIN         22
-#define Y_DIR_PIN          23
-#define Y_ENABLE_PIN       14
+#define Y_STEP_PIN                            22
+#define Y_DIR_PIN                             23
+#define Y_ENABLE_PIN                          14
 
-#define Z_STEP_PIN          3
-#define Z_DIR_PIN           2
-#define Z_ENABLE_PIN       26
+#define Z_STEP_PIN                             3
+#define Z_DIR_PIN                              2
+#define Z_ENABLE_PIN                          26
 
-#define E0_STEP_PIN         1
-#define E0_DIR_PIN          0
-#define E0_ENABLE_PIN      14
+#define E0_STEP_PIN                            1
+#define E0_DIR_PIN                             0
+#define E0_ENABLE_PIN                         14
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        6   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             7  // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN                           6  // Analog Input (pin 34 bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13   // (extruder)
-#define HEATER_BED_PIN     12   // (bed)
+#define HEATER_0_PIN                          13  // (extruder)
+#define HEATER_BED_PIN                        12  // (bed)
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4
+  #define FAN_PIN                              4
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               31
-#define LED_PIN            -1
+#define SDSS                                  31
+#define LED_PIN                               -1
 
 /**
  * LCD / Controller
@@ -153,36 +153,36 @@
  */
 
 #if HAS_SPI_LCD
-  #define LCD_SDSS           28
+  #define LCD_SDSS                            28
   #if ENABLED(ADC_KEYPAD)
-    #define SERVO0_PIN       27   // free for BLTouch/3D-Touch
-    #define LCD_PINS_RS      28
-    #define LCD_PINS_ENABLE  29
-    #define LCD_PINS_D4      10
-    #define LCD_PINS_D5      11
-    #define LCD_PINS_D6      16
-    #define LCD_PINS_D7      17
-    #define ADC_KEYPAD_PIN    1
+    #define SERVO0_PIN                        27  // free for BLTouch/3D-Touch
+    #define LCD_PINS_RS                       28
+    #define LCD_PINS_ENABLE                   29
+    #define LCD_PINS_D4                       10
+    #define LCD_PINS_D5                       11
+    #define LCD_PINS_D6                       16
+    #define LCD_PINS_D7                       17
+    #define ADC_KEYPAD_PIN                     1
   #elif EITHER(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD)
     // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
     // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
     // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
-    #define SERVO0_PIN       29   // free for BLTouch/3D-Touch
-    #define BEEPER_PIN       17
-    #define LCD_PINS_RS      27
-    #define LCD_PINS_ENABLE  28
-    #define LCD_PINS_D4      30
-    #define BTN_EN1          11
-    #define BTN_EN2          10
-    #define BTN_ENC          16
+    #define SERVO0_PIN                        29  // free for BLTouch/3D-Touch
+    #define BEEPER_PIN                        17
+    #define LCD_PINS_RS                       27
+    #define LCD_PINS_ENABLE                   28
+    #define LCD_PINS_D4                       30
+    #define BTN_EN1                           11
+    #define BTN_EN2                           10
+    #define BTN_ENC                           16
     #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
     #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
     #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-    #define STD_ENCODER_PULSES_PER_STEP 4
-    #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
+    #define STD_ENCODER_PULSES_PER_STEP        4
+    #define STD_ENCODER_STEPS_PER_MENU_ITEM    1
   #endif
 #else
-  #define SERVO0_PIN         27
+  #define SERVO0_PIN                          27
 #endif
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
index 833f99fb7f8f..b9a917d65de1 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
@@ -55,47 +55,47 @@
 #endif
 
 #define BOARD_INFO_NAME "Gen3 Monolithic"
-#define DEBUG_PIN 0
+#define DEBUG_PIN                              0
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         20
-#define Y_STOP_PIN         25
-#define Z_STOP_PIN         30
+#define X_STOP_PIN                            20
+#define Y_STOP_PIN                            25
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       24   // actually uses Y_enable_pin
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          24  // actually uses Y_enable_pin
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24   // shared with X_enable_pin
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24  // shared with X_enable_pin
 
-#define Z_STEP_PIN         27
-#define Z_DIR_PIN          28
-#define Z_ENABLE_PIN       29
+#define Z_STEP_PIN                            27
+#define Z_DIR_PIN                             28
+#define Z_ENABLE_PIN                          29
 
-#define E0_STEP_PIN        12
-#define E0_DIR_PIN         17
-#define E0_ENABLE_PIN       3
+#define E0_STEP_PIN                           12
+#define E0_DIR_PIN                            17
+#define E0_ENABLE_PIN                          3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
 
 //
 // Heaters
 //
-#define HEATER_0_PIN       16
+#define HEATER_0_PIN                          16
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          14   // Alex, does this work on the card?
+#define PS_ON_PIN                             14  // Alex, does this work on the card?
 
 // Alex extras from Gen3+
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
index c7c037fd4d46..6cd6fdaf27b3 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
@@ -50,7 +50,6 @@
  *
  */
 
-
 #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
   #error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'"
 #endif
@@ -60,43 +59,43 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         20
-#define Y_STOP_PIN         25
-#define Z_STOP_PIN         30
+#define X_STOP_PIN                            20
+#define Y_STOP_PIN                            25
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       19
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          19
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         27
-#define Z_DIR_PIN          28
-#define Z_ENABLE_PIN       29
+#define Z_STEP_PIN                            27
+#define Z_DIR_PIN                             28
+#define Z_ENABLE_PIN                          29
 
-#define E0_STEP_PIN        17
-#define E0_DIR_PIN         21
-#define E0_ENABLE_PIN      13
+#define E0_STEP_PIN                           17
+#define E0_DIR_PIN                            21
+#define E0_ENABLE_PIN                         13
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        5   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             0  // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN                           5  // Analog Input (pin 34 bed)
 
 //
 // Heaters
 //
-#define HEATER_0_PIN       12
-#define HEATER_BED_PIN     16
+#define HEATER_0_PIN                          12
+#define HEATER_BED_PIN                        16
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define PS_ON_PIN          14
+#define SDSS                                   4
+#define PS_ON_PIN                             14
diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h
index d1b8391bcdf7..0d2449ae6e99 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6.h
@@ -63,58 +63,58 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         20
-#define Y_STOP_PIN         25
-#define Z_STOP_PIN         30
+#define X_STOP_PIN                            20
+#define Y_STOP_PIN                            25
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       19
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          19
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         27
-#define Z_DIR_PIN          28
-#define Z_ENABLE_PIN       29
+#define Z_STEP_PIN                            27
+#define Z_DIR_PIN                             28
+#define Z_ENABLE_PIN                          29
 
-#define E0_STEP_PIN         4   // Edited @ EJE Electronics 20100715
-#define E0_DIR_PIN          2   // Edited @ EJE Electronics 20100715
-#define E0_ENABLE_PIN       3   // Added @ EJE Electronics 20100715
+#define E0_STEP_PIN                            4  // Edited @ EJE Electronics 20100715
+#define E0_DIR_PIN                             2  // Edited @ EJE Electronics 20100715
+#define E0_ENABLE_PIN                          3  // Added @ EJE Electronics 20100715
 
 //
 // Temperature Sensor
 //
-#define TEMP_0_PIN          5   // Analog Input
+#define TEMP_0_PIN                             5  // Analog Input
 
 //
 // Heaters
 //
-#define HEATER_0_PIN       14   // changed @ rkoeppl 20110410
+#define HEATER_0_PIN                          14  // changed @ rkoeppl 20110410
 
 #if !MB(GEN6)
-  #define HEATER_BED_PIN    1   // changed @ rkoeppl 20110410
-  #define TEMP_BED_PIN      0   // Analog Input
+  #define HEATER_BED_PIN                       1  // changed @ rkoeppl 20110410
+  #define TEMP_BED_PIN                         0  // Analog Input
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               17
-#define DEBUG_PIN           0
-#define CASE_LIGHT_PIN     16   // Hardware PWM
+#define SDSS                                  17
+#define DEBUG_PIN                              0
+#define CASE_LIGHT_PIN                        16  // Hardware PWM
 
 // RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN     5   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    16   // Hardware PWM
-#define SPINDLE_DIR_PIN           6
+#define SPINDLE_LASER_ENA_PIN                  5  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+#define SPINDLE_DIR_PIN                        6
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin/src/pins/sanguino/pins_GEN7_12.h
index 4ab53faa98c4..bb0e44a3002a 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_12.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_12.h
@@ -61,90 +61,89 @@
 #endif
 
 #ifndef GEN7_VERSION
-  #define GEN7_VERSION 12   // v1.x
+  #define GEN7_VERSION                        12  // v1.x
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           7
-#define Y_MIN_PIN           5
-#define Z_MIN_PIN           1
-#define Z_MAX_PIN           0
-#define Y_MAX_PIN           2
-#define X_MAX_PIN           6
-
+#define X_MIN_PIN                              7
+#define Y_MIN_PIN                              5
+#define Z_MIN_PIN                              1
+#define Z_MAX_PIN                              0
+#define Y_MAX_PIN                              2
+#define X_MAX_PIN                              6
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN   0
+  #define Z_MIN_PROBE_PIN                      0
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         19
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            19
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3
 
-#if !defined(FAN_PIN) && GEN7_VERSION < 13   // Gen7 v1.3 removed the fan pin
-  #define FAN_PIN        31
+#if !defined(FAN_PIN) && GEN7_VERSION < 13        // Gen7 v1.3 removed the fan pin
+  #define FAN_PIN                             31
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          15
+#define PS_ON_PIN                             15
 
 #if GEN7_VERSION < 13
-  #define CASE_LIGHT_PIN   16   // Hardware PWM
-#else     // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
-  #define CASE_LIGHT_PIN   15   // Hardware PWM
+  #define CASE_LIGHT_PIN                      16  // Hardware PWM
+#else                                             // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
+  #define CASE_LIGHT_PIN                      15  // Hardware PWM
 #endif
 
 // All these generations of Gen7 supply thermistor power
 // via PS_ON, so ignore bad thermistor readings
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD     2000
 
-#define DEBUG_PIN           0
+#define DEBUG_PIN                              0
 
 // RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    10   // Pullup or pulldown!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_ENA_PIN                 10  // Pullup or pulldown!
+#define SPINDLE_DIR_PIN                       11
 #if GEN7_VERSION < 13
-  #define SPINDLE_LASER_PWM_PIN  16   // Hardware PWM
-#else  // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
-  #define SPINDLE_LASER_PWM_PIN  15   // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               16  // Hardware PWM
+#else                                             // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
+  #define SPINDLE_LASER_PWM_PIN               15  // Hardware PWM
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin/src/pins/sanguino/pins_GEN7_14.h
index 5121b7d2e98c..9dc9f2808b77 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_14.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_14.h
@@ -58,62 +58,62 @@
 
 #define BOARD_INFO_NAME "Gen7 v1.4"
 
-#define GEN7_VERSION 14   // v1.4
+#define GEN7_VERSION                          14  // v1.4
 
 //
 // Limit switches
 //
-#define X_STOP_PIN          0
-#define Y_STOP_PIN          1
-#define Z_STOP_PIN          2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         29
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       25
+#define X_STEP_PIN                            29
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          25
 
-#define Y_STEP_PIN         27
-#define Y_DIR_PIN          26
-#define Y_ENABLE_PIN       25
+#define Y_STEP_PIN                            27
+#define Y_DIR_PIN                             26
+#define Y_ENABLE_PIN                          25
 
-#define Z_STEP_PIN         23
-#define Z_DIR_PIN          22
-#define Z_ENABLE_PIN       25
+#define Z_STEP_PIN                            23
+#define Z_DIR_PIN                             22
+#define Z_ENABLE_PIN                          25
 
-#define E0_STEP_PIN        19
-#define E0_DIR_PIN         18
-#define E0_ENABLE_PIN      25
+#define E0_STEP_PIN                           19
+#define E0_DIR_PIN                            18
+#define E0_ENABLE_PIN                         25
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          15
-#define CASE_LIGHT_PIN     15    // Hardware PWM
+#define PS_ON_PIN                             15
+#define CASE_LIGHT_PIN                        15  // Hardware PWM
 
 // A pin for debugging
-#define DEBUG_PIN           0
+#define DEBUG_PIN                              0
 
 // RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    20   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    16   // Hardware PWM
-#define SPINDLE_DIR_PIN          21
+#define SPINDLE_LASER_ENA_PIN                 20  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+#define SPINDLE_DIR_PIN                       21
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
index 0f8a92f08dea..67a9762fa085 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
@@ -64,76 +64,76 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          0
-#define Y_STOP_PIN          1
-#define Z_STOP_PIN          2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         21   // different from standard GEN7
-#define X_DIR_PIN          20   // different from standard GEN7
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            21  // different from standard GEN7
+#define X_DIR_PIN                             20  // different from standard GEN7
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input (pin 34 bed)
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3   // (bed)
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3  // (bed)
 
 //
 // Misc. Functions
 //
-#define SDSS               31   // SCL pin of I2C header || CS Pin for SD Card support
-#define PS_ON_PIN          19
-#define CASE_LIGHT_PIN     15   // Hardware PWM
+#define SDSS                                  31  // SCL pin of I2C header || CS Pin for SD Card support
+#define PS_ON_PIN                             19
+#define CASE_LIGHT_PIN                        15  // Hardware PWM
 
 // A pin for debugging
-#define DEBUG_PIN          -1
+#define DEBUG_PIN                             -1
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
+#define BEEPER_PIN                            -1
 
 // 4bit LCD Support
-#define LCD_PINS_RS        18
-#define LCD_PINS_ENABLE    17
-#define LCD_PINS_D4        16
-#define LCD_PINS_D5        15
-#define LCD_PINS_D6        13
-#define LCD_PINS_D7        14
+#define LCD_PINS_RS                           18
+#define LCD_PINS_ENABLE                       17
+#define LCD_PINS_D4                           16
+#define LCD_PINS_D5                           15
+#define LCD_PINS_D6                           13
+#define LCD_PINS_D7                           14
 
 // Buttons are directly    attached
-#define BTN_EN1            11
-#define BTN_EN2            10
-#define BTN_ENC            12
+#define BTN_EN1                               11
+#define BTN_EN2                               10
+#define BTN_ENC                               12
 
 // RS485 pins
-//#define TX_ENABLE_PIN   12
-//#define RX_ENABLE_PIN   13
+//#define TX_ENABLE_PIN                       12
+//#define RX_ENABLE_PIN                       13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN     5   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    16   // Hardware PWM
-#define SPINDLE_DIR_PIN           6
+#define SPINDLE_LASER_ENA_PIN                  5  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+#define SPINDLE_DIR_PIN                        6
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 958ea78da4b5..10a52705e77e 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -46,15 +46,15 @@
 #undef LCD_PINS_D5
 #undef LCD_PINS_D6
 #undef LCD_PINS_D7
-#undef FIL_RUNOUT_PIN           // Uses Beeper/LED Pin Pulled to GND
+#undef FIL_RUNOUT_PIN                             // Uses Beeper/LED Pin Pulled to GND
 
-#define LCD_SDSS           31   // Smart Controller SD card reader (rather than the Melzi)
-#define LCD_PINS_RS        28   // ST9720 CS
-#define LCD_PINS_ENABLE    17   // ST9720 DAT
-#define LCD_PINS_D4        30   // ST9720 CLK
+#define LCD_SDSS                             31   // Smart Controller SD card reader (rather than the Melzi)
+#define LCD_PINS_RS                          28   // ST9720 CS
+#define LCD_PINS_ENABLE                      17   // ST9720 DAT
+#define LCD_PINS_D4                          30   // ST9720 CLK
 
 #if ENABLED(BLTOUCH)
-  #define SERVO0_PIN 27
+  #define SERVO0_PIN                         27
   #undef BEEPER_PIN
 #endif
 
@@ -67,7 +67,7 @@
 
 #if ENABLED(MINIPANEL)
   #undef DOGLCD_CS
-  #define DOGLCD_CS        LCD_PINS_RS
+  #define DOGLCD_CS LCD_PINS_RS
 #endif
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index bf0e34a9ec8d..8e682453b4f6 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -36,12 +36,12 @@
 #undef BTN_EN2
 #undef BTN_ENC
 
-#define LCD_PINS_RS        17   // ST9720 CS
-#define LCD_PINS_ENABLE    16   // ST9720 DAT
-#define LCD_PINS_D4        11   // ST9720 CLK
-#define BTN_EN1            30
-#define BTN_EN2            29
-#define BTN_ENC            28
+#define LCD_PINS_RS                          17   // ST9720 CS
+#define LCD_PINS_ENABLE                      16   // ST9720 DAT
+#define LCD_PINS_D4                          11   // ST9720 CLK
+#define BTN_EN1                              30
+#define BTN_EN2                              29
+#define BTN_ENC                              28
 
 // Alter timing for graphical display
 #if HAS_GRAPHICAL_LCD
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index 50433f6244db..88b80dfb895e 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -40,16 +40,16 @@
 #undef BTN_ENC
 #undef LCD_SDSS
 
-#define Z_ENABLE_PIN    14
-#define LCD_PINS_RS     30
-#define LCD_PINS_ENABLE 28
-#define LCD_PINS_D4     16
-#define LCD_PINS_D5     17
-#define LCD_PINS_D6     27
-#define LCD_PINS_D7     29
-#define BTN_EN1         10
-#define BTN_EN2         11
-#define BTN_ENC         26
+#define Z_ENABLE_PIN                          14
+#define LCD_PINS_RS                           30
+#define LCD_PINS_ENABLE                       28
+#define LCD_PINS_D4                           16
+#define LCD_PINS_D5                           17
+#define LCD_PINS_D6                           27
+#define LCD_PINS_D7                           29
+#define BTN_EN1                               10
+#define BTN_EN2                               11
+#define BTN_ENC                               26
 
 #if HAS_GRAPHICAL_LCD
   #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
diff --git a/Marlin/src/pins/sanguino/pins_OMCA.h b/Marlin/src/pins/sanguino/pins_OMCA.h
index c2ba1ed7073b..774910bd7d46 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA.h
@@ -86,66 +86,66 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         0
-#define Y_STOP_PIN         1
-#define Z_STOP_PIN         2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       10
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          10
 
-#define Y_STEP_PIN         28
-#define Y_DIR_PIN          27
-#define Y_ENABLE_PIN       10
+#define Y_STEP_PIN                            28
+#define Y_DIR_PIN                             27
+#define Y_ENABLE_PIN                          10
 
-#define Z_STEP_PIN         23
-#define Z_DIR_PIN          22
-#define Z_ENABLE_PIN       10
+#define Z_STEP_PIN                            23
+#define Z_DIR_PIN                             22
+#define Z_ENABLE_PIN                          10
 
-#define E0_STEP_PIN        24
-#define E0_DIR_PIN         21
-#define E0_ENABLE_PIN      10
+#define E0_STEP_PIN                           24
+#define E0_DIR_PIN                            21
+#define E0_ENABLE_PIN                         10
 
-#define E1_STEP_PIN        -1   // 21
-#define E1_DIR_PIN         -1   // 20
-#define E1_ENABLE_PIN      -1   // 19
+#define E1_STEP_PIN                           -1  // 21
+#define E1_DIR_PIN                            -1  // 20
+#define E1_ENABLE_PIN                         -1  // 19
 
-#define E2_STEP_PIN        -1   // 21
-#define E2_DIR_PIN         -1   // 20
-#define E2_ENABLE_PIN      -1   // 18
+#define E2_STEP_PIN                           -1  // 21
+#define E2_DIR_PIN                            -1  // 20
+#define E2_ENABLE_PIN                         -1  // 18
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input (1,2 or I2C)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3   // DONE PWM on RIGHT connector
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           3  // DONE PWM on RIGHT connector
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN          14   // PWM on MIDDLE connector
+  #define FAN_PIN                             14  // PWM on MIDDLE connector
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               11
+#define SDSS                                  11
 
-#define I2C_SCL_PIN        16
-#define I2C_SDA_PIN        17
+#define I2C_SCL_PIN                           16
+#define I2C_SDA_PIN                           17
 
 // future proofing
-#define __FS  20
-#define __FD  19
-#define __GS  18
-#define __GD  13
+#define __FS                                  20
+#define __FD                                  19
+#define __GS                                  18
+#define __GD                                  13
 
-#define UNUSED_PWM         14   // PWM on LEFT connector
+#define UNUSED_PWM                            14  // PWM on LEFT connector
diff --git a/Marlin/src/pins/sanguino/pins_OMCA_A.h b/Marlin/src/pins/sanguino/pins_OMCA_A.h
index b8340a3debd8..73237743b820 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA_A.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA_A.h
@@ -85,54 +85,54 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          0
-#define Y_STOP_PIN          1
-#define Z_STOP_PIN          2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         21
-#define X_DIR_PIN          20
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            21
+#define X_DIR_PIN                             20
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        -1   // 19
-#define E1_DIR_PIN         -1   // 18
-#define E1_ENABLE_PIN      24
+#define E1_STEP_PIN                           -1  // 19
+#define E1_DIR_PIN                            -1  // 18
+#define E1_ENABLE_PIN                         24
 
-#define E2_STEP_PIN        -1   // 17
-#define E2_DIR_PIN         -1   // 16
-#define E2_ENABLE_PIN      24
+#define E2_STEP_PIN                           -1  // 17
+#define E2_DIR_PIN                            -1  // 16
+#define E2_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (D27)
+#define TEMP_0_PIN                             0  // Analog Input (D27)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
+#define HEATER_0_PIN                           4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           3
+  #define FAN_PIN                              3
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               11
+#define SDSS                                  11
 
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 977ba16daf22..50d3a53779cb 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -63,60 +63,60 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         18
-#define Y_STOP_PIN         19
-#define Z_STOP_PIN         20
+#define X_STOP_PIN                            18
+#define Y_STOP_PIN                            19
+#define Z_STOP_PIN                            20
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          21
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             21
 
-#define Y_STEP_PIN         22
-#define Y_DIR_PIN          23
+#define Y_STEP_PIN                            22
+#define Y_DIR_PIN                             23
 
-#define Z_STEP_PIN          3
-#define Z_DIR_PIN           2
+#define Z_STEP_PIN                             3
+#define Z_DIR_PIN                              2
 
-#define E0_STEP_PIN         1
-#define E0_DIR_PIN          0
+#define E0_STEP_PIN                            1
+#define E0_DIR_PIN                             0
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        6   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             7  // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN                           6  // Analog Input (pin 34 bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13   // (extruder)
+#define HEATER_0_PIN                          13  // (extruder)
 
 #if ENABLED(SANGUINOLOLU_V_1_2)
 
-  #define HEATER_BED_PIN   12   // (bed)
-  #define X_ENABLE_PIN     14
-  #define Y_ENABLE_PIN     14
-  #define Z_ENABLE_PIN     26
-  #define E0_ENABLE_PIN    14
+  #define HEATER_BED_PIN                      12  // (bed)
+  #define X_ENABLE_PIN                        14
+  #define Y_ENABLE_PIN                        14
+  #define Z_ENABLE_PIN                        26
+  #define E0_ENABLE_PIN                       14
 
   #if !defined(FAN_PIN) && ENABLED(LCD_I2C_PANELOLU2)
-    #define FAN_PIN         4   // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
+    #define FAN_PIN                            4  // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
   #endif
 
 #else
 
-  #define HEATER_BED_PIN   14   // (bed)
-  #define X_ENABLE_PIN     -1
-  #define Y_ENABLE_PIN     -1
-  #define Z_ENABLE_PIN     -1
-  #define E0_ENABLE_PIN    -1
+  #define HEATER_BED_PIN                      14  // (bed)
+  #define X_ENABLE_PIN                        -1
+  #define Y_ENABLE_PIN                        -1
+  #define Z_ENABLE_PIN                        -1
+  #define E0_ENABLE_PIN                       -1
 
 #endif
 
 #if !defined(FAN_PIN) && (MB(AZTEEG_X1, STB_11) || IS_MELZI)
-  #define FAN_PIN           4   // Works for Panelolu2 too
+  #define FAN_PIN                              4  // Works for Panelolu2 too
 #endif
 
 //
@@ -129,17 +129,17 @@
  * If you encounter issues with these pins, upgrade your
  * Sanguino libraries! See #368.
  */
-//#define SDSS               24
-#define SDSS               31
+//#define SDSS                                24
+#define SDSS                                  31
 
 #if IS_MELZI
-  #define LED_PIN          27
+  #define LED_PIN                             27
 #elif MB(STB_11)
-  #define LCD_BACKLIGHT_PIN 17   // LCD backlight LED
+  #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
 #endif
 
-#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)  // try to use IO Header
-  #define CASE_LIGHT_PIN     4   // Hardware PWM  - see if IO Header is available
+#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
+  #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
 #endif
 
 /**
@@ -156,57 +156,57 @@
 //
 #if HAS_SPI_LCD
 
-  #define SD_DETECT_PIN         -1
+  #define SD_DETECT_PIN                       -1
 
   #if HAS_GRAPHICAL_LCD
 
     #if ENABLED(LCD_FOR_MELZI)
 
-      #define LCD_PINS_RS       17
-      #define LCD_PINS_ENABLE   16
-      #define LCD_PINS_D4       11
+      #define LCD_PINS_RS                     17
+      #define LCD_PINS_ENABLE                 16
+      #define LCD_PINS_D4                     11
 
       #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
       #define BOARD_ST7920_DELAY_2 DELAY_NS(188)
       #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
 
-    #elif ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+    #elif ENABLED(U8GLIB_ST7920)                  // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
 
       #if IS_MELZI
-        #define LCD_PINS_RS     30   // CS chip select /SS chip slave select
-        #define LCD_PINS_ENABLE 29   // SID (MOSI)
-        #define LCD_PINS_D4     17   // SCK (CLK) clock
+        #define LCD_PINS_RS                   30  // CS chip select /SS chip slave select
+        #define LCD_PINS_ENABLE               29  // SID (MOSI)
+        #define LCD_PINS_D4                   17  // SCK (CLK) clock
         // Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
         // with M42 instead of BEEPER_PIN.
-        #define BEEPER_PIN      27
-      #else        // Sanguinololu >=1.3
-        #define LCD_PINS_RS      4
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     30
-        #define LCD_PINS_D5     29
-        #define LCD_PINS_D6     28
-        #define LCD_PINS_D7     27
+        #define BEEPER_PIN                    27
+      #else                                       // Sanguinololu >=1.3
+        #define LCD_PINS_RS                    4
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   30
+        #define LCD_PINS_D5                   29
+        #define LCD_PINS_D6                   28
+        #define LCD_PINS_D7                   27
       #endif
 
     #else
 
-      #define DOGLCD_A0         30
+      #define DOGLCD_A0                       30
 
       #if ENABLED(MAKRPANEL)
 
-        #define BEEPER_PIN      29
-        #define DOGLCD_CS       17
-        #define LCD_BACKLIGHT_PIN 28   // PA3
+        #define BEEPER_PIN                    29
+        #define DOGLCD_CS                     17
+        #define LCD_BACKLIGHT_PIN             28  // PA3
 
       #elif IS_MELZI
 
-        #define BEEPER_PIN      27
-        #define DOGLCD_CS       28
+        #define BEEPER_PIN                    27
+        #define DOGLCD_CS                     28
 
-      #else // !MAKRPANEL
+      #else                                       // !MAKRPANEL
 
-        #define DOGLCD_CS       29
+        #define DOGLCD_CS                     29
 
       #endif
 
@@ -218,57 +218,57 @@
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
 
-  #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+  #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
 
-    #define LCD_PINS_RS    28
-    #define LCD_PINS_ENABLE 29
-    #define LCD_PINS_D4    10
-    #define LCD_PINS_D5    11
-    #define LCD_PINS_D6    16
-    #define LCD_PINS_D7    17
+    #define LCD_PINS_RS                       28
+    #define LCD_PINS_ENABLE                   29
+    #define LCD_PINS_D4                       10
+    #define LCD_PINS_D5                       11
+    #define LCD_PINS_D6                       16
+    #define LCD_PINS_D7                       17
 
   #else
 
-    #define LCD_PINS_RS     4
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4    30
-    #define LCD_PINS_D5    29
-    #define LCD_PINS_D6    28
-    #define LCD_PINS_D7    27
+    #define LCD_PINS_RS                        4
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       30
+    #define LCD_PINS_D5                       29
+    #define LCD_PINS_D6                       28
+    #define LCD_PINS_D7                       27
 
   #endif
 
   #if ENABLED(LCD_FOR_MELZI)
 
-    #define BTN_ENC        28
-    #define BTN_EN1        29
-    #define BTN_EN2        30
+    #define BTN_ENC                           28
+    #define BTN_EN1                           29
+    #define BTN_EN2                           30
 
-  #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+  #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
 
-    #define ADC_KEYPAD_PIN  1
-    #define BTN_EN1        -1
-    #define BTN_EN2        -1
+    #define ADC_KEYPAD_PIN                     1
+    #define BTN_EN1                           -1
+    #define BTN_EN2                           -1
 
   #elif ENABLED(LCD_I2C_PANELOLU2)
 
     #if IS_MELZI
-      #define BTN_ENC      29
-      #define LCD_SDSS     30   // Panelolu2 SD card reader rather than the Melzi
+      #define BTN_ENC                         29
+      #define LCD_SDSS                        30  // Panelolu2 SD card reader rather than the Melzi
     #else
-      #define BTN_ENC      30
+      #define BTN_ENC                         30
     #endif
 
-  #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
+  #else                                           // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
 
-    #define BTN_ENC        16
-    #define LCD_SDSS       28   // Smart Controller SD card reader rather than the Melzi
+    #define BTN_ENC                           16
+    #define LCD_SDSS                          28  // Smart Controller SD card reader rather than the Melzi
 
   #endif
 
   #if ENABLED(NEWPANEL) && !defined(BTN_EN1)
-    #define BTN_EN1        11
-    #define BTN_EN2        10
+    #define BTN_EN1                           11
+    #define BTN_EN2                           10
   #endif
 
 #endif // HAS_SPI_LCD
@@ -277,13 +277,13 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
-  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)  // try to use IO Header
+  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
 
-    #define SPINDLE_LASER_ENA_PIN    10   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM
-    #define SPINDLE_DIR_PIN          11
+    #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   11
 
-  #elif !MB(MELZI)  // use X stepper motor socket
+  #elif !MB(MELZI)                                // use X stepper motor socket
 
     /**
      *  To control the spindle speed and have an LCD you must sacrifice
@@ -315,11 +315,11 @@
     #undef X_DIR_PIN
     #undef X_ENABLE_PIN
     #undef X_STEP_PIN
-    #define X_DIR_PIN                 0
-    #define X_ENABLE_PIN             14
-    #define X_STEP_PIN                1
-    #define SPINDLE_LASER_PWM_PIN    15   // Hardware PWM
-    #define SPINDLE_LASER_ENA_PIN    21   // Pullup!
-    #define SPINDLE_DIR_PIN          -1   // No pin available on the socket for the direction pin
+    #define X_DIR_PIN                          0
+    #define X_ENABLE_PIN                      14
+    #define X_STEP_PIN                         1
+    #define SPINDLE_LASER_PWM_PIN             15  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             21  // Pullup!
+    #define SPINDLE_DIR_PIN                   -1  // No pin available on the socket for the direction pin
   #endif
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_SETHI.h b/Marlin/src/pins/sanguino/pins_SETHI.h
index 528ec4455f48..b945869cbccb 100644
--- a/Marlin/src/pins/sanguino/pins_SETHI.h
+++ b/Marlin/src/pins/sanguino/pins_SETHI.h
@@ -57,69 +57,69 @@
 #define BOARD_INFO_NAME "Sethi 3D_1"
 
 #ifndef GEN7_VERSION
-  #define GEN7_VERSION 12   // v1.x
+  #define GEN7_VERSION                        12  // v1.x
 #endif
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN          2
-#define Y_STOP_PIN          0
-#define Z_MIN_PIN           1
-#define Z_MAX_PIN           0
+#define X_STOP_PIN                             2
+#define Y_STOP_PIN                             0
+#define Z_MIN_PIN                              1
+#define Z_MAX_PIN                              0
 
 //
 // Steppers
 //
-#define X_STEP_PIN         19
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            19
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3
 
 #ifndef FAN_PIN
   #if GEN7_VERSION >= 13
     // Gen7 v1.3 removed the fan pin
-    #define FAN_PIN          -1
+    #define FAN_PIN                           -1
   #else
-    #define FAN_PIN          31
+    #define FAN_PIN                           31
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          15
+#define PS_ON_PIN                             15
 
 // All these generations of Gen7 supply thermistor power
 // via PS_ON, so ignore bad thermistor readings
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD     2000
 
 // our pin for debugging.
-#define DEBUG_PIN           0
+#define DEBUG_PIN                              0
 
 // our RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
index fa555f4151e3..fef8eeb61737 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -42,56 +42,56 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA1    // SERVOS
+#define SERVO0_PIN                          PA1   // SERVOS
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC1    // X-STOP
-#define Y_STOP_PIN         PC0    // Y-STOP
-#define Z_STOP_PIN         PC15   // Z-STOP
+#define X_STOP_PIN                          PC1   // X-STOP
+#define Y_STOP_PIN                          PC0   // Y-STOP
+#define Z_STOP_PIN                          PC15  // Z-STOP
 
 //
 // Z Probe must be this pin
 //
-#define Z_MIN_PROBE_PIN    PC14   // PROBE
+#define Z_MIN_PROBE_PIN                     PC14  // PROBE
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC2    // E0-STOP
+  #define FIL_RUNOUT_PIN                    PC2   // E0-STOP
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PC7
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PB15
+#define X_ENABLE_PIN                        PC7
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PB15
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PC10
+  #define X_CS_PIN                          PC10
 #endif
 
-#define Y_ENABLE_PIN       PB14
-#define Y_STEP_PIN         PB13
-#define Y_DIR_PIN          PB12
+#define Y_ENABLE_PIN                        PB14
+#define Y_STEP_PIN                          PB13
+#define Y_DIR_PIN                           PB12
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PC11
+  #define Y_CS_PIN                          PC11
 #endif
 
-#define Z_ENABLE_PIN       PB11
-#define Z_STEP_PIN         PB10
-#define Z_DIR_PIN          PB2
+#define Z_ENABLE_PIN                        PB11
+#define Z_STEP_PIN                          PB10
+#define Z_DIR_PIN                           PB2
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PC12
+  #define Z_CS_PIN                          PC12
 #endif
 
-#define E0_ENABLE_PIN      PB1
-#define E0_STEP_PIN        PB0
-#define E0_DIR_PIN         PC5
+#define E0_ENABLE_PIN                       PB1
+#define E0_STEP_PIN                         PB0
+#define E0_DIR_PIN                          PC5
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD2
+  #define E0_CS_PIN                         PD2
 #endif
 
 //
@@ -99,13 +99,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB5
+    #define TMC_SW_MOSI                     PB5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB4
+    #define TMC_SW_MISO                     PB4
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
+    #define TMC_SW_SCK                      PB3
   #endif
 #endif
 
@@ -124,17 +124,17 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PC10
-  #define X_SERIAL_RX_PIN  PC10
+  #define X_SERIAL_TX_PIN                   PC10
+  #define X_SERIAL_RX_PIN                   PC10
 
-  #define Y_SERIAL_TX_PIN  PC11
-  #define Y_SERIAL_RX_PIN  PC11
+  #define Y_SERIAL_TX_PIN                   PC11
+  #define Y_SERIAL_RX_PIN                   PC11
 
-  #define Z_SERIAL_TX_PIN  PC12
-  #define Z_SERIAL_RX_PIN  PC12
+  #define Z_SERIAL_TX_PIN                   PC12
+  #define Z_SERIAL_RX_PIN                   PC12
 
-  #define E0_SERIAL_TX_PIN PD2
-  #define E0_SERIAL_RX_PIN PD2
+  #define E0_SERIAL_TX_PIN                  PD2
+  #define E0_SERIAL_RX_PIN                  PD2
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -143,23 +143,23 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input "TH0"
-#define TEMP_BED_PIN       PC3   // Analog Input "TB0"
+#define TEMP_0_PIN                          PA0   // Analog Input "TH0"
+#define TEMP_BED_PIN                        PC3   // Analog Input "TB0"
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC8   // HE
-#define HEATER_BED_PIN     PC9   // HB
-#define FAN_PIN            PA8   // FAN0
+#define HEATER_0_PIN                        PC8   // HE
+#define HEATER_BED_PIN                      PC9   // HB
+#define FAN_PIN                             PA8   // FAN0
 
 //
 // USB connect control
 //
-#define USB_CONNECT_PIN    PC13
+#define USB_CONNECT_PIN                     PC13
 #define USB_CONNECT_INVERTING false
 
-#define SD_DETECT_PIN      PC4
+#define SD_DETECT_PIN                       PC4
 
 /**
  *                 _____
@@ -172,27 +172,27 @@
  *                 EXP1
  */
 
-#define EXPA1_03_PIN       PB7
-#define EXPA1_04_PIN       PB8
-#define EXPA1_05_PIN       PB9
-#define EXPA1_06_PIN       PA10
-#define EXPA1_07_PIN       -1
-#define EXPA1_08_PIN       PA9
-#define EXPA1_09_PIN       PB6
-#define EXPA1_10_PIN       PA15
+#define EXPA1_03_PIN                        PB7
+#define EXPA1_04_PIN                        PB8
+#define EXPA1_05_PIN                        PB9
+#define EXPA1_06_PIN                        PA10
+#define EXPA1_07_PIN                        -1
+#define EXPA1_08_PIN                        PA9
+#define EXPA1_09_PIN                        PB6
+#define EXPA1_10_PIN                        PA15
 
 #if HAS_SPI_LCD
-  #define BTN_ENC          EXPA1_09_PIN
-  #define BTN_EN1          EXPA1_08_PIN
-  #define BTN_EN2          EXPA1_06_PIN
+  #define BTN_ENC                   EXPA1_09_PIN
+  #define BTN_EN1                   EXPA1_08_PIN
+  #define BTN_EN2                   EXPA1_06_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN     EXPA1_10_PIN
+    #define BEEPER_PIN              EXPA1_10_PIN
 
-    #define LCD_PINS_RS    EXPA1_04_PIN
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
+    #define LCD_PINS_RS             EXPA1_04_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -207,12 +207,12 @@
      *                    EXP1
      */
 
-    #define DOGLCD_CS    EXPA1_04_PIN
-    #define DOGLCD_A0    EXPA1_05_PIN
-    #define DOGLCD_SCK   EXPA1_10_PIN
-    #define DOGLCD_MOSI  EXPA1_03_PIN
+    #define DOGLCD_CS               EXPA1_04_PIN
+    #define DOGLCD_A0               EXPA1_05_PIN
+    #define DOGLCD_SCK              EXPA1_10_PIN
+    #define DOGLCD_MOSI             EXPA1_03_PIN
     #define FORCE_SOFT_SPI
-    #define LCD_BACKLIGHT_PIN -1
+    #define LCD_BACKLIGHT_PIN               -1
 
   #else
     #error "Only CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
@@ -226,8 +226,8 @@
 #define HAS_ONBOARD_SD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ON_BOARD_SPI_DEVICE 1    //SPI1
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card
+#define ON_BOARD_SPI_DEVICE 1                     //SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
index 77a412ad613b..15bc01263abb 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
@@ -40,66 +40,66 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA1
+#define SERVO0_PIN                          PA1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC0
-#define Y_STOP_PIN         PC1
-#define Z_STOP_PIN         PC2
+#define X_STOP_PIN                          PC0
+#define Y_STOP_PIN                          PC1
+#define Z_STOP_PIN                          PC2
 
 //
 // Z Probe must be this pins
 //
-#define Z_MIN_PROBE_PIN    PC14
+#define Z_MIN_PROBE_PIN                     PC14
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC15   // "E0-STOP"
+  #define FIL_RUNOUT_PIN                    PC15  // "E0-STOP"
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PB14
-#define X_STEP_PIN         PB13
-#define X_DIR_PIN          PB12
+#define X_ENABLE_PIN                        PB14
+#define X_STEP_PIN                          PB13
+#define X_DIR_PIN                           PB12
 
-#define Y_ENABLE_PIN       PB11
-#define Y_STEP_PIN         PB10
-#define Y_DIR_PIN          PB2
+#define Y_ENABLE_PIN                        PB11
+#define Y_STEP_PIN                          PB10
+#define Y_DIR_PIN                           PB2
 
-#define Z_ENABLE_PIN       PB1
-#define Z_STEP_PIN         PB0
-#define Z_DIR_PIN          PC5
+#define Z_ENABLE_PIN                        PB1
+#define Z_STEP_PIN                          PB0
+#define Z_DIR_PIN                           PC5
 
-#define E0_ENABLE_PIN      PD2
-#define E0_STEP_PIN        PB3
-#define E0_DIR_PIN         PB4
+#define E0_ENABLE_PIN                       PD2
+#define E0_STEP_PIN                         PB3
+#define E0_DIR_PIN                          PB4
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input
-#define TEMP_BED_PIN       PC3   // Analog Input
+#define TEMP_0_PIN                          PA0   // Analog Input
+#define TEMP_BED_PIN                        PC3   // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC8   // EXTRUDER
-#define HEATER_BED_PIN     PC9   // BED
-#define FAN_PIN            PA8
+#define HEATER_0_PIN                        PC8   // EXTRUDER
+#define HEATER_BED_PIN                      PC9   // BED
+#define FAN_PIN                             PA8
 
 //
 // USB connect control
 //
-#define USB_CONNECT_PIN    PC13
+#define USB_CONNECT_PIN                     PC13
 #define USB_CONNECT_INVERTING false
 
-#define SD_DETECT_PIN      PC4
+#define SD_DETECT_PIN                       PC4
 
 /**
  *                 _____
@@ -112,40 +112,40 @@
  *                 EXP1
  */
 
-#define EXPA1_03_PIN       PB7
-#define EXPA1_04_PIN       PB8
-#define EXPA1_05_PIN       PB9
-#define EXPA1_06_PIN       PA10
-#define EXPA1_07_PIN       -1
-#define EXPA1_08_PIN       PA9
-#define EXPA1_09_PIN       PB6
-#define EXPA1_10_PIN       PB5
+#define EXPA1_03_PIN                        PB7
+#define EXPA1_04_PIN                        PB8
+#define EXPA1_05_PIN                        PB9
+#define EXPA1_06_PIN                        PA10
+#define EXPA1_07_PIN                        -1
+#define EXPA1_08_PIN                        PA9
+#define EXPA1_09_PIN                        PB6
+#define EXPA1_10_PIN                        PB5
 
 #if HAS_SPI_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN     EXPA1_10_PIN
+    #define BEEPER_PIN              EXPA1_10_PIN
 
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN
 
-    #define LCD_PINS_RS    EXPA1_04_PIN
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
+    #define LCD_PINS_RS             EXPA1_04_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
 
-  #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+  #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
 
-    #define LCD_PINS_RS    EXPA1_05_PIN
-    #define LCD_PINS_ENABLE EXPA1_09_PIN
-    #define LCD_PINS_D4    EXPA1_04_PIN
-    #define LCD_PINS_D5    EXPA1_06_PIN
-    #define LCD_PINS_D6    EXPA1_08_PIN
-    #define LCD_PINS_D7    EXPA1_10_PIN
-    #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+    #define LCD_PINS_RS             EXPA1_05_PIN
+    #define LCD_PINS_ENABLE         EXPA1_09_PIN
+    #define LCD_PINS_D4             EXPA1_04_PIN
+    #define LCD_PINS_D5             EXPA1_06_PIN
+    #define LCD_PINS_D6             EXPA1_08_PIN
+    #define LCD_PINS_D7             EXPA1_10_PIN
+    #define ADC_KEYPAD_PIN                  PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -159,16 +159,16 @@
      *                   -----
      *                    EXP1
      */
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN
-
-    #define DOGLCD_CS      EXPA1_04_PIN
-    #define DOGLCD_A0      EXPA1_05_PIN
-    #define DOGLCD_SCK     EXPA1_10_PIN
-    #define DOGLCD_MOSI    EXPA1_03_PIN
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN
+
+    #define DOGLCD_CS               EXPA1_04_PIN
+    #define DOGLCD_A0               EXPA1_05_PIN
+    #define DOGLCD_SCK              EXPA1_10_PIN
+    #define DOGLCD_MOSI             EXPA1_03_PIN
     #define FORCE_SOFT_SPI
-    #define LCD_BACKLIGHT_PIN -1
+    #define LCD_BACKLIGHT_PIN               -1
 
   #else
 
@@ -184,8 +184,8 @@
 #define HAS_ONBOARD_SD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ON_BOARD_SPI_DEVICE 1    // SPI1
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card
+#define ON_BOARD_SPI_DEVICE 1                     // SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
index 8935da85af17..961620ee8ba2 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -25,7 +25,7 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR Mini E3 V1.2"
 
-#define NEOPIXEL_PIN       PC7  // LED driving pin
+#define NEOPIXEL_PIN                       PC7    // LED driving pin
 
 /**
  * TMC2208/TMC2209 stepper drivers
@@ -34,17 +34,17 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PB15
-  #define X_SERIAL_RX_PIN  PB15
+  #define X_SERIAL_TX_PIN                  PB15
+  #define X_SERIAL_RX_PIN                  PB15
 
-  #define Y_SERIAL_TX_PIN  PC6
-  #define Y_SERIAL_RX_PIN  PC6
+  #define Y_SERIAL_TX_PIN                  PC6
+  #define Y_SERIAL_RX_PIN                  PC6
 
-  #define Z_SERIAL_TX_PIN  PC10
-  #define Z_SERIAL_RX_PIN  PC10
+  #define Z_SERIAL_TX_PIN                  PC10
+  #define Z_SERIAL_RX_PIN                  PC10
 
-  #define E0_SERIAL_TX_PIN PC11
-  #define E0_SERIAL_RX_PIN PC11
+  #define E0_SERIAL_TX_PIN                 PC11
+  #define E0_SERIAL_RX_PIN                 PC11
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 08f666882eca..fff3af5b6bc2 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -41,57 +41,57 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PC2
-#define X_MAX_PIN          PA2
-#define Y_MIN_PIN          PC1
-#define Y_MAX_PIN          PA1
-#define Z_MIN_PIN          PC0
-#define Z_MAX_PIN          PC3
+#define X_MIN_PIN                           PC2
+#define X_MAX_PIN                           PA2
+#define Y_MIN_PIN                           PC1
+#define Y_MAX_PIN                           PA1
+#define Z_MIN_PIN                           PC0
+#define Z_MAX_PIN                           PC3
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PC7
-#define X_ENABLE_PIN       PB15
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PC7
+#define X_ENABLE_PIN                        PB15
 
-#define Y_STEP_PIN         PB13
-#define Y_DIR_PIN          PB14
-#define Y_ENABLE_PIN       PB12
+#define Y_STEP_PIN                          PB13
+#define Y_DIR_PIN                           PB14
+#define Y_ENABLE_PIN                        PB12
 
-#define Z_STEP_PIN         PB10
-#define Z_DIR_PIN          PB11
-#define Z_ENABLE_PIN       PB2
+#define Z_STEP_PIN                          PB10
+#define Z_DIR_PIN                           PB11
+#define Z_ENABLE_PIN                        PB2
 
-#define E0_STEP_PIN        PC5
-#define E0_DIR_PIN         PB0
-#define E0_ENABLE_PIN      PC4
+#define E0_STEP_PIN                         PC5
+#define E0_DIR_PIN                          PB0
+#define E0_ENABLE_PIN                       PC4
 
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
+    #define TMC_SW_SCK                      PB3
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB4
+    #define TMC_SW_MISO                     PB4
   #endif
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB5
+    #define TMC_SW_MOSI                     PB5
   #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA8
-#define FAN_PIN            PC8
-#define HEATER_BED_PIN     PC9
+#define HEATER_0_PIN                        PA8
+#define FAN_PIN                             PC8
+#define HEATER_BED_PIN                      PC9
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PB1   // Analog Input
-#define TEMP_0_PIN         PA0   // Analog Input
+#define TEMP_BED_PIN                        PB1   // Analog Input
+#define TEMP_0_PIN                          PA0   // Analog Input
 
 //
 // LCD Pins
@@ -109,41 +109,41 @@
  */
 
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PC10
-  #define BTN_ENC          PC11
+  #define BEEPER_PIN                        PC10
+  #define BTN_ENC                           PC11
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PC15
+    #define LCD_PINS_RS                     PC15
 
-    #define BTN_EN1        PB6
-    #define BTN_EN2        PC13
+    #define BTN_EN1                         PB6
+    #define BTN_EN2                         PC13
 
-    #define LCD_PINS_ENABLE PC14
-    #define LCD_PINS_D4    PB7
+    #define LCD_PINS_ENABLE                 PC14
+    #define LCD_PINS_D4                     PB7
 
   #else
 
-    #define LCD_PINS_RS      PC12
+    #define LCD_PINS_RS                     PC12
 
-    #define BTN_EN1          PD2
-    #define BTN_EN2          PB8
+    #define BTN_EN1                         PD2
+    #define BTN_EN2                         PB8
 
-    #define LCD_PINS_ENABLE  PB6
+    #define LCD_PINS_ENABLE                 PB6
 
     #if ENABLED(FYSETC_MINI_12864)
 
-      #define LCD_BACKLIGHT_PIN -1
-      #define LCD_RESET_PIN  PC13
-      #define DOGLCD_A0      PC12
-      #define DOGLCD_CS      PB6
-      #define DOGLCD_SCK     PB3
-      #define DOGLCD_MOSI    PB5
+      #define LCD_BACKLIGHT_PIN             -1
+      #define LCD_RESET_PIN                 PC13
+      #define DOGLCD_A0                     PC12
+      #define DOGLCD_CS                     PB6
+      #define DOGLCD_SCK                    PB3
+      #define DOGLCD_MOSI                   PB5
 
-      #define FORCE_SOFT_SPI   // SPI MODE3
+      #define FORCE_SOFT_SPI                      // SPI MODE3
 
-      #define LED_PIN        PB7   // red pwm
-      //#define LED_PIN        PC15   // green
-      //#define LED_PIN        PC14   // blue
+      #define LED_PIN                       PB7   // red pwm
+      //#define LED_PIN                     PC15  // green
+      //#define LED_PIN                     PC14  // blue
 
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       //  #ifndef RGB_LED_R_PIN
@@ -159,13 +159,13 @@
       //  #define NEOPIXEL_PIN    PB7
       //#endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
-    #define LCD_PINS_D4    PC13
+    #define LCD_PINS_D4                     PC13
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PB7
-      #define LCD_PINS_D6  PC15
-      #define LCD_PINS_D7  PC14
+      #define LCD_PINS_D5                   PB7
+      #define LCD_PINS_D6                   PC15
+      #define LCD_PINS_D7                   PC14
     #endif
 
     #endif // !FYSETC_MINI_12864
@@ -182,26 +182,26 @@
 // set SDCARD_CONNECTION form 'ONBOARD' to 'LCD' and use an external SD (connected to LCD)
 #define HAS_ONBOARD_SD
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI3
-  #define SD_DETECT_PIN    PB9
-  #define SCK_PIN          PB3
-  #define MISO_PIN         PB4
-  #define MOSI_PIN         PB5
-  #define SS_PIN           PA15
+  #define SD_DETECT_PIN                     PB9
+  #define SCK_PIN                           PB3
+  #define MISO_PIN                          PB4
+  #define MOSI_PIN                          PB5
+  #define SS_PIN                            PA15
 #elif SD_CONNECTION_IS(ONBOARD)
   #define ENABLE_SPI1
-  #define SD_DETECT_PIN    PA3
-  #define SCK_PIN          PA5
-  #define MISO_PIN         PA6
-  #define MOSI_PIN         PA7
-  #define SS_PIN           PA4
+  #define SD_DETECT_PIN                     PA3
+  #define SCK_PIN                           PA5
+  #define MISO_PIN                          PA6
+  #define MOSI_PIN                          PA7
+  #define SS_PIN                            PA4
 #endif
-#define ON_BOARD_SPI_DEVICE 1    //SPI1
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card
+#define ON_BOARD_SPI_DEVICE 1                     //SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
 
 #if HAS_GRAPHICAL_LCD
   #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index 2db6b1bc0b92..b9272c721167 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -41,69 +41,67 @@
 //
 // Steppers
 //
-#define X_STEP_PIN         PE5
-#define X_DIR_PIN          PE6
-#define X_ENABLE_PIN       PC13
-#define X_MIN_PIN          PG10
-#define X_MAX_PIN          -1
-
-#define Y_STEP_PIN         PE2
-#define Y_DIR_PIN          PE3
-#define Y_ENABLE_PIN       PE4
-#define Y_MIN_PIN          PA12
+#define X_STEP_PIN                          PE5
+#define X_DIR_PIN                           PE6
+#define X_ENABLE_PIN                        PC13
+#define X_MIN_PIN                           PG10
+#define X_MAX_PIN                           -1
+
+#define Y_STEP_PIN                          PE2
+#define Y_DIR_PIN                           PE3
+#define Y_ENABLE_PIN                        PE4
+#define Y_MIN_PIN                           PA12
 #define Y_MAX_PIN
 
-#define Z_STEP_PIN         PB9
-#define Z_DIR_PIN          PE0
-#define Z_ENABLE_PIN       PE1
-#define Z_MIN_PIN          PA14
-#define Z_MAX_PIN          -1
+#define Z_STEP_PIN                          PB9
+#define Z_DIR_PIN                           PE0
+#define Z_ENABLE_PIN                        PE1
+#define Z_MIN_PIN                           PA14
+#define Z_MAX_PIN                           -1
 
-#define Y2_STEP_PIN        -1
-#define Y2_DIR_PIN         -1
-#define Y2_ENABLE_PIN      -1
+#define Y2_STEP_PIN                         -1
+#define Y2_DIR_PIN                          -1
+#define Y2_ENABLE_PIN                       -1
 
-#define Z2_STEP_PIN        -1
-#define Z2_DIR_PIN         -1
-#define Z2_ENABLE_PIN      -1
+#define Z2_STEP_PIN                         -1
+#define Z2_DIR_PIN                          -1
+#define Z2_ENABLE_PIN                       -1
 
-#define E0_STEP_PIN        PB4
-#define E0_DIR_PIN         PB5
-#define E0_ENABLE_PIN      PB8
+#define E0_STEP_PIN                         PB4
+#define E0_DIR_PIN                          PB5
+#define E0_ENABLE_PIN                       PB8
 
+#define E1_STEP_PIN                         -1
+#define E1_DIR_PIN                          -1
+#define E1_ENABLE_PIN                       -1
 
-
-#define E1_STEP_PIN        -1
-#define E1_DIR_PIN         -1
-#define E1_ENABLE_PIN      -1
-
-#define E2_STEP_PIN        -1
-#define E2_DIR_PIN         -1
-#define E2_ENABLE_PIN      -1
+#define E2_STEP_PIN                         -1
+#define E2_DIR_PIN                          -1
+#define E2_ENABLE_PIN                       -1
 
 //
 // Misc. Functions
 //
-#define SDSS               -1
-#define LED_PIN            -1
-#define CASE_LIGHT_PIN     PA8   // 8
+#define SDSS                                -1
+#define LED_PIN                             -1
+#define CASE_LIGHT_PIN                      PA8   // 8
 
-#define PS_ON_PIN          -1
-#define KILL_PIN           PD6      // LED strip 24v
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            PD6   // LED strip 24v
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PD12     // HOT-END
-#define HEATER_1_PIN       -1
-#define HEATER_2_PIN       -1
+#define HEATER_0_PIN                        PD12  // HOT-END
+#define HEATER_1_PIN                        -1
+#define HEATER_2_PIN                        -1
 
-#define HEATER_BED_PIN     PG11     // HOT-BED
-#define HEATER_BED2_PIN    -1       // BED2
-#define HEATER_BED3_PIN    -1       // BED3
+#define HEATER_BED_PIN                      PG11  // HOT-BED
+#define HEATER_BED2_PIN                     -1    // BED2
+#define HEATER_BED3_PIN                     -1    // BED3
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PG14     // MAIN BOARD FAN
+  #define FAN_PIN                           PG14  // MAIN BOARD FAN
 #endif
 
 #define FAN_SOFT_PWM
@@ -111,10 +109,10 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA0  // Analog Input
-#define TEMP_0_PIN         PA1  // Analog Input
-#define TEMP_1_PIN         -1   // Analog Input
-#define TEMP_2_PIN         -1   // Analog Input
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          -1    // Analog Input
+#define TEMP_2_PIN                          -1    // Analog Input
 
 //
 // LCD Pins
@@ -122,31 +120,31 @@
 #if HAS_SPI_LCD
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         PD1   // 49  // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     PD3   // 51  // SID (MOSI)
-    #define LCD_PINS_D4         PD4   // 52  // SCK (CLK) clock
+    #define LCD_PINS_RS                     PD1   // 49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PD3   // 51  // SID (MOSI)
+    #define LCD_PINS_D4                     PD4   // 52  // SCK (CLK) clock
   #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
   #else
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
     #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        PC1   // 33
+      #define BEEPER_PIN                    PC1   // 33
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       PC6   // 38
-      //#define SHIFT_LD        PC10  // 42
-      //#define SHIFT_OUT       PC8   // 40
-      //#define SHIFT_EN        PA1   // 17
+      //#define SHIFT_CLK                   PC6   // 38
+      //#define SHIFT_LD                    PC10  // 42
+      //#define SHIFT_OUT                   PC8   // 40
+      //#define SHIFT_EN                    PA1   // 17
     #endif
   #endif
 
@@ -154,127 +152,127 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        PC5
+      #define BEEPER_PIN                    PC5
 
-      #define BTN_EN1           PB15  // 31
-      #define BTN_EN2           PC1   // 33
-      #define BTN_ENC           PC3   // 35
+      #define BTN_EN1                       PB15  // 31
+      #define BTN_EN2                       PC1   // 33
+      #define BTN_ENC                       PC3   // 35
 
-      #define SD_DETECT_PIN     PD1   // 49
-      #define KILL_PIN          PC9   // 41
+      #define SD_DETECT_PIN                 PD1   // 49
+      #define KILL_PIN                      PC9   // 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN PC7   // 39
+        #define LCD_BACKLIGHT_PIN           PC7   // 39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           PE0   // 64
-      #define BTN_EN2           PD11  // 59
-      #define BTN_ENC           PD15  // 63
-      #define SD_DETECT_PIN     PC10  // 42
+      #define BTN_EN1                       PE0   // 64
+      #define BTN_EN2                       PD11  // 59
+      #define BTN_ENC                       PD15  // 63
+      #define SD_DETECT_PIN                 PC10  // 42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           PC15  // 47
-      #define BTN_EN2           PC11  // 43
-      #define BTN_ENC           PC0   // 32
-      #define LCD_SDSS          PD5   // 53
-      #define SD_DETECT_PIN     -1
-      #define KILL_PIN          PC9   // 41
+      #define BTN_EN1                       PC15  // 47
+      #define BTN_EN2                       PC11  // 43
+      #define BTN_ENC                       PC0   // 32
+      #define LCD_SDSS                      PD5   // 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN                      PC9   // 41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           PB6   // 22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2           PA7   //  7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1                       PB6   // 22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                       PA7   //  7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
 
-      #define BTN_ENC           -1
-      #define LCD_SDSS          PD5   // 53
-      #define SD_DETECT_PIN     PD1   // 49
+      #define BTN_ENC                       -1
+      #define LCD_SDSS                      PD5   // 53
+      #define SD_DETECT_PIN                 PD1   // 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        PC1   // 33
+      #define BEEPER_PIN                    PC1   // 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         PC12  // 44
-      #define DOGLCD_CS         PC13  // 45
+      #define DOGLCD_A0                     PC12  // 44
+      #define DOGLCD_CS                     PC13  // 45
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1           PB6   // 22
-      #define BTN_EN2           PA7   //  7
-      #define BTN_ENC           PC7   // 39
+      #define BTN_EN1                       PB6   // 22
+      #define BTN_EN2                       PA7   //  7
+      #define BTN_ENC                       PC7   // 39
 
-      #define SDSS              PD5   // 53
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
+      #define SDSS                          PD5   // 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          PB15  // 31
+      #define KILL_PIN                      PB15  // 31
 
-      #define STAT_LED_RED_PIN  PC0   // 32
-      #define STAT_LED_BLUE_PIN PC3   // 35
+      #define STAT_LED_RED_PIN              PC0   // 32
+      #define STAT_LED_BLUE_PIN             PC3   // 35
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-      #define BTN_EN1           PC3   // 35
-      #define BTN_EN2           PC5   // 37
-      #define BTN_ENC           PB15  // 31
-      #define SD_DETECT_PIN     PD1   // 49
-      #define LCD_SDSS          PD5   // 53
-      #define KILL_PIN          PC9   // 41
-      #define BEEPER_PIN        PB7   // 23
-      #define DOGLCD_CS         PB13  // 29
-      #define DOGLCD_A0         PB11  // 27
-      #define LCD_BACKLIGHT_PIN PC1   // 33
+      #define BTN_EN1                       PC3   // 35
+      #define BTN_EN2                       PC5   // 37
+      #define BTN_ENC                       PB15  // 31
+      #define SD_DETECT_PIN                 PD1   // 49
+      #define LCD_SDSS                      PD5   // 53
+      #define KILL_PIN                      PC9   // 41
+      #define BEEPER_PIN                    PB7   // 23
+      #define DOGLCD_CS                     PB13  // 29
+      #define DOGLCD_A0                     PB11  // 27
+      #define LCD_BACKLIGHT_PIN             PC1   // 33
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        PC10  // 42
+      #define BEEPER_PIN                    PC10  // 42
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         PC12  // 44
-      #define DOGLCD_CS         PE2   // 66
-      #define LCD_BACKLIGHT_PIN PE1   // 65   // backlight LED on A11/D65
-      #define SDSS              PD5   // 53
+      #define DOGLCD_A0                     PC12  // 44
+      #define DOGLCD_CS                     PE2   // 66
+      #define LCD_BACKLIGHT_PIN             PE1   // 65   // backlight LED on A11/D65
+      #define SDSS                          PD5   // 53
 
-      #define KILL_PIN          PE0   // 64
+      #define KILL_PIN                      PE0   // 64
       // GLCD features
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
       // The encoder and click button
-      #define BTN_EN1           PC8   // 40
-      #define BTN_EN2           PD15  // 63
-      #define BTN_ENC           PD11  // 59
+      #define BTN_EN1                       PC8   // 40
+      #define BTN_EN2                       PD15  // 63
+      #define BTN_ENC                       PD11  // 59
       // not connected to a pin
-      #define SD_DETECT_PIN     PD1   // 49
+      #define SD_DETECT_PIN                 PD1   // 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        PC1   // 33
+      #define BEEPER_PIN                    PC1   // 33
 
       // Buttons directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         PE0   // 64
-        #define BTN_EN2         PD11  // 59
-        #define BTN_ENC         PD15  // 63
-        #define SHIFT_OUT       PC8   // 40
-        #define SHIFT_CLK       PC12  // 44
-        #define SHIFT_LD        PC10  // 42
+        #define BTN_EN1                     PE0   // 64
+        #define BTN_EN2                     PD11  // 59
+        #define BTN_ENC                     PD15  // 63
+        #define SHIFT_OUT                   PC8   // 40
+        #define SHIFT_CLK                   PC12  // 44
+        #define SHIFT_LD                    PC10  // 42
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         PD11  // 59   // AUX2 PIN 3
-        #define BTN_EN2         PD15  // 63   // AUX2 PIN 4
-        #define BTN_ENC         PD1   // 49   // AUX3 PIN 7
+        #define BTN_EN1                     PD11  // 59   // AUX2 PIN 3
+        #define BTN_EN2                     PD15  // 63   // AUX2 PIN 4
+        #define BTN_ENC                     PD1   // 49   // AUX3 PIN 7
       #else
-        #define BTN_EN1         PC5   // 37
-        #define BTN_EN2         PC3   // 35
-        #define BTN_ENC         PB15  // 31
+        #define BTN_EN1                     PC5   // 37
+        #define BTN_EN2                     PC3   // 35
+        #define BTN_ENC                     PB15  // 31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   PD1   // 49
-        #define KILL_PIN        PC9   // 41
+        #define SD_DETECT_PIN               PD1   // 49
+        #define KILL_PIN                    PC9   // 41
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index db76042ab7f3..dcd1119c8648 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
@@ -46,55 +46,55 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA1
-#define Y_STOP_PIN         PA0
-#define Z_STOP_PIN         PB14
+#define X_STOP_PIN                          PA1
+#define Y_STOP_PIN                          PA0
+#define Z_STOP_PIN                          PB14
 
 //
 // Filament runout
 //
 #ifdef pins_v2_20190128
-  #define FIL_RUNOUT_PIN   PB15
+  #define FIL_RUNOUT_PIN                    PB15
 #else
-  #define FIL_RUNOUT_PIN   PB5
+  #define FIL_RUNOUT_PIN                    PB5
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PB8
-#define X_DIR_PIN          PB9
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB9
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PB2
+#define Y_STEP_PIN                          PB2
 #ifdef pins_v2_20190128
-  #define Y_DIR_PIN        PB3
+  #define Y_DIR_PIN                         PB3
 #else
-  #define Y_DIR_PIN        PB0
+  #define Y_DIR_PIN                         PB0
 #endif
-#define Y_ENABLE_PIN       PB1
+#define Y_ENABLE_PIN                        PB1
 
-#define Z_STEP_PIN         PC0
-#define Z_DIR_PIN          PC1
-#define Z_ENABLE_PIN       PC2
+#define Z_STEP_PIN                          PC0
+#define Z_DIR_PIN                           PC1
+#define Z_ENABLE_PIN                        PC2
 
-#define E0_STEP_PIN        PC15
-#define E0_DIR_PIN         PC14
-#define E0_ENABLE_PIN      PC13
+#define E0_STEP_PIN                         PC15
+#define E0_DIR_PIN                          PC14
+#define E0_ENABLE_PIN                       PC13
 
 //
 // Stepper current PWM
 //
 
 // X:PA2 Y:PA3 Z:PB12 E:PB13 // changed for test
-//#define MOTOR_CURRENT_PWM_XY_PIN PA3
-//#define MOTOR_CURRENT_PWM_Z_PIN  PA2 // PB12
-//#define MOTOR_CURRENT_PWM_XY_PIN PB6
-//#define MOTOR_CURRENT_PWM_Z_PIN  PB7 // PB12
-//#define MOTOR_CURRENT_PWM_E_PIN  -1  // PB13
+//#define MOTOR_CURRENT_PWM_XY_PIN          PA3
+//#define MOTOR_CURRENT_PWM_Z_PIN           PA2   // PB12
+//#define MOTOR_CURRENT_PWM_XY_PIN          PB6
+//#define MOTOR_CURRENT_PWM_Z_PIN           PB7   // PB12
+//#define MOTOR_CURRENT_PWM_E_PIN           -1    // PB13
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE 1500 // geo-f:old 2000
+  #define MOTOR_CURRENT_PWM_RANGE 1500            // geo-f:old 2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {500, 500, 400} // geo-f:old 1300 1300 1250
 
@@ -112,37 +112,37 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC7
-#define HEATER_BED_PIN     PC6
+#define HEATER_0_PIN                        PC7
+#define HEATER_BED_PIN                      PC6
 #ifndef FAN_PIN
-  #define FAN_PIN          PC8
+  #define FAN_PIN                           PC8
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PC5   // Analog Input
-#define TEMP_0_PIN         PC4   // Analog Input
+#define TEMP_BED_PIN                        PC5   // Analog Input
+#define TEMP_0_PIN                          PC4   // Analog Input
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
+#define SDSS                                PA4
 
 //
 // LCD Pins
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       PC9
+  #define BEEPER_PIN                        PC9
 
   #if HAS_GRAPHICAL_LCD
 
-    #define DOGLCD_A0      PA15
+    #define DOGLCD_A0                       PA15
     #ifdef pins_v2_20190128
-      #define DOGLCD_CS    PB5
+      #define DOGLCD_CS                     PB5
     #else
-      #define DOGLCD_CS    PB7
+      #define DOGLCD_CS                     PB7
     #endif
 
     //#define LCD_CONTRAST_INIT 190
@@ -153,36 +153,36 @@
   #endif
 
   // not connected to a pin
-  #define SD_DETECT_PIN    PC3
+  #define SD_DETECT_PIN                     PC3
 
   #if ENABLED(NEWPANEL)
     // The encoder and click button
-    #define BTN_EN1        PC10
-    #define BTN_EN2        PC11
-    #define BTN_ENC        PC12
+    #define BTN_EN1                         PC10
+    #define BTN_EN2                         PC11
+    #define BTN_ENC                         PC12
   #endif
 
   #ifdef pins_v2_20190128
-    #define LCD_RESET_PIN  PB4
+    #define LCD_RESET_PIN                   PB4
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN PB0
+      #define RGB_LED_R_PIN                 PB0
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB6
+      #define RGB_LED_G_PIN                 PB6
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB7
+      #define RGB_LED_B_PIN                 PB7
     #endif
   #else
-    #define LCD_RESET_PIN  PB6
+    #define LCD_RESET_PIN                   PB6
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN PB3
+      #define RGB_LED_R_PIN                 PB3
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB4
+      #define RGB_LED_G_PIN                 PB4
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB5
+      #define RGB_LED_B_PIN                 PB5
     #endif
   #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index a845ed161b7d..e726ca1831a7 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -44,38 +44,38 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA0
+#define SERVO0_PIN                          PA0
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA1
-#define Y_STOP_PIN         PB4
-#define Z_STOP_PIN         PA15
+#define X_STOP_PIN                          PA1
+#define Y_STOP_PIN                          PB4
+#define Z_STOP_PIN                          PA15
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PB5
+#define FIL_RUNOUT_PIN                      PB5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PB8
-#define X_DIR_PIN          PB9
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB9
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PB2
-#define Y_DIR_PIN          PB3
-#define Y_ENABLE_PIN       PB1
+#define Y_STEP_PIN                          PB2
+#define Y_DIR_PIN                           PB3
+#define Y_ENABLE_PIN                        PB1
 
-#define Z_STEP_PIN         PC0
-#define Z_DIR_PIN          PC1
-#define Z_ENABLE_PIN       PC2
+#define Z_STEP_PIN                          PC0
+#define Z_DIR_PIN                           PC1
+#define Z_ENABLE_PIN                        PC2
 
-#define E0_STEP_PIN        PC15
-#define E0_DIR_PIN         PC14
-#define E0_ENABLE_PIN      PC13
+#define E0_STEP_PIN                         PC15
+#define E0_DIR_PIN                          PC14
+#define E0_ENABLE_PIN                       PC13
 
 #define X_HARDWARE_SERIAL  MSerial2
 #define Y_HARDWARE_SERIAL  MSerial2
@@ -85,35 +85,35 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC6
-#define HEATER_BED_PIN     PC7
+#define HEATER_0_PIN                        PC6
+#define HEATER_BED_PIN                      PC7
 #ifndef FAN_PIN
-  #define FAN_PIN          PC8
+  #define FAN_PIN                           PC8
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PC5   // Analog Input
-#define TEMP_0_PIN         PC4   // Analog Input
+#define TEMP_BED_PIN                        PC5   // Analog Input
+#define TEMP_0_PIN                          PC4   // Analog Input
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
+#define SDSS                                PA4
 
 //
 // LCD Pins
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       PC9
+  #define BEEPER_PIN                        PC9
 
   #if HAS_GRAPHICAL_LCD
-    #define DOGLCD_A0      PB14
-    #define DOGLCD_CS      PB12
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
+    #define DOGLCD_A0                       PB14
+    #define DOGLCD_CS                       PB12
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
     //#define LCD_SCREEN_ROT_90
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
@@ -123,29 +123,29 @@
     #endif
   #endif
 
-  #define LCD_PINS_RS      PB12   // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4      PB13   // SCLK
-  #define LCD_PINS_ENABLE  PB15   // DATA MOSI
+  #define LCD_PINS_RS                       PB12  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                       PB13  // SCLK
+  #define LCD_PINS_ENABLE                   PB15  // DATA MOSI
 
   // not connected to a pin
-  #define SD_DETECT_PIN    PC3
+  #define SD_DETECT_PIN                     PC3
 
   #ifndef RGB_LED_R_PIN
-    #define RGB_LED_R_PIN  PB0
+    #define RGB_LED_R_PIN                   PB0
   #endif
   #ifndef RGB_LED_G_PIN
-    #define RGB_LED_G_PIN  PB7
+    #define RGB_LED_G_PIN                   PB7
   #endif
   #ifndef RGB_LED_B_PIN
-    #define RGB_LED_B_PIN  PB6
+    #define RGB_LED_B_PIN                   PB6
   #endif
 
   //#define LCD_CONTRAST_INIT 190
 
   #if ENABLED(NEWPANEL)
-    #define BTN_EN1        PC11
-    #define BTN_EN2        PC10
-    #define BTN_ENC        PC12
+    #define BTN_EN1                         PC11
+    #define BTN_EN2                         PC10
+    #define BTN_ENC                         PC12
   #endif
 
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
index 3e283911b464..9c6412c0cb53 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
@@ -36,7 +36,7 @@
 #undef RGB_LED_G_PIN
 #undef RGB_LED_B_PIN
 
-#define FAN1_PIN          PB0 // Fan1
+#define FAN1_PIN                           PB0    // Fan1
 
 #if HAS_TMC_UART
 
@@ -47,17 +47,17 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PA11
-  #define X_SERIAL_RX_PIN  PA12
+  #define X_SERIAL_TX_PIN                  PA11
+  #define X_SERIAL_RX_PIN                  PA12
 
-  #define Y_SERIAL_TX_PIN  PB6
-  #define Y_SERIAL_RX_PIN  PB7
+  #define Y_SERIAL_TX_PIN                  PB6
+  #define Y_SERIAL_RX_PIN                  PB7
 
-  #define Z_SERIAL_TX_PIN  PB10
-  #define Z_SERIAL_RX_PIN  PB11
+  #define Z_SERIAL_TX_PIN                  PB10
+  #define Z_SERIAL_RX_PIN                  PB11
 
-  #define E0_SERIAL_TX_PIN PA2
-  #define E0_SERIAL_RX_PIN PA3
+  #define E0_SERIAL_TX_PIN                 PA2
+  #define E0_SERIAL_RX_PIN                 PA3
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index a35bd298884b..38cc615f64c6 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE1   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE0   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE1   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE0   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXT0 port
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9   // EXT0 port, used as main extruder fan
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
+//#define FAN_PIN                           PB9   // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -138,19 +138,19 @@
     // Geeetech's LCD2004A Control Panel is very much like
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
   #else
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
@@ -167,9 +167,9 @@
   // RepRapDiscount Smart Controller, but adds an FFC40 connector
   // connected with a flat wire to J2 connector on the board.
   //
-  #define BTN_EN1          PE8
-  #define BTN_EN2          PE9
-  #define BTN_ENC          PE13
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE9
+  #define BTN_ENC                           PE13
 
   #define GTM32_PRO_VB_USE_LCD_BEEPER
   #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -182,10 +182,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -203,28 +203,28 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PC11
-  #define SCK_PIN          PC12
-  #define MOSI_PIN         PD2
-  #define MISO_PIN         PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PC11
+  #define SCK_PIN                           PC12
+  #define MOSI_PIN                          PD2
+  #define MISO_PIN                          PC8
+  #define SD_DETECT_PIN                     PC7
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index 4c14165f799d..873d02b065a2 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE0   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE1   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE0   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE1   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXT0 port
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9   // EXT0 port, used as main extruder fan
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
+//#define FAN_PIN                           PB9   // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -139,16 +139,16 @@
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     // connected with a flat wire to J2 connector on the board.
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
-    #define BTN_EN1          PE8
-    #define BTN_EN2          PE9
-    #define BTN_ENC          PE13
+    #define BTN_EN1                         PE8
+    #define BTN_EN2                         PE9
+    #define BTN_ENC                         PE13
 
     #define GTM32_PRO_VB_USE_LCD_BEEPER
     #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -157,8 +157,8 @@
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
@@ -182,10 +182,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -203,28 +203,28 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PC11
-  #define SCK_PIN          PC12
-  #define MOSI_PIN         PD2
-  #define MISO_PIN         PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PC11
+  #define SCK_PIN                           PC12
+  #define MOSI_PIN                          PD2
+  #define MISO_PIN                          PC8
+  #define SD_DETECT_PIN                     PC7
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index a35bd298884b..38cc615f64c6 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE1   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE0   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE1   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE0   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXT0 port
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9   // EXT0 port, used as main extruder fan
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
+//#define FAN_PIN                           PB9   // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -138,19 +138,19 @@
     // Geeetech's LCD2004A Control Panel is very much like
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
   #else
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
@@ -167,9 +167,9 @@
   // RepRapDiscount Smart Controller, but adds an FFC40 connector
   // connected with a flat wire to J2 connector on the board.
   //
-  #define BTN_EN1          PE8
-  #define BTN_EN2          PE9
-  #define BTN_ENC          PE13
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE9
+  #define BTN_ENC                           PE13
 
   #define GTM32_PRO_VB_USE_LCD_BEEPER
   #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -182,10 +182,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -203,28 +203,28 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PC11
-  #define SCK_PIN          PC12
-  #define MOSI_PIN         PD2
-  #define MISO_PIN         PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PC11
+  #define SCK_PIN                           PC12
+  #define MOSI_PIN                          PD2
+  #define MISO_PIN                          PC8
+  #define SD_DETECT_PIN                     PC7
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index e02b8b9377b5..24196ad892ff 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE1   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE0   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE1   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE0   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans - INFO: Extruders ports are in reverse order. Pin numbers here differ from schematic. Original firmware assumes heater, fan and temp sensor on port EXT0 PB0, PB9, PC2.
 //
-#define HEATER_0_PIN       PB0   // EXT0 port.
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port.
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
-#define ORIG_E0_AUTO_FAN_PIN  PB9  // EXT0 port, used as main extruder fan
+//#define FAN_PIN                           PB9   // EXT0 port
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -140,16 +140,16 @@
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     // connected with a flat wire to J2 connector on the board.
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
-    #define BTN_EN1        PE8
-    #define BTN_EN2        PE9
-    #define BTN_ENC        PE13
+    #define BTN_EN1                         PE8
+    #define BTN_EN2                         PE9
+    #define BTN_ENC                         PE13
 
     //#define GTM32_PRO_VB_USE_LCD_BEEPER
     #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -158,19 +158,19 @@
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
     #ifndef ST7920_DELAY_1
-      #define ST7920_DELAY_1 DELAY_NS(96)
+      #define ST7920_DELAY_1        DELAY_NS(96)
     #endif
     #ifndef ST7920_DELAY_2
-      #define ST7920_DELAY_2 DELAY_NS(48)
+      #define ST7920_DELAY_2        DELAY_NS(48)
     #endif
     #ifndef ST7920_DELAY_3
-      #define ST7920_DELAY_3 DELAY_NS(715)
+      #define ST7920_DELAY_3       DELAY_NS(715)
     #endif
   #endif
 
@@ -183,10 +183,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -204,29 +204,29 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PB12   // PC11
-  #define SCK_PIN          PB13   // PC12 // PC1
-  #define MOSI_PIN         PB15   // PD2  // PD2
-  #define MISO_PIN         PB14   // PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PB12  // PC11
+  #define SCK_PIN                           PB13  // PC12 // PC1
+  #define MOSI_PIN                          PB15  // PD2  // PD2
+  #define MISO_PIN                          PB14  // PC8
+  #define SD_DETECT_PIN                     PC7
 
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6 // PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6   // PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index 3849af3ae3a7..6395f6efc934 100644
--- a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -42,10 +42,10 @@
 // #define MCU_STM32F103ZE // not yet required
 // Enable EEPROM Emulation for this board, so that we don't overwrite factory data
 
-//#define I2C_EEPROM   // AT24C64
-//#define E2END 0x7FFF // 64KB
+//#define I2C_EEPROM                              // AT24C64
+//#define E2END 0x7FFF                            // 64KB
 //#define FLASH_EEPROM_EMULATION
-//#define E2END 0xFFF // 4KB
+//#define E2END 0xFFF                             // 4KB
 //#define E2END uint32(EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE * 2) - 1)
 //#define EEPROM_CHITCHAT
 //#define DEBUG_EEPROM_READWRITE
@@ -53,78 +53,78 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC6
-#define Y_STOP_PIN         PG8
-#define Z_STOP_PIN         PG7
-//#define X_MAX_PIN          PC5
-//#define Y_MAX_PIN          PC4
-//#define Z_MAX_PIN          PB0
+#define X_STOP_PIN                          PC6
+#define Y_STOP_PIN                          PG8
+#define Z_STOP_PIN                          PG7
+//#define X_MAX_PIN                         PC5
+//#define Y_MAX_PIN                         PC4
+//#define Z_MAX_PIN                         PB0
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PD6
-#define X_DIR_PIN          PD3
-#define X_ENABLE_PIN       PG9
+#define X_STEP_PIN                          PD6
+#define X_DIR_PIN                           PD3
+#define X_ENABLE_PIN                        PG9
 
-#define Y_STEP_PIN         PG12
-#define Y_DIR_PIN          PG11
-#define Y_ENABLE_PIN       PG13
+#define Y_STEP_PIN                          PG12
+#define Y_DIR_PIN                           PG11
+#define Y_ENABLE_PIN                        PG13
 
-#define Z_STEP_PIN         PG15
-#define Z_DIR_PIN          PG14
-#define Z_ENABLE_PIN       PB8
+#define Z_STEP_PIN                          PG15
+#define Z_DIR_PIN                           PG14
+#define Z_ENABLE_PIN                        PB8
 
-#define E0_STEP_PIN        PE2
-#define E0_DIR_PIN         PB9
-#define E0_ENABLE_PIN      PE3
+#define E0_STEP_PIN                         PE2
+#define E0_DIR_PIN                          PB9
+#define E0_ENABLE_PIN                       PE3
 
-#define E1_STEP_PIN        PE5
-#define E1_DIR_PIN         PE4
-#define E1_ENABLE_PIN      PE6
+#define E1_STEP_PIN                         PE5
+#define E1_DIR_PIN                          PE4
+#define E1_ENABLE_PIN                       PE6
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2
-#define TEMP_BED_PIN       PC1
+#define TEMP_0_PIN                          PC2
+#define TEMP_BED_PIN                        PC1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA2
-#define HEATER_BED_PIN     PA3
+#define HEATER_0_PIN                        PA2
+#define HEATER_BED_PIN                      PA3
 
-#define FAN_PIN            PA1
+#define FAN_PIN                             PA1
 
-#define FIL_RUNOUT_PIN     PC7
+#define FIL_RUNOUT_PIN                      PC7
 
 //
 // LCD
 //
-#define LCD_BACKLIGHT_PIN  PF11
-#define FSMC_CS_PIN        PD7
-#define FSMC_RS_PIN        PG0
+#define LCD_BACKLIGHT_PIN                   PF11
+#define FSMC_CS_PIN                         PD7
+#define FSMC_RS_PIN                         PG0
 
-#define LCD_USE_DMA_FSMC          // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV       DMA2
-#define FSMC_DMA_CHANNEL   DMA_CH5
+#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV                        DMA2
+#define FSMC_DMA_CHANNEL                 DMA_CH5
 
 //
 // SD Card
 //
-#define SD_DETECT_PIN      PF10
+#define SD_DETECT_PIN                       PF10
 
 //
 // Misc.
 //
-#define BEEPER_PIN         PC3    // use PB7 to shut up if desired
-#define LED_PIN            PC13
+#define BEEPER_PIN                          PC3   // use PB7 to shut up if desired
+#define LED_PIN                             PC13
 
 //
 // Touch support
 //
 #if ENABLED(TOUCH_BUTTONS)
-  #define TOUCH_CS_PIN     PA4
-  #define TOUCH_INT_PIN    PC4
+  #define TOUCH_CS_PIN                      PA4
+  #define TOUCH_INT_PIN                     PC4
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 66c5b55ecb74..83881c128de7 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -29,20 +29,20 @@
 #endif
 
 #define BOARD_INFO_NAME "Longer3D"
-#define ALFAWISE_UX0             // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
+#define ALFAWISE_UX0                              // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
 
-//#define DISABLE_DEBUG          //  We still want to debug with STLINK...
-#define DISABLE_JTAG             //  We free the jtag pins (PA15) but keep STLINK
-                                 //  Release PB4 (STEP_X_PIN) from JTAG NRST role.
+//#define DISABLE_DEBUG                           //  We still want to debug with STLINK...
+#define DISABLE_JTAG                              //  We free the jtag pins (PA15) but keep STLINK
+                                                  //  Release PB4 (STEP_X_PIN) from JTAG NRST role.
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PC1   // pin 16
-#define X_MAX_PIN          PC0   // pin 15 (Filament sensor on Alfawise setup)
-#define Y_MIN_PIN          PC15  // pin 9
-#define Y_MAX_PIN          PC14  // pin 8 (Unused in stock Alfawise setup)
-#define Z_MIN_PIN          PE6   // pin 5 Standard Endstop or Z_Probe endstop function
-#define Z_MAX_PIN          PE5   // pin 4 (Unused in stock Alfawise setup)
+#define X_MIN_PIN                           PC1   // pin 16
+#define X_MAX_PIN                           PC0   // pin 15 (Filament sensor on Alfawise setup)
+#define Y_MIN_PIN                           PC15  // pin 9
+#define Y_MAX_PIN                           PC14  // pin 8 (Unused in stock Alfawise setup)
+#define Z_MIN_PIN                           PE6   // pin 5 Standard Endstop or Z_Probe endstop function
+#define Z_MAX_PIN                           PE5   // pin 4 (Unused in stock Alfawise setup)
                                  // May be used for BLTouch Servo function on older variants (<= V08)
 #define ONBOARD_ENDSTOPPULLUPS
 
@@ -50,60 +50,60 @@
 // Filament Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC0   // XMAX plug on PCB used as filament runout sensor on Alfawise boards (inverting true)
+  #define FIL_RUNOUT_PIN                    PC0   // XMAX plug on PCB used as filament runout sensor on Alfawise boards (inverting true)
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PB5   // pin 91
-#define X_STEP_PIN         PB4   // pin 90
-#define X_DIR_PIN          PB3   // pin 89
+#define X_ENABLE_PIN                        PB5   // pin 91
+#define X_STEP_PIN                          PB4   // pin 90
+#define X_DIR_PIN                           PB3   // pin 89
 
-#define Y_ENABLE_PIN       PB8   // pin 95
-#define Y_STEP_PIN         PB7   // pin 93
-#define Y_DIR_PIN          PB6   // pin 92
+#define Y_ENABLE_PIN                        PB8   // pin 95
+#define Y_STEP_PIN                          PB7   // pin 93
+#define Y_DIR_PIN                           PB6   // pin 92
 
-#define Z_ENABLE_PIN       PE1   // pin 98
-#define Z_STEP_PIN         PE0   // pin 97
-#define Z_DIR_PIN          PB9   // pin 96
+#define Z_ENABLE_PIN                        PE1   // pin 98
+#define Z_STEP_PIN                          PE0   // pin 97
+#define Z_DIR_PIN                           PB9   // pin 96
 
-#define E0_ENABLE_PIN      PE4   // pin 3
-#define E0_STEP_PIN        PE3   // pin 2
-#define E0_DIR_PIN         PE2   // pin 1
+#define E0_ENABLE_PIN                       PE4   // pin 3
+#define E0_STEP_PIN                         PE3   // pin 2
+#define E0_DIR_PIN                          PE2   // pin 1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // pin 23 (Nozzle 100K/3950 thermistor)
-#define TEMP_BED_PIN       PA1   // pin 24 (Hot Bed 100K/3950 thermistor)
+#define TEMP_0_PIN                          PA0   // pin 23 (Nozzle 100K/3950 thermistor)
+#define TEMP_BED_PIN                        PA1   // pin 24 (Hot Bed 100K/3950 thermistor)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PD3   // pin 84 (Nozzle Heat Mosfet)
-#define HEATER_BED_PIN     PA8   // pin 67 (Hot Bed Mosfet)
+#define HEATER_0_PIN                        PD3   // pin 84 (Nozzle Heat Mosfet)
+#define HEATER_BED_PIN                      PA8   // pin 67 (Hot Bed Mosfet)
 
-#define FAN_PIN            PA15  // pin 77 (4cm Fan)
-#define FAN_SOFT_PWM             // Required to avoid issues with heating or STLink
-#define FAN_MIN_PWM        35    // Fan will not start in 1-30 range
-#define FAN_MAX_PWM        255
+#define FAN_PIN                             PA15  // pin 77 (4cm Fan)
+#define FAN_SOFT_PWM                              // Required to avoid issues with heating or STLink
+#define FAN_MIN_PWM 35                            // Fan will not start in 1-30 range
+#define FAN_MAX_PWM 255
 
-//#define BEEPER_PIN       PD13  // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
+//#define BEEPER_PIN                        PD13  // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
                                  // Can drive a PC Buzzer, if connected between PWM and 5V pins
 
-#define LED_PIN            PC2   // pin 17
+#define LED_PIN                             PC2   // pin 17
 
 //
 // PWM for a servo probe
 // Other servo devices are not supported on this board!
 //
 #if HAS_Z_SERVO_PROBE
-  #define SERVO0_PIN       PD13  // Open drain PWM pin on the V0G (GND or floating 5V)
-  #define SERVO0_PWM_OD          // Comment this if using PE5
+  #define SERVO0_PIN                        PD13  // Open drain PWM pin on the V0G (GND or floating 5V)
+  #define SERVO0_PWM_OD                           // Comment this if using PE5
 
-  //#define SERVO0_PIN     PE5   // Pulled up PWM pin on the V08 (3.3V or 0)
-  //#undef Z_MAX_PIN             // Uncomment if using ZMAX connector (PE5)
+  //#define SERVO0_PIN                      PE5   // Pulled up PWM pin on the V08 (3.3V or 0)
+  //#undef Z_MAX_PIN                              // Uncomment if using ZMAX connector (PE5)
 #endif
 
 /**
@@ -118,17 +118,17 @@
  * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
  */
 
-#define LCD_RESET_PIN      PC4   // pin 33
-#define LCD_BACKLIGHT_PIN  PD12  // pin 59
-#define FSMC_CS_PIN        PD7   // pin 88 = FSMC_NE1
-#define FSMC_RS_PIN        PD11  // pin 58 A16 Register. Only one address needed
+#define LCD_RESET_PIN                       PC4   // pin 33
+#define LCD_BACKLIGHT_PIN                   PD12  // pin 59
+#define FSMC_CS_PIN                         PD7   // pin 88 = FSMC_NE1
+#define FSMC_RS_PIN                         PD11  // pin 58 A16 Register. Only one address needed
 
-#define LCD_USE_DMA_FSMC   // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV       DMA2
-#define FSMC_DMA_CHANNEL   DMA_CH5
+#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV                        DMA2
+#define FSMC_DMA_CHANNEL                 DMA_CH5
 
-#define DOGLCD_MOSI        -1  // Prevent auto-define by Conditionals_post.h
-#define DOGLCD_SCK         -1
+#define DOGLCD_MOSI                         -1    // Prevent auto-define by Conditionals_post.h
+#define DOGLCD_SCK                          -1
 
 /**
  * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
@@ -136,11 +136,11 @@
  * declared below.
  */
 #if ENABLED(TOUCH_BUTTONS)
-  #define TOUCH_CS_PIN     PB12  // pin 51 SPI2_NSS
-  #define TOUCH_SCK_PIN    PB13  // pin 52
-  #define TOUCH_MOSI_PIN   PB14  // pin 53
-  #define TOUCH_MISO_PIN   PB15  // pin 54
-  #define TOUCH_INT_PIN    PC6   // pin 63 (PenIRQ coming from ADS7843)
+  #define TOUCH_CS_PIN                      PB12  // pin 51 SPI2_NSS
+  #define TOUCH_SCK_PIN                     PB13  // pin 52
+  #define TOUCH_MOSI_PIN                    PB14  // pin 53
+  #define TOUCH_MISO_PIN                    PB15  // pin 54
+  #define TOUCH_INT_PIN                     PC6   // pin 63 (PenIRQ coming from ADS7843)
 #endif
 
 //
@@ -153,12 +153,12 @@
 #undef E2END
 #if ENABLED(SPI_EEPROM)
   // SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
-  #define SPI_CHAN_EEPROM1   1
-  #define SPI_EEPROM1_CS     PC5   // pin 34
-  #define EEPROM_SCK  BOARD_SPI1_SCK_PIN    // PA5 pin 30
-  #define EEPROM_MISO BOARD_SPI1_MISO_PIN   // PA6 pin 31
-  #define EEPROM_MOSI BOARD_SPI1_MOSI_PIN   // PA7 pin 32
-  #define EEPROM_PAGE_SIZE   0x1000U        // 4KB (from datasheet)
+  #define SPI_CHAN_EEPROM1 1
+  #define SPI_EEPROM1_CS                    PC5   // pin 34
+  #define EEPROM_SCK          BOARD_SPI1_SCK_PIN  // PA5 pin 30
+  #define EEPROM_MISO        BOARD_SPI1_MISO_PIN  // PA6 pin 31
+  #define EEPROM_MOSI        BOARD_SPI1_MOSI_PIN  // PA7 pin 32
+  #define EEPROM_PAGE_SIZE 0x1000U                // 4KB (from datasheet)
   #define E2END ((16 * EEPROM_PAGE_SIZE)-1) // Limit to 64KB for now...
 #elif ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
diff --git a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
index 624c59ebea78..9829018d8df4 100644
--- a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
@@ -36,7 +36,7 @@
 // but it is literally the only board which uses it.
 #define FLASH_EEPROM_EMULATION
 
-#define SDSS SS_PIN
+#define SDSS                              SS_PIN
 
 // Based on PWM timer usage, we have to use these timers and soft PWM for the fans
 // On STM32F103:
@@ -50,43 +50,43 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB4
-#define Y_MIN_PIN          PA15
-#define Z_MIN_PIN          PB5
+#define X_MIN_PIN                           PB4
+#define Y_MIN_PIN                           PA15
+#define Z_MIN_PIN                           PB5
 
 //
 // Steppers
 //
 // X & Y enable are the same
-#define X_STEP_PIN         PB14
-#define X_DIR_PIN          PB15
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PB14
+#define X_DIR_PIN                           PB15
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PB12
-#define Y_DIR_PIN          PB13
-#define Y_ENABLE_PIN       PA8
+#define Y_STEP_PIN                          PB12
+#define Y_DIR_PIN                           PB13
+#define Y_ENABLE_PIN                        PA8
 
-#define Z_STEP_PIN         PB10
-#define Z_DIR_PIN          PB2
-#define Z_ENABLE_PIN       PB11
+#define Z_STEP_PIN                          PB10
+#define Z_DIR_PIN                           PB2
+#define Z_ENABLE_PIN                        PB11
 
-#define E0_STEP_PIN        PB0
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PB1
+#define E0_STEP_PIN                         PB0
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PB1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input (HOTEND0 thermistor)
-#define TEMP_BED_PIN       PA1   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                          PA0   // Analog Input (HOTEND0 thermistor)
+#define TEMP_BED_PIN                        PA1   // Analog Input (BED thermistor)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB6   // HOTEND0 MOSFET
-#define HEATER_BED_PIN     PB7   // BED MOSFET
+#define HEATER_0_PIN                        PB6   // HOTEND0 MOSFET
+#define HEATER_BED_PIN                      PB7   // BED MOSFET
 
-#define MALYAN_FAN1_PIN    PB8   // FAN1 header on board - PRINT FAN
-#define MALYAN_FAN2_PIN    PB3   // FAN2 header on board - CONTROLLER FAN
+#define MALYAN_FAN1_PIN                     PB8   // FAN1 header on board - PRINT FAN
+#define MALYAN_FAN2_PIN                     PB3   // FAN2 header on board - CONTROLLER FAN
 
-#define FAN1_PIN           MALYAN_FAN2_PIN
+#define FAN1_PIN                 MALYAN_FAN2_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 3b10bae139e4..db35548e88ee 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -43,72 +43,72 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PC3   // XS1 - 5
-#define SERVO1_PIN         PA1   // XS1 - 6
-#define SERVO2_PIN         PF9   // XS2 - 5
-#define SERVO3_PIN         PF8   // XS2 - 6
+#define SERVO0_PIN                          PC3   // XS1 - 5
+#define SERVO1_PIN                          PA1   // XS1 - 6
+#define SERVO2_PIN                          PF9   // XS2 - 5
+#define SERVO3_PIN                          PF8   // XS2 - 6
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB12
-#define X_MAX_PIN          PB0
-#define Y_MIN_PIN          PC5
-#define Y_MAX_PIN          PC4
-#define Z_MIN_PIN          PA4
-#define Z_MAX_PIN          PF7
+#define X_MIN_PIN                           PB12
+#define X_MAX_PIN                           PB0
+#define Y_MIN_PIN                           PC5
+#define Y_MAX_PIN                           PC4
+#define Z_MIN_PIN                           PA4
+#define Z_MAX_PIN                           PF7
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PB9
-#define X_STEP_PIN         PB8
-#define X_DIR_PIN          PB5
+#define X_ENABLE_PIN                        PB9
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB5
 
-#define Y_ENABLE_PIN       PB4
-#define Y_STEP_PIN         PG15
-#define Y_DIR_PIN          PG10
+#define Y_ENABLE_PIN                        PB4
+#define Y_STEP_PIN                          PG15
+#define Y_DIR_PIN                           PG10
 
-#define Z_ENABLE_PIN       PD7
-#define Z_STEP_PIN         PD3
-#define Z_DIR_PIN          PG14
+#define Z_ENABLE_PIN                        PD7
+#define Z_STEP_PIN                          PD3
+#define Z_DIR_PIN                           PG14
 
-#define E0_ENABLE_PIN      PG13
-#define E0_STEP_PIN        PG8
-#define E0_DIR_PIN         PA15
+#define E0_ENABLE_PIN                       PG13
+#define E0_STEP_PIN                         PG8
+#define E0_DIR_PIN                          PA15
 
-#define E1_ENABLE_PIN      PA12
-#define E1_STEP_PIN        PA11
-#define E1_DIR_PIN         PA8
+#define E1_ENABLE_PIN                       PA12
+#define E1_STEP_PIN                         PA11
+#define E1_DIR_PIN                          PA8
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_1_PIN         PC2   // TH2
-#define TEMP_BED_PIN       PC0   // TB1
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC7   // HEATER1
-#define HEATER_1_PIN       PA6   // HEATER2
-#define HEATER_BED_PIN     PC6   // HOT BED
+#define HEATER_0_PIN                        PC7   // HEATER1
+#define HEATER_1_PIN                        PA6   // HEATER2
+#define HEATER_BED_PIN                      PC6   // HOT BED
 
-#define FAN_PIN            PA7   // FAN
+#define FAN_PIN                             PA7   // FAN
 
 /**
  * Note: MKS Robin board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
  */
-//#define MAX6675_SS_PIN     PE5  // TC1 - CS1
-//#define MAX6675_SS_PIN     PE6  // TC2 - CS2
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
 
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PA3   // PW_OFF
-#define FIL_RUNOUT_PIN     PF11  // MT_DET
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PA3   // PW_OFF
+#define FIL_RUNOUT_PIN                      PF11  // MT_DET
 
-#define BEEPER_PIN         PC13
-#define LED_PIN            PB2
+#define BEEPER_PIN                          PC13
+#define LED_PIN                             PB2
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers
@@ -122,38 +122,38 @@
  * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
  * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
  */
-//#define LCD_RESET_PIN      PF6
-#define LCD_BACKLIGHT_PIN  PG11
-#define FSMC_CS_PIN        PG12  // NE4
-#define FSMC_RS_PIN        PF0   // A0
+//#define LCD_RESET_PIN                     PF6
+#define LCD_BACKLIGHT_PIN                   PG11
+#define FSMC_CS_PIN                         PG12  // NE4
+#define FSMC_RS_PIN                         PF0   // A0
 
-#define LCD_USE_DMA_FSMC   // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV       DMA2
-#define FSMC_DMA_CHANNEL   DMA_CH5
+#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV                        DMA2
+#define FSMC_DMA_CHANNEL                 DMA_CH5
 
 #if ENABLED(TOUCH_BUTTONS)
-  #define TOUCH_CS_PIN     PB1   // SPI2_NSS
-  #define TOUCH_SCK_PIN    PB13  // SPI2_SCK
-  #define TOUCH_MISO_PIN   PB14  // SPI2_MISO
-  #define TOUCH_MOSI_PIN   PB15  // SPI2_MOSI
+  #define TOUCH_CS_PIN                      PB1   // SPI2_NSS
+  #define TOUCH_SCK_PIN                     PB13  // SPI2_SCK
+  #define TOUCH_MISO_PIN                    PB14  // SPI2_MISO
+  #define TOUCH_MOSI_PIN                    PB15  // SPI2_MOSI
 #endif
 
 // SPI1(PA7) & SPI3(PB5) not available
 #define ENABLE_SPI2
 
 #if ENABLED(SDIO_SUPPORT)
-  #define SCK_PIN           PB13 // SPI2
-  #define MISO_PIN          PB14 // SPI2
-  #define MOSI_PIN          PB15 // SPI2
-  #define SS_PIN            -1   // PB12 is X-
-  #define SD_DETECT_PIN     PF12 // SD_CD
+  #define SCK_PIN                           PB13  // SPI2
+  #define MISO_PIN                          PB14  // SPI2
+  #define MOSI_PIN                          PB15  // SPI2
+  #define SS_PIN                            -1    // PB12 is X-
+  #define SD_DETECT_PIN                     PF12  // SD_CD
 #else
   // SD as custom software SPI (SDIO pins)
-  #define SCK_PIN           PC12
-  #define MISO_PIN          PC8
-  #define MOSI_PIN          PD2
-  #define SS_PIN            -1
-  #define ONBOARD_SD_CS_PIN PC11
-  #define SDSS              PD2
-  #define SD_DETECT_PIN     -1
+  #define SCK_PIN                           PC12
+  #define MISO_PIN                          PC8
+  #define MOSI_PIN                          PD2
+  #define SS_PIN                            -1
+  #define ONBOARD_SD_CS_PIN                 PC11
+  #define SDSS                              PD2
+  #define SD_DETECT_PIN                     -1
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 1a7d664899c6..4c10a310bf7d 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -39,74 +39,74 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC13
-#define Y_STOP_PIN         PC0
-#define Z_MIN_PIN          PC12
-#define Z_MAX_PIN          PB9
+#define X_STOP_PIN                          PC13
+#define Y_STOP_PIN                          PC0
+#define Z_MIN_PIN                           PC12
+#define Z_MAX_PIN                           PB9
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PB12
-#define X_ENABLE_PIN       PB10
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PB12
+#define X_ENABLE_PIN                        PB10
 
-#define Y_STEP_PIN         PB11
-#define Y_DIR_PIN          PB2
-#define Y_ENABLE_PIN       PB10
+#define Y_STEP_PIN                          PB11
+#define Y_DIR_PIN                           PB2
+#define Y_ENABLE_PIN                        PB10
 
-#define Z_STEP_PIN         PB1
-#define Z_DIR_PIN          PC5
-#define Z_ENABLE_PIN       PB10
+#define Z_STEP_PIN                          PB1
+#define Z_DIR_PIN                           PC5
+#define Z_ENABLE_PIN                        PB10
 
-#define E0_STEP_PIN        PC4
-#define E0_DIR_PIN         PA5
-#define E0_ENABLE_PIN      PA4
+#define E0_STEP_PIN                         PC4
+#define E0_DIR_PIN                          PA5
+#define E0_ENABLE_PIN                       PA4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC9
-#define FAN_PIN            PA8
-#define HEATER_BED_PIN     PC8
+#define HEATER_0_PIN                        PC9
+#define FAN_PIN                             PA8
+#define HEATER_BED_PIN                      PC8
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA1
-#define TEMP_0_PIN         PA0
+#define TEMP_BED_PIN                        PA1
+#define TEMP_0_PIN                          PA0
 
-#define FIL_RUNOUT_PIN     PB8  // MT_DET
+#define FIL_RUNOUT_PIN                      PB8   // MT_DET
 
 //
 // LCD Pins
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PD2
-  #define BTN_ENC          PB3
-  #define LCD_PINS_RS      PC3
+  #define BEEPER_PIN                        PD2
+  #define BTN_ENC                           PB3
+  #define LCD_PINS_RS                       PC3
 
-  #define BTN_EN1          PB5
-  #define BTN_EN2          PB4
+  #define BTN_EN1                           PB5
+  #define BTN_EN2                           PB4
 
-  #define LCD_PINS_ENABLE  PC2
+  #define LCD_PINS_ENABLE                   PC2
 
   #if ENABLED(MKS_MINI_12864)
 
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  -1
-    #define DOGLCD_A0      PC1
-    #define DOGLCD_CS      PC2
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   -1
+    #define DOGLCD_A0                       PC1
+    #define DOGLCD_CS                       PC2
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
 
-  #else // !MKS_MINI_12864
+  #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4    PC1
+    #define LCD_PINS_D4                     PC1
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  -1
-      #define LCD_PINS_D6  -1
-      #define LCD_PINS_D7  -1
+      #define LCD_PINS_D5                   -1
+      #define LCD_PINS_D6                   -1
+      #define LCD_PINS_D7                   -1
     #endif
 
   #endif // !MKS_MINI_12864
@@ -114,9 +114,9 @@
 #endif // HAS_SPI_LCD
 
 // Motor current PWM pins
-#define MOTOR_CURRENT_PWM_XY_PIN PB0
-#define MOTOR_CURRENT_PWM_Z_PIN  PA7
-#define MOTOR_CURRENT_PWM_E_PIN  PA6
+#define MOTOR_CURRENT_PWM_XY_PIN            PB0
+#define MOTOR_CURRENT_PWM_Z_PIN             PA7
+#define MOTOR_CURRENT_PWM_E_PIN             PA6
 #define MOTOR_CURRENT_PWM_RANGE (65535/10/3.3) // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
 #define DEFAULT_PWM_MOTOR_CURRENT { 1000, 1000, 1000 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
 
@@ -124,11 +124,11 @@
 // SD Card
 //
 #define ENABLE_SPI2
-#define SD_DETECT_PIN      PC10
-#define SCK_PIN            PB13
-#define MISO_PIN           P1B4
-#define MOSI_PIN           P1B5
-#define SS_PIN             PA15
+#define SD_DETECT_PIN                       PC10
+#define SCK_PIN                             PB13
+#define MISO_PIN                            P1B4
+#define MOSI_PIN                            P1B5
+#define SS_PIN                              PA15
 
 #if HAS_GRAPHICAL_LCD
   #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
index 9a404ec64d24..466bdecc8141 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -43,89 +43,89 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA3
+#define SERVO0_PIN                          PA3
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA12
-#define Y_STOP_PIN         PA11
-#define Z_MIN_PIN          PC6
-#define Z_MAX_PIN          PB1
+#define X_STOP_PIN                          PA12
+#define Y_STOP_PIN                          PA11
+#define Z_MIN_PIN                           PC6
+#define Z_MAX_PIN                           PB1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC0
-#define X_DIR_PIN          PB2
-#define X_ENABLE_PIN       PC13
+#define X_STEP_PIN                          PC0
+#define X_DIR_PIN                           PB2
+#define X_ENABLE_PIN                        PC13
 
-#define Y_STEP_PIN         PC2
-#define Y_DIR_PIN          PB9
-#define Y_ENABLE_PIN       PB12
+#define Y_STEP_PIN                          PC2
+#define Y_DIR_PIN                           PB9
+#define Y_ENABLE_PIN                        PB12
 
-#define Z_STEP_PIN         PB7
-#define Z_DIR_PIN          PB6
-#define Z_ENABLE_PIN       PB8
+#define Z_STEP_PIN                          PB7
+#define Z_DIR_PIN                           PB6
+#define Z_ENABLE_PIN                        PB8
 
-#define E0_STEP_PIN        PB4
-#define E0_DIR_PIN         PB3
-#define E0_ENABLE_PIN      PB5
+#define E0_STEP_PIN                         PB4
+#define E0_DIR_PIN                          PB3
+#define E0_ENABLE_PIN                       PB5
 
-#define E1_STEP_PIN        PC12
-#define E1_DIR_PIN         PC11
-#define E1_ENABLE_PIN      PD2
+#define E1_STEP_PIN                         PC12
+#define E1_DIR_PIN                          PC11
+#define E1_ENABLE_PIN                       PD2
 
 //
 // Heaters 0,1 / Fans / Bed
 //
-#define HEATER_0_PIN       PC9
-#define HEATER_1_PIN       PC7
-#define FAN_PIN            PA8
-#define HEATER_BED_PIN     PC8
+#define HEATER_0_PIN                        PC9
+#define HEATER_1_PIN                        PC7
+#define FAN_PIN                             PA8
+#define HEATER_BED_PIN                      PC8
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA1  //TB
-#define TEMP_0_PIN         PA0  //TH1
-#define TEMP_1_PIN         PA2  //TH2
+#define TEMP_BED_PIN                        PA1   //TB
+#define TEMP_0_PIN                          PA0   //TH1
+#define TEMP_1_PIN                          PA2   //TH2
 
-#define FIL_RUNOUT_PIN     PB10 // MT_DET
+#define FIL_RUNOUT_PIN                      PB10  // MT_DET
 
 //
 // LCD Pins
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       PC1
-  #define BTN_ENC          PC3
-  #define LCD_PINS_ENABLE  PA4
-  #define LCD_PINS_RS      PA5
-  #define BTN_EN1          PB11
-  #define BTN_EN2          PB0
+  #define BEEPER_PIN                        PC1
+  #define BTN_ENC                           PC3
+  #define LCD_PINS_ENABLE                   PA4
+  #define LCD_PINS_RS                       PA5
+  #define BTN_EN1                           PB11
+  #define BTN_EN2                           PB0
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
   #if ENABLED(MKS_MINI_12864)
 
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  -1
-    #define DOGLCD_A0      PC4
-    #define DOGLCD_CS      PA7
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   -1
+    #define DOGLCD_A0                       PC4
+    #define DOGLCD_CS                       PA7
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
 
     // Required for MKS_MINI_12864 with this board
     #define MKS_LCD12864B
     #undef SHOW_BOOTSCREEN
 
-  #else // !MKS_MINI_12864
+  #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4    PA6
+    #define LCD_PINS_D4                     PA6
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PA7
-      #define LCD_PINS_D6  PC4
-      #define LCD_PINS_D7  PC5
+      #define LCD_PINS_D5                   PA7
+      #define LCD_PINS_D6                   PC4
+      #define LCD_PINS_D7                   PC5
     #endif
 
   #endif // !MKS_MINI_12864
@@ -136,18 +136,18 @@
 // SD Card
 //
 #define ENABLE_SPI2
-#define SD_DETECT_PIN      PC10
-#define SCK_PIN            PB13
-#define MISO_PIN           PB14
-#define MOSI_PIN           PB15
-#define SS_PIN             PA15
+#define SD_DETECT_PIN                       PC10
+#define SCK_PIN                             PB13
+#define MISO_PIN                            PB14
+#define MOSI_PIN                            PB15
+#define SS_PIN                              PA15
 
 #ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(125)
+  #define ST7920_DELAY_1           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(125)
+  #define ST7920_DELAY_2           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(125)
+  #define ST7920_DELAY_3           DELAY_NS(125)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index 16e74b169e97..50babad2746e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -52,67 +52,67 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA15
-#define Y_STOP_PIN         PA12
-#define Z_MIN_PIN          PA11
-#define Z_MAX_PIN          PC4
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PA12
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA4  // MT_DET
+  #define FIL_RUNOUT_PIN                    PA4   // MT_DET
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PE4
-#define X_STEP_PIN         PE3
-#define X_DIR_PIN          PE2
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
 
-#define Y_ENABLE_PIN       PE1
-#define Y_STEP_PIN         PE0
-#define Y_DIR_PIN          PB9
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
 
-#define Z_ENABLE_PIN       PB8
-#define Z_STEP_PIN         PB5
-#define Z_DIR_PIN          PB4
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
 
-#define E0_ENABLE_PIN      PB3
-#define E0_STEP_PIN        PD6
-#define E0_DIR_PIN         PD3
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_BED_PIN       PC0   // TB1
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_BED_PIN                        PC0   // TB1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC3   // HEATER1
-#define HEATER_BED_PIN     PA0   // HOT BED
+#define HEATER_0_PIN                        PC3   // HEATER1
+#define HEATER_BED_PIN                      PA0   // HOT BED
 
-#define FAN_PIN            PB1   // FAN
+#define FAN_PIN                             PB1   // FAN
 
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN     PE5  // TC1 - CS1
-//#define MAX6675_SS_PIN     PE6  // TC2 - CS2
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
 
 //
 // Misc. Functions
 //
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PA3   // PW_OFF
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PA3   // PW_OFF
 
-//#define LED_PIN            PB2
+//#define LED_PIN                           PB2
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         PC5
-#define SD_DETECT_PIN      PD12
+#define BEEPER_PIN                          PC5
+#define SD_DETECT_PIN                       PD12
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers.
@@ -120,27 +120,27 @@
  * to let the bootloader init the screen.
  */
 #if ENABLED(FSMC_GRAPHICAL_TFT)
-  #define FSMC_CS_PIN      PD7    // NE4
-  #define FSMC_RS_PIN      PD11   // A0
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
 
-  #define LCD_RESET_PIN    PC6
-  #define NO_LCD_REINIT           // Suppress LCD re-initialization
+  #define LCD_RESET_PIN                     PC6
+  #define NO_LCD_REINIT                           // Suppress LCD re-initialization
 
-  #define LCD_BACKLIGHT_PIN PD13
+  #define LCD_BACKLIGHT_PIN                 PD13
 
   #if ENABLED(TOUCH_BUTTONS)
-    #define TOUCH_CS_PIN   PC2
-    #define TOUCH_SCK_PIN  PB13
-    #define TOUCH_MOSI_PIN PB15
-    #define TOUCH_MISO_PIN PB14
+    #define TOUCH_CS_PIN                    PC2
+    #define TOUCH_SCK_PIN                   PB13
+    #define TOUCH_MOSI_PIN                  PB15
+    #define TOUCH_MISO_PIN                  PB14
   #endif
 #endif
 
 // Motor current PWM pins
-#define MOTOR_CURRENT_PWM_XY_PIN   PA6
-#define MOTOR_CURRENT_PWM_Z_PIN    PA7
-#define MOTOR_CURRENT_PWM_E_PIN    PB0
-#define MOTOR_CURRENT_PWM_RANGE    1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
+#define MOTOR_CURRENT_PWM_XY_PIN            PA6
+#define MOTOR_CURRENT_PWM_Z_PIN             PA7
+#define MOTOR_CURRENT_PWM_E_PIN             PB0
+#define MOTOR_CURRENT_PWM_RANGE 1500              // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1030, 1030, 1030 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
 
 // This is a kind of workaround in case native marlin "digipot" interface won't work.
@@ -149,6 +149,6 @@
 //  #define MKS_ROBIN_MINI_VREF_PWM
 //#endif
 
-//#define VREF_XY_PIN        PA6
-//#define VREF_Z_PIN         PA7
-//#define VREF_E1_PIN        PB0
+//#define VREF_XY_PIN                       PA6
+//#define VREF_Z_PIN                        PA7
+//#define VREF_E1_PIN                       PB0
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 223f520ebe2e..ae9118e6d0e2 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -41,78 +41,78 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN        PA15
-#define Y_STOP_PIN        PA12
-#define Z_MIN_PIN         PA11
-#define Z_MAX_PIN         PC4
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PA12
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA4   // MT_DET
+  #define FIL_RUNOUT_PIN                    PA4   // MT_DET
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PE4
-#define X_STEP_PIN         PE3
-#define X_DIR_PIN          PE2
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
 
-#define Y_ENABLE_PIN       PE1
-#define Y_STEP_PIN         PE0
-#define Y_DIR_PIN          PB9
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
 
-#define Z_ENABLE_PIN       PB8
-#define Z_STEP_PIN         PB5
-#define Z_DIR_PIN          PB4
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
 
-#define E0_ENABLE_PIN      PB3
-#define E0_STEP_PIN        PD6
-#define E0_DIR_PIN         PD3
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
 
-#define E1_ENABLE_PIN      PA3
-#define E1_STEP_PIN        PA6
-#define E1_DIR_PIN         PA1
+#define E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PA6
+#define E1_DIR_PIN                          PA1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_1_PIN         PC2   // TH2
-#define TEMP_BED_PIN       PC0   // TB1
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC3   // HEATER1
-#define HEATER_1_PIN       PB0   // HEATER2
-#define HEATER_BED_PIN     PA0   // HOT BED
+#define HEATER_0_PIN                        PC3   // HEATER1
+#define HEATER_1_PIN                        PB0   // HEATER2
+#define HEATER_BED_PIN                      PA0   // HOT BED
 
-#define FAN_PIN            PB1   // FAN
+#define FAN_PIN                             PB1   // FAN
 
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN     PE5  // TC1 - CS1
-//#define MAX6675_SS_PIN     PE6  // TC2 - CS2
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
 
 //
 // Misc. Functions
 //
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PA3   // PW_OFF
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PA3   // PW_OFF
 
-#define LED_PIN            PB2
+#define LED_PIN                             PB2
 
 //
 // SD Card
 //
 #define SDIO_SUPPORT
-#define SD_DETECT_PIN      PD12
+#define SD_DETECT_PIN                       PD12
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         PC5
+#define BEEPER_PIN                          PC5
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers.
@@ -120,18 +120,18 @@
  * to let the bootloader init the screen.
  */
 #if ENABLED(FSMC_GRAPHICAL_TFT)
-  #define FSMC_CS_PIN        PD7    // NE4
-  #define FSMC_RS_PIN        PD11   // A0
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
 
-  #define LCD_RESET_PIN      PC6    // FSMC_RST
-  #define NO_LCD_REINIT             // Suppress LCD re-initialization
+  #define LCD_RESET_PIN                     PC6   // FSMC_RST
+  #define NO_LCD_REINIT                           // Suppress LCD re-initialization
 
-  #define LCD_BACKLIGHT_PIN  PD13
+  #define LCD_BACKLIGHT_PIN                 PD13
 
   #if ENABLED(TOUCH_BUTTONS)
-    #define TOUCH_CS_PIN     PA7  // SPI2_NSS
-    #define TOUCH_SCK_PIN    PB13 // SPI2_SCK
-    #define TOUCH_MISO_PIN   PB14 // SPI2_MISO
-    #define TOUCH_MOSI_PIN   PB15 // SPI2_MOSI
+    #define TOUCH_CS_PIN                    PA7   // SPI2_NSS
+    #define TOUCH_SCK_PIN                   PB13  // SPI2_SCK
+    #define TOUCH_MISO_PIN                  PB14  // SPI2_MISO
+    #define TOUCH_MOSI_PIN                  PB15  // SPI2_MOSI
   #endif
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 9090fb34c4b3..b42856721d0f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -47,74 +47,74 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA8   // BLTOUCH
+#define SERVO0_PIN                          PA8   // BLTOUCH
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PA15
-#define X_MAX_PIN          PG7
-#define Y_MIN_PIN          PA12
-#define Y_MAX_PIN          PG8
-#define Z_MIN_PIN          PA11
-#define Z_MAX_PIN          PC4
+#define X_MIN_PIN                           PA15
+#define X_MAX_PIN                           PG7
+#define Y_MIN_PIN                           PA12
+#define Y_MAX_PIN                           PG8
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PE4
-#define X_STEP_PIN         PE3
-#define X_DIR_PIN          PE2
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PF8
+  #define X_CS_PIN                          PF8
 #endif
 
-#define Y_ENABLE_PIN       PE1
-#define Y_STEP_PIN         PE0
-#define Y_DIR_PIN          PB9
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PF3
+  #define Y_CS_PIN                          PF3
 #endif
 
-#define Z_ENABLE_PIN       PB8
-#define Z_STEP_PIN         PB5
-#define Z_DIR_PIN          PB4
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PF6
+  #define Z_CS_PIN                          PF6
 #endif
 
-#define E0_ENABLE_PIN      PB3
-#define E0_STEP_PIN        PD6
-#define E0_DIR_PIN         PD3
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PG15
+  #define E0_CS_PIN                         PG15
 #endif
 
-#define E1_ENABLE_PIN      PA3
-#define E1_STEP_PIN        PA6
-#define E1_DIR_PIN         PA1
+#define E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PA6
+#define E1_DIR_PIN                          PA1
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PG10
+  #define E1_CS_PIN                         PG10
 #endif
 
-#define E2_ENABLE_PIN      PF0
-#define E2_STEP_PIN        PF2
-#define E2_DIR_PIN         PF1
+#define E2_ENABLE_PIN                       PF0
+#define E2_STEP_PIN                         PF2
+#define E2_DIR_PIN                          PF1
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG9
+  #define E2_CS_PIN                         PG9
 #endif
 //
 // Software SPI pins for TMC2130 stepper drivers
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB15
+    #define TMC_SW_MOSI                     PB15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB14
+    #define TMC_SW_MISO                     PB14
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB13
+    #define TMC_SW_SCK                      PB13
   #endif
 #endif
 
@@ -140,71 +140,71 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PF7
-  #define X_SERIAL_RX_PIN  PF8
+  #define X_SERIAL_TX_PIN                   PF7
+  #define X_SERIAL_RX_PIN                   PF8
 
-  #define Y_SERIAL_TX_PIN  PF4
-  #define Y_SERIAL_RX_PIN  PF3
+  #define Y_SERIAL_TX_PIN                   PF4
+  #define Y_SERIAL_RX_PIN                   PF3
 
-  #define Z_SERIAL_TX_PIN  PF5
-  #define Z_SERIAL_RX_PIN  PF6
+  #define Z_SERIAL_TX_PIN                   PF5
+  #define Z_SERIAL_RX_PIN                   PF6
 
-  #define E0_SERIAL_TX_PIN PG13
-  #define E0_SERIAL_RX_PIN PG15
+  #define E0_SERIAL_TX_PIN                  PG13
+  #define E0_SERIAL_RX_PIN                  PG15
 
-  #define E1_SERIAL_TX_PIN PG12
-  #define E1_SERIAL_RX_PIN PG10
+  #define E1_SERIAL_TX_PIN                  PG12
+  #define E1_SERIAL_RX_PIN                  PG10
 
-  #define E2_SERIAL_TX_PIN PC13
-  #define E2_SERIAL_RX_PIN PG9
+  #define E2_SERIAL_TX_PIN                  PC13
+  #define E2_SERIAL_RX_PIN                  PG9
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_1_PIN         PC2   // TH2
-#define TEMP_2_PIN         PC3   // TH3
-#define TEMP_BED_PIN       PC0   // TB1
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_2_PIN                          PC3   // TH3
+#define TEMP_BED_PIN                        PC0   // TB1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PF10  // +HE0-
-#define HEATER_1_PIN       PB0   // +HE1-
-#define HEATER_2_PIN       PF9   // +HE2-
-#define HEATER_BED_PIN     PA0   // +HOT-BED-
-#define FAN_PIN            PB1   // +FAN-
+#define HEATER_0_PIN                        PF10  // +HE0-
+#define HEATER_1_PIN                        PB0   // +HE1-
+#define HEATER_2_PIN                        PF9   // +HE2-
+#define HEATER_BED_PIN                      PA0   // +HOT-BED-
+#define FAN_PIN                             PB1   // +FAN-
 
 /**
  * Note: MKS Robin Pro board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
  */
-//#define MAX6675_SS_PIN     PE5   // TC1 - CS1
-//#define MAX6675_SS_PIN     PF11  // TC2 - CS2
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PF11  // TC2 - CS2
 
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PG11   // PW_OFF
-#define FIL_RUNOUT_PIN     PA4  // MT_DET1
-//#define FIL_RUNOUT_PIN     PE6   // MT_DET2
-//#define FIL_RUNOUT_PIN     PG14  // MT_DET3
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PG11  // PW_OFF
+#define FIL_RUNOUT_PIN                      PA4   // MT_DET1
+//#define FIL_RUNOUT_PIN                    PE6   // MT_DET2
+//#define FIL_RUNOUT_PIN                    PG14  // MT_DET3
 
 //
 // SD Card
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI2
-  #define SD_DETECT_PIN    PG3
-  #define SCK_PIN          PB13
-  #define MISO_PIN         PB14
-  #define MOSI_PIN         PB15
-  #define SS_PIN           PG6
+  #define SD_DETECT_PIN                     PG3
+  #define SCK_PIN                           PB13
+  #define MISO_PIN                          PB14
+  #define MOSI_PIN                          PB15
+  #define SS_PIN                            PG6
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT
-  #define SD_DETECT_PIN    PD12
+  #define SD_DETECT_PIN                     PD12
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -215,60 +215,60 @@
  * to let the bootloader init the screen.
  */
 #if ENABLED(FSMC_GRAPHICAL_TFT)
-  #define FSMC_CS_PIN      PD7    // NE4
-  #define FSMC_RS_PIN      PD11   // A0
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
 
-  #define LCD_RESET_PIN    PF6
-  #define NO_LCD_REINIT             // Suppress LCD re-initialization
+  #define LCD_RESET_PIN                     PF6
+  #define NO_LCD_REINIT                           // Suppress LCD re-initialization
 
-  #define LCD_BACKLIGHT_PIN PD13
+  #define LCD_BACKLIGHT_PIN                 PD13
 
   #if ENABLED(TOUCH_BUTTONS)
-    #define TOUCH_CS_PIN   PA7
+    #define TOUCH_CS_PIN                    PA7
   #else
-    #define BEEPER_PIN     PC5
-    #define BTN_ENC        PG2
-    #define BTN_EN1        PG5
-    #define BTN_EN2        PG4
+    #define BEEPER_PIN                      PC5
+    #define BTN_ENC                         PG2
+    #define BTN_EN1                         PG5
+    #define BTN_EN2                         PG4
   #endif
 
 #elif HAS_SPI_LCD
 
-  #define BEEPER_PIN       PC5
-  #define BTN_ENC          PG2
-  #define LCD_PINS_ENABLE  PG0
-  #define LCD_PINS_RS      PG1
-  #define BTN_EN1          PG5
-  #define BTN_EN2          PG4
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PG2
+  #define LCD_PINS_ENABLE                   PG0
+  #define LCD_PINS_RS                       PG1
+  #define BTN_EN1                           PG5
+  #define BTN_EN2                           PG4
 
   // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor)
   #if ENABLED(MKS_MINI_12864)
 
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  -1
-    #define DOGLCD_A0      PF12
-    #define DOGLCD_CS      PF15
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   -1
+    #define DOGLCD_A0                       PF12
+    #define DOGLCD_CS                       PF15
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
 
-  #else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
+  #else                                           // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
 
-    #define LCD_PINS_D4    PF14
+    #define LCD_PINS_D4                     PF14
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PF15
-      #define LCD_PINS_D6  PF12
-      #define LCD_PINS_D7  PF13
+      #define LCD_PINS_D5                   PF15
+      #define LCD_PINS_D6                   PF12
+      #define LCD_PINS_D7                   PF13
     #endif
 
   #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
 #endif
 
 #ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(125)
+  #define ST7920_DELAY_1           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(125)
+  #define ST7920_DELAY_2           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(125)
+  #define ST7920_DELAY_3           DELAY_NS(125)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
index 8c583434e486..7311d91a80ff 100644
--- a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
+++ b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
@@ -39,53 +39,53 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB14
-#define Y_MIN_PIN          PB13
-#define Z_MIN_PIN          PB12
+#define X_MIN_PIN                           PB14
+#define Y_MIN_PIN                           PB13
+#define Z_MIN_PIN                           PB12
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PB9
+  #define Z_MIN_PROBE_PIN                   PB9
 #endif
 
 //
 // Steppers
 //
 // X & Y enable are the same
-#define X_STEP_PIN         PB7
-#define X_DIR_PIN          PB6
-#define X_ENABLE_PIN       PB8
+#define X_STEP_PIN                          PB7
+#define X_DIR_PIN                           PB6
+#define X_ENABLE_PIN                        PB8
 
-#define Y_STEP_PIN         PB5
-#define Y_DIR_PIN          PB4
-#define Y_ENABLE_PIN       PB8
+#define Y_STEP_PIN                          PB5
+#define Y_DIR_PIN                           PB4
+#define Y_ENABLE_PIN                        PB8
 
-#define Z_STEP_PIN         PA15
-#define Z_DIR_PIN          PA10
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PA15
+#define Z_DIR_PIN                           PA10
+#define Z_ENABLE_PIN                        PB3
 
-#define E0_STEP_PIN        PA8
-#define E0_DIR_PIN         PB15
-#define E0_ENABLE_PIN      PA9
+#define E0_STEP_PIN                         PA8
+#define E0_DIR_PIN                          PB15
+#define E0_ENABLE_PIN                       PA9
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PB1   // Analog Input (HOTEND thermistor)
-#define TEMP_BED_PIN       PB0   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                          PB1   // Analog Input (HOTEND thermistor)
+#define TEMP_BED_PIN                        PB0   // Analog Input (BED thermistor)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA2   // HOTEND MOSFET
-#define HEATER_BED_PIN     PA0   // BED MOSFET
+#define HEATER_0_PIN                        PA2   // HOTEND MOSFET
+#define HEATER_BED_PIN                      PA0   // BED MOSFET
 
-#define FAN_PIN            PA1   // FAN1 header on board - PRINT FAN
+#define FAN_PIN                             PA1   // FAN1 header on board - PRINT FAN
 
 //
 // Misc.
 //
-#define LED_PIN            PC13
-#define SDSS               PA3
+#define LED_PIN                             PC13
+#define SDSS                                PA3
diff --git a/Marlin/src/pins/stm32f1/pins_STM32F1R.h b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
index b43492af21c3..d144c0e69244 100644
--- a/Marlin/src/pins/stm32f1/pins_STM32F1R.h
+++ b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
@@ -38,61 +38,61 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PB3
-#define Y_STOP_PIN         PB4
-#define Z_STOP_PIN         PB5
+#define X_STOP_PIN                          PB3
+#define Y_STOP_PIN                          PB4
+#define Z_STOP_PIN                          PB5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC0
-#define X_DIR_PIN          PC1
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC0
+#define X_DIR_PIN                           PC1
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PC2
-#define Y_DIR_PIN          PC3
-#define Y_ENABLE_PIN       PA8
+#define Y_STEP_PIN                          PC2
+#define Y_DIR_PIN                           PC3
+#define Y_ENABLE_PIN                        PA8
 
-#define Z_STEP_PIN         PC4
-#define Z_DIR_PIN          PC5
-#define Z_ENABLE_PIN       PA8
+#define Z_STEP_PIN                          PC4
+#define Z_DIR_PIN                           PC5
+#define Z_ENABLE_PIN                        PA8
 
-#define E0_STEP_PIN        PC6
-#define E0_DIR_PIN         PC7
-#define E0_ENABLE_PIN      PA8
+#define E0_STEP_PIN                         PC6
+#define E0_DIR_PIN                          PC7
+#define E0_ENABLE_PIN                       PA8
 
 /**
  * TODO: Currently using same Enable pin to all steppers.
  */
 
-#define E1_STEP_PIN        PC8
-#define E1_DIR_PIN         PC9
-#define E1_ENABLE_PIN      PA8
+#define E1_STEP_PIN                         PC8
+#define E1_DIR_PIN                          PC9
+#define E1_ENABLE_PIN                       PA8
 
-#define E2_STEP_PIN        PC10
-#define E2_DIR_PIN         PC11
-#define E2_ENABLE_PIN      PA8
+#define E2_STEP_PIN                         PC10
+#define E2_DIR_PIN                          PC11
+#define E2_ENABLE_PIN                       PA8
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
-#define LED_PIN            PD2
+#define SDSS                                PA4
+#define LED_PIN                             PD2
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXTRUDER 1
-#define HEATER_1_PIN       PB1
+#define HEATER_0_PIN                        PB0   // EXTRUDER 1
+#define HEATER_1_PIN                        PB1
 
-#define HEATER_BED_PIN     PA3   // BED
+#define HEATER_BED_PIN                      PA3   // BED
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
-#define TEMP_1_PIN         PA2   // Analog Input
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          PA2   // Analog Input
 
 //
 // LCD Pins
@@ -100,25 +100,25 @@
 #if HAS_SPI_LCD
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS 49                        // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE 51                    // SID (MOSI)
+    #define LCD_PINS_D4 52                        // SCK (CLK) clock
   #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
   #else
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
     #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
       // Buttons attached to a shift register
       // Not wired yet
       //#define SHIFT_CLK 38
@@ -132,14 +132,14 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN 37
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1 31
+      #define BTN_EN2 33
+      #define BTN_ENC 35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
@@ -147,112 +147,112 @@
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1 64
+      #define BTN_EN2 59
+      #define BTN_ENC 63
+      #define SD_DETECT_PIN 42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
+      #define BTN_EN1 47
+      #define BTN_EN2 43
+      #define BTN_ENC 32
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN 41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1 22                          // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2 7                           // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
 
-      #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
+      #define BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 45
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1 22
+      #define BTN_EN2 7
+      #define BTN_ENC 39
 
-      #define SDSS              53
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
+      #define SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          31
+      #define KILL_PIN 31
 
-      #define STAT_LED_RED_PIN  32
+      #define STAT_LED_RED_PIN 32
       #define STAT_LED_BLUE_PIN 35
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define BTN_EN1 35
+      #define BTN_EN2 37
+      #define BTN_ENC 31
+      #define SD_DETECT_PIN 49
+      #define LCD_SDSS 53
+      #define KILL_PIN 41
+      #define BEEPER_PIN 23
+      #define DOGLCD_CS 29
+      #define DOGLCD_A0 27
       #define LCD_BACKLIGHT_PIN 33
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN 42
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
 
-      #define KILL_PIN          64
+      #define KILL_PIN 64
       // GLCD features
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
       // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
       // not connected to a pin
-      #define SD_DETECT_PIN     49
+      #define SD_DETECT_PIN 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
 
       // Buttons directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
+        #define BTN_EN1 64
+        #define BTN_EN2 59
+        #define BTN_ENC 63
+        #define SHIFT_OUT 40
+        #define SHIFT_CLK 44
+        #define SHIFT_LD 42
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1 59                        // AUX2 PIN 3
+        #define BTN_EN2 63                        // AUX2 PIN 4
+        #define BTN_ENC 49                        // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1 37
+        #define BTN_EN2 35
+        #define BTN_ENC 31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN 49
+        #define KILL_PIN 41
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
index 99f1cea35ce3..58b13b90dfe9 100644
--- a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -41,72 +41,72 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PD0
-#define Y_STOP_PIN         PD1
-#define Z_STOP_PIN         PD4
+#define X_STOP_PIN                          PD0
+#define Y_STOP_PIN                          PD1
+#define Z_STOP_PIN                          PD4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PE1
-#define X_DIR_PIN          PE0
-#define X_ENABLE_PIN       PC0
+#define X_STEP_PIN                          PE1
+#define X_DIR_PIN                           PE0
+#define X_ENABLE_PIN                        PC0
 
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PC1
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PC1
 
-#define Z_STEP_PIN         PE5
-#define Z_DIR_PIN          PE4
-#define Z_ENABLE_PIN       PC2
+#define Z_STEP_PIN                          PE5
+#define Z_DIR_PIN                           PE4
+#define Z_ENABLE_PIN                        PC2
 
-#define E0_STEP_PIN        PE7
-#define E0_DIR_PIN         PE6
-#define E0_ENABLE_PIN      PC3
+#define E0_STEP_PIN                         PE7
+#define E0_DIR_PIN                          PE6
+#define E0_ENABLE_PIN                       PC3
 
-#define E1_STEP_PIN        PE9
-#define E1_DIR_PIN         PE8
-#define E1_ENABLE_PIN      PC4
+#define E1_STEP_PIN                         PE9
+#define E1_DIR_PIN                          PE8
+#define E1_ENABLE_PIN                       PC4
 
-#define E2_STEP_PIN        PE11
-#define E2_DIR_PIN         PE10
-#define E2_ENABLE_PIN      PC5
+#define E2_STEP_PIN                         PE11
+#define E2_DIR_PIN                          PE10
+#define E2_ENABLE_PIN                       PC5
 
 //
 // Misc. Functions
 //
-#define SDSS               PA15
-#define LED_PIN            PB2
+#define SDSS                                PA15
+#define LED_PIN                             PB2
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PD12   // EXTRUDER 1
-//#define HEATER_1_PIN       PD13
+#define HEATER_0_PIN                        PD12  // EXTRUDER 1
+//#define HEATER_1_PIN                      PD13
 
-#define HEATER_BED_PIN     PB9   // BED
-//#define HEATER_BED2_PIN    -1   // BED2
-//#define HEATER_BED3_PIN    -1   // BED3
+#define HEATER_BED_PIN                      PB9   // BED
+//#define HEATER_BED2_PIN                   -1    // BED2
+//#define HEATER_BED3_PIN                   -1    // BED3
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PD14
+  #define FAN_PIN                           PD14
 #endif
-#define FAN1_PIN           PD13
+#define FAN1_PIN                            PD13
 
 #define FAN_SOFT_PWM
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA0
-#define TEMP_0_PIN         PA1
-#define TEMP_1_PIN         PA2
-#define TEMP_2_PIN         PA3
+#define TEMP_BED_PIN                        PA0
+#define TEMP_0_PIN                          PA1
+#define TEMP_1_PIN                          PA2
+#define TEMP_2_PIN                          PA3
 
 // Laser control
 #if HAS_CUTTER
-  #define SPINDLE_LASER_PWM_PIN     PB8
-  #define SPINDLE_LASER_ENA_PIN     PD5
+  #define SPINDLE_LASER_PWM_PIN             PB8
+  #define SPINDLE_LASER_ENA_PIN             PD5
 #endif
 
 //
@@ -115,54 +115,54 @@
 #if HAS_SPI_LCD
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS    49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE 51  // SID (MOSI)
-    #define LCD_PINS_D4    52   // SCK (CLK) clock
+    #define LCD_PINS_RS 49                        // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE 51                    // SID (MOSI)
+    #define LCD_PINS_D4 52                        // SCK (CLK) clock
   #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS    PB8
-    #define LCD_PINS_ENABLE PD2
-    #define LCD_PINS_D4    PB12
-    #define LCD_PINS_D5    PB13
-    #define LCD_PINS_D6    PB14
-    #define LCD_PINS_D7    PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
   #else
-    #define LCD_PINS_RS    PB8
-    #define LCD_PINS_ENABLE PD2
-    #define LCD_PINS_D4    PB12
-    #define LCD_PINS_D5    PB13
-    #define LCD_PINS_D6    PB14
-    #define LCD_PINS_D7    PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
     #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN 33
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK  38
-      //#define SHIFT_LD   42
-      //#define SHIFT_OUT  40
-      //#define SHIFT_EN   17
+      //#define SHIFT_CLK 38
+      //#define SHIFT_LD 42
+      //#define SHIFT_OUT 40
+      //#define SHIFT_EN 17
     #endif
   #endif
 
   #if ENABLED(TOUCH_BUTTONS)
 
-    #define TOUCH_CS_PIN   PB12   // SPI2_NSS
-    #define TOUCH_SCK_PIN  PB13
-    #define TOUCH_MOSI_PIN PB14
-    #define TOUCH_MISO_PIN PB15
-    #define TOUCH_INT_PIN  PC6   // (PenIRQ coming from ADS7843)
+    #define TOUCH_CS_PIN                    PB12  // SPI2_NSS
+    #define TOUCH_SCK_PIN                   PB13
+    #define TOUCH_MOSI_PIN                  PB14
+    #define TOUCH_MISO_PIN                  PB15
+    #define TOUCH_INT_PIN                   PC6   // (PenIRQ coming from ADS7843)
 
   #elif ENABLED(NEWPANEL)
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN 37
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1 31
+      #define BTN_EN2 33
+      #define BTN_ENC 35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
@@ -170,113 +170,113 @@
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1      64
-      #define BTN_EN2      59
-      #define BTN_ENC      63
+      #define BTN_EN1 64
+      #define BTN_EN2 59
+      #define BTN_ENC 63
       #define SD_DETECT_PIN 42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1      47
-      #define BTN_EN2      43
-      #define BTN_ENC      32
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN -1
-      #define KILL_PIN     41
+      #define BTN_EN1 47
+      #define BTN_EN2 43
+      #define BTN_ENC 32
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN 41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1      22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2       7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1 22                          // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2 7                           // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
 
-      #define BTN_ENC      -1
-      #define LCD_SDSS     53
+      #define BTN_ENC                       -1
+      #define LCD_SDSS 53
       #define SD_DETECT_PIN 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    45
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 45
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1      22
-      #define BTN_EN2       7
-      #define BTN_ENC      39
+      #define BTN_EN1 22
+      #define BTN_EN2 7
+      #define BTN_ENC 39
 
-      #define SDSS         53
-      #define SD_DETECT_PIN -1   // Pin 49 for display sd interface, 72 for easy adapter board
+      #define SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN     31
+      #define KILL_PIN 31
 
-      #define STAT_LED_RED_PIN  32
+      #define STAT_LED_RED_PIN 32
       #define STAT_LED_BLUE_PIN 35
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define BTN_EN1      35
-      #define BTN_EN2      37
-      #define BTN_ENC      31
+      #define BTN_EN1 35
+      #define BTN_EN2 37
+      #define BTN_ENC 31
       #define SD_DETECT_PIN 49
-      #define LCD_SDSS     53
-      #define KILL_PIN     41
-      #define BEEPER_PIN   23
-      #define DOGLCD_CS    29
-      #define DOGLCD_A0    27
+      #define LCD_SDSS 53
+      #define KILL_PIN 41
+      #define BEEPER_PIN 23
+      #define DOGLCD_CS 29
+      #define DOGLCD_A0 27
       #define LCD_BACKLIGHT_PIN 33
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN   42
+      #define BEEPER_PIN 42
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS         53
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
 
-      #define KILL_PIN     64
+      #define KILL_PIN 64
       // GLCD features
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
       // The encoder and click button
-      #define BTN_EN1      40
-      #define BTN_EN2      63
-      #define BTN_ENC      59
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
       // not connected to a pin
       #define SD_DETECT_PIN 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN 33
 
       // Buttons directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1    64
-        #define BTN_EN2    59
-        #define BTN_ENC    63
-        #define SHIFT_OUT  40
-        #define SHIFT_CLK  44
-        #define SHIFT_LD   42
+        #define BTN_EN1 64
+        #define BTN_EN2 59
+        #define BTN_ENC 63
+        #define SHIFT_OUT 40
+        #define SHIFT_CLK 44
+        #define SHIFT_LD 42
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1    59   // AUX2 PIN 3
-        #define BTN_EN2    63   // AUX2 PIN 4
-        #define BTN_ENC    49   // AUX3 PIN 7
+        #define BTN_EN1 59                        // AUX2 PIN 3
+        #define BTN_EN2 63                        // AUX2 PIN 4
+        #define BTN_ENC 49                        // AUX3 PIN 7
       #else
-        #define BTN_EN1    37
-        #define BTN_EN2    35
-        #define BTN_ENC    31
+        #define BTN_EN1 37
+        #define BTN_EN2 35
+        #define BTN_ENC 31
       #endif
 
       #if ENABLED(G3D_PANEL)
         #define SD_DETECT_PIN 49
-        #define KILL_PIN   41
+        #define KILL_PIN 41
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index 1e3333651247..ddbe09c355fd 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -34,21 +34,21 @@
   #define ARMED_V1_1
 #endif
 
-#undef BOARD_INFO_NAME // Defined on the command line by Arduino Core STM32
+#undef BOARD_INFO_NAME                            // Defined on the command line by Arduino Core STM32
 #define BOARD_INFO_NAME      "Arm'ed"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 #define I2C_EEPROM
 
-#undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-#define E2END 0xFFF // 4KB
+#undef E2END                                      // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PE0
-#define Y_STOP_PIN         PE1
-#define Z_STOP_PIN         PE14
+#define X_STOP_PIN                          PE0
+#define Y_STOP_PIN                          PE1
+#define Z_STOP_PIN                          PE14
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -61,7 +61,7 @@
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA3
+  #define FIL_RUNOUT_PIN                    PA3
 #endif
 
 //
@@ -69,163 +69,163 @@
 //
 
 #ifdef ARMED_SWAP_X_E1
-  #define X_STEP_PIN       PE4
-  #define X_DIR_PIN        PE2
-  #define X_ENABLE_PIN     PE3
-  #define X_CS_PIN         PE5
+  #define X_STEP_PIN                        PE4
+  #define X_DIR_PIN                         PE2
+  #define X_ENABLE_PIN                      PE3
+  #define X_CS_PIN                          PE5
 #else
-  #define X_STEP_PIN       PD3
-  #define X_DIR_PIN        PD2
-  #define X_ENABLE_PIN     PD0
-  #define X_CS_PIN         PD1
+  #define X_STEP_PIN                        PD3
+  #define X_DIR_PIN                         PD2
+  #define X_ENABLE_PIN                      PD0
+  #define X_CS_PIN                          PD1
 #endif
 
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE10
-#define Y_ENABLE_PIN       PE13
-#define Y_CS_PIN           PE12
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE10
+#define Y_ENABLE_PIN                        PE13
+#define Y_CS_PIN                            PE12
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD7
-#define Z_ENABLE_PIN       PD4
-#define Z_CS_PIN           PD5
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD7
+#define Z_ENABLE_PIN                        PD4
+#define Z_CS_PIN                            PD5
 
-#define E0_STEP_PIN        PB5
-#define E0_DIR_PIN         PB6
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
 #ifdef ARMED_V1_1
-  #define E0_ENABLE_PIN    PC12
+  #define E0_ENABLE_PIN                     PC12
 #else
-  #define E0_ENABLE_PIN    PB3
+  #define E0_ENABLE_PIN                     PB3
 #endif
-#define E0_CS_PIN          PB4
+#define E0_CS_PIN                           PB4
 
 #ifdef ARMED_SWAP_X_E1
-  #define E1_STEP_PIN      PD3
-  #define E1_DIR_PIN       PD2
-  #define E1_ENABLE_PIN    PD0
-  #define E1_CS_PIN        PD1
+  #define E1_STEP_PIN                       PD3
+  #define E1_DIR_PIN                        PD2
+  #define E1_ENABLE_PIN                     PD0
+  #define E1_CS_PIN                         PD1
 #else
-  #define E1_STEP_PIN      PE4
-  #define E1_DIR_PIN       PE2
-  #define E1_ENABLE_PIN    PE3
-  #define E1_CS_PIN        PE5
+  #define E1_STEP_PIN                       PE4
+  #define E1_DIR_PIN                        PE2
+  #define E1_ENABLE_PIN                     PE3
+  #define E1_CS_PIN                         PE5
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_BED_PIN       PC2   // Analog Input
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_BED_PIN                        PC2   // Analog Input
 
 #if HOTENDS == 1 && TEMP_SENSOR_PROBE
-  #define TEMP_PROBE_PIN   PC1
+  #define TEMP_PROBE_PIN                    PC1
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA1   // Hardware PWM
-#define HEATER_1_PIN       PA2   // Hardware PWM
-#define HEATER_BED_PIN     PA0   // Hardware PWM
+#define HEATER_0_PIN                        PA1   // Hardware PWM
+#define HEATER_1_PIN                        PA2   // Hardware PWM
+#define HEATER_BED_PIN                      PA0   // Hardware PWM
 
-#define FAN_PIN            PC6   // Hardware PWM, Part cooling fan
-#define FAN1_PIN           PC7   // Hardware PWM, Extruder fan
-#define FAN2_PIN           PC8   // Hardware PWM, Controller fan
+#define FAN_PIN                             PC6   // Hardware PWM, Part cooling fan
+#define FAN1_PIN                            PC7   // Hardware PWM, Extruder fan
+#define FAN2_PIN                            PC8   // Hardware PWM, Controller fan
 
 //
 // Misc functions
 //
-#define SDSS               PE7
-#define LED_PIN            PB7   // Heart beat
-#define PS_ON_PIN          PA10
-#define KILL_PIN           PA8
-#define PWR_LOSS           PA4   // Power loss / nAC_FAULT
+#define SDSS                                PE7
+#define LED_PIN                             PB7   // Heart beat
+#define PS_ON_PIN                           PA10
+#define KILL_PIN                            PA8
+#define PWR_LOSS                            PA4   // Power loss / nAC_FAULT
 
 //
 // LCD / Controller
 //
-#define SD_DETECT_PIN      PA15
-#define BEEPER_PIN         PC9
+#define SD_DETECT_PIN                       PA15
+#define BEEPER_PIN                          PC9
 
 #if ENABLED(FYSETC_MINI_12864)
   //
   // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
   //
-  #define DOGLCD_A0        PE9
-  #define DOGLCD_CS        PE8
+  #define DOGLCD_A0                         PE9
+  #define DOGLCD_CS                         PE8
 
-  #define LCD_BACKLIGHT_PIN -1
+  #define LCD_BACKLIGHT_PIN                 -1
 
-  #define LCD_RESET_PIN    PB12   // Must be high or open for LCD to operate normally.
+  #define LCD_RESET_PIN                     PB12  // Must be high or open for LCD to operate normally.
 
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN PB13
+      #define RGB_LED_R_PIN                 PB13
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB14
+      #define RGB_LED_G_PIN                 PB14
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB15
+      #define RGB_LED_B_PIN                 PB15
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN   PB13
+    #define NEOPIXEL_PIN                    PB13
   #endif
 #else
-  #define LCD_PINS_RS      PE9
-  #define LCD_PINS_ENABLE  PE8
-  #define LCD_PINS_D4      PB12
-  #define LCD_PINS_D5      PB13
-  #define LCD_PINS_D6      PB14
-  #define LCD_PINS_D7      PB15
+  #define LCD_PINS_RS                       PE9
+  #define LCD_PINS_ENABLE                   PE8
+  #define LCD_PINS_D4                       PB12
+  #define LCD_PINS_D5                       PB13
+  #define LCD_PINS_D6                       PB14
+  #define LCD_PINS_D7                       PB15
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      PB13
-    #define DOGLCD_A0      PB14
+    #define DOGLCD_CS                       PB13
+    #define DOGLCD_A0                       PB14
   #endif
 #endif
 
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PC3
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PC3
 
 //
 // Extension pins
 //
-#define EXT0_PIN           PB0
-#define EXT1_PIN           PB1
-#define EXT2_PIN           PB2
-#define EXT3_PIN           PD8
-#define EXT4_PIN           PD9
-#define EXT5_PIN           PD10
-#define EXT6_PIN           PD11
-#define EXT7_PIN           PD12
-#define EXT8_PIN           PB10
-#define EXT9_PIN           PB11
+#define EXT0_PIN                            PB0
+#define EXT1_PIN                            PB1
+#define EXT2_PIN                            PB2
+#define EXT3_PIN                            PD8
+#define EXT4_PIN                            PD9
+#define EXT5_PIN                            PD10
+#define EXT6_PIN                            PD11
+#define EXT7_PIN                            PD12
+#define EXT8_PIN                            PB10
+#define EXT9_PIN                            PB11
 
 #if HAS_TMC_UART
   // TMC2208/TMC2209 stepper drivers
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN EXT0_PIN
-  #define X_SERIAL_RX_PIN EXT0_PIN
+  #define X_SERIAL_TX_PIN               EXT0_PIN
+  #define X_SERIAL_RX_PIN               EXT0_PIN
 
-  #define Y_SERIAL_TX_PIN EXT1_PIN
-  #define Y_SERIAL_RX_PIN EXT1_PIN
+  #define Y_SERIAL_TX_PIN               EXT1_PIN
+  #define Y_SERIAL_RX_PIN               EXT1_PIN
 
-  #define Z_SERIAL_TX_PIN EXT2_PIN
-  #define Z_SERIAL_RX_PIN EXT2_PIN
+  #define Z_SERIAL_TX_PIN               EXT2_PIN
+  #define Z_SERIAL_RX_PIN               EXT2_PIN
 
-  #define E0_SERIAL_TX_PIN EXT3_PIN
-  #define E0_SERIAL_RX_PIN EXT3_PIN
+  #define E0_SERIAL_TX_PIN              EXT3_PIN
+  #define E0_SERIAL_RX_PIN              EXT3_PIN
 
-  #define E1_SERIAL_RX_PIN EXT4_PIN
-  #define E1_SERIAL_TX_PIN EXT4_PIN
+  #define E1_SERIAL_RX_PIN              EXT4_PIN
+  #define E1_SERIAL_TX_PIN              EXT4_PIN
 
-  #define Z2_SERIAL_RX_PIN EXT4_PIN
-  #define Z2_SERIAL_TX_PIN EXT4_PIN
+  #define Z2_SERIAL_RX_PIN              EXT4_PIN
+  #define Z2_SERIAL_TX_PIN              EXT4_PIN
 
   #define TMC_BAUD_RATE 19200
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BEAST.h b/Marlin/src/pins/stm32f4/pins_BEAST.h
index d779994d1926..5be4368789f0 100644
--- a/Marlin/src/pins/stm32f4/pins_BEAST.h
+++ b/Marlin/src/pins/stm32f4/pins_BEAST.h
@@ -41,70 +41,70 @@
 //
 // Steppers
 //
-#define X_STEP_PIN         PE0
-#define X_DIR_PIN          PE1
-#define X_ENABLE_PIN       PC0
-#define X_MIN_PIN          PD5
-#define X_MAX_PIN          -1
-
-#define Y_STEP_PIN         PE2
-#define Y_DIR_PIN          PE3
-#define Y_ENABLE_PIN       PC1
-#define Y_MIN_PIN          PD6
+#define X_STEP_PIN                          PE0
+#define X_DIR_PIN                           PE1
+#define X_ENABLE_PIN                        PC0
+#define X_MIN_PIN                           PD5
+#define X_MAX_PIN                           -1
+
+#define Y_STEP_PIN                          PE2
+#define Y_DIR_PIN                           PE3
+#define Y_ENABLE_PIN                        PC1
+#define Y_MIN_PIN                           PD6
 #define Y_MAX_PIN
 
-#define Z_STEP_PIN         PE4
-#define Z_DIR_PIN          PE5
-#define Z_ENABLE_PIN       PC2
-#define Z_MIN_PIN          PD7
-#define Z_MAX_PIN          -1
+#define Z_STEP_PIN                          PE4
+#define Z_DIR_PIN                           PE5
+#define Z_ENABLE_PIN                        PC2
+#define Z_MIN_PIN                           PD7
+#define Z_MAX_PIN                           -1
 
-#define Y2_STEP_PIN        -1
-#define Y2_DIR_PIN         -1
-#define Y2_ENABLE_PIN      -1
+#define Y2_STEP_PIN                         -1
+#define Y2_DIR_PIN                          -1
+#define Y2_ENABLE_PIN                       -1
 
-#define Z2_STEP_PIN        -1
-#define Z2_DIR_PIN         -1
-#define Z2_ENABLE_PIN      -1
+#define Z2_STEP_PIN                         -1
+#define Z2_DIR_PIN                          -1
+#define Z2_ENABLE_PIN                       -1
 
-#define E0_STEP_PIN        PE6
-#define E0_DIR_PIN         PE7
-#define E0_ENABLE_PIN      PC3
+#define E0_STEP_PIN                         PE6
+#define E0_DIR_PIN                          PE7
+#define E0_ENABLE_PIN                       PC3
 
 /**
  * TODO: Currently using same Enable pin to all steppers.
  */
 
-#define E1_STEP_PIN        PE8
-#define E1_DIR_PIN         PE9
-#define E1_ENABLE_PIN      PC4
+#define E1_STEP_PIN                         PE8
+#define E1_DIR_PIN                          PE9
+#define E1_ENABLE_PIN                       PC4
 
-#define E2_STEP_PIN        PE10
-#define E2_DIR_PIN         PE11
-#define E2_ENABLE_PIN      PC5
+#define E2_STEP_PIN                         PE10
+#define E2_DIR_PIN                          PE11
+#define E2_ENABLE_PIN                       PC5
 
 //
 // Misc. Functions
 //
-#define SDSS               PA15
-#define LED_PIN            PB2
+#define SDSS                                PA15
+#define LED_PIN                             PB2
 
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            -1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PD12   // EXTRUDER 1
-#define HEATER_1_PIN       PD13
-#define HEATER_2_PIN       PD14
+#define HEATER_0_PIN                        PD12  // EXTRUDER 1
+#define HEATER_1_PIN                        PD13
+#define HEATER_2_PIN                        PD14
 
-#define HEATER_BED_PIN     PB9   // BED
-#define HEATER_BED2_PIN    -1    // BED2
-#define HEATER_BED3_PIN    -1    // BED3
+#define HEATER_BED_PIN                      PB9   // BED
+#define HEATER_BED2_PIN                     -1    // BED2
+#define HEATER_BED3_PIN                     -1    // BED3
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PB10
+  #define FAN_PIN                           PB10
 #endif
 
 #define FAN_SOFT_PWM
@@ -112,10 +112,10 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
-#define TEMP_1_PIN         PA2   // Analog Input
-#define TEMP_2_PIN         PA3   // Analog Input
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          PA2   // Analog Input
+#define TEMP_2_PIN                          PA3   // Analog Input
 
 //
 // LCD Pins
@@ -123,25 +123,25 @@
 #if HAS_SPI_LCD
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS 49                        // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE 51                    // SID (MOSI)
+    #define LCD_PINS_D4 52                        // SCK (CLK) clock
   #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
   #else
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
     #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
       // Buttons attached to a shift register
       // Not wired yet
       //#define SHIFT_CLK 38
@@ -155,14 +155,14 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN 37
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1 31
+      #define BTN_EN2 33
+      #define BTN_ENC 35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
@@ -170,113 +170,113 @@
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1 64
+      #define BTN_EN2 59
+      #define BTN_ENC 63
+      #define SD_DETECT_PIN 42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
+      #define BTN_EN1 47
+      #define BTN_EN2 43
+      #define BTN_ENC 32
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN 41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1 22                          // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2 7                           // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
 
-      #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
+      #define BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 45
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1 22
+      #define BTN_EN2 7
+      #define BTN_ENC 39
 
-      #define SDSS              53
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
+      #define SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          31
+      #define KILL_PIN 31
 
-      #define STAT_LED_RED_PIN  32
+      #define STAT_LED_RED_PIN 32
       #define STAT_LED_BLUE_PIN 35
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define BTN_EN1 35
+      #define BTN_EN2 37
+      #define BTN_ENC 31
+      #define SD_DETECT_PIN 49
+      #define LCD_SDSS 53
+      #define KILL_PIN 41
+      #define BEEPER_PIN 23
+      #define DOGLCD_CS 29
+      #define DOGLCD_A0 27
       #define LCD_BACKLIGHT_PIN 33
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN 42
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
 
-      #define KILL_PIN          64
+      #define KILL_PIN 64
       // GLCD features
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
       // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
       // not connected to a pin
-      #define SD_DETECT_PIN     49
+      #define SD_DETECT_PIN 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
 
       // Buttons directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
+        #define BTN_EN1 64
+        #define BTN_EN2 59
+        #define BTN_ENC 63
+        #define SHIFT_OUT 40
+        #define SHIFT_CLK 44
+        #define SHIFT_LD 42
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1 59                        // AUX2 PIN 3
+        #define BTN_EN2 63                        // AUX2 PIN 4
+        #define BTN_ENC 49                        // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1 37
+        #define BTN_EN2 35
+        #define BTN_ENC 31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN 49
+        #define KILL_PIN 41
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
index d0edf897f407..170b90368bdd 100644
--- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -40,116 +40,116 @@
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
 
 //#define I2C_EEPROM
-//#define E2END 0x1FFF // 8KB
+//#define E2END 0x1FFF                            // 8KB
 #define SRAM_EEPROM_EMULATION
 
 //
 // Servos
 //
-#define SERVO0_PIN         PC6
-#define SERVO1_PIN         PC7
+#define SERVO0_PIN                          PC6
+#define SERVO1_PIN                          PC7
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PC13
-#define X_MAX_PIN          PA15
-#define Y_MIN_PIN          PA5
-#define Y_MAX_PIN          PD12
-#define Z_MIN_PIN          PD14
-#define Z_MAX_PIN          PD15
+#define X_MIN_PIN                           PC13
+#define X_MAX_PIN                           PA15
+#define Y_MIN_PIN                           PA5
+#define Y_MAX_PIN                           PD12
+#define Z_MIN_PIN                           PD14
+#define Z_MAX_PIN                           PD15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC4
-#define X_DIR_PIN          PA4
-#define X_ENABLE_PIN       PE7
+#define X_STEP_PIN                          PC4
+#define X_DIR_PIN                           PA4
+#define X_ENABLE_PIN                        PE7
 
-#define Y_STEP_PIN         PE5
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE6
+#define Y_STEP_PIN                          PE5
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE6
 
-#define Z_STEP_PIN         PD5
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PD6
+#define Z_STEP_PIN                          PD5
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PD6
 
-#define E0_STEP_PIN        PD7
-#define E0_DIR_PIN         PD0
-#define E0_ENABLE_PIN      PB9
+#define E0_STEP_PIN                         PD7
+#define E0_DIR_PIN                          PD0
+#define E0_ENABLE_PIN                       PB9
 
-#define E1_STEP_PIN        PE0
-#define E1_DIR_PIN         PE1
-#define E1_ENABLE_PIN      PB8
+#define E1_STEP_PIN                         PE0
+#define E1_DIR_PIN                          PE1
+#define E1_ENABLE_PIN                       PB8
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC0  // T0
-#define TEMP_1_PIN         PC1  // T1
-#define TEMP_BED_PIN       PC2  // TB
+#define TEMP_0_PIN                          PC0   // T0
+#define TEMP_1_PIN                          PC1   // T1
+#define TEMP_BED_PIN                        PC2   // TB
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN PC3  // TC
+  #define TEMP_CHAMBER_PIN                  PC3   // TC
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA2  // Heater0
-#define HEATER_1_PIN       PA3  // Heater1
-#define HEATER_BED_PIN     PA1  // Hotbed
+#define HEATER_0_PIN                        PA2   // Heater0
+#define HEATER_1_PIN                        PA3   // Heater1
+#define HEATER_BED_PIN                      PA1   // Hotbed
 
-#define FAN_PIN            PE9  // Fan0
-#define FAN1_PIN           PE11 // Fan1
-#define FAN2_PIN           PE13 // Fan2
-#define FAN3_PIN           PE14 // Fan3
+#define FAN_PIN                             PE9   // Fan0
+#define FAN1_PIN                            PE11  // Fan1
+#define FAN2_PIN                            PE13  // Fan2
+#define FAN3_PIN                            PE14  // Fan3
 
 //
 // Misc. Functions
 //
-#define LED_PIN            PA6
-//#define LED_PIN          PA7
-#define KILL_PIN           PB1
+#define LED_PIN                             PA6
+//#define LED_PIN                           PA7
+#define KILL_PIN                            PB1
 
 //
 // LCD / Controller
 //
-//#define SD_DETECT_PIN      PC5
-//#define SD_DETECT_PIN      PA8  // SDIO SD_DETECT_PIN, external SDIO card reader only
+//#define SD_DETECT_PIN                     PC5
+//#define SD_DETECT_PIN                     PA8   // SDIO SD_DETECT_PIN, external SDIO card reader only
 
-#define BEEPER_PIN         PD10
-#define LCD_PINS_RS        PE15
-#define LCD_PINS_ENABLE    PD8
-#define LCD_PINS_D4        PE10
-#define LCD_PINS_D5        PE12
-#define LCD_PINS_D6        PD1
-#define LCD_PINS_D7        PE8
-#define BTN_ENC            PD9
-#define BTN_EN1            PD4
-#define BTN_EN2            PD13
+#define BEEPER_PIN                          PD10
+#define LCD_PINS_RS                         PE15
+#define LCD_PINS_ENABLE                     PD8
+#define LCD_PINS_D4                         PE10
+#define LCD_PINS_D5                         PE12
+#define LCD_PINS_D6                         PD1
+#define LCD_PINS_D7                         PE8
+#define BTN_ENC                             PD9
+#define BTN_EN1                             PD4
+#define BTN_EN2                             PD13
 
-#define DOGLCD_CS          LCD_PINS_D5
-#define DOGLCD_A0          LCD_PINS_D6
+#define DOGLCD_CS                    LCD_PINS_D5
+#define DOGLCD_A0                    LCD_PINS_D6
 
 //
 // Onboard SD support
 //
-#define SDIO_D0_PIN        PC8
-#define SDIO_D1_PIN        PC9
-#define SDIO_D2_PIN        PC10
-#define SDIO_D3_PIN        PC11
-#define SDIO_CK_PIN        PC12
-#define SDIO_CMD_PIN       PD2
+#define SDIO_D0_PIN                         PC8
+#define SDIO_D1_PIN                         PC9
+#define SDIO_D2_PIN                         PC10
+#define SDIO_D3_PIN                         PC11
+#define SDIO_CK_PIN                         PC12
+#define SDIO_CMD_PIN                        PD2
 
 #if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
-  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
 
   #ifndef SDIO_SUPPORT
-    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
-    #define SDSS           SDIO_D3_PIN
-    #define SCK_PIN        SDIO_CK_PIN
-    #define MISO_PIN       SDIO_D0_PIN
-    #define MOSI_PIN       SDIO_CMD_PIN
+    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
+    #define SDSS                     SDIO_D3_PIN
+    #define SCK_PIN                  SDIO_CK_PIN
+    #define MISO_PIN                 SDIO_D0_PIN
+    #define MOSI_PIN                SDIO_CMD_PIN
   #endif
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
index 5d2c83e3b9e3..ee5c4da1fe57 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -30,8 +30,8 @@
 #define BOARD_INFO_NAME "BIGTREE Btt002 1.0"
 
 // Use one of these or SDCard-based Emulation will be used
-//#define SRAM_EEPROM_EMULATION   // Use BackSRAM-based EEPROM emulation
-#define FLASH_EEPROM_EMULATION  // Use Flash-based EEPROM emulation
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+#define FLASH_EEPROM_EMULATION                    // Use Flash-based EEPROM emulation
 
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
@@ -39,60 +39,60 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PD3
-#define Y_STOP_PIN         PD2
-#define Z_STOP_PIN         PD1   // Shares J4 connector with PC3
+#define X_STOP_PIN                          PD3
+#define Y_STOP_PIN                          PD2
+#define Z_STOP_PIN                          PD1   // Shares J4 connector with PC3
 
 //
 // Z Probe must be this pin
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PD1
+  #define Z_MIN_PROBE_PIN                   PD1
 #endif
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA15
+  #define FIL_RUNOUT_PIN                    PA15
 #endif
 
 //
 // Power Loss Detection
 //
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN   PD4
+  #define POWER_LOSS_PIN                    PD4
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PA9
-#define X_DIR_PIN          PA10
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PA9
+#define X_DIR_PIN                           PA10
+#define X_ENABLE_PIN                        PA8
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PE2
+  #define X_CS_PIN                          PE2
 #endif
 
-#define Y_STEP_PIN         PC8
-#define Y_DIR_PIN          PC9
-#define Y_ENABLE_PIN       PC7
+#define Y_STEP_PIN                          PC8
+#define Y_DIR_PIN                           PC9
+#define Y_ENABLE_PIN                        PC7
  #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PE3
+  #define Y_CS_PIN                          PE3
 #endif
 
-#define Z_STEP_PIN         PD15
-#define Z_DIR_PIN          PC6
-#define Z_ENABLE_PIN       PD14
+#define Z_STEP_PIN                          PD15
+#define Z_DIR_PIN                           PC6
+#define Z_ENABLE_PIN                        PD14
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PE4
+  #define Z_CS_PIN                          PE4
 #endif
 
-#define E0_STEP_PIN        PD12
-#define E0_DIR_PIN         PD13
-#define E0_ENABLE_PIN      PD11
+#define E0_STEP_PIN                         PD12
+#define E0_DIR_PIN                          PD13
+#define E0_ENABLE_PIN                       PD11
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD7
+  #define E0_CS_PIN                         PD7
 #endif
 
 //
@@ -100,13 +100,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB15
+    #define TMC_SW_MOSI                     PB15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB14
+    #define TMC_SW_MISO                     PB14
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB13
+    #define TMC_SW_SCK                      PB13
   #endif
 #endif
 
@@ -132,17 +132,17 @@
   //
   // Software serial  ##
   //
-  #define X_SERIAL_TX_PIN  PE2
-  #define X_SERIAL_RX_PIN  PE2
+  #define X_SERIAL_TX_PIN                   PE2
+  #define X_SERIAL_RX_PIN                   PE2
 
-  #define Y_SERIAL_TX_PIN  PE3
-  #define Y_SERIAL_RX_PIN  PE3
+  #define Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN                   PE3
 
-  #define Z_SERIAL_TX_PIN  PE4
-  #define Z_SERIAL_RX_PIN  PE4
+  #define Z_SERIAL_TX_PIN                   PE4
+  #define Z_SERIAL_RX_PIN                   PE4
 
-  #define E0_SERIAL_TX_PIN PD7
-  #define E0_SERIAL_RX_PIN PD7
+  #define E0_SERIAL_TX_PIN                  PD7
+  #define E0_SERIAL_RX_PIN                  PD7
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -151,32 +151,32 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA2   // T0 <-> E0
-#define TEMP_1_PIN         PA0   // T1 <-> E1
-#define TEMP_BED_PIN       PA1   // T2 <-> Bed
-#define TEMP_PROBE_PIN     PC3   // Shares J4 connector with PD1
+#define TEMP_0_PIN                          PA2   // T0 <-> E0
+#define TEMP_1_PIN                          PA0   // T1 <-> E1
+#define TEMP_BED_PIN                        PA1   // T2 <-> Bed
+#define TEMP_PROBE_PIN                      PC3   // Shares J4 connector with PD1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PE6   // Heater0
-#define HEATER_BED_PIN     PE5   // Hotbed
-#define FAN_PIN            PB8   // Fan1
-#define FAN1_PIN           PB9   // Fan0
+#define HEATER_0_PIN                        PE6   // Heater0
+#define HEATER_BED_PIN                      PE5   // Hotbed
+#define FAN_PIN                             PB8   // Fan1
+#define FAN1_PIN                            PB9   // Fan0
 
 // HAL SPI1 pins
 #define CUSTOM_SPI_PINS
 #if ENABLED(CUSTOM_SPI_PINS)
-  #define SCK_PIN          PA5   // SPI1 SCLK
-  #define SS_PIN           PA4   // SPI1 SSEL
-  #define MISO_PIN         PA6   // SPI1 MISO
-  #define MOSI_PIN         PA7   // SPI1 MOSI
+  #define SCK_PIN                           PA5   // SPI1 SCLK
+  #define SS_PIN                            PA4   // SPI1 SSEL
+  #define MISO_PIN                          PA6   // SPI1 MISO
+  #define MOSI_PIN                          PA7   // SPI1 MOSI
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
+#define SDSS                                PA4
 
 /**
  * -------------------------------------BTT002 V1.0-----------------------------------------------
@@ -194,35 +194,35 @@
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PE7
-  #define BTN_ENC          PB1
+  #define BEEPER_PIN                        PE7
+  #define BTN_ENC                           PB1
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PE12
+    #define LCD_PINS_RS                     PE12
 
-    #define BTN_EN1        PE9
-    #define BTN_EN2        PE10
+    #define BTN_EN1                         PE9
+    #define BTN_EN2                         PE10
 
-    #define LCD_PINS_ENABLE PE13
-    #define LCD_PINS_D4    PE11
+    #define LCD_PINS_ENABLE                 PE13
+    #define LCD_PINS_D4                     PE11
 
   #else
 
-    #define LCD_PINS_RS    PE8
+    #define LCD_PINS_RS                     PE8
 
-    #define BTN_EN1        PC5
-    #define BTN_EN2        PB0
-    #define SD_DETECT_PIN  PC4
+    #define BTN_EN1                         PC5
+    #define BTN_EN2                         PB0
+    #define SD_DETECT_PIN                   PC4
 
-    #define LCD_SDSS       PA4
+    #define LCD_SDSS                        PA4
 
-    #define LCD_PINS_ENABLE PE9
-    #define LCD_PINS_D4    PE10
+    #define LCD_PINS_ENABLE                 PE9
+    #define LCD_PINS_D4                     PE10
 
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PE11
-      #define LCD_PINS_D6  PE12
-      #define LCD_PINS_D7  PE13
+      #define LCD_PINS_D5                   PE11
+      #define LCD_PINS_D6                   PE12
+      #define LCD_PINS_D7                   PE13
     #endif
 
   #endif
@@ -240,14 +240,14 @@
 // RGB LEDs
 //
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    PB5
+  #define RGB_LED_R_PIN                     PB5
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN    PB4
+  #define RGB_LED_G_PIN                     PB4
 #endif
 #ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN    PB3
+  #define RGB_LED_B_PIN                     PB3
 #endif
 #ifndef RGB_LED_W_PIN
-  #define RGB_LED_W_PIN    -1
+  #define RGB_LED_W_PIN                     -1
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
index eaef0b09dff7..ac8b731aae55 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -33,121 +33,121 @@
 
 // Use one of these or SDCard-based Emulation will be used
 //#define I2C_EEPROM
-//#define SRAM_EEPROM_EMULATION   // Use BackSRAM-based EEPROM emulation
-//#define FLASH_EEPROM_EMULATION  // Use Flash-based EEPROM emulation
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
 
-#define TP   // Enable to define servo and probe pins
+#define TP                                        // Enable to define servo and probe pins
 
 //
 // Servos
 //
 #if ENABLED(TP)
-  #define SERVO0_PIN       PB11
+  #define SERVO0_PIN                        PB11
 #endif
 
-#define PS_ON_PIN          PH6
+#define PS_ON_PIN                           PH6
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PF2
-#define X_MAX_PIN          PG14
-#define Y_MIN_PIN          PC13
-#define Y_MAX_PIN          PG9
-#define Z_MIN_PIN          PE0
-#define Z_MAX_PIN          PD3
+#define X_MIN_PIN                           PF2
+#define X_MAX_PIN                           PG14
+#define Y_MIN_PIN                           PC13
+#define Y_MAX_PIN                           PG9
+#define Z_MIN_PIN                           PE0
+#define Z_MAX_PIN                           PD3
 
 //
 // Pins on the extender
 //
-//#define X_MIN_PIN        PI4
-//#define X2_MIN_PIN       PF12
-//#define Y_MIN_PIN        PF4
-//#define Y2_MIN_PIN       PI7
-//#define Z_MIN_PIN        PF6
+//#define X_MIN_PIN                         PI4
+//#define X2_MIN_PIN                        PF12
+//#define Y_MIN_PIN                         PF4
+//#define Y2_MIN_PIN                        PI7
+//#define Z_MIN_PIN                         PF6
 
 #if ENABLED(TP) && !defined(Z_MIN_PROBE_PIN)
-  #define Z_MIN_PROBE_PIN PH11   // Z Probe must be PH11
+  #define Z_MIN_PROBE_PIN                   PH11  // Z Probe must be PH11
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC15
-#define X_DIR_PIN          PF0
-#define X_ENABLE_PIN       PF1
+#define X_STEP_PIN                          PC15
+#define X_DIR_PIN                           PF0
+#define X_ENABLE_PIN                        PF1
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PC14
+  #define X_CS_PIN                          PC14
 #endif
 
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE4
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE4
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PE1
+  #define Y_CS_PIN                          PE1
 #endif
 
-#define Z_STEP_PIN         PB8
-#define Z_DIR_PIN          PB7   // PB7
-#define Z_ENABLE_PIN       PB9
+#define Z_STEP_PIN                          PB8
+#define Z_DIR_PIN                           PB7   // PB7
+#define Z_ENABLE_PIN                        PB9
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PB5
+  #define Z_CS_PIN                          PB5
 #endif
 
-#define E0_STEP_PIN        PG12
-#define E0_DIR_PIN         PG11
-#define E0_ENABLE_PIN      PG13
+#define E0_STEP_PIN                         PG12
+#define E0_DIR_PIN                          PG11
+#define E0_ENABLE_PIN                       PG13
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PG10
+  #define E0_CS_PIN                         PG10
 #endif
 
-#define E1_STEP_PIN        PD6
-#define E1_DIR_PIN         PD5
-#define E1_ENABLE_PIN      PD7
+#define E1_STEP_PIN                         PD6
+#define E1_DIR_PIN                          PD5
+#define E1_ENABLE_PIN                       PD7
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PD4
+  #define E1_CS_PIN                         PD4
 #endif
 
-#define E2_STEP_PIN        PD1
-#define E2_DIR_PIN         PD0
-#define E2_ENABLE_PIN      PD2
+#define E2_STEP_PIN                         PD1
+#define E2_DIR_PIN                          PD0
+#define E2_ENABLE_PIN                       PD2
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PC12
+  #define E2_CS_PIN                         PC12
 #endif
 
-#define E3_STEP_PIN        PF3
-#define E3_DIR_PIN         PG3
-#define E3_ENABLE_PIN      PF8
+#define E3_STEP_PIN                         PF3
+#define E3_DIR_PIN                          PG3
+#define E3_ENABLE_PIN                       PF8
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        PG4
+  #define E3_CS_PIN                         PG4
 #endif
 
-#define E4_STEP_PIN        PD14
-#define E4_DIR_PIN         PD11
-#define E4_ENABLE_PIN      PG2
+#define E4_STEP_PIN                         PD14
+#define E4_DIR_PIN                          PD11
+#define E4_ENABLE_PIN                       PG2
 #ifndef E4_CS_PIN
-  #define E4_CS_PIN        PE15
+  #define E4_CS_PIN                         PE15
 #endif
 
-#define E5_STEP_PIN        PE12
-#define E5_DIR_PIN         PE10
-#define E5_ENABLE_PIN      PF14
+#define E5_STEP_PIN                         PE12
+#define E5_DIR_PIN                          PE10
+#define E5_ENABLE_PIN                       PF14
 #ifndef E5_CS_PIN
-  #define E5_CS_PIN        PE7
+  #define E5_CS_PIN                         PE7
 #endif
 
-#define E6_STEP_PIN        PG0
-#define E6_DIR_PIN         PG1
-#define E6_ENABLE_PIN      PE8
+#define E6_STEP_PIN                         PG0
+#define E6_DIR_PIN                          PG1
+#define E6_ENABLE_PIN                       PE8
 #ifndef E6_CS_PIN
-  #define E6_CS_PIN        PF15
+  #define E6_CS_PIN                         PF15
 #endif
 
-#define E7_STEP_PIN        PH12
-#define E7_DIR_PIN         PH15
-#define E7_ENABLE_PIN      PI0
+#define E7_STEP_PIN                         PH12
+#define E7_DIR_PIN                          PH15
+#define E7_ENABLE_PIN                       PI0
 #ifndef E7_CS_PIN
-  #define E7_CS_PIN        PH14
+  #define E7_CS_PIN                         PH14
 #endif
 
 //
@@ -155,13 +155,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PG15
+    #define TMC_SW_MOSI                     PG15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB6
+    #define TMC_SW_MISO                     PB6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
+    #define TMC_SW_SCK                      PB3
   #endif
 #endif
 
@@ -190,38 +190,38 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PC14
-  #define X_SERIAL_RX_PIN  PC14
+  #define X_SERIAL_TX_PIN                   PC14
+  #define X_SERIAL_RX_PIN                   PC14
 
-  #define Y_SERIAL_TX_PIN  PE1
-  #define Y_SERIAL_RX_PIN  PE1
+  #define Y_SERIAL_TX_PIN                   PE1
+  #define Y_SERIAL_RX_PIN                   PE1
 
-  #define Z_SERIAL_TX_PIN  PB5
-  #define Z_SERIAL_RX_PIN  PB5
+  #define Z_SERIAL_TX_PIN                   PB5
+  #define Z_SERIAL_RX_PIN                   PB5
 
-  #define E0_SERIAL_TX_PIN PG10
-  #define E0_SERIAL_RX_PIN PG10
+  #define E0_SERIAL_TX_PIN                  PG10
+  #define E0_SERIAL_RX_PIN                  PG10
 
-  #define E1_SERIAL_TX_PIN PD4
-  #define E1_SERIAL_RX_PIN PD4
+  #define E1_SERIAL_TX_PIN                  PD4
+  #define E1_SERIAL_RX_PIN                  PD4
 
-  #define E2_SERIAL_TX_PIN PC12
-  #define E2_SERIAL_RX_PIN PC12
+  #define E2_SERIAL_TX_PIN                  PC12
+  #define E2_SERIAL_RX_PIN                  PC12
 
-  #define E3_SERIAL_TX_PIN PG4
-  #define E3_SERIAL_RX_PIN PG4
+  #define E3_SERIAL_TX_PIN                  PG4
+  #define E3_SERIAL_RX_PIN                  PG4
 
-  #define E4_SERIAL_TX_PIN PE15
-  #define E4_SERIAL_RX_PIN PE15
+  #define E4_SERIAL_TX_PIN                  PE15
+  #define E4_SERIAL_RX_PIN                  PE15
 
-  #define E5_SERIAL_TX_PIN PE7
-  #define E5_SERIAL_RX_PIN PE7
+  #define E5_SERIAL_TX_PIN                  PE7
+  #define E5_SERIAL_RX_PIN                  PE7
 
-  #define E6_SERIAL_TX_PIN PF15
-  #define E6_SERIAL_RX_PIN PF15
+  #define E6_SERIAL_TX_PIN                  PF15
+  #define E6_SERIAL_RX_PIN                  PF15
 
-  #define E7_SERIAL_TX_PIN PH14
-  #define E7_SERIAL_RX_PIN PH14
+  #define E7_SERIAL_TX_PIN                  PH14
+  #define E7_SERIAL_RX_PIN                  PH14
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -230,75 +230,75 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // T1 <-> E0
-#define TEMP_1_PIN         PC2   // T2 <-> E1
-#define TEMP_2_PIN         PC3   // T3 <-> E2
+#define TEMP_0_PIN                          PC1   // T1 <-> E0
+#define TEMP_1_PIN                          PC2   // T2 <-> E1
+#define TEMP_2_PIN                          PC3   // T3 <-> E2
 
-#define TEMP_3_PIN         PA3   // T4 <-> E3
-#define TEMP_4_PIN         PF9   // T5 <-> E4
-#define TEMP_5_PIN         PF10  // T6 <-> E5
-#define TEMP_6_PIN         PF7   // T7 <-> E6
-#define TEMP_7_PIN         PF5   // T8 <-> E7
+#define TEMP_3_PIN                          PA3   // T4 <-> E3
+#define TEMP_4_PIN                          PF9   // T5 <-> E4
+#define TEMP_5_PIN                          PF10  // T6 <-> E5
+#define TEMP_6_PIN                          PF7   // T7 <-> E6
+#define TEMP_7_PIN                          PF5   // T8 <-> E7
 
-#define TEMP_BED_PIN       PC0   // T0 <-> Bed
+#define TEMP_BED_PIN                        PC0   // T0 <-> Bed
 
 // SPI for Max6675 or Max31855 Thermocouple
 // Uses a separate SPI bus
 // If you have a two-way thermocouple, you can customize two THERMO_CSx_PIN pins (x:1~2)
 
-#define THERMO_SCK_PIN     PI1   // SCK
-#define THERMO_DO_PIN      PI2   // MISO
-#define THERMO_CS1_PIN     PH9   // CS1
-#define THERMO_CS2_PIN     PH2   // CS2
+#define THERMO_SCK_PIN                      PI1   // SCK
+#define THERMO_DO_PIN                       PI2   // MISO
+#define THERMO_CS1_PIN                      PH9   // CS1
+#define THERMO_CS2_PIN                      PH2   // CS2
 
-#define MAX6675_SS_PIN     THERMO_CS1_PIN
-#define MAX6675_SS2_PIN    THERMO_CS2_PIN
-#define MAX6675_SCK_PIN    THERMO_SCK_PIN
-#define MAX6675_DO_PIN     THERMO_DO_PIN
+#define MAX6675_SS_PIN            THERMO_CS1_PIN
+#define MAX6675_SS2_PIN           THERMO_CS2_PIN
+#define MAX6675_SCK_PIN           THERMO_SCK_PIN
+#define MAX6675_DO_PIN             THERMO_DO_PIN
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB1   // Heater0
-#define HEATER_1_PIN       PA1   // Heater1
-#define HEATER_2_PIN       PB0   // Heater2
+#define HEATER_0_PIN                        PB1   // Heater0
+#define HEATER_1_PIN                        PA1   // Heater1
+#define HEATER_2_PIN                        PB0   // Heater2
 
-#define HEATER_3_PIN       PD15  // Heater3
-#define HEATER_4_PIN       PD13  // Heater4
-#define HEATER_5_PIN       PD12  // Heater5
-#define HEATER_6_PIN       PE13 // Heater6
-#define HEATER_7_PIN       PI6  // Heater7
+#define HEATER_3_PIN                        PD15  // Heater3
+#define HEATER_4_PIN                        PD13  // Heater4
+#define HEATER_5_PIN                        PD12  // Heater5
+#define HEATER_6_PIN                        PE13  // Heater6
+#define HEATER_7_PIN                        PI6   // Heater7
 
-#define HEATER_BED_PIN     PA2   // Hotbed
+#define HEATER_BED_PIN                      PA2   // Hotbed
 
-#define FAN_PIN            PE5   // Fan0
-#define FAN1_PIN           PE6   // Fan1
-#define FAN2_PIN           PC8   // Fan2
+#define FAN_PIN                             PE5   // Fan0
+#define FAN1_PIN                            PE6   // Fan1
+#define FAN2_PIN                            PC8   // Fan2
 
-#define FAN3_PIN           PI5   // Fan3
-#define FAN4_PIN           PE9   // Fan4
-#define FAN5_PIN           PE11  // Fan5
-//#define FAN6_PIN           PC9   // Fan6
-//#define FAN7_PIN           PE14  // Fan7
+#define FAN3_PIN                            PI5   // Fan3
+#define FAN4_PIN                            PE9   // Fan4
+#define FAN5_PIN                            PE11  // Fan5
+//#define FAN6_PIN                          PC9   // Fan6
+//#define FAN7_PIN                          PE14  // Fan7
 
 //
 // By default the onboard SD (SPI1) is enabled
 //
 #define CUSTOM_SPI_PINS
 #if DISABLED(CUSTOM_SPI_PINS)
-  #define SDSS             PB12
+  #define SDSS                              PB12
 #endif
 
 // HAL SPI1 pins group
 #if ENABLED(CUSTOM_SPI_PINS)
-  #define SDSS             PA4
-  #define SD_DETECT_PIN    PC4
-  #define LCD_SDSS         PA4
-
-  #define SCK_PIN          PA5
-  #define MISO_PIN         PA6
-  #define MOSI_PIN         PA7
-  #define SS_PIN           PA4   // Chip select for SD card used by Marlin
+  #define SDSS                              PA4
+  #define SD_DETECT_PIN                     PC4
+  #define LCD_SDSS                          PA4
+
+  #define SCK_PIN                           PA5
+  #define MISO_PIN                          PA6
+  #define MOSI_PIN                          PA7
+  #define SS_PIN                            PA4   // Chip select for SD card used by Marlin
 #endif
 
 /**
@@ -316,18 +316,18 @@
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PC11
-  #define BTN_ENC          PA15
+  #define BEEPER_PIN                        PC11
+  #define BTN_ENC                           PA15
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    PA8
+    #define LCD_PINS_RS                     PA8
 
-    #define BTN_EN1        PD10
-    #define BTN_EN2        PH10
+    #define BTN_EN1                         PD10
+    #define BTN_EN2                         PH10
 
-    #define LCD_PINS_ENABLE PG7
-    #define LCD_PINS_D4    PG8
+    #define LCD_PINS_ENABLE                 PG7
+    #define LCD_PINS_D4                     PG8
 
     //#undef ST7920_DELAY_1
     //#undef ST7920_DELAY_2
@@ -335,43 +335,43 @@
 
   #else
 
-    #define LCD_PINS_RS    PA8
+    #define LCD_PINS_RS                     PA8
 
-    #define BTN_EN1        PD10
-    #define BTN_EN2        PH10
+    #define BTN_EN1                         PD10
+    #define BTN_EN2                         PH10
 
     #if DISABLED(CUSTOM_SPI_PINS)
-      #define SD_DETECT_PIN PB10
-      #define LCD_SDSS     PB12
+      #define SD_DETECT_PIN                 PB10
+      #define LCD_SDSS                      PB12
     #endif
 
-    #define LCD_PINS_ENABLE PC10
-    #define LCD_PINS_D4    PG8
+    #define LCD_PINS_ENABLE                 PC10
+    #define LCD_PINS_D4                     PG8
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    PC10
-      #define DOGLCD_A0    PA8
-      //#define LCD_BACKLIGHT_PIN -1
-      #define LCD_RESET_PIN PG8   // Must be high or open for LCD to operate normally.
+      #define DOGLCD_CS                     PC10
+      #define DOGLCD_A0                     PA8
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN                 PG8   // Must be high or open for LCD to operate normally.
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PG7
+          #define RGB_LED_R_PIN             PG7
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PG6
+          #define RGB_LED_G_PIN             PG6
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PG5
+          #define RGB_LED_B_PIN             PG5
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PF13
+        #define NEOPIXEL_PIN                PF13
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PG7
-      #define LCD_PINS_D6  PG6
-      #define LCD_PINS_D7  PG5
+      #define LCD_PINS_D5                   PG7
+      #define LCD_PINS_D6                   PG6
+      #define LCD_PINS_D7                   PG5
     #endif
 
   #endif
@@ -383,9 +383,9 @@
     #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
   #endif
 
-  //#define DOGLCD_CS      PB12
-  //#define DOGLCD_A0      PA8
-  //#define LCD_PINS_DC    PB14
-  //#define DOGLCD_MOSI    PB15
+  //#define DOGLCD_CS                       PB12
+  //#define DOGLCD_A0                       PA8
+  //#define LCD_PINS_DC                     PB14
+  //#define DOGLCD_MOSI                     PB15
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
index 3376a997116b..4dbdf0e77f60 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
@@ -30,74 +30,74 @@
 #define BOARD_INFO_NAME "BIGTREE SKR Pro 1.1" // redefined?
 
 // Use one of these or SDCard-based Emulation will be used
-//#define SRAM_EEPROM_EMULATION   // Use BackSRAM-based EEPROM emulation
-//#define FLASH_EEPROM_EMULATION  // Use Flash-based EEPROM emulation
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
 
 //
 // Servos
 //
-#define SERVO0_PIN         PA1
+#define SERVO0_PIN                          PA1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB10
-#define X_MAX_PIN          PE15
-#define Y_MIN_PIN          PE12
-#define Y_MAX_PIN          PE10
-#define Z_MIN_PIN          PG8
-#define Z_MAX_PIN          PG5
+#define X_MIN_PIN                           PB10
+#define X_MAX_PIN                           PE15
+#define Y_MIN_PIN                           PE12
+#define Y_MAX_PIN                           PE10
+#define Z_MIN_PIN                           PG8
+#define Z_MAX_PIN                           PG5
 
 //
 // Z Probe must be this pins
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PA2
+  #define Z_MIN_PROBE_PIN                   PA2
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PE9
-#define X_DIR_PIN          PF1
-#define X_ENABLE_PIN       PF2
+#define X_STEP_PIN                          PE9
+#define X_DIR_PIN                           PF1
+#define X_ENABLE_PIN                        PF2
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PA15
+  #define X_CS_PIN                          PA15
 #endif
 
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE8
-#define Y_ENABLE_PIN       PD7
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE8
+#define Y_ENABLE_PIN                        PD7
  #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PB8
+  #define Y_CS_PIN                          PB8
 #endif
 
-#define Z_STEP_PIN         PE13
-#define Z_DIR_PIN          PC2
-#define Z_ENABLE_PIN       PC0
+#define Z_STEP_PIN                          PE13
+#define Z_DIR_PIN                           PC2
+#define Z_ENABLE_PIN                        PC0
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PB9
+  #define Z_CS_PIN                          PB9
 #endif
 
-#define E0_STEP_PIN        PE14
-#define E0_DIR_PIN         PA0
-#define E0_ENABLE_PIN      PC3
+#define E0_STEP_PIN                         PE14
+#define E0_DIR_PIN                          PA0
+#define E0_ENABLE_PIN                       PC3
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PB3
+  #define E0_CS_PIN                         PB3
 #endif
 
-#define E1_STEP_PIN        PD15
-#define E1_DIR_PIN         PE7
-#define E1_ENABLE_PIN      PA3
+#define E1_STEP_PIN                         PD15
+#define E1_DIR_PIN                          PE7
+#define E1_ENABLE_PIN                       PA3
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PG15
+  #define E1_CS_PIN                         PG15
 #endif
 
-#define E2_STEP_PIN        PD13
-#define E2_DIR_PIN         PG9
-#define E2_ENABLE_PIN      PF0
+#define E2_STEP_PIN                         PD13
+#define E2_DIR_PIN                          PG9
+#define E2_ENABLE_PIN                       PF0
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG12
+  #define E2_CS_PIN                         PG12
 #endif
 
 //
@@ -105,13 +105,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PC12
+    #define TMC_SW_MOSI                     PC12
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PC11
+    #define TMC_SW_MISO                     PC11
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PC10
+    #define TMC_SW_SCK                      PC10
   #endif
 #endif
 
@@ -137,23 +137,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PC13
-  #define X_SERIAL_RX_PIN  PC13
+  #define X_SERIAL_TX_PIN                   PC13
+  #define X_SERIAL_RX_PIN                   PC13
 
-  #define Y_SERIAL_TX_PIN  PE3
-  #define Y_SERIAL_RX_PIN  PE3
+  #define Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN                   PE3
 
-  #define Z_SERIAL_TX_PIN  PE1
-  #define Z_SERIAL_RX_PIN  PE1
+  #define Z_SERIAL_TX_PIN                   PE1
+  #define Z_SERIAL_RX_PIN                   PE1
 
-  #define E0_SERIAL_TX_PIN PD4
-  #define E0_SERIAL_RX_PIN PD4
+  #define E0_SERIAL_TX_PIN                  PD4
+  #define E0_SERIAL_RX_PIN                  PD4
 
-  #define E1_SERIAL_TX_PIN PD1
-  #define E1_SERIAL_RX_PIN PD1
+  #define E1_SERIAL_TX_PIN                  PD1
+  #define E1_SERIAL_RX_PIN                  PD1
 
-  #define E2_SERIAL_TX_PIN PD6
-  #define E2_SERIAL_RX_PIN PD6
+  #define E2_SERIAL_TX_PIN                  PD6
+  #define E2_SERIAL_RX_PIN                  PD6
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -162,28 +162,28 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PF4  // T1 <-> E0
-#define TEMP_1_PIN         PF5  // T2 <-> E1
-#define TEMP_2_PIN         PF6  // T3 <-> E2
-#define TEMP_BED_PIN       PF3  // T0 <-> Bed
+#define TEMP_0_PIN                          PF4   // T1 <-> E0
+#define TEMP_1_PIN                          PF5   // T2 <-> E1
+#define TEMP_2_PIN                          PF6   // T3 <-> E2
+#define TEMP_BED_PIN                        PF3   // T0 <-> Bed
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB1  // Heater0
-#define HEATER_1_PIN       PD14 // Heater1
-#define HEATER_2_PIN       PB0  // Heater1
-#define HEATER_BED_PIN     PD12 // Hotbed
-#define FAN_PIN            PC8  // Fan0
-#define FAN1_PIN           PE5  // Fan1
-#define FAN2_PIN           PE6  // Fan2
+#define HEATER_0_PIN                        PB1   // Heater0
+#define HEATER_1_PIN                        PD14  // Heater1
+#define HEATER_2_PIN                        PB0   // Heater1
+#define HEATER_BED_PIN                      PD12  // Hotbed
+#define FAN_PIN                             PC8   // Fan0
+#define FAN1_PIN                            PE5   // Fan1
+#define FAN2_PIN                            PE6   // Fan2
 
 //
 // Misc. Functions
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 //
@@ -191,16 +191,15 @@
 //   NOT compatible with LCD
 //
 #if SDCARD_CONNECTION == ONBOARD && !HAS_SPI_LCD
-  #define SOFTWARE_SPI            // Use soft SPI for onboard SD
-  #define SDSS             PA4
-  #define SCK_PIN          PA5
-  #define MISO_PIN         PA6
-  #define MOSI_PIN         PB5
+  #define SOFTWARE_SPI                            // Use soft SPI for onboard SD
+  #define SDSS                              PA4
+  #define SCK_PIN                           PA5
+  #define MISO_PIN                          PA6
+  #define MOSI_PIN                          PB5
 #else
-  #define SDSS             PB12
+  #define SDSS                              PB12
 #endif
 
-
 /**
  *               _____                                             _____
  *           NC | · · | GND                                    5V | · · | GND
@@ -216,17 +215,17 @@
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PG4
-  #define BTN_ENC          PA8
+  #define BEEPER_PIN                        PG4
+  #define BTN_ENC                           PA8
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PG6
+    #define LCD_PINS_RS                     PG6
 
-    #define BTN_EN1        PD11
-    #define BTN_EN2        PG2
+    #define BTN_EN1                         PD11
+    #define BTN_EN2                         PG2
 
-    #define LCD_PINS_ENABLE PG7
-    #define LCD_PINS_D4    PG3
+    #define LCD_PINS_ENABLE                 PG7
+    #define LCD_PINS_D4                     PG3
 
     // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
     // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
@@ -234,44 +233,43 @@
     #undef ST7920_DELAY_2
     #undef ST7920_DELAY_3
 
-
   #else
 
-    #define LCD_PINS_RS    PD10
+    #define LCD_PINS_RS                     PD10
 
-    #define BTN_EN1        PG10
-    #define BTN_EN2        PF11
-    #define SD_DETECT_PIN  PF12
+    #define BTN_EN1                         PG10
+    #define BTN_EN2                         PF11
+    #define SD_DETECT_PIN                   PF12
 
-    #define LCD_SDSS       PB12
+    #define LCD_SDSS                        PB12
 
-    #define LCD_PINS_ENABLE PD11
-    #define LCD_PINS_D4    PG2
+    #define LCD_PINS_ENABLE                 PD11
+    #define LCD_PINS_D4                     PG2
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    PD11
-      #define DOGLCD_A0    PD10
-      //#define LCD_BACKLIGHT_PIN -1
-      #define LCD_RESET_PIN PG2   // Must be high or open for LCD to operate normally.
+      #define DOGLCD_CS                     PD11
+      #define DOGLCD_A0                     PD10
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN                 PG2   // Must be high or open for LCD to operate normally.
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PG3
+          #define RGB_LED_R_PIN             PG3
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PG6
+          #define RGB_LED_G_PIN             PG6
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PG7
+          #define RGB_LED_B_PIN             PG7
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PG3
+        #define NEOPIXEL_PIN                PG3
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PG3
-      #define LCD_PINS_D6  PG6
-      #define LCD_PINS_D7  PG7
+      #define LCD_PINS_D5                   PG3
+      #define LCD_PINS_D6                   PG6
+      #define LCD_PINS_D7                   PG7
     #endif
 
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 8c8ea2adc1c0..8205cd9f4db0 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -32,147 +32,147 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 #undef E2END
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Servos
 //
-#define SERVO0_PIN         PE11
+#define SERVO0_PIN                          PE11
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PC3
-#define X_MAX_PIN          PC2
-#define Y_MIN_PIN          PF2
-#define Y_MAX_PIN          PF1
-#define Z_MIN_PIN          PF0
-#define Z_MAX_PIN          PC15
+#define X_MIN_PIN                           PC3
+#define X_MAX_PIN                           PC2
+#define Y_MIN_PIN                           PF2
+#define Y_MAX_PIN                           PF1
+#define Z_MIN_PIN                           PF0
+#define Z_MAX_PIN                           PC15
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
-#define Z_MIN_PROBE_PIN    PC14   // Z3_PIN
+#define Z_MIN_PROBE_PIN                     PC14  // Z3_PIN
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         PB9
-#define X_DIR_PIN          PE0
-#define X_ENABLE_PIN       PE1
+#define X_STEP_PIN                          PB9
+#define X_DIR_PIN                           PE0
+#define X_ENABLE_PIN                        PE1
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PG13
+  #define X_CS_PIN                          PG13
 #endif
 
-#define Y_STEP_PIN         PB8
-#define Y_DIR_PIN          PG11
-#define Y_ENABLE_PIN       PG12
+#define Y_STEP_PIN                          PB8
+#define Y_DIR_PIN                           PG11
+#define Y_ENABLE_PIN                        PG12
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PG10
+  #define Y_CS_PIN                          PG10
 #endif
 
-#define Z_STEP_PIN         PA8
-#define Z_DIR_PIN          PD6
-#define Z_ENABLE_PIN       PD7
+#define Z_STEP_PIN                          PA8
+#define Z_DIR_PIN                           PD6
+#define Z_ENABLE_PIN                        PD7
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PD5
+  #define Z_CS_PIN                          PD5
 #endif
 
-#define E0_STEP_PIN        PC7
-#define E0_DIR_PIN         PD3
-#define E0_ENABLE_PIN      PD4
+#define E0_STEP_PIN                         PC7
+#define E0_DIR_PIN                          PD3
+#define E0_ENABLE_PIN                       PD4
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD1
+  #define E0_CS_PIN                         PD1
 #endif
 
-#define E1_STEP_PIN        PC6
-#define E1_DIR_PIN         PA15
-#define E1_ENABLE_PIN      PD0
+#define E1_STEP_PIN                         PC6
+#define E1_DIR_PIN                          PA15
+#define E1_ENABLE_PIN                       PD0
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PA14
+  #define E1_CS_PIN                         PA14
 #endif
 
-#define E2_STEP_PIN        PD15
-#define E2_DIR_PIN         PG7
-#define E2_ENABLE_PIN      PG8
+#define E2_STEP_PIN                         PD15
+#define E2_DIR_PIN                          PG7
+#define E2_ENABLE_PIN                       PG8
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG6
+  #define E2_CS_PIN                         PG6
 #endif
 
-#define E3_STEP_PIN        PD14
-#define E3_DIR_PIN         PG4
-#define E3_ENABLE_PIN      PG5
+#define E3_STEP_PIN                         PD14
+#define E3_DIR_PIN                          PG4
+#define E3_ENABLE_PIN                       PG5
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        PG3
+  #define E3_CS_PIN                         PG3
 #endif
 
-#define E4_STEP_PIN        PD13
-#define E4_DIR_PIN         PD11
-#define E4_ENABLE_PIN      PG2
+#define E4_STEP_PIN                         PD13
+#define E4_DIR_PIN                          PD11
+#define E4_ENABLE_PIN                       PG2
 #ifndef E4_CS_PIN
-  #define E4_CS_PIN        PD10
+  #define E4_CS_PIN                         PD10
 #endif
 
-#define E5_STEP_PIN        PD12
-#define E5_DIR_PIN         PD8
-#define E5_ENABLE_PIN      PD9
+#define E5_STEP_PIN                         PD12
+#define E5_DIR_PIN                          PD8
+#define E5_ENABLE_PIN                       PD9
 #ifndef E5_CS_PIN
-  #define E5_CS_PIN        PB12
+  #define E5_CS_PIN                         PB12
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_2_PIN         PC0   // Analog Input
-#define TEMP_3_PIN         PF10  // Analog Input
-#define TEMP_4_PIN         PF5   // Analog Input
-#define TEMP_5_PIN         PF4   // Analog Input
-#define TEMP_BED_PIN       PF3   // Analog Input
+#define TEMP_0_PIN                          PA0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_2_PIN                          PC0   // Analog Input
+#define TEMP_3_PIN                          PF10  // Analog Input
+#define TEMP_4_PIN                          PF5   // Analog Input
+#define TEMP_5_PIN                          PF4   // Analog Input
+#define TEMP_BED_PIN                        PF3   // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PF7
-#define HEATER_1_PIN       PF6
-#define HEATER_2_PIN       PE6
-#define HEATER_3_PIN       PE5
-#define HEATER_4_PIN       PE4
-#define HEATER_5_PIN       PA2
-#define HEATER_BED_PIN     PE2
+#define HEATER_0_PIN                        PF7
+#define HEATER_1_PIN                        PF6
+#define HEATER_2_PIN                        PE6
+#define HEATER_3_PIN                        PE5
+#define HEATER_4_PIN                        PE4
+#define HEATER_5_PIN                        PA2
+#define HEATER_BED_PIN                      PE2
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PF8
+  #define FAN_PIN                           PF8
 #endif
-#define FAN1_PIN           PF9
-#define FAN2_PIN           PE3
-#define FAN3_PIN           PA1
-#define FAN4_PIN           PE13
-#define FAN5_PIN           PB11
+#define FAN1_PIN                            PF9
+#define FAN2_PIN                            PE3
+#define FAN3_PIN                            PA1
+#define FAN4_PIN                            PE13
+#define FAN5_PIN                            PB11
 
 //
 // Onboard SD support
 //
 
-#define SDIO_D0_PIN        PC8
-#define SDIO_D1_PIN        PC9
-//#define SD_CARD_DETECT_PIN PC13
-#define SDIO_D2_PIN        PC10
-#define SDIO_D3_PIN        PC11
-#define SDIO_CK_PIN        PC12
-#define SDIO_CMD_PIN       PD2
+#define SDIO_D0_PIN                         PC8
+#define SDIO_D1_PIN                         PC9
+//#define SD_CARD_DETECT_PIN                PC13
+#define SDIO_D2_PIN                         PC10
+#define SDIO_D3_PIN                         PC11
+#define SDIO_CK_PIN                         PC12
+#define SDIO_CMD_PIN                        PD2
 
 #if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
-  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
 
   #ifndef SDIO_SUPPORT
-    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
-    #define SDSS           SDIO_D3_PIN
-    #define SCK_PIN        SDIO_CK_PIN
-    #define MISO_PIN       SDIO_D0_PIN
-    #define MOSI_PIN       SDIO_CMD_PIN
+    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
+    #define SDSS                     SDIO_D3_PIN
+    #define SCK_PIN                  SDIO_CK_PIN
+    #define MISO_PIN                 SDIO_D0_PIN
+    #define MOSI_PIN                SDIO_CMD_PIN
   #endif
 #endif
 
@@ -182,13 +182,13 @@
 
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB15
+    #define TMC_SW_MOSI                     PB15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB14
+    #define TMC_SW_MISO                     PB14
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB13
+    #define TMC_SW_SCK                      PB13
   #endif
 #endif
 
@@ -197,70 +197,69 @@
 //
 
 #if HAS_TMC_UART
-  #define X_SERIAL_TX_PIN  PG13
-  #define X_SERIAL_RX_PIN  PG13
+  #define X_SERIAL_TX_PIN                   PG13
+  #define X_SERIAL_RX_PIN                   PG13
 
-  #define Y_SERIAL_TX_PIN  PG10
-  #define Y_SERIAL_RX_PIN  PG10
+  #define Y_SERIAL_TX_PIN                   PG10
+  #define Y_SERIAL_RX_PIN                   PG10
 
-  #define Z_SERIAL_TX_PIN  PD5
-  #define Z_SERIAL_RX_PIN  PD5
+  #define Z_SERIAL_TX_PIN                   PD5
+  #define Z_SERIAL_RX_PIN                   PD5
 
-  #define E0_SERIAL_TX_PIN PD1
-  #define E0_SERIAL_RX_PIN PD1
+  #define E0_SERIAL_TX_PIN                  PD1
+  #define E0_SERIAL_RX_PIN                  PD1
 
-  #define E1_SERIAL_TX_PIN PA14
-  #define E1_SERIAL_RX_PIN PA14
+  #define E1_SERIAL_TX_PIN                  PA14
+  #define E1_SERIAL_RX_PIN                  PA14
 
-  #define E2_SERIAL_TX_PIN PG6
-  #define E2_SERIAL_RX_PIN PG6
+  #define E2_SERIAL_TX_PIN                  PG6
+  #define E2_SERIAL_RX_PIN                  PG6
 
-  #define E3_SERIAL_TX_PIN PG3
-  #define E3_SERIAL_RX_PIN PG3
+  #define E3_SERIAL_TX_PIN                  PG3
+  #define E3_SERIAL_RX_PIN                  PG3
 
-  #define E4_SERIAL_TX_PIN PD10
-  #define E4_SERIAL_RX_PIN PD10
+  #define E4_SERIAL_TX_PIN                  PD10
+  #define E4_SERIAL_RX_PIN                  PD10
 
-  #define E5_SERIAL_TX_PIN PB12
-  #define E5_SERIAL_RX_PIN PB12
+  #define E5_SERIAL_TX_PIN                  PB12
+  #define E5_SERIAL_RX_PIN                  PB12
 
 #endif
 
-
 //
 // LCD / Controller
 //
-#define SCK_PIN            PB13
-#define MISO_PIN           PB14
-#define MOSI_PIN           PB15
-#define SDSS               PF11
-#define SD_DETECT_PIN      PB2
-#define BEEPER_PIN         PB10
-#define LCD_PINS_RS        PE12
-#define LCD_PINS_ENABLE    PE14
-#define LCD_PINS_D4        PE10
-#define LCD_PINS_D5        PE9
-#define LCD_PINS_D6        PE8
-#define LCD_PINS_D7        PE7
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PE15
+#define SCK_PIN                             PB13
+#define MISO_PIN                            PB14
+#define MOSI_PIN                            PB15
+#define SDSS                                PF11
+#define SD_DETECT_PIN                       PB2
+#define BEEPER_PIN                          PB10
+#define LCD_PINS_RS                         PE12
+#define LCD_PINS_ENABLE                     PE14
+#define LCD_PINS_D4                         PE10
+#define LCD_PINS_D5                         PE9
+#define LCD_PINS_D6                         PE8
+#define LCD_PINS_D7                         PE7
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PE15
 
 //
 // Filament runout
 //
 
-#define FIL_RUNOUT_PIN     PA3
+#define FIL_RUNOUT_PIN                      PA3
 
 //
 // ST7920 Delays
 //
 #ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(96)
+  #define ST7920_DELAY_1            DELAY_NS(96)
 #endif
 #ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(48)
+  #define ST7920_DELAY_2            DELAY_NS(48)
 #endif
 #ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(715)
+  #define ST7920_DELAY_3           DELAY_NS(715)
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index d135ef0750c0..bdadbe36c20f 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -47,65 +47,65 @@
 //#define SRAM_EEPROM_EMULATION
 //#define I2C_EEPROM
 #ifdef I2C_EEPROM
-  #undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-  #define E2END 0xFFF // 4KB
+  #undef E2END                                    // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
+  #define E2END 0xFFF                             // 4KB
 #endif
 
 //
 // Servos
 //
-#define SERVO0_PIN         PA3
+#define SERVO0_PIN                          PA3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB14
-#define X_MAX_PIN          PA1
-#define Y_MIN_PIN          PB13
-#define Y_MAX_PIN          PA2
-#define Z_MIN_PIN          PA0
-#define Z_MAX_PIN          PA3
+#define X_MIN_PIN                           PB14
+#define X_MAX_PIN                           PA1
+#define Y_MIN_PIN                           PB13
+#define Y_MAX_PIN                           PA2
+#define Z_MIN_PIN                           PA0
+#define Z_MAX_PIN                           PA3
 
 //
 // Filament Sensor
 // share with X_MAX_PIN
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA1
+  #define FIL_RUNOUT_PIN                    PA1
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PE11
-#define X_DIR_PIN          PE10
-#define X_ENABLE_PIN       PE12
-#define X_CS_PIN           PE7
-
-#define Y_STEP_PIN         PD8
-#define Y_DIR_PIN          PB12
-#define Y_ENABLE_PIN       PD9
-#define Y_CS_PIN           PE15
-
-#define Z_STEP_PIN         PD14
-#define Z_DIR_PIN          PD13
-#define Z_ENABLE_PIN       PD15
-#define Z_CS_PIN           PD10
-
-#define E0_STEP_PIN        PD5
-#define E0_DIR_PIN         PD6
-#define E0_ENABLE_PIN      PD4
-#define E0_CS_PIN          PD7
-
-#define E1_STEP_PIN        PE6
-#define E1_DIR_PIN         PC13
-#define E1_ENABLE_PIN      PE5
-#define E1_CS_PIN          PC14
-
-#define E2_STEP_PIN        PE2
-#define E2_DIR_PIN         PE4
-#define E2_ENABLE_PIN      PE3
-#define E2_CS_PIN          PC15
+#define X_STEP_PIN                          PE11
+#define X_DIR_PIN                           PE10
+#define X_ENABLE_PIN                        PE12
+#define X_CS_PIN                            PE7
+
+#define Y_STEP_PIN                          PD8
+#define Y_DIR_PIN                           PB12
+#define Y_ENABLE_PIN                        PD9
+#define Y_CS_PIN                            PE15
+
+#define Z_STEP_PIN                          PD14
+#define Z_DIR_PIN                           PD13
+#define Z_ENABLE_PIN                        PD15
+#define Z_CS_PIN                            PD10
+
+#define E0_STEP_PIN                         PD5
+#define E0_DIR_PIN                          PD6
+#define E0_ENABLE_PIN                       PD4
+#define E0_CS_PIN                           PD7
+
+#define E1_STEP_PIN                         PE6
+#define E1_DIR_PIN                          PC13
+#define E1_ENABLE_PIN                       PE5
+#define E1_CS_PIN                           PC14
+
+#define E2_STEP_PIN                         PE2
+#define E2_DIR_PIN                          PE4
+#define E2_ENABLE_PIN                       PE3
+#define E2_CS_PIN                           PC15
 
 #if HAS_TMC_UART
   //
@@ -115,78 +115,78 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PE9
-  #define X_SERIAL_RX_PIN  PE8
+  #define X_SERIAL_TX_PIN                   PE9
+  #define X_SERIAL_RX_PIN                   PE8
 
-  #define Y_SERIAL_TX_PIN  PE14
-  #define Y_SERIAL_RX_PIN  PE13
+  #define Y_SERIAL_TX_PIN                   PE14
+  #define Y_SERIAL_RX_PIN                   PE13
 
-  #define Z_SERIAL_TX_PIN  PD11
-  #define Z_SERIAL_RX_PIN  PD12
+  #define Z_SERIAL_TX_PIN                   PD11
+  #define Z_SERIAL_RX_PIN                   PD12
 
-  #define E0_SERIAL_TX_PIN PD3
-  #define E0_SERIAL_RX_PIN PA15
+  #define E0_SERIAL_TX_PIN                  PD3
+  #define E0_SERIAL_RX_PIN                  PA15
 
-  #define E1_SERIAL_TX_PIN PC4
-  #define E1_SERIAL_RX_PIN PC5
+  #define E1_SERIAL_TX_PIN                  PC4
+  #define E1_SERIAL_RX_PIN                  PC5
 
-  #define E2_SERIAL_TX_PIN PE1
-  #define E2_SERIAL_RX_PIN PE0
+  #define E2_SERIAL_TX_PIN                  PE1
+  #define E2_SERIAL_RX_PIN                  PE0
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC0
-#define TEMP_1_PIN         PC1
-#define TEMP_2_PIN         PC2
-#define TEMP_BED_PIN       PC3
+#define TEMP_0_PIN                          PC0
+#define TEMP_1_PIN                          PC1
+#define TEMP_2_PIN                          PC2
+#define TEMP_BED_PIN                        PC3
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB3
-#define HEATER_1_PIN       PB4
-#define HEATER_2_PIN       PB15
-#define HEATER_BED_PIN     PC8
+#define HEATER_0_PIN                        PB3
+#define HEATER_1_PIN                        PB4
+#define HEATER_2_PIN                        PB15
+#define HEATER_BED_PIN                      PC8
 
-#define FAN_PIN            PB0
-#define FAN1_PIN           PB1
-#define FAN2_PIN           PB2
+#define FAN_PIN                             PB0
+#define FAN1_PIN                            PB1
+#define FAN2_PIN                            PB2
 
 //
 // SPI
 //
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
 
 //
 // Misc. Functions
 //
-//#define LED_PIN            PB14
-//#define BTN_PIN            PC10
-//#define PS_ON_PIN          PE11
-//#define KILL_PIN           PC5
+//#define LED_PIN                           PB14
+//#define BTN_PIN                           PC10
+//#define PS_ON_PIN                         PE11
+//#define KILL_PIN                          PC5
 
-#define SDSS               PA4
-#define SD_DETECT_PIN  	   PB10
+#define SDSS                                PA4
+#define SD_DETECT_PIN                       PB10
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PC9
-  #define BTN_ENC          PA8
+  #define BEEPER_PIN                        PC9
+  #define BTN_ENC                           PA8
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PD0
+    #define LCD_PINS_RS                     PD0
 
-    #define BTN_EN1        PC11
-    #define BTN_EN2        PC10
+    #define BTN_EN1                         PC11
+    #define BTN_EN2                         PC10
 
-    #define LCD_PINS_ENABLE PD1
-    #define LCD_PINS_D4    PC12
+    #define LCD_PINS_ENABLE                 PD1
+    #define LCD_PINS_D4                     PC12
 
     // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
     // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
@@ -196,43 +196,43 @@
 
   #else
 
-    #define LCD_PINS_RS    PD2
+    #define LCD_PINS_RS                     PD2
 
-    #define BTN_EN1        PC6
-    #define BTN_EN2        PC7
+    #define BTN_EN1                         PC6
+    #define BTN_EN2                         PC7
 
-    #define LCD_SDSS       PA4
+    #define LCD_SDSS                        PA4
 
-    #define LCD_PINS_ENABLE PC11
-    #define LCD_PINS_D4    PC10
+    #define LCD_PINS_ENABLE                 PC11
+    #define LCD_PINS_D4                     PC10
 
     #if ENABLED(FYSETC_MINI_12864)
      // See https://wiki.fysetc.com/Mini12864_Panel
-      #define DOGLCD_CS    PC11
-      #define DOGLCD_A0    PD2
+      #define DOGLCD_CS                     PC11
+      #define DOGLCD_A0                     PD2
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
-        #define LCD_BACKLIGHT_PIN PD0
+        #define LCD_BACKLIGHT_PIN           PD0
       #endif
-      #define LCD_RESET_PIN PC10   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                 PC10  // Must be high or open for LCD to operate normally.
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PC12
+          #define RGB_LED_R_PIN             PC12
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PD0
+          #define RGB_LED_G_PIN             PD0
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PD1
+          #define RGB_LED_B_PIN             PD1
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PC12
+        #define NEOPIXEL_PIN                PC12
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PC12
-      #define LCD_PINS_D6  PD0
-      #define LCD_PINS_D7  PD1
+      #define LCD_PINS_D5                   PC12
+      #define LCD_PINS_D6                   PD0
+      #define LCD_PINS_D7                   PD1
     #endif
 
   #endif
@@ -240,27 +240,27 @@
   // Alter timing for graphical display
   #if HAS_GRAPHICAL_LCD
     #ifndef ST7920_DELAY_1
-      #define ST7920_DELAY_1 DELAY_NS(96)
+      #define ST7920_DELAY_1        DELAY_NS(96)
     #endif
     #ifndef ST7920_DELAY_2
-      #define ST7920_DELAY_2 DELAY_NS(48)
+      #define ST7920_DELAY_2        DELAY_NS(48)
     #endif
     #ifndef ST7920_DELAY_3
-      #define ST7920_DELAY_3 DELAY_NS(600)
+      #define ST7920_DELAY_3       DELAY_NS(600)
     #endif
   #endif
 
 #endif // HAS_SPI_LCD
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    PB6
+  #define RGB_LED_R_PIN                     PB6
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN    PB5
+  #define RGB_LED_G_PIN                     PB5
 #endif
 #ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN    PB7
+  #define RGB_LED_B_PIN                     PB7
 #endif
 #ifndef RGB_LED_W_PIN
-  #define RGB_LED_W_PIN    -1
+  #define RGB_LED_W_PIN                     -1
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
index 2909b7c53824..924b94c4f1fe 100644
--- a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
+++ b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
@@ -37,7 +37,7 @@
 //#define I2C_EEPROM
 
 #ifndef E2END
-  #define E2END 0xFFF // 4KB
+  #define E2END 0xFFF                             // 4KB
 #endif
 
 // Ignore temp readings during development.
@@ -46,12 +46,12 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE0
-#define X_MAX_PIN          -1
-#define Y_MIN_PIN          PE1
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          PE14
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                           PE0
+#define X_MAX_PIN                           -1
+#define Y_MIN_PIN                           PE1
+#define Y_MAX_PIN                           -1
+#define Z_MIN_PIN                           PE14
+#define Z_MAX_PIN                           -1
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -65,120 +65,119 @@
 // Steppers
 //
 
-#define X_STEP_PIN         PD3
-#define X_DIR_PIN          PD2
-#define X_ENABLE_PIN       PD0
+#define X_STEP_PIN                          PD3
+#define X_DIR_PIN                           PD2
+#define X_ENABLE_PIN                        PD0
 //#ifndef X_CS_PIN
 //  #define X_CS_PIN         PD1
 //#endif
 
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE10
-#define Y_ENABLE_PIN       PE13
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE10
+#define Y_ENABLE_PIN                        PE13
 //#ifndef Y_CS_PIN
 //  #define Y_CS_PIN         PE12
 //#endif
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD7
-#define Z_ENABLE_PIN       PD4
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD7
+#define Z_ENABLE_PIN                        PD4
 //#ifndef Z_CS_PIN
 //  #define Z_CS_PIN         PD5
 //#endif
 
-#define E0_STEP_PIN        PB5
-#define E0_DIR_PIN         PB6
-#define E0_ENABLE_PIN      PB3
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
+#define E0_ENABLE_PIN                       PB3
 //#ifndef E0_CS_PIN
 //  #define E0_CS_PIN         PB4
 //#endif
 
-#define E1_STEP_PIN        PE4
-#define E1_DIR_PIN         PE2
-#define E1_ENABLE_PIN      PE3
+#define E1_STEP_PIN                         PE4
+#define E1_DIR_PIN                          PE2
+#define E1_ENABLE_PIN                       PE3
 //#ifndef E1_CS_PIN
 //  #define E1_CS_PIN         PE5
 //#endif
 
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
 
 //
 // Temperature Sensors
 //
 
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_BED_PIN       PC2   // Analog Input
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_BED_PIN                        PC2   // Analog Input
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_0_PIN       PA1
-#define HEATER_1_PIN       PA2
-#define HEATER_BED_PIN     PA0
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        PA2
+#define HEATER_BED_PIN                      PA0
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PC6
+  #define FAN_PIN                           PC6
 #endif
-#define FAN1_PIN           PC7
-#define FAN2_PIN           PC8
+#define FAN1_PIN                            PC7
+#define FAN2_PIN                            PC8
 
-#define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN  // Use this by NOT overriding E0_AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
 
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN      PF13
+//#define CASE_LIGHT_PIN_CI                 PF13
+//#define CASE_LIGHT_PIN_DO                 PF14
+//#define NEOPIXEL_PIN                      PF13
 
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
 
-//#define E_MUX0_PIN         PG3
-//#define E_MUX1_PIN         PG4
+//#define E_MUX0_PIN                        PG3
+//#define E_MUX1_PIN                        PG4
 
 //
 // Servos
 //
 
-//#define SERVO0_PIN         PE13
-//#define SERVO1_PIN         PE14
+//#define SERVO0_PIN                        PE13
+//#define SERVO1_PIN                        PE14
 
-
-#define SDSS               PE7
-#define SS_PIN             PE7
-#define LED_PIN            PB7         //Alive
-#define PS_ON_PIN          PA10
-#define KILL_PIN           PA8
-#define PWR_LOSS           PA4         //Power loss / nAC_FAULT
+#define SDSS                                PE7
+#define SS_PIN                              PE7
+#define LED_PIN                             PB7   //Alive
+#define PS_ON_PIN                           PA10
+#define KILL_PIN                            PA8
+#define PWR_LOSS                            PA4   //Power loss / nAC_FAULT
 
 //
 // LCD / Controller
 //
 
-#define SD_DETECT_PIN      PA15
-#define BEEPER_PIN         PC9
-#define LCD_PINS_RS        PE9
-#define LCD_PINS_ENABLE    PE8
-#define LCD_PINS_D4        PB12
-#define LCD_PINS_D5        PB13
-#define LCD_PINS_D6        PB14
-#define LCD_PINS_D7        PB15
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PC3
+#define SD_DETECT_PIN                       PA15
+#define BEEPER_PIN                          PC9
+#define LCD_PINS_RS                         PE9
+#define LCD_PINS_ENABLE                     PE8
+#define LCD_PINS_D4                         PB12
+#define LCD_PINS_D5                         PB13
+#define LCD_PINS_D6                         PB14
+#define LCD_PINS_D7                         PB15
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PC3
 
 //
 // Filament runout
 //
 
-#define FIL_RUNOUT_PIN     PA3
+#define FIL_RUNOUT_PIN                      PA3
 
 //
 // ST7920 Delays
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 2b3ad6019920..d21cdd09583c 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -35,14 +35,14 @@
 //
 // Servos
 //
-//#define SERVO0_PIN         PD12
+//#define SERVO0_PIN                        PD12
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PG3
-#define Y_STOP_PIN         PG4
-#define Z_STOP_PIN         PG5
+#define X_STOP_PIN                          PG3
+#define Y_STOP_PIN                          PG4
+#define Z_STOP_PIN                          PG5
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -54,43 +54,43 @@
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PE6
-#define FIL_RUNOUT2_PIN    PE7
+#define FIL_RUNOUT_PIN                      PE6
+#define FIL_RUNOUT2_PIN                     PE7
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PG1
-#define X_DIR_PIN          PB10
-#define X_ENABLE_PIN       PG0
+#define X_STEP_PIN                          PG1
+#define X_DIR_PIN                           PB10
+#define X_ENABLE_PIN                        PG0
 //#ifndef X_CS_PIN
 //  #define X_CS_PIN       PE0
 //#endif
 
-#define Y_STEP_PIN         PF14
-#define Y_DIR_PIN          PF15
-#define Y_ENABLE_PIN       PF13
+#define Y_STEP_PIN                          PF14
+#define Y_DIR_PIN                           PF15
+#define Y_ENABLE_PIN                        PF13
 //#ifndef Y_CS_PIN
 //  #define Y_CS_PIN       PE1
 //#endif
 
-#define Z_STEP_PIN         PF11
-#define Z_DIR_PIN          PF12
-#define Z_ENABLE_PIN       PC5
+#define Z_STEP_PIN                          PF11
+#define Z_DIR_PIN                           PF12
+#define Z_ENABLE_PIN                        PC5
 //#ifndef Z_CS_PIN
 //  #define Z_CS_PIN       PE2
 //#endif
 
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 //#ifndef E0_CS_PIN
 //  #define E0_CS_PIN      PE3
 //#endif
 
-#define E1_STEP_PIN        PF1
-#define E1_DIR_PIN         PF0
-#define E1_ENABLE_PIN      PF2
+#define E1_STEP_PIN                         PF1
+#define E1_DIR_PIN                          PF0
+#define E1_ENABLE_PIN                       PF2
 //#ifndef E1_CS_PIN
 //  #define E1_CS_PIN      PE4
 //#endif
@@ -98,37 +98,37 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // Analog Input
-#define TEMP_1_PIN         PC2   // Analog Input
-#define TEMP_BED_PIN       PC0   // Analog Input
+#define TEMP_0_PIN                          PC1   // Analog Input
+#define TEMP_1_PIN                          PC2   // Analog Input
+#define TEMP_BED_PIN                        PC0   // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA1
-#define HEATER_1_PIN       PA0
-#define HEATER_BED_PIN     PA2
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        PA0
+#define HEATER_BED_PIN                      PA2
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PC15
+  #define FAN_PIN                           PC15
 #endif
-#define FAN1_PIN           PF6
-#define FAN2_PIN           PF7
+#define FAN1_PIN                            PF6
+#define FAN2_PIN                            PF7
 
-#define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN  // Use this by NOT overriding E0_AUTO_FAN_PIN
 
 //
 // LED / Lighting
 //
-//#define CASE_LIGHT_PIN_CI -1
-//#define CASE_LIGHT_PIN_DO -1
-//#define NEOPIXEL_PIN      -1
+//#define CASE_LIGHT_PIN_CI                 -1
+//#define CASE_LIGHT_PIN_DO                 -1
+//#define NEOPIXEL_PIN                      -1
 
 //
 // Prusa i3 MK2 Multi-Material Multiplexer Support
 //
-//#define E_MUX0_PIN         -1
-//#define E_MUX1_PIN         -1
+//#define E_MUX0_PIN                        -1
+//#define E_MUX1_PIN                        -1
 
 //
 // SD support
@@ -138,34 +138,34 @@
 //
 // Misc. Functions
 //
-#define SDSS               PC11
-#define LED_PIN            PC7   // Alive
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-#define POWER_LOSS_PIN     -1    // Power-loss / nAC_FAULT
+#define SDSS                                PC11
+#define LED_PIN                             PC7   // Alive
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            -1
+#define POWER_LOSS_PIN                      -1    // Power-loss / nAC_FAULT
 
-#define SCK_PIN            PC12
-#define MISO_PIN           PC8
-#define MOSI_PIN           PD2
-#define SS_PIN             PC11
+#define SCK_PIN                             PC12
+#define MISO_PIN                            PC8
+#define MOSI_PIN                            PD2
+#define SS_PIN                              PC11
 
 //
 // LCD / Controller
 //
 
 // TODO: Replace these with the correct FSMC pins, once known
-#define SD_DETECT_PIN      -1
-#define BEEPER_PIN         PD12
-#define LCD_PINS_RS        -1
-#define LCD_PINS_ENABLE    -1
-#define LCD_PINS_D4        -1
-#define LCD_PINS_D5        -1
-#define LCD_PINS_D6        -1
-#define LCD_PINS_D7        -1
-
-#define BTN_EN1            PE3
-#define BTN_EN2            PE4
-#define BTN_ENC            PE2
+#define SD_DETECT_PIN                       -1
+#define BEEPER_PIN                          PD12
+#define LCD_PINS_RS                         -1
+#define LCD_PINS_ENABLE                     -1
+#define LCD_PINS_D4                         -1
+#define LCD_PINS_D5                         -1
+#define LCD_PINS_D6                         -1
+#define LCD_PINS_D7                         -1
+
+#define BTN_EN1                             PE3
+#define BTN_EN2                             PE4
+#define BTN_ENC                             PE2
 
 //
 // ST7920 Delays
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index f498b7d0b9f6..c54c5c180681 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -32,20 +32,20 @@
 //
 // Servos
 //
-//#define SERVO0_PIN         PD12
-//#define SERVO1_PIN         -1
+//#define SERVO0_PIN                        PD12
+//#define SERVO1_PIN                        -1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PB12
-#define Y_STOP_PIN         PB13
-#define Z_STOP_PIN         PB14
+#define X_STOP_PIN                          PB12
+#define Y_STOP_PIN                          PB13
+#define Z_STOP_PIN                          PB14
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PE1
+#define FIL_RUNOUT_PIN                      PE1
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -57,37 +57,37 @@
 //
 // Steppers
 //
-#define X_STEP_PIN         PB10
-#define X_DIR_PIN          PB2
-#define X_ENABLE_PIN       PB11
+#define X_STEP_PIN                          PB10
+#define X_DIR_PIN                           PB2
+#define X_ENABLE_PIN                        PB11
 //#ifndef X_CS_PIN
 //  #define X_CS_PIN       PD1
 //#endif
 
-#define Y_STEP_PIN         PB0
-#define Y_DIR_PIN          PC5
-#define Y_ENABLE_PIN       PB1
+#define Y_STEP_PIN                          PB0
+#define Y_DIR_PIN                           PC5
+#define Y_ENABLE_PIN                        PB1
 //#ifndef Y_CS_PIN
 //  #define Y_CS_PIN       PE12
 //#endif
 
-#define Z_STEP_PIN         PA7
-#define Z_DIR_PIN          PA6
-#define Z_ENABLE_PIN       PC4
+#define Z_STEP_PIN                          PA7
+#define Z_DIR_PIN                           PA6
+#define Z_ENABLE_PIN                        PC4
 //#ifndef Z_CS_PIN
 //  #define Z_CS_PIN       PD5
 //#endif
 
-#define E0_STEP_PIN        PA4
-#define E0_DIR_PIN         PA3
-#define E0_ENABLE_PIN      PA5
+#define E0_STEP_PIN                         PA4
+#define E0_DIR_PIN                          PA3
+#define E0_ENABLE_PIN                       PA5
 //#ifndef E0_CS_PIN
 //  #define E0_CS_PIN      PB4
 //#endif
 
-#define E1_STEP_PIN        -1
-#define E1_DIR_PIN         -1
-#define E1_ENABLE_PIN      -1
+#define E1_STEP_PIN                         -1
+#define E1_DIR_PIN                          -1
+#define E1_ENABLE_PIN                       -1
 //#ifndef E1_CS_PIN
 //  #define E1_CS_PIN      PE5
 //#endif
@@ -95,51 +95,51 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         -1    // Analog Input
-#define TEMP_BED_PIN       PC1   // Analog Input
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          -1    // Analog Input
+#define TEMP_BED_PIN                        PC1   // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA1
-#define HEATER_1_PIN       -1
-#define HEATER_BED_PIN     PA2
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        -1
+#define HEATER_BED_PIN                      PA2
 
 #ifndef FAN_PIN
 //  #define FAN_PIN        PC15
 #endif
-#define FAN1_PIN           PC15
-#define FAN2_PIN           PA0
+#define FAN1_PIN                            PC15
+#define FAN2_PIN                            PA0
 
-#define ORIG_E0_AUTO_FAN_PIN PC15   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN                PC15  // Use this by NOT overriding E0_AUTO_FAN_PIN
 
 //
 // Prusa i3 MK2 Multi Material Multiplexer Support
 //
-//#define E_MUX0_PIN       -1
-//#define E_MUX1_PIN       -1
+//#define E_MUX0_PIN                        -1
+//#define E_MUX1_PIN                        -1
 
 //
 // LED / Lighting
 //
-//#define CASE_LIGHT_PIN_CI -1
-//#define CASE_LIGHT_PIN_DO -1
-//#define NEOPIXEL_PIN     -1
+//#define CASE_LIGHT_PIN_CI                 -1
+//#define CASE_LIGHT_PIN_DO                 -1
+//#define NEOPIXEL_PIN                      -1
 
 //
 // Misc. Functions
 //
-#define SDSS               PC11
-#define LED_PIN            PC7   // Alive
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-#define POWER_LOSS_PIN     -1    // Power-loss / nAC_FAULT
+#define SDSS                                PC11
+#define LED_PIN                             PC7   // Alive
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            -1
+#define POWER_LOSS_PIN                      -1    // Power-loss / nAC_FAULT
 
-#define SCK_PIN            PC12
-#define MISO_PIN           PC8
-#define MOSI_PIN           PD2
-#define SS_PIN             PC11
+#define SCK_PIN                             PC12
+#define MISO_PIN                            PC8
+#define MOSI_PIN                            PD2
+#define SS_PIN                              PC11
 
 //
 // SD support
@@ -151,18 +151,18 @@
 //
 
 // The LCD is initialized in FSMC mode
-#define SD_DETECT_PIN      -1
-#define BEEPER_PIN         PD12
-
-#define BTN_EN1            PE3
-#define BTN_EN2            PE4
-#define BTN_ENC            PE2
-
-#define LCD_RESET_PIN      PD6
-#define LCD_BACKLIGHT_PIN  PD3
-#define FSMC_CS_PIN        PD4
-#define FSMC_RS_PIN        PD11
-#define TOUCH_CS           PB6
+#define SD_DETECT_PIN                       -1
+#define BEEPER_PIN                          PD12
+
+#define BTN_EN1                             PE3
+#define BTN_EN2                             PE4
+#define BTN_ENC                             PE2
+
+#define LCD_RESET_PIN                       PD6
+#define LCD_BACKLIGHT_PIN                   PD3
+#define FSMC_CS_PIN                         PD4
+#define FSMC_RS_PIN                         PD11
+#define TOUCH_CS                            PB6
 
 //
 // ST7920 Delays
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
index 5d97de12ebf2..36298d05f5e6 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
@@ -40,63 +40,62 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PG8
-#define X_MAX_PIN          PG7
-#define Y_MIN_PIN          PG6
-#define Y_MAX_PIN          PG5
-#define Z_MIN_PIN          PG4
-#define Z_MAX_PIN          PG3
+#define X_MIN_PIN                           PG8
+#define X_MAX_PIN                           PG7
+#define Y_MIN_PIN                           PG6
+#define Y_MAX_PIN                           PG5
+#define Z_MIN_PIN                           PG4
+#define Z_MAX_PIN                           PG3
 
 //
 // Servos
 //
-#define SERVO0_PIN         PB0   // XS2-5
-#define SERVO1_PIN         PF7   // XS1-5
-#define SERVO2_PIN         PF8   // XS1-6
+#define SERVO0_PIN                          PB0   // XS2-5
+#define SERVO1_PIN                          PF7   // XS1-5
+#define SERVO2_PIN                          PF8   // XS1-6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PE6
-#define X_DIR_PIN          PE5
-#define X_ENABLE_PIN       PC13
+#define X_STEP_PIN                          PE6
+#define X_DIR_PIN                           PE5
+#define X_ENABLE_PIN                        PC13
 
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE4
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE4
 
-#define Z_STEP_PIN         PE0
-#define Z_DIR_PIN          PB9
-#define Z_ENABLE_PIN       PE1
+#define Z_STEP_PIN                          PE0
+#define Z_DIR_PIN                           PB9
+#define Z_ENABLE_PIN                        PE1
 
-#define E0_STEP_PIN        PG10
-#define E0_DIR_PIN         PG9
-#define E0_ENABLE_PIN      PB8
-
-#define E1_STEP_PIN        PD3
-#define E1_DIR_PIN         PA15
-#define E1_ENABLE_PIN      PD6
+#define E0_STEP_PIN                         PG10
+#define E0_DIR_PIN                          PG9
+#define E0_ENABLE_PIN                       PB8
 
+#define E1_STEP_PIN                         PD3
+#define E1_DIR_PIN                          PA15
+#define E1_ENABLE_PIN                       PD6
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // T1 <-> E0
-#define TEMP_1_PIN         PC2   // T2 <-> E1
-#define TEMP_BED_PIN       PC0   // T0 <-> Bed
+#define TEMP_0_PIN                          PC1   // T1 <-> E0
+#define TEMP_1_PIN                          PC2   // T2 <-> E1
+#define TEMP_BED_PIN                        PC0   // T0 <-> Bed
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PF3   // Heater0
-#define HEATER_1_PIN       PF2   // Heater1
-#define HEATER_BED_PIN     PF4   // Hotbed
-#define FAN_PIN            PA7   // Fan0
+#define HEATER_0_PIN                        PF3   // Heater0
+#define HEATER_1_PIN                        PF2   // Heater1
+#define HEATER_BED_PIN                      PF4   // Hotbed
+#define FAN_PIN                             PA7   // Fan0
 
 //
 // Misc. Functions
 //
-#define SDSS               -1    // PB12
+#define SDSS                                -1    // PB12
 
-#define SD_DETECT_PIN      PF9
-#define BEEPER_PIN         PG2
+#define SD_DETECT_PIN                       PF9
+#define BEEPER_PIN                          PG2
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
index a6bc2b49a6c0..9fcd5a1474c8 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -46,13 +46,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PA7
+    #define TMC_SW_MOSI                     PA7
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PA6
+    #define TMC_SW_MISO                     PA6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PA5
+    #define TMC_SW_SCK                      PA5
   #endif
 #endif
 
@@ -78,23 +78,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PA3
-  #define X_SERIAL_RX_PIN  PC14
+  #define X_SERIAL_TX_PIN                   PA3
+  #define X_SERIAL_RX_PIN                   PC14
 
-  #define Y_SERIAL_TX_PIN  PA4
-  #define Y_SERIAL_RX_PIN  PE4
+  #define Y_SERIAL_TX_PIN                   PA4
+  #define Y_SERIAL_RX_PIN                   PE4
 
-  #define Z_SERIAL_TX_PIN  PD13
-  #define Z_SERIAL_RX_PIN  PE0
+  #define Z_SERIAL_TX_PIN                   PD13
+  #define Z_SERIAL_RX_PIN                   PE0
 
-  #define E0_SERIAL_TX_PIN PD14
-  #define E0_SERIAL_RX_PIN PC13
+  #define E0_SERIAL_TX_PIN                  PD14
+  #define E0_SERIAL_RX_PIN                  PC13
 
-  #define E1_SERIAL_TX_PIN PD15
-  #define E1_SERIAL_RX_PIN PD5
+  #define E1_SERIAL_TX_PIN                  PD15
+  #define E1_SERIAL_RX_PIN                  PD5
 
-  #define E2_SERIAL_TX_PIN PD12
-  #define E2_SERIAL_RX_PIN PD1
+  #define E2_SERIAL_TX_PIN                  PD12
+  #define E2_SERIAL_RX_PIN                  PD1
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 0fb469112d41..19853a78fea2 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -38,112 +38,112 @@
 #ifdef E2END
   #undef E2END
 #endif
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB12
-#define X_MAX_PIN          PB13
-#define Y_MIN_PIN          PB15
-#define Y_MAX_PIN          PD8
-#define Z_MIN_PIN          PD9
-#define Z_MAX_PIN          PD10
+#define X_MIN_PIN                           PB12
+#define X_MAX_PIN                           PB13
+#define Y_MIN_PIN                           PB15
+#define Y_MAX_PIN                           PD8
+#define Z_MIN_PIN                           PD9
+#define Z_MAX_PIN                           PD10
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PA0
-#define X_DIR_PIN          PC15
-#define X_ENABLE_PIN       PC11
-#define X_CS_PIN           PC14
-
-#define Y_STEP_PIN         PE5
-#define Y_DIR_PIN          PE6
-#define Y_ENABLE_PIN       PE3
-#define Y_CS_PIN           PE4
-
-#define Z_STEP_PIN         PE1
-#define Z_DIR_PIN          PE2
-#define Z_ENABLE_PIN       PB7
-#define Z_CS_PIN           PE0
-
-#define E0_STEP_PIN        PB5
-#define E0_DIR_PIN         PB6
-#define E0_ENABLE_PIN      PC12
-#define E0_CS_PIN          PC13
-
-#define E1_STEP_PIN        PD6
-#define E1_DIR_PIN         PD7
-#define E1_ENABLE_PIN      PD4
-#define E1_CS_PIN          PD5
-
-#define E2_STEP_PIN        PD2
-#define E2_DIR_PIN         PD3
-#define E2_ENABLE_PIN      PD0
-#define E2_CS_PIN          PD1
+#define X_STEP_PIN                          PA0
+#define X_DIR_PIN                           PC15
+#define X_ENABLE_PIN                        PC11
+#define X_CS_PIN                            PC14
+
+#define Y_STEP_PIN                          PE5
+#define Y_DIR_PIN                           PE6
+#define Y_ENABLE_PIN                        PE3
+#define Y_CS_PIN                            PE4
+
+#define Z_STEP_PIN                          PE1
+#define Z_DIR_PIN                           PE2
+#define Z_ENABLE_PIN                        PB7
+#define Z_CS_PIN                            PE0
+
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
+#define E0_ENABLE_PIN                       PC12
+#define E0_CS_PIN                           PC13
+
+#define E1_STEP_PIN                         PD6
+#define E1_DIR_PIN                          PD7
+#define E1_ENABLE_PIN                       PD4
+#define E1_CS_PIN                           PD5
+
+#define E2_STEP_PIN                         PD2
+#define E2_DIR_PIN                          PD3
+#define E2_ENABLE_PIN                       PD0
+#define E2_CS_PIN                           PD1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC4
-#define TEMP_1_PIN         PC3
-#define TEMP_2_PIN         PC2
-#define TEMP_3_PIN         PC1
-#define TEMP_BED_PIN       PC0
+#define TEMP_0_PIN                          PC4
+#define TEMP_1_PIN                          PC3
+#define TEMP_2_PIN                          PC2
+#define TEMP_3_PIN                          PC1
+#define TEMP_BED_PIN                        PC0
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC6
-#define HEATER_1_PIN       PC7
-#define HEATER_2_PIN       PC8
-#define HEATER_BED_PIN     PA1
+#define HEATER_0_PIN                        PC6
+#define HEATER_1_PIN                        PC7
+#define HEATER_2_PIN                        PC8
+#define HEATER_BED_PIN                      PA1
 
-#define FAN_PIN            PC9
-#define FAN1_PIN           PA8
+#define FAN_PIN                             PC9
+#define FAN1_PIN                            PA8
 
 //
 // I2C
 //
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
 
 //
 // Misc. Functions
 //
-#define LED_PIN            PB14
-#define BTN_PIN            PC10
-#define PS_ON_PIN          PE11
-#define KILL_PIN           PC5
+#define LED_PIN                             PB14
+#define BTN_PIN                             PC10
+#define PS_ON_PIN                           PE11
+#define KILL_PIN                            PC5
 
-#define SDSS               PA2
-#define SD_DETECT_PIN      PB0
-#define BEEPER_PIN         PE8
+#define SDSS                                PA2
+#define SD_DETECT_PIN                       PB0
+#define BEEPER_PIN                          PE8
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define BTN_EN1          PB2
-  #define BTN_EN2          PB1
-  #define BTN_ENC          PE7
+  #define BTN_EN1                           PB2
+  #define BTN_EN2                           PB1
+  #define BTN_ENC                           PE7
 
-  #define LCD_PINS_RS      PE10
-  #define LCD_PINS_ENABLE  PE9
-  #define LCD_PINS_D4      PE12
+  #define LCD_PINS_RS                       PE10
+  #define LCD_PINS_ENABLE                   PE9
+  #define LCD_PINS_D4                       PE12
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      PE13
-    #define DOGLCD_A0      PE14
+    #define DOGLCD_CS                       PE13
+    #define DOGLCD_A0                       PE14
   #endif
 
   #if ENABLED(ULTIPANEL)
-    #define LCD_PINS_D5    PE13
-    #define LCD_PINS_D6    PE14
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_D5                     PE13
+    #define LCD_PINS_D6                     PE14
+    #define LCD_PINS_D7                     PE15
   #endif
 
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 2b6e6f6c335b..1a008cd4ae32 100644
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -51,13 +51,13 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          39   // PD8   X_STOP
-#define Y_MIN_PIN          40   // PD9   Y_STOP
-#define Z_MIN_PIN          41   // PD10  Z_STOP
+#define X_MIN_PIN                             39  // PD8   X_STOP
+#define Y_MIN_PIN                             40  // PD9   Y_STOP
+#define Z_MIN_PIN                             41  // PD10  Z_STOP
 
-#define X_MAX_PIN          44   // PD0   W_STOP
-#define Y_MAX_PIN          43   // PA8   V_STOP
-#define Z_MAX_PIN          42   // PD11  U_STOP
+#define X_MAX_PIN                             44  // PD0   W_STOP
+#define Y_MAX_PIN                             43  // PA8   V_STOP
+#define Z_MAX_PIN                             42  // PD11  U_STOP
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -69,64 +69,64 @@
 //
 // Filament runout
 //
-//#define FIL_RUNOUT_PIN     53   // PA3    BED_THE
+//#define FIL_RUNOUT_PIN                      53  // PA3    BED_THE
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         61  // PE14    X_PWM
-#define X_DIR_PIN          62  // PE15    X_DIR
-#define X_ENABLE_PIN       60  // PE13    X_RES
-#define X_CS_PIN           16  // PA4     SPI_CS
+#define X_STEP_PIN                            61  // PE14    X_PWM
+#define X_DIR_PIN                             62  // PE15    X_DIR
+#define X_ENABLE_PIN                          60  // PE13    X_RES
+#define X_CS_PIN                              16  // PA4     SPI_CS
 
-#define Y_STEP_PIN         64  // PB10    Y_PWM
-#define Y_DIR_PIN          65  // PE9     Y_DIR
-#define Y_ENABLE_PIN       63  // PE10    Y_RES
-#define Y_CS_PIN           16  // PA4     SPI_CS
+#define Y_STEP_PIN                            64  // PB10    Y_PWM
+#define Y_DIR_PIN                             65  // PE9     Y_DIR
+#define Y_ENABLE_PIN                          63  // PE10    Y_RES
+#define Y_CS_PIN                              16  // PA4     SPI_CS
 
-#define Z_STEP_PIN         67  // PC6     Z_PWM
-#define Z_DIR_PIN          68  // PC0     Z_DIR
-#define Z_ENABLE_PIN       66  // PC15    Z_RES
-#define Z_CS_PIN           16  // PA4     SPI_CS
+#define Z_STEP_PIN                            67  // PC6     Z_PWM
+#define Z_DIR_PIN                             68  // PC0     Z_DIR
+#define Z_ENABLE_PIN                          66  // PC15    Z_RES
+#define Z_CS_PIN                              16  // PA4     SPI_CS
 
-#define E0_STEP_PIN        71  // PD12    E1_PW
-#define E0_DIR_PIN         70  // PC13    E1_DIR
-#define E0_ENABLE_PIN      69  // PC14    E1_RE
-#define E0_CS_PIN          16  // PA4     SPI_CS
+#define E0_STEP_PIN                           71  // PD12    E1_PW
+#define E0_DIR_PIN                            70  // PC13    E1_DIR
+#define E0_ENABLE_PIN                         69  // PC14    E1_RE
+#define E0_CS_PIN                             16  // PA4     SPI_CS
 
-#define E1_STEP_PIN        73  // PE5     E2_PWM
-#define E1_DIR_PIN         74  // PE6     E2_DIR
-#define E1_ENABLE_PIN      72  // PE4     E2_RESE
-#define E1_CS_PIN          16  // PA4     SPI_CS
+#define E1_STEP_PIN                           73  // PE5     E2_PWM
+#define E1_DIR_PIN                            74  // PE6     E2_DIR
+#define E1_ENABLE_PIN                         72  // PE4     E2_RESE
+#define E1_CS_PIN                             16  // PA4     SPI_CS
 
-#define E2_STEP_PIN        77  // PB8     E3_PWM
-#define E2_DIR_PIN         76  // PE2     E3_DIR
-#define E2_ENABLE_PIN      75  // PE3     E3_RESE
-#define E2_CS_PIN          16  // PA4     SPI_CS
+#define E2_STEP_PIN                           77  // PB8     E3_PWM
+#define E2_DIR_PIN                            76  // PE2     E3_DIR
+#define E2_ENABLE_PIN                         75  // PE3     E3_RESE
+#define E2_CS_PIN                             16  // PA4     SPI_CS
 
 // needed to pass a sanity check
-#define X2_CS_PIN          16  // PA4     SPI_CS
-#define Y2_CS_PIN          16  // PA4     SPI_CS
-#define Z2_CS_PIN          16  // PA4     SPI_CS
-#define Z3_CS_PIN          16  // PA4     SPI_CS
-#define E3_CS_PIN          16  // PA4     SPI_CS
-#define E4_CS_PIN          16  // PA4     SPI_CS
-#define E5_CS_PIN          16  // PA4     SPI_CS
+#define X2_CS_PIN                             16  // PA4     SPI_CS
+#define Y2_CS_PIN                             16  // PA4     SPI_CS
+#define Z2_CS_PIN                             16  // PA4     SPI_CS
+#define Z3_CS_PIN                             16  // PA4     SPI_CS
+#define E3_CS_PIN                             16  // PA4     SPI_CS
+#define E4_CS_PIN                             16  // PA4     SPI_CS
+#define E5_CS_PIN                             16  // PA4     SPI_CS
 
 #if HAS_L64XX
-  #define L6470_CHAIN_SCK_PIN  17   // PA5
-  #define L6470_CHAIN_MISO_PIN 18   // PA6
-  #define L6470_CHAIN_MOSI_PIN 19   // PA7
-  #define L6470_CHAIN_SS_PIN   16   // PA4
-
-  //#define SCK_PIN        L6470_CHAIN_SCK_PIN
-  //#define MISO_PIN       L6470_CHAIN_MISO_PIN
-  //#define MOSI_PIN       L6470_CHAIN_MOSI_PIN
+  #define L6470_CHAIN_SCK_PIN                 17  // PA5
+  #define L6470_CHAIN_MISO_PIN                18  // PA6
+  #define L6470_CHAIN_MOSI_PIN                19  // PA7
+  #define L6470_CHAIN_SS_PIN                  16  // PA4
+
+  //#define SCK_PIN          L6470_CHAIN_SCK_PIN
+  //#define MISO_PIN        L6470_CHAIN_MISO_PIN
+  //#define MOSI_PIN        L6470_CHAIN_MOSI_PIN
 #else
-  //#define SCK_PIN        13   // PB13    SPI_S
-  //#define MISO_PIN       12   // PB14    SPI_M
-  //#define MOSI_PIN       11   // PB15    SPI_M
+  //#define SCK_PIN                           13  // PB13    SPI_S
+  //#define MISO_PIN                          12  // PB14    SPI_M
+  //#define MOSI_PIN                          11  // PB15    SPI_M
 #endif
 
 /**
@@ -147,64 +147,64 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          3   // Analog input 3,  digital pin 54   PA0     E1_THERMISTOR
-#define TEMP_1_PIN          4   // Analog input 4,  digital pin 55   PA1     E2_THERMISTOR
-#define TEMP_2_PIN          5   // Analog input 5,  digital pin 56   PA2     E3_THERMISTOR
-#define TEMP_BED_PIN        0   // Analog input 0,  digital pin 51   PC2     BED_THERMISTOR_1
-#define TEMP_BED_1_PIN      1   // Analog input 1,  digital pin 52   PC3     BED_THERMISTOR_2
-#define TEMP_BED_2_PIN      2   // Analog input 2,  digital pin 53   PA3     BED_THERMISTOR_3
+#define TEMP_0_PIN                             3  // Analog input 3,  digital pin 54   PA0     E1_THERMISTOR
+#define TEMP_1_PIN                             4  // Analog input 4,  digital pin 55   PA1     E2_THERMISTOR
+#define TEMP_2_PIN                             5  // Analog input 5,  digital pin 56   PA2     E3_THERMISTOR
+#define TEMP_BED_PIN                           0  // Analog input 0,  digital pin 51   PC2     BED_THERMISTOR_1
+#define TEMP_BED_1_PIN                         1  // Analog input 1,  digital pin 52   PC3     BED_THERMISTOR_2
+#define TEMP_BED_2_PIN                         2  // Analog input 2,  digital pin 53   PA3     BED_THERMISTOR_3
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       48   // PC7   E1_HEAT_PWM
-#define HEATER_1_PIN       49   // PB0   E2_HEAT_PWM
-#define HEATER_2_PIN       50   // PB1   E3_HEAT_PWM
-#define HEATER_BED_PIN     46   // PD14 (BED_HEAT_1 FET
-#define HEATER_BED_1_PIN   45   // PD13 (BED_HEAT_2 FET
-#define HEATER_BED_2_PIN   47   // PD15 (BED_HEAT_3 FET
-
-#define FAN_PIN            57   // PC4   E1_FAN   PWM pin, Part cooling fan FET
-#define FAN1_PIN           58   // PC5   E2_FAN   PWM pin, Extruder fan FET
-#define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN
-#define FAN2_PIN           59   // PE8   E3_FAN   PWM pin, Controller fan FET
+#define HEATER_0_PIN                          48  // PC7   E1_HEAT_PWM
+#define HEATER_1_PIN                          49  // PB0   E2_HEAT_PWM
+#define HEATER_2_PIN                          50  // PB1   E3_HEAT_PWM
+#define HEATER_BED_PIN                        46  // PD14 (BED_HEAT_1 FET
+#define HEATER_BED_1_PIN                      45  // PD13 (BED_HEAT_2 FET
+#define HEATER_BED_2_PIN                      47  // PD15 (BED_HEAT_3 FET
+
+#define FAN_PIN                               57  // PC4   E1_FAN   PWM pin, Part cooling fan FET
+#define FAN1_PIN                              58  // PC5   E2_FAN   PWM pin, Extruder fan FET
+#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN
+#define FAN2_PIN                              59  // PE8   E3_FAN   PWM pin, Controller fan FET
 
 //
 // Misc functions
 //
-#define SDSS               16   // PA4    SPI_CS
-#define LED_PIN            -1   // 9 // PE1 green LED   Heart beat
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-#define POWER_LOSS_PIN     -1   // PWR_LOSS / nAC_FAULT
+#define SDSS                                  16  // PA4    SPI_CS
+#define LED_PIN                               -1  // 9 // PE1 green LED   Heart beat
+#define PS_ON_PIN                             -1
+#define KILL_PIN                              -1
+#define POWER_LOSS_PIN                        -1  // PWR_LOSS / nAC_FAULT
 
 //
 // LCD / Controller
 //
-//#define SD_DETECT_PIN      66   // PA15    SD_CA
-//#define BEEPER_PIN         24   // PC9     SDIO_D1
-//#define LCD_PINS_RS        65   // PE9     Y_DIR
-//#define LCD_PINS_ENABLE    59   // PE8     E3_FAN
-//#define LCD_PINS_D4        10   // PB12    SPI_C
-//#define LCD_PINS_D5        13   // PB13    SPI_S
-//#define LCD_PINS_D6        12   // PB14    SPI_M
-//#define LCD_PINS_D7        11   // PB15    SPI_M
-//#define BTN_EN1            57   // PC4     E1_FAN
-//#define BTN_EN2            58   // PC5     E2_FAN
-//#define BTN_ENC            52   // PC3     BED_THE
+//#define SD_DETECT_PIN                       66  // PA15    SD_CA
+//#define BEEPER_PIN                          24  // PC9     SDIO_D1
+//#define LCD_PINS_RS                         65  // PE9     Y_DIR
+//#define LCD_PINS_ENABLE                     59  // PE8     E3_FAN
+//#define LCD_PINS_D4                         10  // PB12    SPI_C
+//#define LCD_PINS_D5                         13  // PB13    SPI_S
+//#define LCD_PINS_D6                         12  // PB14    SPI_M
+//#define LCD_PINS_D7                         11  // PB15    SPI_M
+//#define BTN_EN1                             57  // PC4     E1_FAN
+//#define BTN_EN2                             58  // PC5     E2_FAN
+//#define BTN_ENC                             52  // PC3     BED_THE
 
 //
 // Extension pins
 //
-//#define EXT0_PIN           49   // PB0     E2_HEAT
-//#define EXT1_PIN           50   // PB1     E3_HEAT
-//#define EXT2_PIN                // PB2    not used (tied to ground
-//#define EXT3_PIN           39   // PD8     X_STOP
-//#define EXT4_PIN           40   // PD9     Y_STOP
-//#define EXT5_PIN           41   // PD10    Z_STOP
-//#define EXT6_PIN           42   // PD11
-//#define EXT7_PIN           71   // PD12    E1_PW
-//#define EXT8_PIN           64   // PB10    Y_PWM
+//#define EXT0_PIN                            49  // PB0     E2_HEAT
+//#define EXT1_PIN                            50  // PB1     E3_HEAT
+//#define EXT2_PIN                                // PB2    not used (tied to ground
+//#define EXT3_PIN                            39  // PD8     X_STOP
+//#define EXT4_PIN                            40  // PD9     Y_STOP
+//#define EXT5_PIN                            41  // PD10    Z_STOP
+//#define EXT6_PIN                            42  // PD11
+//#define EXT7_PIN                            71  // PD12    E1_PW
+//#define EXT8_PIN                            64  // PB10    Y_PWM
 
 // WIFI
 //  2   // PD3   CTS
@@ -215,7 +215,6 @@
 //  7   // PE11  WIFI_RESET
 //  8   // PE12  WIFI_BOOT
 
-
 // I2C USER
 // 14   // PB7   SDA
 // 15   // PB6   SCL
@@ -228,27 +227,27 @@
 //
 // Onboard SD support
 //
-#define SDIO_D0_PIN       23   // PC8   SDIO_D0
-#define SDIO_D1_PIN       24   // PC9   SDIO_D1
-//#define SD_CARD_DETECT_PIN 25   // PA15  SD_CARD_DETECT
-#define SDIO_D2_PIN       26   // PC10  SDIO_D2
-#define SDIO_D3_PIN       27   // PC11  SDIO_D3
-#define SDIO_CK_PIN       28   // PC12  SDIO_CK
-#define SDIO_CMD_PIN      29   // PD2   SDIO_CMD
+#define SDIO_D0_PIN                           23  // PC8   SDIO_D0
+#define SDIO_D1_PIN                           24  // PC9   SDIO_D1
+//#define SD_CARD_DETECT_PIN                  25  // PA15  SD_CARD_DETECT
+#define SDIO_D2_PIN                           26  // PC10  SDIO_D2
+#define SDIO_D3_PIN                           27  // PC11  SDIO_D3
+#define SDIO_CK_PIN                           28  // PC12  SDIO_CK
+#define SDIO_CMD_PIN                          29  // PD2   SDIO_CMD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SDCARD_CONNECTION == ONBOARD
-  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
 
   #ifndef SDIO_SUPPORT
-    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
-    #define SDSS           SDIO_D3_PIN
-    #define SCK_PIN        SDIO_CK_PIN
-    #define MISO_PIN       SDIO_D0_PIN
-    #define MOSI_PIN       SDIO_CMD_PIN
+    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
+    #define SDSS                     SDIO_D3_PIN
+    #define SCK_PIN                  SDIO_CK_PIN
+    #define MISO_PIN                 SDIO_D0_PIN
+    #define MOSI_PIN                SDIO_CMD_PIN
   #endif
 #endif
 
@@ -265,16 +264,13 @@
 // USERKET
 // 38   // PE7   USER_BUTTON
 
-
 //  0   // PA9   TX
 //  1   // PA10  RX
 
-
 // IR/PROBE
 // 32   // PD1   IR_OUT
 // 33   // PC1   IR_ON
 
-
 /**
  * Logical pin vs. port/pin cross reference
  *
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 35faf076abb2..7eb95a4f5044 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -32,133 +32,133 @@
 
 //#define I2C_EEPROM
 
-#define E2END 0xFFF // EEPROM end address (4kB)
+#define E2END 0xFFF                               // EEPROM end address (4kB)
 
 //
 // Servos
 //
-//#define SERVO0_PIN         PE13
-//#define SERVO1_PIN         PE14
+//#define SERVO0_PIN                        PE13
+//#define SERVO1_PIN                        PE14
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PE10
-#define Y_STOP_PIN         PE9
-#define Z_STOP_PIN         PE8
+#define X_STOP_PIN                          PE10
+#define Y_STOP_PIN                          PE9
+#define Z_STOP_PIN                          PE8
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PA4
+  #define Z_MIN_PROBE_PIN                   PA4
 #endif
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PA3
+#define FIL_RUNOUT_PIN                      PA3
 
 //
 // Steppers
 //
 
-#define STEPPER_ENABLE_PIN PB2
+#define STEPPER_ENABLE_PIN                  PB2
 
-#define X_STEP_PIN         PC6   // X_STEP
-#define X_DIR_PIN          PC7   // X_DIR
-#define X_ENABLE_PIN       PB2   //
+#define X_STEP_PIN                          PC6   // X_STEP
+#define X_DIR_PIN                           PC7   // X_DIR
+#define X_ENABLE_PIN                        PB2   //
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PC8   // X_CS
+  #define X_CS_PIN                          PC8   // X_CS
 #endif
 
-#define Y_STEP_PIN         PD9   // Y_STEP
-#define Y_DIR_PIN          PD10  // Y_DIR
-#define Y_ENABLE_PIN       PB2   //
+#define Y_STEP_PIN                          PD9   // Y_STEP
+#define Y_DIR_PIN                           PD10  // Y_DIR
+#define Y_ENABLE_PIN                        PB2   //
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PD11  // Y_CS
+  #define Y_CS_PIN                          PD11  // Y_CS
 #endif
 
-#define Z_STEP_PIN         PE15  // Z_STEP
-#define Z_DIR_PIN          PB10  // Z_DIR
-#define Z_ENABLE_PIN       PB2
+#define Z_STEP_PIN                          PE15  // Z_STEP
+#define Z_DIR_PIN                           PB10  // Z_DIR
+#define Z_ENABLE_PIN                        PB2
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PD8
+  #define Z_CS_PIN                          PD8
 #endif
 
-#define E0_STEP_PIN        PB1
-#define E0_DIR_PIN         PB13
-#define E0_ENABLE_PIN      PB2
+#define E0_STEP_PIN                         PB1
+#define E0_DIR_PIN                          PB13
+#define E0_ENABLE_PIN                       PB2
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PE11
+  #define E0_CS_PIN                         PE11
 #endif
 
-#define E1_STEP_PIN        PC4
-#define E1_DIR_PIN         PC5
-#define E1_ENABLE_PIN      PB2
+#define E1_STEP_PIN                         PC4
+#define E1_DIR_PIN                          PC5
+#define E1_ENABLE_PIN                       PB2
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PB0
+  #define E1_CS_PIN                         PB0
 #endif
 
-#define SCK_PIN            PE12  // PA5   // SPI1 for SD card
-#define MISO_PIN           PE13  // PA6
-#define MOSI_PIN           PE14  // PA7
+#define SCK_PIN                             PE12  // PA5   // SPI1 for SD card
+#define MISO_PIN                            PE13  // PA6
+#define MOSI_PIN                            PE14  // PA7
 
 // added for SD card : optional or not ???
-//#define SD_CHIP_SELECT_PIN SDSS   // The default chip select pin for the SD card is SS.
+//#define SD_CHIP_SELECT_PIN                SDSS  // The default chip select pin for the SD card is SS.
 // The following three pins must not be redefined for hardware SPI.
-//#define SPI_MOSI_PIN MOSI_PIN       // SPI Master Out Slave In pin
-//#define SPI_MISO_PIN MISO_PIN       // SPI Master In Slave Out pin
-//#define SPI_SCK_PIN SCK_PIN         // SPI Clock pin
+//#define SPI_MOSI_PIN                  MOSI_PIN  // SPI Master Out Slave In pin
+//#define SPI_MISO_PIN                  MISO_PIN  // SPI Master In Slave Out pin
+//#define SPI_SCK_PIN                    SCK_PIN  // SPI Clock pin
 
 //
 // Temperature Sensors (Analog inputs)
 //
 
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_2_PIN         PC2   // Analog Input
-#define TEMP_3_PIN         PC3   // Analog Input
-#define TEMP_BED_PIN       PC3   // Analog Input
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_2_PIN                          PC2   // Analog Input
+#define TEMP_3_PIN                          PC3   // Analog Input
+#define TEMP_BED_PIN                        PC3   // Analog Input
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_0_PIN       PD15
-#define HEATER_1_PIN       PD14
-#define HEATER_BED_PIN     PD12
+#define HEATER_0_PIN                        PD15
+#define HEATER_1_PIN                        PD14
+#define HEATER_BED_PIN                      PD12
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PD13
+  #define FAN_PIN                           PD13
 #endif
-#define FAN1_PIN           PB5   // PA0
-#define FAN2_PIN           PB4   // PA1
+#define FAN1_PIN                            PB5   // PA0
+#define FAN2_PIN                            PB4   // PA1
 
-#define ORIG_E0_AUTO_FAN_PIN PD13   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN                PD13  // Use this by NOT overriding E0_AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
 
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN      PF13
+//#define CASE_LIGHT_PIN_CI                 PF13
+//#define CASE_LIGHT_PIN_DO                 PF14
+//#define NEOPIXEL_PIN                      PF13
 
 //
 // Prusa i3 MK2 Multi Material Multiplexer Support
 //
-//#define E_MUX0_PIN         PG3
-//#define E_MUX1_PIN         PG4
+//#define E_MUX0_PIN                        PG3
+//#define E_MUX1_PIN                        PG4
 
-#define LED_PIN            PB14   // Alive
-#define PS_ON_PIN          PE0
-#define KILL_PIN           PD5
-#define POWER_LOSS_PIN     PA4   // ?? Power loss / nAC_FAULT
+#define LED_PIN                             PB14  // Alive
+#define PS_ON_PIN                           PE0
+#define KILL_PIN                            PD5
+#define POWER_LOSS_PIN                      PA4   // ?? Power loss / nAC_FAULT
 
 #if ENABLED(SDSUPPORT)
-  #define SD_DETECT_PIN    PB7
-  #define SS_PIN           PB_15  // USD_CS -> CS for onboard SD
+  #define SD_DETECT_PIN                     PB7
+  #define SS_PIN                           PB_15  // USD_CS -> CS for onboard SD
 #endif
 
 //
@@ -166,29 +166,29 @@
 //
 #if HAS_SPI_LCD
   #if ENABLED(SDSUPPORT)
-    #define SDSS           PB6   // CS for SD card in LCD
+    #define SDSS                            PB6   // CS for SD card in LCD
   #endif
-  #define BEEPER_PIN       PC9
-  #define LCD_PINS_RS      PC12
-  #define LCD_PINS_ENABLE  PD7
-  #define LCD_PINS_D4      PD1
-  #define LCD_PINS_D5      PD2
-  #define LCD_PINS_D6      PD3
-  #define LCD_PINS_D7      PD4
-  #define BTN_EN1          PD6
-  #define BTN_EN2          PD0
-  #define BTN_ENC          PB12
+  #define BEEPER_PIN                        PC9
+  #define LCD_PINS_RS                       PC12
+  #define LCD_PINS_ENABLE                   PD7
+  #define LCD_PINS_D4                       PD1
+  #define LCD_PINS_D5                       PD2
+  #define LCD_PINS_D6                       PD3
+  #define LCD_PINS_D7                       PD4
+  #define BTN_EN1                           PD6
+  #define BTN_EN2                           PD0
+  #define BTN_ENC                           PB12
 #endif
 
 //
 // ST7920 Delays
 //
 #ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(96)
+  #define ST7920_DELAY_1            DELAY_NS(96)
 #endif
 #ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(48)
+  #define ST7920_DELAY_2            DELAY_NS(48)
 #endif
 #ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(715)
+  #define ST7920_DELAY_3           DELAY_NS(715)
 #endif
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
index 45a1f68e5a3a..736445cdabe5 100644
--- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -28,7 +28,7 @@
 #define BOARD_INFO_NAME      "RemRam v1"
 #define DEFAULT_MACHINE_NAME "RemRam"
 
-#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM
+#define SRAM_EEPROM_EMULATION                     // Emulate the EEPROM using Backup SRAM
 
 #if HOTENDS > 1 || E_STEPPERS > 1
   #error "RemRam supports only one hotend / E-stepper."
@@ -38,96 +38,96 @@
 // Limit Switches
 //
 #if DISABLED(SENSORLESS_HOMING)
-  #define X_MIN_PIN        58
-  #define X_MAX_PIN        59
-  #define Y_MIN_PIN        60
-  #define Y_MAX_PIN        61
-  #define Z_MIN_PIN        62
-  #define Z_MAX_PIN        63
+  #define X_MIN_PIN                           58
+  #define X_MAX_PIN                           59
+  #define Y_MIN_PIN                           60
+  #define Y_MAX_PIN                           61
+  #define Z_MIN_PIN                           62
+  #define Z_MAX_PIN                           63
 #else
-  #define X_STOP_PIN       36
-  #define Y_STOP_PIN       39
-  #define Z_MIN_PIN        62
-  #define Z_MAX_PIN        42
+  #define X_STOP_PIN                          36
+  #define Y_STOP_PIN                          39
+  #define Z_MIN_PIN                           62
+  #define Z_MAX_PIN                           42
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  26   // EXT_D1
+  #define Z_MIN_PROBE_PIN                     26  // EXT_D1
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         22
-#define X_DIR_PIN          35
-#define X_ENABLE_PIN       34
-#define X_CS_PIN           14
+#define X_STEP_PIN                            22
+#define X_DIR_PIN                             35
+#define X_ENABLE_PIN                          34
+#define X_CS_PIN                              14
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          38
-#define Y_ENABLE_PIN       37
-#define Y_CS_PIN           15
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             38
+#define Y_ENABLE_PIN                          37
+#define Y_CS_PIN                              15
 
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          41
-#define Z_ENABLE_PIN       40
-#define Z_CS_PIN           16
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             41
+#define Z_ENABLE_PIN                          40
+#define Z_CS_PIN                              16
 
-#define E0_STEP_PIN        25
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      43
-#define E0_CS_PIN          10
+#define E0_STEP_PIN                           25
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         43
+#define E0_CS_PIN                             10
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         64   // THERM_1
-#define TEMP_1_PIN         65   // THERM_2
-#define TEMP_BED_PIN       66   // THERM_3
+#define TEMP_0_PIN                            64  // THERM_1
+#define TEMP_1_PIN                            65  // THERM_2
+#define TEMP_BED_PIN                          66  // THERM_3
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       33
-#define HEATER_BED_PIN     31
+#define HEATER_0_PIN                          33
+#define HEATER_BED_PIN                        31
 
 #ifndef FAN_PIN
-  #define FAN_PIN          30   // "FAN1"
+  #define FAN_PIN                             30  // "FAN1"
 #endif
-#define FAN1_PIN           32   // "FAN2"
+#define FAN1_PIN                              32  // "FAN2"
 
-#define ORIG_E0_AUTO_FAN_PIN 32   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN                  32  // Use this by NOT overriding E0_AUTO_FAN_PIN
 
 //
 // Servos
 //
-#define SERVO0_PIN         26   // PWM_EXT1
-#define SERVO1_PIN         27   // PWM_EXT2
+#define SERVO0_PIN                            26  // PWM_EXT1
+#define SERVO1_PIN                            27  // PWM_EXT2
 
-#define SDSS               57   // Onboard SD card reader
-//#define SDSS              9   // LCD SD card reader
-#define LED_PIN            21   // STATUS_LED
+#define SDSS                                  57  // Onboard SD card reader
+//#define SDSS                                 9  // LCD SD card reader
+#define LED_PIN                               21  // STATUS_LED
 
 //
 // LCD / Controller
 //
-#define SD_DETECT_PIN      56   // SD_CARD_DET
-#define BEEPER_PIN         46   // LCD_BEEPER
-#define LCD_PINS_RS        49   // LCD_RS
-#define LCD_PINS_ENABLE    48   // LCD_EN
-#define LCD_PINS_D4        50   // LCD_D4
-#define LCD_PINS_D5        51   // LCD_D5
-#define LCD_PINS_D6        52   // LCD_D6
-#define LCD_PINS_D7        53   // LCD_D7
-#define BTN_EN1            54   // BTN_EN1
-#define BTN_EN2            55   // BTN_EN2
-#define BTN_ENC            47   // BTN_ENC
+#define SD_DETECT_PIN                         56  // SD_CARD_DET
+#define BEEPER_PIN                            46  // LCD_BEEPER
+#define LCD_PINS_RS                           49  // LCD_RS
+#define LCD_PINS_ENABLE                       48  // LCD_EN
+#define LCD_PINS_D4                           50  // LCD_D4
+#define LCD_PINS_D5                           51  // LCD_D5
+#define LCD_PINS_D6                           52  // LCD_D6
+#define LCD_PINS_D7                           53  // LCD_D7
+#define BTN_EN1                               54  // BTN_EN1
+#define BTN_EN2                               55  // BTN_EN2
+#define BTN_ENC                               47  // BTN_ENC
 
 //
 // Timers
 //
 
-#define STEP_TIMER 2
+#define STEP_TIMER                             2
diff --git a/Marlin/src/pins/stm32f7/pins_THE_BORG.h b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
index bfc9507c451e..9968d9d1f1f8 100644
--- a/Marlin/src/pins/stm32f7/pins_THE_BORG.h
+++ b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
@@ -31,7 +31,7 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 #ifndef E2END
-  #define E2END 0xFFF   // EEPROM end address
+  #define E2END 0xFFF                             // EEPROM end address
 #endif
 
 // Ignore temp readings during development.
@@ -40,148 +40,142 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE9
-#define X_MAX_PIN          PE10
-#define Y_MIN_PIN          PE7
-#define Y_MAX_PIN          PE8
-#define Z_MIN_PIN          PF15
-#define Z_MAX_PIN          PG0
-#define E_MIN_PIN          PE2
-#define E_MAX_PIN          PE3
+#define X_MIN_PIN                           PE9
+#define X_MAX_PIN                           PE10
+#define Y_MIN_PIN                           PE7
+#define Y_MAX_PIN                           PE8
+#define Z_MIN_PIN                           PF15
+#define Z_MAX_PIN                           PG0
+#define E_MIN_PIN                           PE2
+#define E_MAX_PIN                           PE3
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PA4
+  #define Z_MIN_PROBE_PIN                   PA4
 #endif
 
 //
 // Steppers
 //
-#define STEPPER_ENABLE_PIN PE0
+#define STEPPER_ENABLE_PIN                  PE0
 
-#define X_STEP_PIN         PC6   // 96, 39 in Arduino
-#define X_DIR_PIN          PC7
-#define X_ENABLE_PIN       PC8
+#define X_STEP_PIN                          PC6   // 96, 39 in Arduino
+#define X_DIR_PIN                           PC7
+#define X_ENABLE_PIN                        PC8
 
+#define Y_STEP_PIN                          PD9
+#define Y_DIR_PIN                           PD10
+#define Y_ENABLE_PIN                        PD11
 
-#define Y_STEP_PIN         PD9
-#define Y_DIR_PIN          PD10
-#define Y_ENABLE_PIN       PD11
+#define Z_STEP_PIN                          PE15
+#define Z_DIR_PIN                           PG1
+#define Z_ENABLE_PIN                        PD8
 
-#define Z_STEP_PIN         PE15
-#define Z_DIR_PIN          PG1
-#define Z_ENABLE_PIN       PD8
+#define E0_STEP_PIN                         PB1
+#define E0_DIR_PIN                          PB2
+#define E0_ENABLE_PIN                       PE11
 
+#define E1_STEP_PIN                         PC4
+#define E1_DIR_PIN                          PC5
+#define E1_ENABLE_PIN                       PB0
 
-#define E0_STEP_PIN        PB1
-#define E0_DIR_PIN         PB2
-#define E0_ENABLE_PIN      PE11
+#define E2_STEP_PIN                         PC13
+#define E2_DIR_PIN                          PC14
+#define E2_ENABLE_PIN                       PC15
 
+#define Z2_STEP_PIN                         PC13
+#define Z2_DIR_PIN                          PC14
+#define Z2_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PC4
-#define E1_DIR_PIN         PC5
-#define E1_ENABLE_PIN      PB0
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
 
+#define SPI1_SCK_PIN                        PA5
+#define SPI1_MISO_PIN                       PA6
+#define SPI1_MOSI_PIN                       PA7
 
-#define E2_STEP_PIN        PC13
-#define E2_DIR_PIN         PC14
-#define E2_ENABLE_PIN      PC15
-
-#define Z2_STEP_PIN        PC13
-#define Z2_DIR_PIN         PC14
-#define Z2_ENABLE_PIN      PC15
-
-
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
-
-#define SPI1_SCK_PIN       PA5
-#define SPI1_MISO_PIN      PA6
-#define SPI1_MOSI_PIN      PA7
-
-#define SPI6_SCK_PIN       PG13
-#define SPI6_MISO_PIN      PG12
-#define SPI6_MOSI_PIN      PG14
+#define SPI6_SCK_PIN                        PG13
+#define SPI6_MISO_PIN                       PG12
+#define SPI6_MOSI_PIN                       PG14
 
 //
 // Temperature Sensors
 //
 
-#define TEMP_0_PIN         PC3   // Analog Input
-#define TEMP_1_PIN         PC2   // Analog Input
-#define TEMP_2_PIN         PC1   // Analog Input
-#define TEMP_3_PIN         PC0   // Analog Input
+#define TEMP_0_PIN                          PC3   // Analog Input
+#define TEMP_1_PIN                          PC2   // Analog Input
+#define TEMP_2_PIN                          PC1   // Analog Input
+#define TEMP_3_PIN                          PC0   // Analog Input
 
-#define TEMP_BED_PIN       PF10  // Analog Input
+#define TEMP_BED_PIN                        PF10  // Analog Input
 
-#define TEMP_5_PIN         PE12  // Analog Input, Probe temp
+#define TEMP_5_PIN                          PE12  // Analog Input, Probe temp
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PD15
-#define HEATER_1_PIN       PD14
-#define HEATER_BED_PIN     PF6
+#define HEATER_0_PIN                        PD15
+#define HEATER_1_PIN                        PD14
+#define HEATER_BED_PIN                      PF6
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PD13
+  #define FAN_PIN                           PD13
 #endif
-#define FAN1_PIN           PA0
-#define FAN2_PIN           PA1
+#define FAN1_PIN                            PA0
+#define FAN2_PIN                            PA1
 
-#define ORIG_E0_AUTO_FAN_PIN  PA1   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN                PA1   // Use this by NOT overriding E0_AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
 
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN      PF13
+//#define CASE_LIGHT_PIN_CI                 PF13
+//#define CASE_LIGHT_PIN_DO                 PF14
+//#define NEOPIXEL_PIN                      PF13
 
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
 
-#define E_MUX0_PIN         PG3
-#define E_MUX1_PIN         PG4
+#define E_MUX0_PIN                          PG3
+#define E_MUX1_PIN                          PG4
 
 //
 // Servos
 //
 
-#define SERVO0_PIN         PE13
-#define SERVO1_PIN         PE14
-
+#define SERVO0_PIN                          PE13
+#define SERVO1_PIN                          PE14
 
-#define SDSS               PA8
-#define SS_PIN             PA8
-#define LED_PIN            PA2   // Alive
-#define PS_ON_PIN          PA3
-#define KILL_PIN           -1 //PD5   // EXP2-10
-#define PWR_LOSS           PG5   // Power loss / nAC_FAULT
+#define SDSS                                PA8
+#define SS_PIN                              PA8
+#define LED_PIN                             PA2   // Alive
+#define PS_ON_PIN                           PA3
+#define KILL_PIN                            -1    //PD5   // EXP2-10
+#define PWR_LOSS                            PG5   // Power loss / nAC_FAULT
 
 //
 // MAX7219_DEBUG
 //
-#define MAX7219_CLK_PIN    PG10  // EXP1-1
-#define MAX7219_DIN_PIN    PD7   // EXP1-3
-#define MAX7219_LOAD_PIN   PD1   // EXP1-5
+#define MAX7219_CLK_PIN                     PG10  // EXP1-1
+#define MAX7219_DIN_PIN                     PD7   // EXP1-3
+#define MAX7219_LOAD_PIN                    PD1   // EXP1-5
 
 //
 // LCD / Controller
 //
-//#define SD_DETECT_PIN      -1 //PB6)     // EXP2-4
-#define BEEPER_PIN         PG10  // EXP1-1
-#define LCD_PINS_RS        PG9   // EXP1-4
-#define LCD_PINS_ENABLE    PD7   // EXP1-3
-#define LCD_PINS_D4        PD1   // EXP1-5
-#define LCD_PINS_D5        PF0   // EXP1-6
-#define LCD_PINS_D6        PD3   // EXP1-7
-#define LCD_PINS_D7        PD4   // EXP1-8
-#define BTN_EN1            PD6   // EXP2-5
-#define BTN_EN2            PD0   // EXP2-3
-#define BTN_ENC            PG11  // EXP1-2
+//#define SD_DETECT_PIN                     -1    //PB6)     // EXP2-4
+#define BEEPER_PIN                          PG10  // EXP1-1
+#define LCD_PINS_RS                         PG9   // EXP1-4
+#define LCD_PINS_ENABLE                     PD7   // EXP1-3
+#define LCD_PINS_D4                         PD1   // EXP1-5
+#define LCD_PINS_D5                         PF0   // EXP1-6
+#define LCD_PINS_D6                         PD3   // EXP1-7
+#define LCD_PINS_D7                         PD4   // EXP1-8
+#define BTN_EN1                             PD6   // EXP2-5
+#define BTN_EN2                             PD0   // EXP2-3
+#define BTN_ENC                             PG11  // EXP1-2
diff --git a/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin/src/pins/teensy2/pins_5DPRINT.h
index 206e22bb9cb7..4ee74660ead9 100644
--- a/Marlin/src/pins/teensy2/pins_5DPRINT.h
+++ b/Marlin/src/pins/teensy2/pins_5DPRINT.h
@@ -78,71 +78,71 @@
 //
 // Servos
 //
-#define SERVO0_PIN        41
-#define SERVO1_PIN        42
-#define SERVO2_PIN        43
-#define SERVO3_PIN        44
+#define SERVO0_PIN                            41
+#define SERVO1_PIN                            42
+#define SERVO2_PIN                            43
+#define SERVO3_PIN                            44
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         37   // E5
-#define Y_STOP_PIN         36   // E4
-#define Z_STOP_PIN         19   // E7
+#define X_STOP_PIN                            37  // E5
+#define Y_STOP_PIN                            36  // E4
+#define Z_STOP_PIN                            19  // E7
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       17   // C7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          17  // C7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       13   // C3
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          13  // C3
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       12   // C2
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          12  // C2
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      11   // C1
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         11  // C1
 
 //
 // Digital Microstepping
 //
-#define X_MS1_PIN          25   // B5
-#define X_MS2_PIN          26   // B6
-#define Y_MS1_PIN           9   // E1
-#define Y_MS2_PIN           8   // E0
-#define Z_MS1_PIN           7   // D7
-#define Z_MS2_PIN           6   // D6
-#define E0_MS1_PIN          5   // D5
-#define E0_MS2_PIN          4   // D4
+#define X_MS1_PIN                             25  // B5
+#define X_MS2_PIN                             26  // B6
+#define Y_MS1_PIN                              9  // E1
+#define Y_MS2_PIN                              8  // E0
+#define Z_MS1_PIN                              7  // D7
+#define Z_MS2_PIN                              6  // D6
+#define E0_MS1_PIN                             5  // D5
+#define E0_MS2_PIN                             4  // D4
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // F1  Analog Input
-#define TEMP_BED_PIN        0   // F0  Analog Input
+#define TEMP_0_PIN                             1  // F1  Analog Input
+#define TEMP_BED_PIN                           0  // F0  Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5
-#define HEATER_BED_PIN     14   // C4
+#define HEATER_0_PIN                          15  // C5
+#define HEATER_BED_PIN                        14  // C4
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6  PWM3A
+  #define FAN_PIN                             16  // C6  PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
+#define SDSS                                  20  // B0
 
 //DIGIPOTS slave addresses
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
index 22ceb975403f..f7597dbbae74 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
@@ -77,50 +77,50 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         35   // A7
-#define Y_STOP_PIN         34   // A6
-#define Z_STOP_PIN         33   // A5
+#define X_STOP_PIN                            35  // A7
+#define Y_STOP_PIN                            34  // A6
+#define Z_STOP_PIN                            33  // A5
 
 //
 // Steppers
 //
-#define X_STEP_PIN          3   // D3
-#define X_DIR_PIN           5   // D5
-#define X_ENABLE_PIN        4   // D4
-#define X_ATT_PIN           2   // D2
-
-#define Y_STEP_PIN          7   // D7
-#define Y_DIR_PIN           9   // E1
-#define Y_ENABLE_PIN        8   // E0
-#define Y_ATT_PIN           6   // D6
-
-#define Z_STEP_PIN         11   // C1
-#define Z_DIR_PIN          13   // C3
-#define Z_ENABLE_PIN       12   // C2
-#define Z_ATT_PIN          10   // C0
-
-#define E0_STEP_PIN        15   // C5
-#define E0_DIR_PIN         17   // C7
-#define E0_ENABLE_PIN      16   // C6
-#define E0_ATT_PIN         14   // C4
+#define X_STEP_PIN                             3  // D3
+#define X_DIR_PIN                              5  // D5
+#define X_ENABLE_PIN                           4  // D4
+#define X_ATT_PIN                              2  // D2
+
+#define Y_STEP_PIN                             7  // D7
+#define Y_DIR_PIN                              9  // E1
+#define Y_ENABLE_PIN                           8  // E0
+#define Y_ATT_PIN                              6  // D6
+
+#define Z_STEP_PIN                            11  // C1
+#define Z_DIR_PIN                             13  // C3
+#define Z_ENABLE_PIN                          12  // C2
+#define Z_ATT_PIN                             10  // C0
+
+#define E0_STEP_PIN                           15  // C5
+#define E0_DIR_PIN                            17  // C7
+#define E0_ENABLE_PIN                         16  // C6
+#define E0_ATT_PIN                            14  // C4
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // F7  Analog Input
-#define TEMP_BED_PIN        6   // F6  Analog Input
+#define TEMP_0_PIN                             7  // F7  Analog Input
+#define TEMP_BED_PIN                           6  // F6  Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       32   // A4 Extruder
-#define HEATER_BED_PIN     18   // E6 Bed
+#define HEATER_0_PIN                          32  // A4 Extruder
+#define HEATER_BED_PIN                        18  // E6 Bed
 
 #ifndef FAN_PIN
-  #define FAN_PIN          31   // A3 Fan
+  #define FAN_PIN                             31  // A3 Fan
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            19   // E7
+#define LED_PIN                               19  // E7
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
index 88b045b833f6..575428f097b2 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
@@ -84,55 +84,55 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         45   // F7
-#define Y_STOP_PIN         12   // C2
-#define Z_STOP_PIN         36   // E4
+#define X_STOP_PIN                            45  // F7
+#define Y_STOP_PIN                            12  // C2
+#define Z_STOP_PIN                            36  // E4
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  11   // C1
+  #define Z_MIN_PROBE_PIN                     11  // C1
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN          9   // E1
-#define X_DIR_PIN           8   // E0
-#define X_ENABLE_PIN       23   // B3
+#define X_STEP_PIN                             9  // E1
+#define X_DIR_PIN                              8  // E0
+#define X_ENABLE_PIN                          23  // B3
 
-#define Y_STEP_PIN          7   // D7
-#define Y_DIR_PIN           6   // D6
-#define Y_ENABLE_PIN       20   // B0
+#define Y_STEP_PIN                             7  // D7
+#define Y_DIR_PIN                              6  // D6
+#define Y_ENABLE_PIN                          20  // B0
 
-#define Z_STEP_PIN          5   // D5
-#define Z_DIR_PIN           4   // D4
-#define Z_ENABLE_PIN       37   // E5
+#define Z_STEP_PIN                             5  // D5
+#define Z_DIR_PIN                              4  // D4
+#define Z_ENABLE_PIN                          37  // E5
 
-#define E0_STEP_PIN        47   // E3
-#define E0_DIR_PIN         46   // E2
-#define E0_ENABLE_PIN      25   // B5
+#define E0_STEP_PIN                           47  // E3
+#define E0_DIR_PIN                            46  // E2
+#define E0_ENABLE_PIN                         25  // B5
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // F2  Analog Input
-#define TEMP_1_PIN          1   // F1  Analog Input
-#define TEMP_BED_PIN        0   // F0  Analog Input
+#define TEMP_0_PIN                             2  // F2  Analog Input
+#define TEMP_1_PIN                             1  // F1  Analog Input
+#define TEMP_BED_PIN                           0  // F0  Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       27   // B7
-#define HEATER_BED_PIN     26   // B6  Bed
+#define HEATER_0_PIN                          27  // B7
+#define HEATER_BED_PIN                        26  // B6  Bed
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6  Fan, PWM3A
+  #define FAN_PIN                             16  // C6  Fan, PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
-#define SD_DETECT_PIN      24   // B4
-#define LED_PIN            13   // C3
+#define SDSS                                  20  // B0
+#define SD_DETECT_PIN                         24  // B4
+#define LED_PIN                               13  // C3
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index 4f10e08084ab..68c548f83313 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -74,95 +74,95 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // E3
-#define Y_STOP_PIN         20   // B0 SS
-#define Z_STOP_PIN         36   // E4
+#define X_STOP_PIN                            47  // E3
+#define Y_STOP_PIN                            20  // B0 SS
+#define Z_STOP_PIN                            36  // E4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_1_PIN       44   // F6
-#define HEATER_2_PIN       45   // F7
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_1_PIN                          44  // F6
+#define HEATER_2_PIN                          45  // F7
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               26   // B6 SDCS
-#define FILWIDTH_PIN        2   // Analog Input
+#define SDSS                                  26  // B6 SDCS
+#define FILWIDTH_PIN                           2  // Analog Input
 
 //
 // LCD / Controller
 //
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define LCD_PINS_RS       9   // E1       JP11-11
-  #define LCD_PINS_ENABLE   8   // E0       JP11-10
-  #define LCD_PINS_D4       7   // D7       JP11-8
-  #define LCD_PINS_D5       6   // D6       JP11-7
-  #define LCD_PINS_D6       5   // D5       JP11-6
-  #define LCD_PINS_D7       4   // D4       JP11-5
+  #define LCD_PINS_RS                          9  // E1       JP11-11
+  #define LCD_PINS_ENABLE                      8  // E0       JP11-10
+  #define LCD_PINS_D4                          7  // D7       JP11-8
+  #define LCD_PINS_D5                          6  // D6       JP11-7
+  #define LCD_PINS_D6                          5  // D5       JP11-6
+  #define LCD_PINS_D7                          4  // D4       JP11-5
 
   #if ANY(VIKI2, miniVIKI)
-    #define BEEPER_PIN      8   // E0       JP11-10
+    #define BEEPER_PIN                         8  // E0       JP11-10
 
-    #define DOGLCD_A0      40   // F2       JP2-2
-    #define DOGLCD_CS      41   // F3       JP2-4
+    #define DOGLCD_A0                         40  // F2       JP2-2
+    #define DOGLCD_CS                         41  // F3       JP2-4
     #define LCD_SCREEN_ROT_180
 
-    #define BTN_EN1         2   // D2 TX1   JP2-5
-    #define BTN_EN2         3   // D3 RX1   JP2-7
-    #define BTN_ENC        45   // F7 TDI   JP2-12
+    #define BTN_EN1                            2  // D2 TX1   JP2-5
+    #define BTN_EN2                            3  // D3 RX1   JP2-7
+    #define BTN_ENC                           45  // F7 TDI   JP2-12
 
     #undef SDSS
-    #define SDSS           43   // F5 TMS   JP2-8
+    #define SDSS                              43  // F5 TMS   JP2-8
 
-    #define STAT_LED_RED_PIN  12   // C2    JP11-14
-    #define STAT_LED_BLUE_PIN 10   // C0    JP11-12
+    #define STAT_LED_RED_PIN                  12  // C2    JP11-14
+    #define STAT_LED_BLUE_PIN                 10  // C0    JP11-12
 
   #elif ENABLED(LCD_I2C_PANELOLU2)
 
-    #define BTN_EN1         3   // D3 RX1   JP2-7
-    #define BTN_EN2         2   // D2 TX1   JP2-5
-    #define BTN_ENC        41   // F3       JP2-4
+    #define BTN_EN1                            3  // D3 RX1   JP2-7
+    #define BTN_EN2                            2  // D2 TX1   JP2-5
+    #define BTN_ENC                           41  // F3       JP2-4
     #undef SDSS
-    #define SDSS           38   // F0       B-THERM connector - use SD card on Panelolu2
+    #define SDSS                              38  // F0       B-THERM connector - use SD card on Panelolu2
 
   #else
 
-    #define BTN_EN1        10   // C0       JP11-12
-    #define BTN_EN2        11   // C1       JP11-13
-    #define BTN_ENC        12   // C2       JP11-14
+    #define BTN_EN1                           10  // C0       JP11-12
+    #define BTN_EN2                           11  // C1       JP11-13
+    #define BTN_ENC                           12  // C2       JP11-14
 
   #endif
 
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index c1198a4d4bad..f5f05ddeaf16 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -99,46 +99,46 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // E3
-#define Y_STOP_PIN         24   // B4 PWM2A
-#define Z_STOP_PIN         36   // E4
+#define X_STOP_PIN                            47  // E3
+#define Y_STOP_PIN                            24  // B4 PWM2A
+#define Z_STOP_PIN                            36  // E4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 #if DISABLED(NO_EXTRUDRBOARD)
 #if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
-  #define E1_STEP_PIN      25   // B5
-  #define E1_DIR_PIN       37   // E5
-  #define E1_ENABLE_PIN    42   // F4
+  #define E1_STEP_PIN                         25  // B5
+  #define E1_DIR_PIN                          37  // E5
+  #define E1_ENABLE_PIN                       42  // F4
 
-  #define E2_STEP_PIN       2   // D2
-  #define E2_DIR_PIN        3   // D3
-  #define E2_ENABLE_PIN    43   // F5
+  #define E2_STEP_PIN                          2  // D2
+  #define E2_DIR_PIN                           3  // D3
+  #define E2_ENABLE_PIN                       43  // F5
 #else
-  #define E1_STEP_PIN       2   // D2
-  #define E1_DIR_PIN        3   // D3
-  #define E1_ENABLE_PIN    43   // F5
+  #define E1_STEP_PIN                          2  // D2
+  #define E1_DIR_PIN                           3  // D3
+  #define E1_ENABLE_PIN                       43  // F5
 
-  #define E2_STEP_PIN      25   // B5
-  #define E2_DIR_PIN       37   // E5
-  #define E2_ENABLE_PIN    42   // F4
+  #define E2_STEP_PIN                         25  // B5
+  #define E2_DIR_PIN                          37  // E5
+  #define E2_ENABLE_PIN                       42  // F4
 #endif
 #endif // NO_EXTRUDRBOARD
 
@@ -154,46 +154,46 @@
 #define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
 
 #define DAC_STEPPER_SENSE    0.11
-#define DAC_STEPPER_ADDRESS  0
-#define DAC_STEPPER_MAX   3520
-#define DAC_STEPPER_VREF     1   // internal Vref, gain 1x = 2.048V
-#define DAC_STEPPER_GAIN     0
-#define DAC_OR_ADDRESS    0x00
+#define DAC_STEPPER_ADDRESS                    0
+#define DAC_STEPPER_MAX                      3520
+#define DAC_STEPPER_VREF                       1  // internal Vref, gain 1x = 2.048V
+#define DAC_STEPPER_GAIN                       0
+#define DAC_OR_ADDRESS 0x00
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input (Extruder)
-#define TEMP_BED_PIN        0   // Analog Input (Bed)
+#define TEMP_0_PIN                             1  // Analog Input (Extruder)
+#define TEMP_BED_PIN                           0  // Analog Input (Bed)
 
 #if DISABLED(NO_EXTRUDRBOARD)
 #if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
-  #define TEMP_1_PIN        2   // Analog Input (Extrudrboard A THERM)
-  #define TEMP_2_PIN        3   // Analog Input (Extrudrboard B THERM)
+  #define TEMP_1_PIN                           2  // Analog Input (Extrudrboard A THERM)
+  #define TEMP_2_PIN                           3  // Analog Input (Extrudrboard B THERM)
 #else
-  #define TEMP_1_PIN        3   // Analog Input (Extrudrboard B THERM)
-  #define TEMP_2_PIN        2   // Analog Input (Extrudrboard A THERM)
+  #define TEMP_1_PIN                           3  // Analog Input (Extrudrboard B THERM)
+  #define TEMP_2_PIN                           2  // Analog Input (Extrudrboard A THERM)
 #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 
 #if DISABLED(NO_EXTRUDRBOARD)
 #if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
-  #define HEATER_1_PIN     44   // F6 - Extrudrboard A HOTEND
-  #define HEATER_2_PIN     45   // F7 - Extrudrboard B HOTEND
+  #define HEATER_1_PIN                        44  // F6 - Extrudrboard A HOTEND
+  #define HEATER_2_PIN                        45  // F7 - Extrudrboard B HOTEND
 #else
-  #define HEATER_1_PIN     45   // F7 - Extrudrboard B HOTEND
-  #define HEATER_2_PIN     44   // F6 - Extrudrboard A HOTEND
+  #define HEATER_1_PIN                        45  // F7 - Extrudrboard B HOTEND
+  #define HEATER_2_PIN                        44  // F6 - Extrudrboard A HOTEND
 #endif
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
@@ -202,49 +202,49 @@
 //#define USE_INTERNAL_SD
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS       9   // E1       JP11-11
-  #define LCD_PINS_ENABLE   8   // E0       JP11-10
-  #define LCD_PINS_D4       7   // D7       JP11-8
-  #define LCD_PINS_D5       6   // D6       JP11-7
-  #define LCD_PINS_D6       5   // D5       JP11-6
-  #define LCD_PINS_D7       4   // D4       JP11-5
+  #define LCD_PINS_RS                          9  // E1       JP11-11
+  #define LCD_PINS_ENABLE                      8  // E0       JP11-10
+  #define LCD_PINS_D4                          7  // D7       JP11-8
+  #define LCD_PINS_D5                          6  // D6       JP11-7
+  #define LCD_PINS_D6                          5  // D5       JP11-6
+  #define LCD_PINS_D7                          4  // D4       JP11-5
 
   #if ANY(VIKI2, miniVIKI)
 
-    #define BEEPER_PIN      8   // E0       JP11-10
-    #define DOGLCD_A0      40   // F2       JP2-2
-    #define DOGLCD_CS      41   // F3       JP2-4
+    #define BEEPER_PIN                         8  // E0       JP11-10
+    #define DOGLCD_A0                         40  // F2       JP2-2
+    #define DOGLCD_CS                         41  // F3       JP2-4
     #define LCD_SCREEN_ROT_180
 
-    #define BTN_EN1         2   // D2 TX1   JP2-5
-    #define BTN_EN2         3   // D3 RX1   JP2-7
-    #define BTN_ENC        45   // F7 TDI   JP2-12
+    #define BTN_EN1                            2  // D2 TX1   JP2-5
+    #define BTN_EN2                            3  // D3 RX1   JP2-7
+    #define BTN_ENC                           45  // F7 TDI   JP2-12
 
-    #define SDSS            3   // F5 TMS   JP2-8
+    #define SDSS                               3  // F5 TMS   JP2-8
 
-    #define STAT_LED_RED_PIN  12   // C2       JP11-14
-    #define STAT_LED_BLUE_PIN 10   // C0       JP11-12
+    #define STAT_LED_RED_PIN                  12  // C2       JP11-14
+    #define STAT_LED_BLUE_PIN                 10  // C0       JP11-12
 
   #elif ENABLED(MINIPANEL)
 
     #if DISABLED(USE_INTERNAL_SD)
       //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.   MKSLCD12864 PIN#
-      #define SDSS          11   //      36               C1                EXP2-13             EXP2-07
-      #define SD_DETECT_PIN  9   //      34               E1                EXP2-11             EXP2-04
+      #define SDSS                            11  //      36               C1                EXP2-13             EXP2-07
+      #define SD_DETECT_PIN                    9  //      34               E1                EXP2-11             EXP2-04
     #endif
 
     //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.   MKSLCD12864 PIN#
-    #define DOGLCD_A0       4   //       29               D4                EXP2-05             EXP1-04
-    #define DOGLCD_CS       5   //       30               D5                EXP2-06             EXP1-05
-    #define BTN_ENC         6   //       31               D6                EXP2-07             EXP1-09
-    #define BEEPER_PIN      7   //       32               D7                EXP2-08             EXP1-10
-    #define KILL_PIN        8   //       33               E0                EXP2-10             EXP2-03
-    #define BTN_EN1        10   //       35               C0                EXP2-12             EXP2-06
-    #define BTN_EN2        12   //       37               C2                EXP2-14             EXP2-08
-    //#define LCD_BACKLIGHT_PIN 43   //    56               F5                EXP1-12     Not Implemented
-    //#define SCK          21   //         11               B1                ICSP-04             EXP2-09
-    //#define MOSI         22   //         12               B2                ICSP-03             EXP2-05
-    //#define MISO         23   //         13               B3                ICSP-06             EXP2-05
+    #define DOGLCD_A0                          4  //       29               D4                EXP2-05             EXP1-04
+    #define DOGLCD_CS                          5  //       30               D5                EXP2-06             EXP1-05
+    #define BTN_ENC                            6  //       31               D6                EXP2-07             EXP1-09
+    #define BEEPER_PIN                         7  //       32               D7                EXP2-08             EXP1-10
+    #define KILL_PIN                           8  //       33               E0                EXP2-10             EXP2-03
+    #define BTN_EN1                           10  //       35               C0                EXP2-12             EXP2-06
+    #define BTN_EN2                           12  //       37               C2                EXP2-14             EXP2-08
+    //#define LCD_BACKLIGHT_PIN               43  //    56               F5                EXP1-12     Not Implemented
+    //#define SCK                             21  //         11               B1                ICSP-04             EXP2-09
+    //#define MOSI                            22  //         12               B2                ICSP-03             EXP2-05
+    //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
 
     // increase delays
     #define BOARD_ST7920_DELAY_1 DELAY_NS(313)
@@ -253,9 +253,9 @@
 
   #else
 
-    #define BTN_EN1        10   // C0       JP11-12
-    #define BTN_EN2        11   // C1       JP11-13
-    #define BTN_ENC        12   // C2       JP11-14
+    #define BTN_EN1                           10  // C0       JP11-12
+    #define BTN_EN2                           11  // C1       JP11-13
+    #define BTN_ENC                           12  // C2       JP11-14
 
   #endif
 
@@ -266,7 +266,7 @@
 //
 //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.
 #ifndef SDSS
-  #define SDSS             20   //       10               B0
+  #define SDSS                                20  //       10               B0
 #endif
 
 /**
@@ -277,5 +277,5 @@
  * which will let you use Channel B on the Extrudrboard as E1.
  */
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      2   // Analog Input
+  #define FILWIDTH_PIN                         2  // Analog Input
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
index 0ced699938c5..01003b056d8e 100644
--- a/Marlin/src/pins/teensy2/pins_SAV_MKI.h
+++ b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
@@ -73,56 +73,56 @@
 //
 // Servos
 //
-#define SERVO0_PIN         39   // F1  In teensy's pin definition for pinMode (in servo.cpp)
+#define SERVO0_PIN                            39  // F1  In teensy's pin definition for pinMode (in servo.cpp)
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         25   // B5
-#define Y_STOP_PIN         26   // B6
-//#define Z_STOP_PIN         27   // B7
-#define Z_STOP_PIN         36   // E4 For inductive sensor.
-//#define E_STOP_PIN         36   // E4
+#define X_STOP_PIN                            25  // B5
+#define Y_STOP_PIN                            26  // B6
+//#define Z_STOP_PIN                          27  // B7
+#define Z_STOP_PIN                            36  // E4 For inductive sensor.
+//#define E_STOP_PIN                          36  // E4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // F7  Analog Input (Extruder)
-#define TEMP_BED_PIN        6   // F6  Analog Input (Bed)
+#define TEMP_0_PIN                             7  // F7  Analog Input (Extruder)
+#define TEMP_BED_PIN                           6  // F6  Analog Input (Bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C - Bed
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C - Bed
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
+#define SDSS                                  20  // B0
 
 // Extension header pin mapping
 // ----------------------------
@@ -133,53 +133,53 @@
 //  PWM-D24         A4 (An), IO
 //  5V              GND
 //  12V             GND
-#define EXT_AUX_SCL_D0      0   // D0  PWM0B
-#define EXT_AUX_SDA_D1      1   // D1
-#define EXT_AUX_RX1_D2      2   // D2
-#define EXT_AUX_TX1_D3      3   // D3
-#define EXT_AUX_PWM_D24    24   // B4  PWM2A
-#define EXT_AUX_A0          0   // F0  Analog Input
-#define EXT_AUX_A0_IO      38   // F0  Digital IO
-#define EXT_AUX_A1          1   // F1  Analog Input
-#define EXT_AUX_A1_IO      39   // F1  Digital IO
-#define EXT_AUX_A2          2   // F2  Analog Input
-#define EXT_AUX_A2_IO      40   // F2  Digital IO
-#define EXT_AUX_A3          3   // F3  Analog Input
-#define EXT_AUX_A3_IO      41   // F3  Digital IO
-#define EXT_AUX_A4          4   // F4  Analog Input
-#define EXT_AUX_A4_IO      42   // F4  Digital IO
+#define EXT_AUX_SCL_D0                         0  // D0  PWM0B
+#define EXT_AUX_SDA_D1                         1  // D1
+#define EXT_AUX_RX1_D2                         2  // D2
+#define EXT_AUX_TX1_D3                         3  // D3
+#define EXT_AUX_PWM_D24                       24  // B4  PWM2A
+#define EXT_AUX_A0                             0  // F0  Analog Input
+#define EXT_AUX_A0_IO                         38  // F0  Digital IO
+#define EXT_AUX_A1                             1  // F1  Analog Input
+#define EXT_AUX_A1_IO                         39  // F1  Digital IO
+#define EXT_AUX_A2                             2  // F2  Analog Input
+#define EXT_AUX_A2_IO                         40  // F2  Digital IO
+#define EXT_AUX_A3                             3  // F3  Analog Input
+#define EXT_AUX_A3_IO                         41  // F3  Digital IO
+#define EXT_AUX_A4                             4  // F4  Analog Input
+#define EXT_AUX_A4_IO                         42  // F4  Digital IO
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
-#define LCD_PINS_RS        -1
-#define LCD_PINS_ENABLE    -1
+#define BEEPER_PIN                            -1
+#define LCD_PINS_RS                           -1
+#define LCD_PINS_ENABLE                       -1
 
 #if ENABLED(SAV_3DLCD)
   // For LCD SHIFT register LCD
-  #define SR_DATA_PIN      EXT_AUX_SDA_D1
-  #define SR_CLK_PIN       EXT_AUX_SCL_D0
+  #define SR_DATA_PIN             EXT_AUX_SDA_D1
+  #define SR_CLK_PIN              EXT_AUX_SCL_D0
 #endif
 
 #if EITHER(SAV_3DLCD, SAV_3DGLCD)
 
-  #define BTN_EN1          EXT_AUX_A1_IO
-  #define BTN_EN2          EXT_AUX_A0_IO
-  #define BTN_ENC          EXT_AUX_PWM_D24
+  #define BTN_EN1                  EXT_AUX_A1_IO
+  #define BTN_EN2                  EXT_AUX_A0_IO
+  #define BTN_ENC                EXT_AUX_PWM_D24
 
-  #define KILL_PIN         EXT_AUX_A2_IO
-  #define HOME_PIN         EXT_AUX_A4_IO
+  #define KILL_PIN                 EXT_AUX_A2_IO
+  #define HOME_PIN                 EXT_AUX_A4_IO
 
-#else // Use the expansion header for spindle control
+#else                                             // Use the expansion header for spindle control
 
   //
   // M3/M4/M5 - Spindle/Laser Control
   //
-  #define SPINDLE_LASER_PWM_PIN    24   // B4  PWM2A
-  #define SPINDLE_LASER_ENA_PIN    39   // F1  Pin should have a pullup!
-  #define SPINDLE_DIR_PIN          40   // F2
+  #define SPINDLE_LASER_PWM_PIN               24  // B4  PWM2A
+  #define SPINDLE_LASER_ENA_PIN               39  // F1  Pin should have a pullup!
+  #define SPINDLE_DIR_PIN                     40  // F2
 
-  #define CASE_LIGHT_PIN            0   // D0  PWM0B
+  #define CASE_LIGHT_PIN                       0  // D0  PWM0B
 
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_TEENSY2.h b/Marlin/src/pins/teensy2/pins_TEENSY2.h
index 985cd46df427..eb116ee3e892 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSY2.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSY2.h
@@ -116,70 +116,70 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          2   // D2
-#define Y_STOP_PIN          3   // D3
-#define Z_STOP_PIN          4   // D4
+#define X_STOP_PIN                             2  // D2
+#define Y_STOP_PIN                             3  // D3
+#define Z_STOP_PIN                             4  // D4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0 Marlin
-#define X_DIR_PIN          29   // A1 Marlin
-#define X_ENABLE_PIN       26   // B6
+#define X_STEP_PIN                            28  // A0 Marlin
+#define X_DIR_PIN                             29  // A1 Marlin
+#define X_ENABLE_PIN                          26  // B6
 
-#define Y_STEP_PIN         30   // A2 Marlin
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       26   // B6 Shared w/x
+#define Y_STEP_PIN                            30  // A2 Marlin
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          26  // B6 Shared w/x
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       26   // B6 Shared w/x
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          26  // B6 Shared w/x
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      26   // B6 Shared w/x
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         26  // B6 Shared w/x
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // F7 Analog Input (Extruder)
-#define TEMP_BED_PIN        6   // F6 Analog Input (Bed)
+#define TEMP_0_PIN                             7  // F7 Analog Input (Extruder)
+#define TEMP_BED_PIN                           6  // F6 Analog Input (Bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B  Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B  Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A  Fan
+  #define FAN_PIN                             16  // C6 PWM3A  Fan
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
-#define LED_PIN             6   // D6
-#define PS_ON_PIN          27   // B7
-#define CASE_LIGHT_PIN      1   // D1 PWM2B  MUST BE HARDWARE PWM
+#define SDSS                                  20  // B0
+#define LED_PIN                                6  // D6
+#define PS_ON_PIN                             27  // B7
+#define CASE_LIGHT_PIN                         1  // D1 PWM2B  MUST BE HARDWARE PWM
 
 //
 // LCD / Controller
 //
 #if ENABLED(ULTIPANEL)
-  #define LCD_PINS_RS       8   // E0
-  #define LCD_PINS_ENABLE   9   // E1
-  #define LCD_PINS_D4      10   // C0
-  #define LCD_PINS_D5      11   // C1
-  #define LCD_PINS_D6      12   // C2
-  #define LCD_PINS_D7      13   // C3
-  #define BTN_EN1          38   // F0
-  #define BTN_EN2          39   // F1
-  #define BTN_ENC          40   // F2
+  #define LCD_PINS_RS                          8  // E0
+  #define LCD_PINS_ENABLE                      9  // E1
+  #define LCD_PINS_D4                         10  // C0
+  #define LCD_PINS_D5                         11  // C1
+  #define LCD_PINS_D6                         12  // C2
+  #define LCD_PINS_D7                         13  // C3
+  #define BTN_EN1                             38  // F0
+  #define BTN_EN2                             39  // F1
+  #define BTN_ENC                             40  // F2
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN     5   // D5  Pin should have a pullup!
-#define SPINDLE_LASER_PWM_PIN     0   // D0 PWM0B   MUST BE HARDWARE PWM
-#define SPINDLE_DIR_PIN           7   // D7
+#define SPINDLE_LASER_ENA_PIN                  5  // D5  Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN                  0  // D0 PWM0B   MUST BE HARDWARE PWM
+#define SPINDLE_DIR_PIN                        7  // D7
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index 72eb21c1aaac..05f433cb8928 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -82,82 +82,81 @@
 //
 // Limit Switch definitions that match the SCHEMATIC
 //
-//#define X_STOP_PIN       25   // B5
-//#define Y_STOP_PIN       26   // B6
-//#define Z_STOP_PIN       27   // B7
-//#define E_STOP_PIN       36   // E4
-
+//#define X_STOP_PIN                          25  // B5
+//#define Y_STOP_PIN                          26  // B6
+//#define Z_STOP_PIN                          27  // B7
+//#define E_STOP_PIN                          36  // E4
 
 //
 // Limit Switch definitions that match the SILKSCREEN
 //
-#define X_STOP_PIN         26   // B6
-#define Y_STOP_PIN         27   // B7
-#define Z_STOP_PIN         36   // E4
-//#define E_STOP_PIN       25   // B5
+#define X_STOP_PIN                            26  // B6
+#define Y_STOP_PIN                            27  // B7
+#define Z_STOP_PIN                            36  // E4
+//#define E_STOP_PIN                          25  // B5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input (Extruder)
-#define TEMP_BED_PIN        6   // Analog Input (Bed)
+#define TEMP_0_PIN                             7  // Analog Input (Extruder)
+#define TEMP_BED_PIN                           6  // Analog Input (Bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0 JP31-6
-#define CASE_LIGHT_PIN      0   // D0 IO-14  PWM0B
+#define SDSS                                  20  // B0 JP31-6
+#define CASE_LIGHT_PIN                         0  // D0 IO-14  PWM0B
 
 //
 // LCD / Controller
 //
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define BEEPER_PIN       -1
+  #define BEEPER_PIN                          -1
 
   #if ENABLED(LCD_I2C_PANELOLU2)
-    #define BTN_EN1         3   // D3 IO-8
-    #define BTN_EN2         2   // D2 IO-10
-    #define BTN_ENC        41   // F3 IO-7
-    #define SDSS           38   // F0 IO-13 use SD card on Panelolu2
+    #define BTN_EN1                            3  // D3 IO-8
+    #define BTN_EN2                            2  // D2 IO-10
+    #define BTN_ENC                           41  // F3 IO-7
+    #define SDSS                              38  // F0 IO-13 use SD card on Panelolu2
   #endif
 
-  #define SD_DETECT_PIN    -1
+  #define SD_DETECT_PIN                       -1
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN    24   // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENA_PIN    39   // F1 IO-11 - Pin should have a pullup!
-#define SPINDLE_DIR_PIN          40   // F2 IO-9
+#define SPINDLE_LASER_PWM_PIN                 24  // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENA_PIN                 39  // F1 IO-11 - Pin should have a pullup!
+#define SPINDLE_DIR_PIN                       40  // F2 IO-9
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
index 6c43c4aaa8a2..0f895c9e6bdf 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
@@ -35,87 +35,87 @@
   #define BOARD_INFO_NAME "Teensy3.2"
 #endif
 
-#define AT90USB 1286   // Disable MarlinSerial etc.
+#define AT90USB                              1286 // Disable MarlinSerial etc.
 #define USBCON //1286  // Disable MarlinSerial etc.
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN          4
-#define Z_STOP_PIN          5
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                             4
+#define Z_STOP_PIN                             5
 
 //
 // Steppers
 //
-#define X_STEP_PIN          5
-#define X_DIR_PIN           6
-#define X_ENABLE_PIN        2
+#define X_STEP_PIN                             5
+#define X_DIR_PIN                              6
+#define X_ENABLE_PIN                           2
 
-#define Y_STEP_PIN          7
-#define Y_DIR_PIN           8
-#define Y_ENABLE_PIN        2
+#define Y_STEP_PIN                             7
+#define Y_DIR_PIN                              8
+#define Y_ENABLE_PIN                           2
 
-#define Z_STEP_PIN          9
-#define Z_DIR_PIN          10
-#define Z_ENABLE_PIN        2
+#define Z_STEP_PIN                             9
+#define Z_DIR_PIN                             10
+#define Z_ENABLE_PIN                           2
 
-#define E0_STEP_PIN        11
-#define E0_DIR_PIN         12
-#define E0_ENABLE_PIN       2
+#define E0_STEP_PIN                           11
+#define E0_DIR_PIN                            12
+#define E0_ENABLE_PIN                          2
 
-//#define E1_STEP_PIN        33
-//#define E1_DIR_PIN         34
-//#define E1_ENABLE_PIN      35
+//#define E1_STEP_PIN                         33
+//#define E1_DIR_PIN                          34
+//#define E1_ENABLE_PIN                       35
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       20
+#define HEATER_0_PIN                          20
 // #define HEATER_1_PIN      36
-#define HEATER_BED_PIN     21
+#define HEATER_BED_PIN                        21
 #ifndef FAN_PIN
-  #define FAN_PIN          22
+  #define FAN_PIN                             22
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         14   // Analog Input - Extruder 2 => A2
-//#define TEMP_1_PIN          0   // Analog Input
-#define TEMP_BED_PIN       15   // Analog Input - Bed
+#define TEMP_0_PIN                            14  // Analog Input - Extruder 2 => A2
+//#define TEMP_1_PIN                           0  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input - Bed
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      6   // Analog Input
+  #define FILWIDTH_PIN                         6  // Analog Input
 #endif
 
 //
 // Misc. Functions
 //
 
-//#define SDSS               16   // 8
-#define LED_PIN            13
+//#define SDSS                                16  // 8
+#define LED_PIN                               13
 
-//#define SOL1_PIN           28
+//#define SOL1_PIN                            28
 
 //
 // LCD / Controller
 //
 
-//#define SCK_PIN            13
-//#define MISO_PIN           12
-//#define MOSI_PIN           11
+//#define SCK_PIN                             13
+//#define MISO_PIN                            12
+//#define MOSI_PIN                            11
 
 /*
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      40
-  #define LCD_PINS_ENABLE  41
-  #define LCD_PINS_D4      42
-  #define LCD_PINS_D5      43
-  #define LCD_PINS_D6      44
-  #define LCD_PINS_D7      45
-  #define BTN_EN1          46
-  #define BTN_EN2          47
-  #define BTN_ENC          48
+  #define LCD_PINS_RS                         40
+  #define LCD_PINS_ENABLE                     41
+  #define LCD_PINS_D4                         42
+  #define LCD_PINS_D5                         43
+  #define LCD_PINS_D6                         44
+  #define LCD_PINS_D7                         45
+  #define BTN_EN1                             46
+  #define BTN_EN2                             47
+  #define BTN_ENC                             48
 #endif
 */
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
index 28fd51b8a058..8528533d7b8b 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
@@ -37,7 +37,7 @@
   #define BOARD_INFO_NAME "Teensy3.6"
 #endif
 
-#define AT90USB 1286   // Disable MarlinSerial etc.
+#define AT90USB                              1286 // Disable MarlinSerial etc.
 #define USBCON //1286  // Disable MarlinSerial etc.
 /*
 
@@ -83,80 +83,80 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
 //
 // Limit Switches
 //
-#define X_STOP_PIN         24
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         28
+#define X_STOP_PIN                            24
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         22
-#define X_DIR_PIN          21
-#define X_ENABLE_PIN       39
+#define X_STEP_PIN                            22
+#define X_DIR_PIN                             21
+#define X_ENABLE_PIN                          39
 
-#define Y_STEP_PIN         19
-#define Y_DIR_PIN          18
-#define Y_ENABLE_PIN       20
+#define Y_STEP_PIN                            19
+#define Y_DIR_PIN                             18
+#define Y_ENABLE_PIN                          20
 
-#define Z_STEP_PIN         38
-#define Z_DIR_PIN          37
-#define Z_ENABLE_PIN       17
+#define Z_STEP_PIN                            38
+#define Z_DIR_PIN                             37
+#define Z_ENABLE_PIN                          17
 
-#define E0_STEP_PIN        31
-#define E0_DIR_PIN         30
-#define E0_ENABLE_PIN      32
+#define E0_STEP_PIN                           31
+#define E0_DIR_PIN                            30
+#define E0_ENABLE_PIN                         32
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      35
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         35
 
-#define HEATER_0_PIN       30
-#define HEATER_1_PIN       36
-#define HEATER_BED_PIN     31
+#define HEATER_0_PIN                          30
+#define HEATER_1_PIN                          36
+#define HEATER_BED_PIN                        31
 #ifndef FAN_PIN
-  #define FAN_PIN           2
+  #define FAN_PIN                              2
 #endif
 
-#define TEMP_0_PIN          2   // Extruder / Analog pin numbering: 2 => A2
-#define TEMP_1_PIN          0
-#define TEMP_BED_PIN        1   // Bed / Analog pin numbering
+#define TEMP_0_PIN                             2  // Extruder / Analog pin numbering: 2 => A2
+#define TEMP_1_PIN                             0
+#define TEMP_BED_PIN                           1  // Bed / Analog pin numbering
 
-#define SDSS               39   // 8
-#define LED_PIN            13
-#define PS_ON_PIN           1
-#define ALARM_PIN          -1
+#define SDSS                                  39  // 8
+#define LED_PIN                               13
+#define PS_ON_PIN                              1
+#define ALARM_PIN                             -1
 
-#define FILWIDTH_PIN        6
-#define SOL1_PIN           28
+#define FILWIDTH_PIN                           6
+#define SOL1_PIN                              28
 
 #if 0
 // Pretty sure this is obsolete!
 // Please use Marlin 1.1.x pins files as reference for new pins files.
 #ifndef SDSUPPORT
   // these are defined in the SD library if building with SD support
-  #define SCK_PIN          13
-  #define MISO_PIN         12
-  #define MOSI_PIN         11
+  #define SCK_PIN                             13
+  #define MISO_PIN                            12
+  #define MOSI_PIN                            11
 #endif
 #endif
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      40
-  #define LCD_PINS_ENABLE  41
-  #define LCD_PINS_D4      42
-  #define LCD_PINS_D5      43
-  #define LCD_PINS_D6      44
-  #define LCD_PINS_D7      45
+  #define LCD_PINS_RS                         40
+  #define LCD_PINS_ENABLE                     41
+  #define LCD_PINS_D4                         42
+  #define LCD_PINS_D5                         43
+  #define LCD_PINS_D6                         44
+  #define LCD_PINS_D7                         45
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          46
-  #define BTN_EN2          47
-  #define BTN_ENC          48
+  #define BTN_EN1                             46
+  #define BTN_EN2                             47
+  #define BTN_ENC                             48
 #endif
 
 #if ENABLED(REPRAPWORLD_KEYPAD)
-  #define SHIFT_OUT        40
-  #define SHIFT_CLK        44
-  #define SHIFT_LD         42
+  #define SHIFT_OUT                           40
+  #define SHIFT_CLK                           44
+  #define SHIFT_LD                            42
 #endif

From d5cae7b7a599340050d36b95bfbd2877b85bf7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Sun, 22 Mar 2020 09:21:35 +0500
Subject: [PATCH 473/565] fix #39

---
 Marlin/Configuration_adv.h                 |  1 +
 Marlin/src/MarlinCore.cpp                  | 24 +++++++++++
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 31 ++++++++++++---
 Marlin/src/lcd/ultralcd.cpp                | 46 +++++-----------------
 Marlin/src/sd/cardreader.cpp               |  7 ++++
 Marlin/src/sd/cardreader.h                 | 37 +++++++++++++++++
 6 files changed, 105 insertions(+), 41 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 268ef1d1774c..5ba78dac8f68 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1225,6 +1225,7 @@
   #define DOGM_SD_PRESENT // https://github.com/ursoft/Marlin/issues/34
   #define DOGM_SHOW_SPEED // https://github.com/ursoft/Marlin/issues/39
   #define DOGM_SHOW_LAYER // https://github.com/ursoft/Marlin/issues/39
+  #define DOGM_SHOW_PERF  // https://github.com/ursoft/Marlin/issues/39
 
   // Enable to save many cycles by drawing a hollow frame on the Info Screen
   #define XYZ_HOLLOW_FRAME
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index b1361638866f..0aae2cc611af 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -687,6 +687,11 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
 /**
  * Standard idle routine keeps the machine alive
  */
+#if ENABLED(DOGM_SHOW_PERF)
+uint8_t maxCpuLoadPercent = 100, minCpuLoadPercent = 100;
+uint32_t loopTm = micros();
+#endif
+
 void idle(
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     bool no_stepper_sleep/*=false*/
@@ -770,6 +775,25 @@ void idle(
   #if ENABLED(POLL_JOG)
     joystick.inject_jog_moves();
   #endif
+
+#if ENABLED(DOGM_SHOW_PERF)
+    uint8_t newCpuLoadPercent;
+    uint32_t newLoopTm = micros();
+    uint32_t microsFromPrev = newLoopTm - loopTm;
+    if(int32_t(microsFromPrev) < 0)
+      microsFromPrev = 0; // ???
+    if(microsFromPrev < 5000)
+      newCpuLoadPercent = microsFromPrev / 100; //первые 50% - доли 5 мс
+    else if(microsFromPrev > 30000) //более 30мс - переполнение
+      newCpuLoadPercent = 100;
+    else
+      newCpuLoadPercent = (uint8_t)(50 + (uint8_t)((microsFromPrev - 5000)*49.0/25000.0)); //5...30ms -> 50...99%
+    loopTm = newLoopTm;
+    if(maxCpuLoadPercent == 100 || maxCpuLoadPercent < newCpuLoadPercent)
+      maxCpuLoadPercent = newCpuLoadPercent;
+    if(minCpuLoadPercent == 100 || minCpuLoadPercent > newCpuLoadPercent)
+      minCpuLoadPercent = newCpuLoadPercent;
+#endif
 }
 
 /**
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 2e7956ef6d2a..55fc84e73fe7 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -353,6 +353,10 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   extern int dogmLayerCnt, dogmLayer;
   extern char conv[8];
 #endif
+#if ENABLED(DOGM_SHOW_PERF)
+  extern uint8_t minCpuLoadPercent, maxCpuLoadPercent;
+#endif
+
 void MarlinUI::draw_status_screen() {
 
   static char xstring[5
@@ -510,13 +514,15 @@ void MarlinUI::draw_status_screen() {
   // Status Menu Font
   set_font(FONT_STATUSMENU);
   #if ENABLED(DOGM_SHOW_SPEED)
-    u8g.drawHLine(35, 0, 6);
-    u8g.drawHLine(33, 3, 6);
-    u8g.drawHLine(31, 6, 6);
-    lcd_put_u8str(43, 7, i16tostr3(dogmSpeedToShow));
+    if(PAGE_CONTAINS(0, 8)) {
+      u8g.drawHLine(35, 0, 6);
+      u8g.drawHLine(33, 3, 6);
+      u8g.drawHLine(31, 6, 6);
+      lcd_put_u8str(43, 7, i16tostr3(dogmSpeedToShow));
+    }
   #endif
   #if ENABLED(DOGM_SHOW_LAYER)
-    if(dogmLayer) {
+    if(PAGE_CONTAINS(8, 16) && dogmLayer) {
       sprintf(conv, "L%d", dogmLayer);
       lcd_put_u8str(32 - 5 * (dogmLayer > 999) - 5 * (dogmLayerCnt > 999), 16, conv);
       if(dogmLayerCnt) {
@@ -525,6 +531,21 @@ void MarlinUI::draw_status_screen() {
       }
     }
   #endif
+  #if ENABLED(DOGM_SHOW_PERF)
+    if (PAGE_CONTAINS(19, 27)) {
+      u8g.drawFrame(30, 19, 51, 3);
+      int bufferUsage = (int)planner.nonbusy_movesplanned() * 48 / BLOCK_BUFFER_SIZE;
+      u8g.drawHLine(31, 20, bufferUsage);
+      int cpuLoadPercentLen = (int)(maxCpuLoadPercent - minCpuLoadPercent) * 48 / 100;
+      if(cpuLoadPercentLen == 0)
+        cpuLoadPercentLen = 1;
+      int cpuLoadPercentFrom = int(minCpuLoadPercent) * 48 / 100;
+      u8g.drawFrame(30, 24, 51, 3);
+      u8g.drawHLine(31 + cpuLoadPercentFrom, 25, cpuLoadPercentLen);
+      maxCpuLoadPercent = 100;
+      minCpuLoadPercent = 100;
+    }
+  #endif
 
   #if DO_DRAW_LOGO
     if (PAGE_CONTAINS(STATUS_LOGO_Y, STATUS_LOGO_Y + STATUS_LOGO_HEIGHT - 1))
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 9d6240c318ae..3b24b230c2d4 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -22,7 +22,7 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-#ifdef LED_BACKLIGHT_TIMEOUT
+#if EITHER(LED_BACKLIGHT_TIMEOUT, LED_COLOR_PRESETS)
   #include "../feature/leds/leds.h"
 #endif
 
@@ -174,42 +174,9 @@ millis_t MarlinUI::next_button_update_ms; // = 0
             outstr += filename_scroll_pos;
           }
         #else
-          static char longFilenameCyr[LONG_FILENAME_LENGTH*3];
           theCard.longFilename[maxlen] = '\0'; // cutoff at screen edge
           #ifdef CYRILLIC_FILENAMES // convert 1251 to  utf8
-            static const int table[128] = {                    
-                0x82D0,0x83D0,0x9A80E2,0x93D1,0x9E80E2,0xA680E2,0xA080E2,0xA180E2,
-                0xAC82E2,0xB080E2,0x89D0,0xB980E2,0x8AD0,0x8CD0,0x8BD0,0x8FD0,    
-                0x92D1,0x9880E2,0x9980E2,0x9C80E2,0x9D80E2,0xA280E2,0x9380E2,0x9480E2,
-                0,0xA284E2,0x99D1,0xBA80E2,0x9AD1,0x9CD1,0x9BD1,0x9FD1,               
-                0xA0C2,0x8ED0,0x9ED1,0x88D0,0xA4C2,0x90D2,0xA6C2,0xA7C2,              
-                0x81D0,0xA9C2,0x84D0,0xABC2,0xACC2,0xADC2,0xAEC2,0x87D0,              
-                0xB0C2,0xB1C2,0x86D0,0x96D1,0x91D2,0xB5C2,0xB6C2,0xB7C2,              
-                0x91D1,0x9684E2,0x94D1,0xBBC2,0x98D1,0x85D0,0x95D1,0x97D1,            
-                0x90D0,0x91D0,0x92D0,0x93D0,0x94D0,0x95D0,0x96D0,0x97D0,
-                0x98D0,0x99D0,0x9AD0,0x9BD0,0x9CD0,0x9DD0,0x9ED0,0x9FD0,
-                0xA0D0,0xA1D0,0xA2D0,0xA3D0,0xA4D0,0xA5D0,0xA6D0,0xA7D0,
-                0xA8D0,0xA9D0,0xAAD0,0xABD0,0xACD0,0xADD0,0xAED0,0xAFD0,
-                0xB0D0,0xB1D0,0xB2D0,0xB3D0,0xB4D0,0xB5D0,0xB6D0,0xB7D0,
-                0xB8D0,0xB9D0,0xBAD0,0xBBD0,0xBCD0,0xBDD0,0xBED0,0xBFD0,
-                0x80D1,0x81D1,0x82D1,0x83D1,0x84D1,0x85D1,0x86D1,0x87D1,
-                0x88D1,0x89D1,0x8AD1,0x8BD1,0x8CD1,0x8DD1,0x8ED1,0x8FD1
-            };
-            memcpy(longFilenameCyr, theCard.longFilename, LONG_FILENAME_LENGTH);
-            int n = 0;
-            for(int i = 0; i < LONG_FILENAME_LENGTH && n < 2*LONG_FILENAME_LENGTH; i++) {
-              char c1251 = theCard.longFilename[i];
-              if(c1251 >= 0 && c1251 <= 0x7f) longFilenameCyr[n++] = c1251; else {
-                int v = table[(int)(0x7f & c1251)];
-                longFilenameCyr[n++] = (char)v;
-                longFilenameCyr[n++] = (char)(v >> 8);
-                if (v >>= 16)
-                    longFilenameCyr[n++] = (char)v;
-              }
-              if(c1251 == 0) break;
-            }
-            longFilenameCyr[2*LONG_FILENAME_LENGTH - 1] = '\0';
-            outstr = longFilenameCyr;
+            outstr = theCard.longFilenameCyr();
           #endif
         #endif
       }
@@ -1546,7 +1513,11 @@ void MarlinUI::update() {
       msg = print_paused;
     #if ENABLED(SDSUPPORT)
       else if (IS_SD_PRINTING())
-        return set_status(card.longest_filename(), true);
+        #ifdef CYRILLIC_FILENAMES
+          return set_status(card.longFilename[0] ? card.longFilenameCyr() : card.filename, true);
+        #else
+          return set_status(card.longest_filename(), true);
+        #endif
     #endif
     else if (print_job_timer.isRunning())
       msg = printing;
@@ -1589,6 +1560,9 @@ void MarlinUI::update() {
     #if HAS_LCD_MENU
       return_to_status();
     #endif
+    #if ENABLED(LED_COLOR_PRESETS)
+      leds.set_default();
+    #endif
   }
 
   #if ANY(PARK_HEAD_ON_PAUSE, SDSUPPORT)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 99dcc7d52cb9..e7c1487228b7 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -535,11 +535,18 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
 #ifndef LONG_FILENAME_OVERRIDE_SHORT
     selectFileByName(fname);
 #endif
+#ifdef CYRILLIC_FILENAMES
+    ui.set_status(longFilename[0] ? longFilenameCyr() : fname);
+#else
     ui.set_status(longFilename[0] ? longFilename : fname);
+#endif
   }
   else
     openFailed(fname);
 }
+#ifdef CYRILLIC_FILENAMES
+  char CardReader::_longFilenameCyr[LONG_FILENAME_LENGTH*3];
+#endif
 
 inline void echo_write_to_file(const char * const fname) {
   SERIAL_ECHOLNPAIR(STR_SD_WRITE_TO_FILE, fname);
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 7c3b3a9f1755..73024038bf6f 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -53,6 +53,43 @@ class CardReader {
   static card_flags_t flag;                         // Flags (above)
   static char filename[FILENAME_LENGTH],            // DOS 8.3 filename of the selected item
               longFilename[LONG_FILENAME_LENGTH];   // Long name of the selected item
+#ifdef CYRILLIC_FILENAMES // convert 1251 to  utf8
+  static char _longFilenameCyr[LONG_FILENAME_LENGTH*3];
+  static const char *longFilenameCyr() {
+    static const int table[128] = {                    
+        0x82D0,0x83D0,0x9A80E2,0x93D1,0x9E80E2,0xA680E2,0xA080E2,0xA180E2,
+        0xAC82E2,0xB080E2,0x89D0,0xB980E2,0x8AD0,0x8CD0,0x8BD0,0x8FD0,    
+        0x92D1,0x9880E2,0x9980E2,0x9C80E2,0x9D80E2,0xA280E2,0x9380E2,0x9480E2,
+        0,0xA284E2,0x99D1,0xBA80E2,0x9AD1,0x9CD1,0x9BD1,0x9FD1,               
+        0xA0C2,0x8ED0,0x9ED1,0x88D0,0xA4C2,0x90D2,0xA6C2,0xA7C2,              
+        0x81D0,0xA9C2,0x84D0,0xABC2,0xACC2,0xADC2,0xAEC2,0x87D0,              
+        0xB0C2,0xB1C2,0x86D0,0x96D1,0x91D2,0xB5C2,0xB6C2,0xB7C2,              
+        0x91D1,0x9684E2,0x94D1,0xBBC2,0x98D1,0x85D0,0x95D1,0x97D1,            
+        0x90D0,0x91D0,0x92D0,0x93D0,0x94D0,0x95D0,0x96D0,0x97D0,
+        0x98D0,0x99D0,0x9AD0,0x9BD0,0x9CD0,0x9DD0,0x9ED0,0x9FD0,
+        0xA0D0,0xA1D0,0xA2D0,0xA3D0,0xA4D0,0xA5D0,0xA6D0,0xA7D0,
+        0xA8D0,0xA9D0,0xAAD0,0xABD0,0xACD0,0xADD0,0xAED0,0xAFD0,
+        0xB0D0,0xB1D0,0xB2D0,0xB3D0,0xB4D0,0xB5D0,0xB6D0,0xB7D0,
+        0xB8D0,0xB9D0,0xBAD0,0xBBD0,0xBCD0,0xBDD0,0xBED0,0xBFD0,
+        0x80D1,0x81D1,0x82D1,0x83D1,0x84D1,0x85D1,0x86D1,0x87D1,
+        0x88D1,0x89D1,0x8AD1,0x8BD1,0x8CD1,0x8DD1,0x8ED1,0x8FD1
+    };
+    int n = 0;
+    for(int i = 0; i < LONG_FILENAME_LENGTH && n < (int)sizeof(_longFilenameCyr); i++) {
+      char c1251 = longFilename[i];
+      if(c1251 >= 0 && c1251 <= 0x7f) _longFilenameCyr[n++] = c1251; else {
+        int v = table[(int)(0x7f & c1251)];
+        _longFilenameCyr[n++] = (char)v;
+        _longFilenameCyr[n++] = (char)(v >> 8);
+        if (v >>= 16)
+            _longFilenameCyr[n++] = (char)v;
+      }
+      if(c1251 == 0) break;
+    }
+    _longFilenameCyr[sizeof(_longFilenameCyr) - 1] = '\0';
+    return _longFilenameCyr;
+  }
+#endif
 
   // Fast! binary file transfer
   #if ENABLED(BINARY_FILE_TRANSFER)

From 2460a3dfbb3e75fe273f15bd07ded1757dff1b2a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 23:31:02 -0500
Subject: [PATCH 474/565] Fix custom version file include

---
 Marlin/src/core/macros.h         | 4 ++++
 Marlin/src/inc/MarlinConfigPre.h | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 56ec11bd7cee..bcee642368dc 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+#if !defined(__has_include)
+  #define __has_include(...) 1
+#endif
+
 #define ABCE 4
 #define XYZE 4
 #define ABC  3
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index 1385f9e19fa1..d84f75120026 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -37,12 +37,8 @@
 #include "../../Configuration.h"
 
 #ifdef CUSTOM_VERSION_FILE
-  #if defined(__has_include)
-    #if __has_include(XSTR(../../CUSTOM_VERSION_FILE))
-      #include XSTR(../../CUSTOM_VERSION_FILE)
-    #endif
-  #else
-    #include XSTR(../../CUSTOM_VERSION_FILE)
+  #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
+    #include STRINGIFY(../../CUSTOM_VERSION_FILE)
   #endif
 #endif
 

From e7a9f173718198b6196de0ee7f1b9d4aab84ecd2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Mar 2020 23:38:44 -0500
Subject: [PATCH 475/565] Tweak serial port descriptions

---
 Marlin/Configuration.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 007b8fc5df46..df99f8b676bf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -99,6 +99,7 @@
 /**
  * Select the serial port on the board to use for communication with the host.
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
+ * Serial port -1 is the USB emulated serial port, if available.
  * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
@@ -107,9 +108,6 @@
 
 /**
  * Select a secondary serial port on the board to use for communication with the host.
- * This allows the connection of wireless adapters (for instance) to non-default port pins.
- * Serial port -1 is the USB emulated serial port, if available.
- *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_2 -1

From 27c281eec3729e819d1329d8eae4450a4cbf2d38 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 23 Mar 2020 00:03:08 +0000
Subject: [PATCH 476/565] [cron] Bump distribution date (2020-03-23)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2f99b9a6ed37..22d2ac724c23 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-22"
+  #define STRING_DISTRIBUTION_DATE "2020-03-23"
 #endif
 
 /**

From 717c2168519001a2f5196282a75eb6cf0eb704fd Mon Sep 17 00:00:00 2001
From: RasmusAaen <rasmus@aaen.net>
Date: Mon, 23 Mar 2020 23:34:38 +0100
Subject: [PATCH 477/565] Fix Copymaster Y_MAX pin (#17267)

---
 Marlin/src/pins/ramps/pins_COPYMASTER_3D.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
index 7ee66b1194a2..8f61ef47dc68 100644
--- a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
+++ b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
@@ -24,6 +24,7 @@
 #define BOARD_INFO_NAME "Copymaster 3D RAMPS"
 
 #define Z_STEP_PIN        47
+#define Y_MAX_PIN         14
 #define FIL_RUNOUT_PIN    15
 #define SD_DETECT_PIN     66
 

From fe154fa5dee7c2c3a796c9fd634fd422ee944103 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 22 Mar 2020 00:00:19 -0500
Subject: [PATCH 478/565] Fix CONTROLLER_FAN options compile

---
 Marlin/src/feature/controllerfan.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/controllerfan.h b/Marlin/src/feature/controllerfan.h
index bc48a6e2616d..cd56ff8cedf6 100644
--- a/Marlin/src/feature/controllerfan.h
+++ b/Marlin/src/feature/controllerfan.h
@@ -58,7 +58,7 @@ class ControllerFan {
     #if ENABLED(CONTROLLER_FAN_EDITABLE)
       static controllerFan_settings_t settings;
     #else
-      static const controllerFan_settings_t &settings = controllerFan_defaults;
+      static const controllerFan_settings_t constexpr &settings = controllerFan_defaults;
     #endif
     static inline bool state() { return speed > 0; }
     static inline void init() { reset(); }

From 580d314fbe72cd398a90bb62f4e33e186761a9e6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 22 Mar 2020 00:19:05 -0500
Subject: [PATCH 479/565] Skip impossible PWM sanity-checks

---
 Marlin/src/HAL/STM32F1/HAL.h | 1 +
 Marlin/src/inc/SanityCheck.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index c97abf4bb1a8..f0f0ce1ea6ac 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -160,6 +160,7 @@ void HAL_idletask();
 
 #ifndef digitalPinHasPWM
   #define digitalPinHasPWM(P) (PIN_MAP[P].timer_device != nullptr)
+  #define NO_COMPILE_TIME_PWM
 #endif
 
 #define CRITICAL_SECTION_START()  uint32_t primask = __get_primask(); (void)__iCliRetVal()
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 89b53362d6ed..f44f93b9af72 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1985,7 +1985,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Auto Fan check for PWM pins
  */
-#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255
+#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(NO_COMPILE_TIME_PWM)
   #define AF_ERR_SUFF "_AUTO_FAN_PIN is not a PWM pin. Set EXTRUDER_AUTO_FAN_SPEED to 255."
   #if HAS_AUTO_FAN_0
     static_assert(PWM_PIN(E0_AUTO_FAN_PIN), "E0" AF_ERR_SUFF);

From adb7a88428c04fe73d0923ba50782ba726968da7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 23 Mar 2020 17:11:00 -0500
Subject: [PATCH 480/565] Fix an unused var warning

---
 Marlin/src/HAL/LPC1768/HAL.cpp | 4 +---
 Marlin/src/HAL/LPC1768/HAL.h   | 2 +-
 Marlin/src/HAL/STM32/HAL.cpp   | 2 +-
 Marlin/src/HAL/STM32/HAL.h     | 2 +-
 Marlin/src/HAL/STM32F1/HAL.cpp | 2 +-
 Marlin/src/HAL/STM32F1/HAL.h   | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
index f0559d268a1c..f206ce7adb76 100644
--- a/Marlin/src/HAL/LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -67,9 +67,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return ind > -1 ? ind : dval;
 }
 
-void flashFirmware(int16_t value) {
-  NVIC_SystemReset();
-}
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
 
 void HAL_clear_reset_source(void) {
   #if ENABLED(USE_WATCHDOG)
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index c727877ff372..f5ea629f1694 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -195,7 +195,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 void HAL_idletask();
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
 
 /**
  * set_pwm_frequency
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 5d8c686af30e..77f8d2764055 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -133,6 +133,6 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRe
 
 uint16_t HAL_adc_get_result() { return HAL_adc_result; }
 
-void flashFirmware(int16_t) { NVIC_SystemReset(); }
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
 
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 9fb40d612187..c310cca74e29 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -223,4 +223,4 @@ uint16_t HAL_adc_get_result();
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index bc5479b60ce0..01fd2c8fc38b 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -388,6 +388,6 @@ void analogWrite(pin_t pin, int pwm_val8) {
     analogWrite(uint8_t(pin), pwm_val8);
 }
 
-void flashFirmware(int16_t value) { nvic_sys_reset(); }
+void flashFirmware(const int16_t) { nvic_sys_reset(); }
 
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index f0f0ce1ea6ac..ff42beb92af2 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -288,4 +288,4 @@ void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);

From cd4060a99cb11b8cb0915294bb91ea427f89ff33 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 24 Mar 2020 11:55:21 +1300
Subject: [PATCH 481/565] Add USB serial support to SERIAL_PORT_2 on DUE
 (#17245)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/DUE/HAL.h               |  1 -
 Marlin/src/HAL/DUE/MarlinSerial.cpp    | 20 +++++---------------
 Marlin/src/HAL/DUE/MarlinSerial.h      |  8 ++------
 Marlin/src/HAL/DUE/MarlinSerialUSB.cpp | 12 ++++++++----
 Marlin/src/HAL/DUE/MarlinSerialUSB.h   | 12 +++++++++---
 Marlin/src/inc/Conditionals_LCD.h      |  4 ++++
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 97b94b5db234..90b6fabc050e 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -94,7 +94,6 @@
   #endif
 #endif
 
-
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
 
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index d827def42251..d114c75989c4 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -629,23 +629,13 @@ void MarlinSerial<Cfg>::printFloat(double number, uint8_t digits) {
 
 // If not using the USB port as serial port
 #if SERIAL_PORT >= 0
-
-  // Preinstantiate
-  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>;
-
-  // Instantiate
-  MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
-
+  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>;      // Define
+  MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;   // Instantiate
 #endif
 
-#ifdef SERIAL_PORT_2
-
-  // Preinstantiate
-  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>>;
-
-  // Instantiate
-  MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2;
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
+  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>>;    // Define
+  MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2; // Instantiate
 #endif
 
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
index eb26a5644dd9..fa6a2c7d157a 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -172,13 +172,9 @@ struct MarlinSerialCfg {
 };
 
 #if SERIAL_PORT >= 0
-
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
+#endif
 
-#endif // SERIAL_PORT >= 0
-
-#ifdef SERIAL_PORT_2
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2;
-
 #endif
diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index 41ffb52ba112..7a020bbaf0b1 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -29,7 +29,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
 
 #include "MarlinSerialUSB.h"
 
@@ -283,8 +283,12 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
 }
 
 // Preinstantiate
-MarlinSerialUSB customizedSerial1;
-
-#endif // SERIAL_PORT == -1
+#if SERIAL_PORT == -1
+  MarlinSerialUSB customizedSerial1;
+#endif
+#if SERIAL_PORT_2 == -1
+  MarlinSerialUSB customizedSerial2;
+#endif
 
+#endif // HAS_USB_SERIAL
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.h b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
index d8b051d37e01..9aece901b12b 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.h
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
@@ -28,7 +28,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
 
 #include <WString.h>
 
@@ -88,6 +88,12 @@ class MarlinSerialUSB {
   static void printFloat(double, uint8_t);
 };
 
-extern MarlinSerialUSB customizedSerial1;
+#if SERIAL_PORT == -1
+  extern MarlinSerialUSB customizedSerial1;
+#endif
+
+#if SERIAL_PORT_2 == -1
+  extern MarlinSerialUSB customizedSerial2;
+#endif
 
-#endif // SERIAL_PORT == -1
+#endif // HAS_USB_SERIAL
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 2907694fb4c5..dd1f13fae0f8 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -683,6 +683,10 @@
   #define SPI_SPEED SPI_FULL_SPEED
 #endif
 
+#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1
+  #define HAS_USB_SERIAL 1
+#endif
+
 /**
  * This setting is also used by M109 when trying to calculate
  * a ballpark safe margin to prevent wait-forever situation.

From e3ebbe25e0f643d0423edf4b5c43db18e54ef5c1 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Tue, 24 Mar 2020 07:00:22 +0800
Subject: [PATCH 482/565] DGUS updates (#17260)

---
 Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp          | 10 +++++-----
 .../src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp  | 10 +++++++++-
 Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
index 2b4080485fad..6ac84c2bb0af 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
@@ -30,10 +30,6 @@
   #error "More than 2 hotends not implemented on the Display UI design."
 #endif
 
-#include "DGUSDisplay.h"
-#include "DGUSVPVariable.h"
-#include "DGUSDisplayDef.h"
-
 #include "../../ui_api.h"
 
 #include "../../../../MarlinCore.h"
@@ -48,6 +44,10 @@
   #include "../../../../feature/powerloss.h"
 #endif
 
+#include "DGUSDisplay.h"
+#include "DGUSVPVariable.h"
+#include "DGUSDisplayDef.h"
+
 // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable
 constexpr uint8_t DGUS_HEADER1 = 0x5A;
 constexpr uint8_t DGUS_HEADER2 = 0xA5;
@@ -855,7 +855,7 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable
 void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
 
-  const float offset = float(swap16(*(uint16_t*)val_ptr)) / 100.0f;
+  const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
   ExtUI::setZOffset_mm(offset);
   ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
   return;
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
index 3ccde11411d5..5fbb307ee809 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -283,6 +283,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
   0x0000
 };
 
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+  #if HOTENDS >= 1
+    VP_SD_Print_ProbeOffsetZ,
+  #endif
+  0x0000
+};
+
 const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_BOOT, VPList_Boot },
   { DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -291,6 +298,7 @@ const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
   { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
   { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
+  { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
   { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
   { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
   { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
@@ -361,7 +369,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #if HOTENDS >= 1
     VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E0, nullptr, DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
     VPHELPER(VP_MOVE_E0, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),
     VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &DGUSScreenVariableHandler::HandleHeaterControl, nullptr),
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
index dbf7b8f631cd..1bfdf542549f 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
@@ -35,6 +35,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_FILAMENT_LOADING     =  76,
   DGUSLCD_SCREEN_FILAMENT_UNLOADING   =  82,
   DGUSLCD_SCREEN_MANUALEXTRUDE        =  84,
+  DGUSLCD_SCREEN_Z_OFFSET             =  88,
   DGUSLCD_SCREEN_SDFILELIST           =   3,
   DGUSLCD_SCREEN_SDPRINTMANIPULATION  =   7,
   DGUSLCD_SCREEN_SDPRINTTUNE          =   9,

From c87d73045b7bb6f05c6e7c149ac07751e7ff963f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 23 Mar 2020 18:31:04 -0500
Subject: [PATCH 483/565] Fix extra M114 output line

Fixes #17255
---
 Marlin/src/module/motion.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index c1d8fceaa07e..a0b59284fe04 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -218,7 +218,6 @@ inline void report_more_positions() {
 inline void report_logical_position(const xyze_pos_t &rpos) {
   const xyze_pos_t lpos = rpos.asLogical();
   SERIAL_ECHOPAIR_P(X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z, SP_E_LBL, lpos.e);
-  report_more_positions();
 }
 
 // Report the real current position according to the steppers.
@@ -237,10 +236,14 @@ void report_real_position() {
   #endif
 
   report_logical_position(npos);
+  report_more_positions();
 }
 
 // Report the logical current position according to the most recent G-code command
-void report_current_position() { report_logical_position(current_position); }
+void report_current_position() {
+  report_logical_position(current_position);
+  report_more_positions();
+}
 
 /**
  * Report the logical current position according to the most recent G-code command.

From edd6f6c5f293c510069d4f60587e6f9b3ecac939 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 24 Mar 2020 00:03:08 +0000
Subject: [PATCH 484/565] [cron] Bump distribution date (2020-03-24)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 22d2ac724c23..5fc22110231b 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-23"
+  #define STRING_DISTRIBUTION_DATE "2020-03-24"
 #endif
 
 /**

From bef9b9b07e90b5e81e900cb9d740145e8b494e6d Mon Sep 17 00:00:00 2001
From: rado79 <51396577+rado79@users.noreply.github.com>
Date: Tue, 24 Mar 2020 02:32:36 +0100
Subject: [PATCH 485/565] Delay after homing_backoff for CoreXY sensorless
 homing (#17273)

---
 Marlin/src/module/motion.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index a0b59284fe04..14da9b47e027 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1779,6 +1779,13 @@ void homeaxis(const AxisEnum axis) {
         #endif
         homing_feedrate(axis)
       );
+
+      #if ENABLED(SENSORLESS_HOMING)
+        planner.synchronize();
+        #if IS_CORE
+          if (axis != NORMAL_AXIS) safe_delay(200);  // Short delay to allow belts to spring back
+        #endif
+      #endif
     }
   #endif
 

From 326022800988855b32ede249e0bb134b93466564 Mon Sep 17 00:00:00 2001
From: mkpfalz <50922721+mkpfalz@users.noreply.github.com>
Date: Tue, 24 Mar 2020 20:08:55 +0100
Subject: [PATCH 486/565] Sanity-check CORE backlash axes (#17279)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/SanityCheck.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f44f93b9af72..5814d92bb07e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2651,14 +2651,14 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #endif
 
 #if ENABLED(BACKLASH_COMPENSATION)
-  #if IS_CORE
-    #error "BACKLASH_COMPENSATION is incompatible with CORE kinematics."
-  #endif
   #ifndef BACKLASH_DISTANCE_MM
     #error "BACKLASH_COMPENSATION requires BACKLASH_DISTANCE_MM"
-  #endif
-  #ifndef BACKLASH_CORRECTION
+  #elif !defined(BACKLASH_CORRECTION)
     #error "BACKLASH_COMPENSATION requires BACKLASH_CORRECTION"
+  #elif IS_CORE
+    constexpr float backlash_arr[] = BACKLASH_DISTANCE_MM;
+    static_assert(!backlash_arr[CORE_AXIS_1] && !backlash_arr[CORE_AXIS_2],
+                  "BACKLASH_COMPENSATION can only apply to " STRINGIFY(NORMAL_AXIS) " with your CORE system.");
   #endif
 #endif
 

From 4113481c4eb1c218cc93e7928c024ff01d00bb88 Mon Sep 17 00:00:00 2001
From: MarkMan0 <38912829+MarkMan0@users.noreply.github.com>
Date: Tue, 24 Mar 2020 21:13:37 +0100
Subject: [PATCH 487/565] Fix limits on acceleration editing (#17280)

---
 Marlin/src/lcd/menu/menu_advanced.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index ca02dc9622ce..1577e59fc117 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -376,12 +376,12 @@ void menu_cancelobject();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-    static float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
+    const float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
     // M204 P Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_ACC, &planner.settings.acceleration, 25, max_accel);
 
     // M204 R Retract Acceleration
-    EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, max_accel);
+    EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]);
 
     // M204 T Travel Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);

From 41e944da002f38da71deadb092f1803e4501233e Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 25 Mar 2020 09:14:52 +1300
Subject: [PATCH 488/565] Fix Emergency Parser on DUE (#17276)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/HAL/DUE/HAL.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 90b6fabc050e..42f6f175fb35 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -39,7 +39,7 @@
 #include <stdint.h>
 
 // Define MYSERIAL0/1 before MarlinSerial includes!
-#if SERIAL_PORT == -1
+#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
   #define MYSERIAL0 customizedSerial1
 #elif SERIAL_PORT == 0
   #define MYSERIAL0 Serial
@@ -56,7 +56,7 @@
 #ifdef SERIAL_PORT_2
   #if SERIAL_PORT_2 == SERIAL_PORT
     #error "SERIAL_PORT_2 must be different from SERIAL_PORT. Please update your configuration."
-  #elif SERIAL_PORT_2 == -1
+  #elif SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
     #define MYSERIAL1 customizedSerial2
   #elif SERIAL_PORT_2 == 0
     #define MYSERIAL1 Serial

From 7455bb09b348c5126d651200f0fae9d00d78cc39 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:14:30 -0500
Subject: [PATCH 489/565] Add SoftwareSerialM for MKS Robin (#17207)

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h | 35 ++++++++++++++++++++++++
 platformio.ini                           |  6 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index db35548e88ee..2f2881ee3f0e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -157,3 +157,38 @@
   #define SDSS                              PD2
   #define SD_DETECT_PIN                     -1
 #endif
+
+#if HAS_TMC_UART
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial1
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+
+  // Unused servo pins may be repurposed with SoftwareSerialM
+  //#define X_SERIAL_TX_PIN  PF8   // SERVO3_PIN
+  //#define Y_SERIAL_TX_PIN  PF9   // SERVO2_PIN
+  //#define Z_SERIAL_TX_PIN  PA1   // SERVO1_PIN
+  //#define E0_SERIAL_TX_PIN PC3   // SERVO0_PIN
+  //#define X_SERIAL_RX_PIN  X_SERIAL_TX_PIN
+  //#define Y_SERIAL_RX_PIN  Y_SERIAL_TX_PIN
+  //#define Z_SERIAL_RX_PIN  Z_SERIAL_TX_PIN
+  //#define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN
+
+  // Reduce baud rate for software serial reliability
+  #if HAS_TMC_SW_SERIAL
+    #define TMC_BAUD_RATE 19200
+  #endif
+#endif
diff --git a/platformio.ini b/platformio.ini
index 62582e1d93db..2f3e86c31612 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -491,7 +491,7 @@ build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps = ${common.lib_deps}
+lib_deps      = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
 
@@ -502,10 +502,12 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103ZE
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
-  ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
+  ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps      = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #

From 68face848ab75f987ce4b679064f3546715afb20 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 24 Mar 2020 16:40:40 -0500
Subject: [PATCH 490/565] Sanity check CONTROLLERFAN_SECS

---
 Marlin/src/inc/SanityCheck.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 5814d92bb07e..2fd61d4be10e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -272,6 +272,8 @@
   #error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h."
 #elif defined(CONTROLLERFAN_SPEED)
   #error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SECS)
+  #error "CONTROLLERFAN_SECS is now CONTROLLERFAN_IDLE_TIME. Please update your Configuration_adv.h."
 #elif defined(MIN_RETRACT)
   #error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
 #elif defined(ADVANCE)

From 5d515c3a2fac22b7adc0222f64aac6dbf7be7eed Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Tue, 24 Mar 2020 17:08:31 -0500
Subject: [PATCH 491/565] Adjust for timing shift on Max7219 displays on AVR's

Something has shifted.   The previous timing delays on the Max7219 debug displays is too tight without this correction.
I suspect something has been optimized and roughly 50ns of needed setup and hold time has disappeared.
This corrects the issue and the display results are clean again.
---
 Marlin/src/feature/max7219.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index 2ec23f019c93..b37ba98e7e6c 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -121,7 +121,7 @@ uint8_t Max7219::suspended; // = 0;
   #define CRITICAL_SECTION_START() NOOP
   #define CRITICAL_SECTION_END()   NOOP
 #else
-  #define SIG_DELAY() DELAY_NS(188) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR)
+  #define SIG_DELAY() DELAY_NS(250) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR)
 #endif
 
 void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/*=-1*/) {

From 075a86b076719e0d0cb3d390c71b590a6f3a3750 Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Tue, 24 Mar 2020 17:15:03 -0500
Subject: [PATCH 492/565] Update LCD timing on Formbot T-Rex 2+ machines

The code is slightly more optimized than it used to be and this has caused the setup and hold times on the Formbot T-Rex 2+ machines to be insufficient.   This change gives sufficient margin and the LCD Display is clean again.
---
 Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 8fa368651443..5176c699ee28 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -21,6 +21,15 @@
  */
 #pragma once
 
+/**
+ * Override default LCD timing for Formbot T-Rex 2+ machines.
+ * The long LCD cables and the routing near electrically noisy stepper motors
+ * requires a slightly longer setup and hold time on the signals.
+ */
+#define BOARD_ST7920_DELAY_1 DELAY_NS(200)
+#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
+#define BOARD_ST7920_DELAY_3 DELAY_NS(200)
+
 /**
  * Formbot pin assignments
  */

From 0aeee64cca2364be6025c58bbf1970ff4c77e710 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 25 Mar 2020 00:03:18 +0000
Subject: [PATCH 493/565] [cron] Bump distribution date (2020-03-25)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5fc22110231b..e9ac62d04f9f 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-24"
+  #define STRING_DISTRIBUTION_DATE "2020-03-25"
 #endif
 
 /**

From 1986e1cdf851579958dc1fb245486cb2099582dc Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Tue, 24 Mar 2020 19:38:09 -0500
Subject: [PATCH 494/565] Allow PID_DEBUG to be turned on and off (#17284)

M303 D will now toggle activation of PID_DEBUG output.   This allows the debug capability to be built into the firmware, but turned on and off as needed.
---
 Marlin/Configuration.h            |  2 +-
 Marlin/src/gcode/temp/M303.cpp    | 16 ++++++++++++++++
 Marlin/src/module/temperature.cpp | 18 ++++++------------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index df99f8b676bf..77c077ed429d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -473,7 +473,7 @@
 #if ENABLED(PIDTEMP)
   //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
-  //#define PID_DEBUG             // Sends debug data to the serial port.
+  //#define PID_DEBUG             // Sends debug data to the serial port.  Use M303 D to toggle activation.
   //#define PID_OPENLOOP 1        // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index 63dcc3f4c48e..ba119f0d41fe 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -38,7 +38,13 @@
  *       E<extruder> (-1 for the bed) (default 0)
  *       C<cycles> Minimum 3. Default 5.
  *       U<bool> with a non-zero value will apply the result to current settings
+ *       D Toggles PID_DEBUG flag. No other action happens even if more parameters are specified.
  */
+
+#if ENABLED(PID_DEBUG)
+  bool PID_Debug_Flag = 0;
+#endif
+
 void GcodeSuite::M303() {
   #if ENABLED(PIDTEMPBED)
     #define SI H_BED
@@ -63,6 +69,16 @@ void GcodeSuite::M303() {
   const bool u = parser.boolval('U');
   const int16_t temp = parser.celsiusval('S', e < 0 ? 70 : 150);
 
+  #if ENABLED(PID_DEBUG)
+    bool d = parser.boolval('D');
+    if (d) {
+      PID_Debug_Flag = !PID_Debug_Flag;
+      SERIAL_ECHOPGM("PID Debug set to: ");
+      SERIAL_ECHOLN( PID_Debug_Flag );
+      return;
+    }
+  #endif
+
   #if DISABLED(BUSY_WHILE_HEATING)
     KEEPALIVE_STATE(NOT_BUSY);
   #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index f16a3af04693..4e49fcfa2463 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -830,6 +830,9 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
 }
 
 #if HOTENDS
+  #if ENABLED(PID_DEBUG)
+    extern bool PID_Debug_Flag;
+  #endif
 
   float Temperature::get_pid_output_hotend(const uint8_t E_NAME) {
     const uint8_t ee = HOTEND_INDEX;
@@ -911,24 +914,15 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
       #endif // PID_OPENLOOP
 
       #if ENABLED(PID_DEBUG)
-        if (ee == active_extruder) {
+        if (ee == active_extruder && PID_Debug_Flag) {
           SERIAL_ECHO_START();
-          SERIAL_ECHOPAIR(
-            STR_PID_DEBUG, ee,
-            STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius,
-            STR_PID_DEBUG_OUTPUT, pid_output
-          );
+          SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output);
           #if DISABLED(PID_OPENLOOP)
-          {
-            SERIAL_ECHOPAIR(
-              STR_PID_DEBUG_PTERM, work_pid[ee].Kp,
-              STR_PID_DEBUG_ITERM, work_pid[ee].Ki,
-              STR_PID_DEBUG_DTERM, work_pid[ee].Kd
+            SERIAL_ECHOPAIR( STR_PID_DEBUG_PTERM, work_pid[ee].Kp, STR_PID_DEBUG_ITERM, work_pid[ee].Ki, STR_PID_DEBUG_DTERM, work_pid[ee].Kd
               #if ENABLED(PID_EXTRUSION_SCALING)
                 , STR_PID_DEBUG_CTERM, work_pid[ee].Kc
               #endif
             );
-          }
           #endif
           SERIAL_EOL();
         }

From f2ed18d150a070b5542b6113c8bea6e62a31ab02 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 15:07:58 -0500
Subject: [PATCH 495/565] M303 followup

- Put 'D' before other params for clean exit.
- Use serial on/off for debug status.
---
 Marlin/Configuration.h         |  2 +-
 Marlin/src/gcode/temp/M303.cpp | 35 ++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 77c077ed429d..f02e69ee5a6f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -473,7 +473,7 @@
 #if ENABLED(PIDTEMP)
   //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
-  //#define PID_DEBUG             // Sends debug data to the serial port.  Use M303 D to toggle activation.
+  //#define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
   //#define PID_OPENLOOP 1        // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index ba119f0d41fe..657dd867ee9f 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -34,18 +34,31 @@
 /**
  * M303: PID relay autotune
  *
- *       S<temperature> sets the target temperature. (default 150C / 70C)
- *       E<extruder> (-1 for the bed) (default 0)
- *       C<cycles> Minimum 3. Default 5.
- *       U<bool> with a non-zero value will apply the result to current settings
- *       D Toggles PID_DEBUG flag. No other action happens even if more parameters are specified.
+ *  S<temperature>  Set the target temperature. (Default: 150C / 70C)
+ *  E<extruder>     Extruder number to tune, or -1 for the bed. (Default: E0)
+ *  C<cycles>       Number of times to repeat the procedure. (Minimum: 3, Default: 5)
+ *  U<bool>         Flag to apply the result to the current PID values
+ *
+ * With PID_DEBUG:
+ *  D               Toggle PID debugging and EXIT without further action.
  */
 
 #if ENABLED(PID_DEBUG)
-  bool PID_Debug_Flag = 0;
+  bool pid_debug_flag = 0;
 #endif
 
 void GcodeSuite::M303() {
+
+  #if ENABLED(PID_DEBUG)
+    if (parser.seen('D')) {
+      pid_debug_flag = !pid_debug_flag;
+      SERIAL_ECHO_START();
+      SERIAL_ECHOPGM("PID Debug ");
+      serialprintln_onoff(pid_debug_flag);
+      return;
+    }
+  #endif
+
   #if ENABLED(PIDTEMPBED)
     #define SI H_BED
   #else
@@ -69,16 +82,6 @@ void GcodeSuite::M303() {
   const bool u = parser.boolval('U');
   const int16_t temp = parser.celsiusval('S', e < 0 ? 70 : 150);
 
-  #if ENABLED(PID_DEBUG)
-    bool d = parser.boolval('D');
-    if (d) {
-      PID_Debug_Flag = !PID_Debug_Flag;
-      SERIAL_ECHOPGM("PID Debug set to: ");
-      SERIAL_ECHOLN( PID_Debug_Flag );
-      return;
-    }
-  #endif
-
   #if DISABLED(BUSY_WHILE_HEATING)
     KEEPALIVE_STATE(NOT_BUSY);
   #endif

From c86ee574ec7495e926bdfa52d68571758fba7a59 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 15:11:02 -0500
Subject: [PATCH 496/565] Drop old comment

---
 Marlin/src/feature/max7219.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index b37ba98e7e6c..a012aeb5fa69 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -121,7 +121,7 @@ uint8_t Max7219::suspended; // = 0;
   #define CRITICAL_SECTION_START() NOOP
   #define CRITICAL_SECTION_END()   NOOP
 #else
-  #define SIG_DELAY() DELAY_NS(250) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR)
+  #define SIG_DELAY() DELAY_NS(250)
 #endif
 
 void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/*=-1*/) {

From 4dea0200500bedb2c9dd9e90ad74cc9fd845edd9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 26 Mar 2020 00:03:54 +0000
Subject: [PATCH 497/565] [cron] Bump distribution date (2020-03-26)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e9ac62d04f9f..7025c695a171 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-25"
+  #define STRING_DISTRIBUTION_DATE "2020-03-26"
 #endif
 
 /**

From adb6334ba031166e33f256344fc2b01e909cd99f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 17:55:36 -0500
Subject: [PATCH 498/565] Use "dist" instead of "delta" for clarity

---
 Marlin/src/feature/backlash.cpp |  2 +-
 Marlin/src/module/motion.cpp    |  9 ++--
 Marlin/src/module/planner.cpp   | 96 ++++++++++++++++-----------------
 Marlin/src/module/planner.h     | 24 +++++----
 4 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 84cd0a85b7d7..bc33ae31853a 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -113,7 +113,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
             error_correction = 0; // Don't take up any backlash in this segment, as it would subtract steps
         }
       #endif
-      // Making a correction reduces the residual error and modifies delta_mm
+      // Making a correction reduces the residual error and adds block steps
       if (error_correction) {
         block->steps[axis] += ABS(error_correction);
         residual_error[axis] -= error_correction;
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 14da9b47e027..8ab96b9b0879 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1292,12 +1292,14 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
  */
 void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t fr_mm_s=0.0) {
 
+  const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
+
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOPAIR(">>> do_homing_move(", axis_codes[axis], ", ", distance, ", ");
     if (fr_mm_s)
       DEBUG_ECHO(fr_mm_s);
     else
-      DEBUG_ECHOPAIR("[", homing_feedrate(axis), "]");
+      DEBUG_ECHOPAIR("[", real_fr_mm_s, "]");
     DEBUG_ECHOLNPGM(")");
   }
 
@@ -1331,7 +1333,6 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
     #endif
   }
 
-  const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
   #if IS_SCARA
     // Tell the planner the axis is at 0
     current_position[axis] = 0;
@@ -1345,13 +1346,13 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
     target[axis] = distance;
 
     #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-      const xyze_float_t delta_mm_cart{0};
+      const xyze_float_t cart_dist_mm{0};
     #endif
 
     // Set delta/cartesian axes directly
     planner.buffer_segment(target
       #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , delta_mm_cart
+        , cart_dist_mm
       #endif
       , real_fr_mm_s, active_extruder
     );
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 3b2daf1812e9..c71a0f61ccd1 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1648,8 +1648,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
   #if HAS_POSITION_FLOAT
     , const xyze_pos_t &target_float
   #endif
-  #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-    , const xyze_float_t &delta_mm_cart
+  #if HAS_DIST_MM_ARG
+    , const xyze_float_t &cart_dist_mm
   #endif
   , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters
 ) {
@@ -1666,8 +1666,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
     #if HAS_POSITION_FLOAT
       , target_float
     #endif
-    #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-      , delta_mm_cart
+    #if HAS_DIST_MM_ARG
+      , cart_dist_mm
     #endif
     , fr_mm_s, extruder, millimeters
   )) {
@@ -1712,8 +1712,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #if HAS_POSITION_FLOAT
     , const xyze_pos_t &target_float
   #endif
-  #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-    , const xyze_float_t &delta_mm_cart
+  #if HAS_DIST_MM_ARG
+    , const xyze_float_t &cart_dist_mm
   #endif
   , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
 ) {
@@ -1840,51 +1840,51 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
    * So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning the real displacement of the Head.
    * Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.
    */
-  struct DeltaMM : abce_float_t {
+  struct DistanceMM : abce_float_t {
     #if IS_CORE
       xyz_pos_t head;
     #endif
-  } delta_mm;
+  } steps_dist_mm;
   #if IS_CORE
     #if CORE_IS_XY
-      delta_mm.head.x = da * steps_to_mm[A_AXIS];
-      delta_mm.head.y = db * steps_to_mm[B_AXIS];
-      delta_mm.z      = dc * steps_to_mm[Z_AXIS];
-      delta_mm.a      = (da + db) * steps_to_mm[A_AXIS];
-      delta_mm.b      = CORESIGN(da - db) * steps_to_mm[B_AXIS];
+      steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
+      steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];
+      steps_dist_mm.z      = dc * steps_to_mm[Z_AXIS];
+      steps_dist_mm.a      = (da + db) * steps_to_mm[A_AXIS];
+      steps_dist_mm.b      = CORESIGN(da - db) * steps_to_mm[B_AXIS];
     #elif CORE_IS_XZ
-      delta_mm.head.x = da * steps_to_mm[A_AXIS];
-      delta_mm.y      = db * steps_to_mm[Y_AXIS];
-      delta_mm.head.z = dc * steps_to_mm[C_AXIS];
-      delta_mm.a      = (da + dc) * steps_to_mm[A_AXIS];
-      delta_mm.c      = CORESIGN(da - dc) * steps_to_mm[C_AXIS];
+      steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
+      steps_dist_mm.y      = db * steps_to_mm[Y_AXIS];
+      steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS];
+      steps_dist_mm.a      = (da + dc) * steps_to_mm[A_AXIS];
+      steps_dist_mm.c      = CORESIGN(da - dc) * steps_to_mm[C_AXIS];
     #elif CORE_IS_YZ
-      delta_mm.x      = da * steps_to_mm[X_AXIS];
-      delta_mm.head.y = db * steps_to_mm[B_AXIS];
-      delta_mm.head.z = dc * steps_to_mm[C_AXIS];
-      delta_mm.b      = (db + dc) * steps_to_mm[B_AXIS];
-      delta_mm.c      = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
+      steps_dist_mm.x      = da * steps_to_mm[X_AXIS];
+      steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];
+      steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS];
+      steps_dist_mm.b      = (db + dc) * steps_to_mm[B_AXIS];
+      steps_dist_mm.c      = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
     #endif
   #else
-    delta_mm.a = da * steps_to_mm[A_AXIS];
-    delta_mm.b = db * steps_to_mm[B_AXIS];
-    delta_mm.c = dc * steps_to_mm[C_AXIS];
+    steps_dist_mm.a = da * steps_to_mm[A_AXIS];
+    steps_dist_mm.b = db * steps_to_mm[B_AXIS];
+    steps_dist_mm.c = dc * steps_to_mm[C_AXIS];
   #endif
 
   #if EXTRUDERS
-    delta_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
+    steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
   #else
-    delta_mm.e = 0.0f;
+    steps_dist_mm.e = 0.0f;
   #endif
 
   #if ENABLED(LCD_SHOW_E_TOTAL)
-    e_move_accumulator += delta_mm.e;
+    e_move_accumulator += steps_dist_mm.e;
   #endif
 
   if (block->steps.a < MIN_STEPS_PER_SEGMENT && block->steps.b < MIN_STEPS_PER_SEGMENT && block->steps.c < MIN_STEPS_PER_SEGMENT) {
     block->millimeters = (0
       #if EXTRUDERS
-        + ABS(delta_mm.e)
+        + ABS(steps_dist_mm.e)
       #endif
     );
   }
@@ -1894,13 +1894,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     else
       block->millimeters = SQRT(
         #if CORE_IS_XY
-          sq(delta_mm.head.x) + sq(delta_mm.head.y) + sq(delta_mm.z)
+          sq(steps_dist_mm.head.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.z)
         #elif CORE_IS_XZ
-          sq(delta_mm.head.x) + sq(delta_mm.y) + sq(delta_mm.head.z)
+          sq(steps_dist_mm.head.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.head.z)
         #elif CORE_IS_YZ
-          sq(delta_mm.x) + sq(delta_mm.head.y) + sq(delta_mm.head.z)
+          sq(steps_dist_mm.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z)
         #else
-          sq(delta_mm.x) + sq(delta_mm.y) + sq(delta_mm.z)
+          sq(steps_dist_mm.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.z)
         #endif
       );
 
@@ -2071,7 +2071,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
     if (extruder == FILAMENT_SENSOR_EXTRUDER_NUM)   // Only for extruder with filament sensor
-      filwidth.advance_e(delta_mm.e);
+      filwidth.advance_e(steps_dist_mm.e);
   #endif
 
   // Calculate and limit speed in mm/sec
@@ -2081,7 +2081,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   // Linear axes first with less logic
   LOOP_XYZ(i) {
-    current_speed[i] = delta_mm[i] * inverse_secs;
+    current_speed[i] = steps_dist_mm[i] * inverse_secs;
     const feedRate_t cs = ABS(current_speed[i]),
                  max_fr = settings.max_feedrate_mm_s[i];
     if (cs > max_fr) NOMORE(speed_factor, max_fr / cs);
@@ -2090,7 +2090,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Limit speed on extruders, if any
   #if EXTRUDERS
     {
-      current_speed.e = delta_mm.e * inverse_secs;
+      current_speed.e = steps_dist_mm.e * inverse_secs;
       #if BOTH(MIXING_EXTRUDER, RETRACT_SYNC_MIXING)
         // Move all mixing extruders at the specified rate
         if (mixer.get_current_vtool() == MIXER_AUTORETRACT_TOOL)
@@ -2308,10 +2308,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     static xyze_float_t prev_unit_vec;
 
     xyze_float_t unit_vec =
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        cart_dist_mm
       #else
-        { delta_mm.x, delta_mm.y, delta_mm.z, delta_mm.e }
+        { steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.e }
       #endif
     ;
     unit_vec *= inverse_millimeters;
@@ -2572,8 +2572,8 @@ void Planner::buffer_sync_block() {
  *  millimeters - the length of the movement, if known
  */
 bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e
-  #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-    , const xyze_float_t &delta_mm_cart
+  #if HAS_DIST_MM_ARG
+    , const xyze_float_t &cart_dist_mm
   #endif
   , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
 ) {
@@ -2651,8 +2651,8 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
       #if HAS_POSITION_FLOAT
         , target_float
       #endif
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , cart_dist_mm
       #endif
       , fr_mm_s, extruder, millimeters
     )
@@ -2686,17 +2686,17 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
   #if IS_KINEMATIC
 
     #if DISABLED(CLASSIC_JERK)
-      const xyze_pos_t delta_mm_cart = {
+      const xyze_pos_t cart_dist_mm = {
         rx - position_cart.x, ry - position_cart.y,
         rz - position_cart.z, e  - position_cart.e
       };
     #else
-      const xyz_pos_t delta_mm_cart = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
+      const xyz_pos_t cart_dist_mm = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
     #endif
 
     float mm = millimeters;
     if (mm == 0.0)
-      mm = (delta_mm_cart.x != 0.0 || delta_mm_cart.y != 0.0) ? delta_mm_cart.magnitude() : ABS(delta_mm_cart.z);
+      mm = (cart_dist_mm.x != 0.0 || cart_dist_mm.y != 0.0) ? cart_dist_mm.magnitude() : ABS(cart_dist_mm.z);
 
     // Cartesian XYZ to kinematic ABC, stored in global 'delta'
     inverse_kinematics(machine);
@@ -2712,7 +2712,7 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
     #endif
     if (buffer_segment(delta.a, delta.b, delta.c, machine.e
       #if DISABLED(CLASSIC_JERK)
-        , delta_mm_cart
+        , cart_dist_mm
       #endif
       , feedrate, extruder, mm
     )) {
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index ae104eb35415..24c02c01c5c6 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -61,6 +61,10 @@
                             manual_feedrate_mm_s { _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f, _mf.e / 60.0f };
 #endif
 
+#if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
+  #define HAS_DIST_MM_ARG 1
+#endif
+
 enum BlockFlagBit : char {
   // Recalculate trapezoids on entry junction. For optimization.
   BLOCK_BIT_RECALCULATE,
@@ -588,8 +592,8 @@ class Planner {
       #if HAS_POSITION_FLOAT
         , const xyze_pos_t &target_float
       #endif
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     );
@@ -611,8 +615,8 @@ class Planner {
       #if HAS_POSITION_FLOAT
         , const xyze_pos_t &target_float
       #endif
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     );
@@ -643,21 +647,21 @@ class Planner {
      *  millimeters - the length of the movement, if known
      */
     static bool buffer_segment(const float &a, const float &b, const float &c, const float &e
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     );
 
     FORCE_INLINE static bool buffer_segment(abce_pos_t &abce
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     ) {
       return buffer_segment(abce.a, abce.b, abce.c, abce.e
-        #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-          , delta_mm_cart
+        #if HAS_DIST_MM_ARG
+          , cart_dist_mm
         #endif
         , fr_mm_s, extruder, millimeters);
     }

From 0175189c34807733c2230d36e470a713a8186d49 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 19:17:50 -0500
Subject: [PATCH 499/565] Allow G2_PWM to be slimmer

---
 Marlin/src/HAL/DUE/fastio/G2_PWM.cpp      | 155 +++++++++++++++-------
 Marlin/src/module/configuration_store.cpp |   2 +-
 2 files changed, 109 insertions(+), 48 deletions(-)

diff --git a/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
index fd2c6ccf9770..672932f56cd5 100644
--- a/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
@@ -46,6 +46,31 @@
 
 #include "G2_PWM.h"
 
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+  #define G2_PWM_X 1
+#else
+  #define G2_PWM_X 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+  #define G2_PWM_Y 1
+#else
+  #define G2_PWM_Y 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+  #define G2_PWM_Z 1
+#else
+  #define G2_PWM_Z 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+  #define G2_PWM_E 1
+#else
+  #define G2_PWM_E 0
+#endif
+#define G2_MASK_X(V) (G2_PWM_X * (V))
+#define G2_MASK_Y(V) (G2_PWM_Y * (V))
+#define G2_MASK_Z(V) (G2_PWM_Z * (V))
+#define G2_MASK_E(V) (G2_PWM_E * (V))
+
 volatile uint32_t *SODR_A = &PIOA->PIO_SODR,
                   *SODR_B = &PIOB->PIO_SODR,
                   *CODR_A = &PIOA->PIO_CODR,
@@ -55,10 +80,18 @@ PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
 
 void Stepper::digipot_init() {
 
-  OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
-  OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
-  OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
-  OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
+  #endif
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
+  #endif
+  #if G2_PWM_Z
+    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
+  #endif
+  #if G2_PWM_E
+    OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
+  #endif
 
   #define WPKEY          (0x50574D << 8) // “PWM” in ASCII
   #define WPCMD_DIS_SW   0  // command to disable Write Protect SW
@@ -71,30 +104,51 @@ void Stepper::digipot_init() {
   PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW;        // enable setting of all PWM registers
   PWM->PWM_CLK = PWM_CLOCK_F;                             // enable CLK_A and set it to 1MHz, leave CLK_B disabled
   PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011;                    // set channel 0 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011;                    // set channel 1 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011;                    // set channel 2 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011;                    // set channel 3 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011;                    // set channel 4 to Clock A input & to left aligned
+  if (G2_PWM_X) PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011;      // set channel 1 to Clock A input & to left aligned
+  if (G2_PWM_Y) PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011;      // set channel 2 to Clock A input & to left aligned
+  if (G2_PWM_Z) PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011;      // set channel 3 to Clock A input & to left aligned
+  if (G2_PWM_E) PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011;      // set channel 4 to Clock A input & to left aligned
 
   PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US;            // set channel 0 Period
 
   PWM->PWM_IER2 = PWM_IER1_CHID0;                         // generate interrupt when counter0 overflows
-  PWM->PWM_IER2 = PWM_IER2_CMPM0 | PWM_IER2_CMPM1 | PWM_IER2_CMPM2 | PWM_IER2_CMPM3 | PWM_IER2_CMPM4;        // generate interrupt on compare event
-
-  PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0]));   // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive
-  PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0]));   // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive
-  PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1]));   // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive
-  PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2]));   // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive
-
-  PWM->PWM_CMP[1].PWM_CMPM = 0x0001;  // enable compare event
-  PWM->PWM_CMP[2].PWM_CMPM = 0x0001;  // enable compare event
-  PWM->PWM_CMP[3].PWM_CMPM = 0x0001;  // enable compare event
-  PWM->PWM_CMP[4].PWM_CMPM = 0x0001;  // enable compare event
-
-  PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0 | PWM_SCM_SYNC1 | PWM_SCM_SYNC2 | PWM_SCM_SYNC3 | PWM_SCM_SYNC4; // sync 1-4 with 0, use mode 0 for updates
-
-  PWM->PWM_ENA = PWM_ENA_CHID0 | PWM_ENA_CHID1 | PWM_ENA_CHID2 | PWM_ENA_CHID3 | PWM_ENA_CHID4;         // enable the channels used by G2
-  PWM->PWM_IER1 = PWM_IER1_CHID0 | PWM_IER1_CHID1 | PWM_IER1_CHID2 | PWM_IER1_CHID3 | PWM_IER1_CHID4;        // enable interrupts for the channels used by G2
+  PWM->PWM_IER2 = PWM_IER2_CMPM0
+    | G2_MASK_X(PWM_IER2_CMPM1)
+    | G2_MASK_Y(PWM_IER2_CMPM2)
+    | G2_MASK_Z(PWM_IER2_CMPM3)
+    | G2_MASK_E(PWM_IER2_CMPM4)
+  ; // generate interrupt on compare event
+
+  if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive
+  if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive
+  if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1])); // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive
+  if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2])); // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive
+
+  if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPM = 0x0001;  // enable compare event
+  if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPM = 0x0001;  // enable compare event
+  if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPM = 0x0001;  // enable compare event
+  if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPM = 0x0001;  // enable compare event
+
+  PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0
+    | G2_MASK_X(PWM_SCM_SYNC1)
+    | G2_MASK_Y(PWM_SCM_SYNC2)
+    | G2_MASK_Z(PWM_SCM_SYNC3)
+    | G2_MASK_E(PWM_SCM_SYNC4)
+  ; // sync 1-4 with 0, use mode 0 for updates
+
+  PWM->PWM_ENA = PWM_ENA_CHID0
+    | G2_MASK_X(PWM_ENA_CHID1)
+    | G2_MASK_Y(PWM_ENA_CHID2)
+    | G2_MASK_Z(PWM_ENA_CHID3)
+    | G2_MASK_E(PWM_ENA_CHID4)
+  ; // enable channels used by G2
+
+  PWM->PWM_IER1 = PWM_IER1_CHID0
+    | G2_MASK_X(PWM_IER1_CHID1)
+    | G2_MASK_Y(PWM_IER1_CHID2)
+    | G2_MASK_Z(PWM_IER1_CHID3)
+    | G2_MASK_E(PWM_IER1_CHID4)
+  ; // enable interrupts for channels used by G2
 
   NVIC_EnableIRQ(PWM_IRQn);     // Enable interrupt handler
   NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0));  // normal priority for PWM module (can stand some jitter on the Vref signals)
@@ -105,20 +159,27 @@ void Stepper::digipot_current(const uint8_t driver, const int16_t current) {
   if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init();  // Init PWM system if needed
 
   switch (driver) {
-    case 0: PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update X & Y
-            PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));
-            PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
-            break;
-    case 1: PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update Z
-            PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
-            break;
-    default:PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update E
-            PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
-            break;
+    case 0:
+      if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update X & Y
+      if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));
+      if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001;  // enable compare event
+      if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001;  // enable compare event
+      if (G2_PWM_X || G2_PWM_Y) PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+      break;
+    case 1:
+      if (G2_PWM_Z) {
+        PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update Z
+        PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001;  // enable compare event
+        PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+      }
+      break;
+    default:
+      if (G2_PWM_E) {
+        PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update E
+        PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001;  // enable compare event
+        PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+      }
+      break;
   }
 }
 
@@ -127,17 +188,17 @@ volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS;
 void PWM_Handler() {
   PWM_ISR1_STATUS = PWM->PWM_ISR1;
   PWM_ISR2_STATUS = PWM->PWM_ISR2;
-  if (PWM_ISR1_STATUS & PWM_IER1_CHID0) {                           // CHAN_0 interrupt
-    *ISR_table[0].set_register = ISR_table[0].write_mask;                                          // set X to active
-    *ISR_table[1].set_register = ISR_table[1].write_mask;                                          // set Y to active
-    *ISR_table[2].set_register = ISR_table[2].write_mask;                                          // set Z to active
-    *ISR_table[3].set_register = ISR_table[3].write_mask;                                          // set E to active
+  if (PWM_ISR1_STATUS & PWM_IER1_CHID0) {                                                         // CHAN_0 interrupt
+    if (G2_PWM_X) *ISR_table[0].set_register = ISR_table[0].write_mask;                           // set X to active
+    if (G2_PWM_Y) *ISR_table[1].set_register = ISR_table[1].write_mask;                           // set Y to active
+    if (G2_PWM_Z) *ISR_table[2].set_register = ISR_table[2].write_mask;                           // set Z to active
+    if (G2_PWM_E) *ISR_table[3].set_register = ISR_table[3].write_mask;                           // set E to active
   }
   else {
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM1)  *ISR_table[0].clr_register = ISR_table[0].write_mask;   // set X to inactive
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM2)  *ISR_table[1].clr_register = ISR_table[1].write_mask;   // set Y to inactive
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM3)  *ISR_table[2].clr_register = ISR_table[2].write_mask;   // set Z to inactive
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM4)  *ISR_table[3].clr_register = ISR_table[3].write_mask;   // set E to inactive
+    if (G2_PWM_X && (PWM_ISR2_STATUS & PWM_IER2_CMPM1)) *ISR_table[0].clr_register = ISR_table[0].write_mask; // set X to inactive
+    if (G2_PWM_Y && (PWM_ISR2_STATUS & PWM_IER2_CMPM2)) *ISR_table[1].clr_register = ISR_table[1].write_mask; // set Y to inactive
+    if (G2_PWM_Z && (PWM_ISR2_STATUS & PWM_IER2_CMPM3)) *ISR_table[2].clr_register = ISR_table[2].write_mask; // set Z to inactive
+    if (G2_PWM_E && (PWM_ISR2_STATUS & PWM_IER2_CMPM4)) *ISR_table[3].clr_register = ISR_table[3].write_mask; // set E to inactive
   }
   return;
 }
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 4b7946c6a9a7..803095811e90 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2696,7 +2696,7 @@ void MarlinSettings::reset() {
 
   #if HAS_MOTOR_CURRENT_PWM
     constexpr uint32_t tmp_motor_current_setting[3] = PWM_MOTOR_CURRENT;
-    for (uint8_t q = 3; q--;)
+    LOOP_L_N(q, 3)
       stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q]));
   #endif
 

From dd6781217a1571c31124cc5c331a0c39de1ce4fe Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 19:21:48 -0500
Subject: [PATCH 500/565] motion.cpp: HAS_DIST_MM_ARG

---
 Marlin/src/module/motion.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 8ab96b9b0879..e47727b3ec52 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1345,13 +1345,13 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
     planner.set_machine_position_mm(target);
     target[axis] = distance;
 
-    #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
+    #if HAS_DIST_MM_ARG
       const xyze_float_t cart_dist_mm{0};
     #endif
 
     // Set delta/cartesian axes directly
     planner.buffer_segment(target
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
+      #if HAS_DIST_MM_ARG
         , cart_dist_mm
       #endif
       , real_fr_mm_s, active_extruder

From 5ec1a8bb2b0708c3f94f162e71621f662554ce6f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 14:51:22 -0500
Subject: [PATCH 501/565] Fix M0 unused var warning

---
 Marlin/src/gcode/lcd/M0_M1.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 21766932090b..20ce55bd78be 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -56,9 +56,11 @@ void GcodeSuite::M0_M1() {
 
   planner.synchronize();
 
-  const bool seenQ = parser.seen('Q');
-  #if HAS_LEDS_OFF_FLAG
-    if (seenQ) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
+  #if HAS_LCD_MENU || HAS_LEDS_OFF_FLAG
+    const bool seenQ = parser.seen('Q');
+    #if HAS_LEDS_OFF_FLAG
+      if (seenQ) printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
+    #endif
   #endif
 
   #if HAS_LCD_MENU

From 5c150c0c941d9ab3fd140e0a837dff40432acca3 Mon Sep 17 00:00:00 2001
From: Acenotass <44540957+Acenotass@users.noreply.github.com>
Date: Thu, 26 Mar 2020 08:04:57 +0600
Subject: [PATCH 502/565] Update Russian language (#17290)

---
 Marlin/src/lcd/language/language_ru.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 82c91c65029c..a7c971e8c7e9 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -222,6 +222,11 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Кулер ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Кулер доп.");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Кулер доп. ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Обдув платы");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Обороты простоя");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Автовключение");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Рабочие обороты");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Простой после");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Поток");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Поток ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Настройки");

From 8122468a361cf9fd25261dc04fa82a9ce1796644 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Thu, 26 Mar 2020 03:05:36 +0100
Subject: [PATCH 503/565] Update Italian language (#17293)

---
 Marlin/src/lcd/language/language_it.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index ae4dd813ea5f..8d8112d523f1 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -245,6 +245,11 @@ namespace Language_it {
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Ventola mem. ~");   // Max 15 characters
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra vel.vent.");  // Max 15 characters
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra v.vent. ~");  // Max 15 characters
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controller vent.");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Vel. inattivo");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Modo autom.");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Vel. attivo");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Tempo inattivo");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flusso");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flusso ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Controllo");
@@ -312,6 +317,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Carica impostazioni");
   PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Ripristina imp.");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inizializza EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Err: CRC EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Err: Indice EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Err: Versione EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Aggiorna media");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetta stampante");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Aggiorna");

From d6a4c3079dc261b94aeccfc5f2031b589744bc67 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 20:47:27 -0500
Subject: [PATCH 504/565] Tweak ui.finish_status

---
 Marlin/src/lcd/ultralcd.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 1cb23baa25c1..7ff14405598c 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -524,7 +524,7 @@ void MarlinUI::status_screen() {
     #if PROGRESS_MSG_EXPIRE > 0
 
       // Handle message expire
-      if (expire_status_ms > 0) {
+      if (expire_status_ms) {
 
         // Expire the message if a job is active and the bar has ticks
         if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
@@ -1337,15 +1337,19 @@ void MarlinUI::update() {
       UNUSED(persist);
     #endif
 
+    #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+      const millis_t ms = millis();
+    #endif
+
     #if ENABLED(LCD_PROGRESS_BAR)
-      progress_bar_ms = millis();
+      progress_bar_ms = ms;
       #if PROGRESS_MSG_EXPIRE > 0
-        expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
+        expire_status_ms = persist ? 0 : ms + PROGRESS_MSG_EXPIRE;
       #endif
     #endif
 
     #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
-      next_filament_display = millis() + 5000UL; // Show status message for 5s
+      next_filament_display = ms + 5000UL; // Show status message for 5s
     #endif
 
     #if HAS_SPI_LCD && ENABLED(STATUS_MESSAGE_SCROLLING)

From 54a12ee1d6557d820fb353a318525aebd7f6c082 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 17:20:23 -0500
Subject: [PATCH 505/565] Tweak eeprom storage type

---
 Marlin/src/module/configuration_store.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 803095811e90..129e207d2948 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1231,7 +1231,7 @@ void MarlinSettings::postprocess() {
       #if HAS_MOTOR_CURRENT_PWM
         EEPROM_WRITE(stepper.motor_current_setting);
       #else
-        const xyz_ulong_t no_current{0};
+        const uint32_t no_current[3] = { 0 };
         EEPROM_WRITE(no_current);
       #endif
     }

From 98ef161bfe7545afda2c1ab432aeb420637eedde Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 27 Mar 2020 00:03:27 +0000
Subject: [PATCH 506/565] [cron] Bump distribution date (2020-03-27)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7025c695a171..afbb5cf3c8db 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-26"
+  #define STRING_DISTRIBUTION_DATE "2020-03-27"
 #endif
 
 /**

From 99afd00b056106c73681adc4ee72dca604b2f5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Sat, 28 Mar 2020 00:16:03 +0500
Subject: [PATCH 507/565] small fixes after merge

---
 Marlin/Configuration_adv.h     | 2 +-
 Marlin/src/feature/pause.cpp   | 4 ++++
 Marlin/src/module/endstops.cpp | 8 ++++++--
 Marlin/src/sd/Sd2Card.cpp      | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5c4ca9b2fd8b..98539c7aaaf5 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1218,7 +1218,7 @@
    *
    * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE', 'LCD_AND_ONBOARD' ]
    */
-  #define SDCARD_CONNECTION LCD //_AND_ONBOARD
+  #define SDCARD_CONNECTION LCD_AND_ONBOARD
 
 #endif // SDSUPPORT
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 9b5b28287e11..9114aaf1da2a 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -409,7 +409,11 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
       }
     #endif
 
+#if (GITHUB_USER==URSOFT)
     //return false; // unable to reach safe temperature, but need pause
+#else
+    return false; // unable to reach safe temperature
+#endif
   }
 
   // Indicate that the printer is paused
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 4dcafc0a78af..8cd690f0e3d0 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -820,8 +820,12 @@ void Endstops::update() {
         if (true
           #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
             && z_probe_enabled
-          //#elif HAS_CUSTOM_PROBE_PIN /* stop on Zmin also, not only probe */
-          //  && !z_probe_enabled
+          #elif HAS_CUSTOM_PROBE_PIN
+#if (GITHUB_USER==URSOFT)
+            /* stop on Zmin also, not only probe */
+#else
+            && !z_probe_enabled
+#endif          
           #endif
         ) PROCESS_ENDSTOP_Z(MIN);
       #endif
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index 68430d4d720f..f963d09122bd 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -42,8 +42,8 @@
  #else
    HardwareSPI<> SPI_LCD;
  #endif
-  SoftwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB;
-  //HardwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB; //much slower!!?
+  //SoftwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB; //much slower because of diff pins for Software SPI
+  HardwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB;
 
  #define spiSend(P) (isOnBoard() ? SPI_OB.spiSend(P) : SPI_LCD.spiSend(P))
  #define spiRead(P1, P2) (isOnBoard() ? SPI_OB.spiRead(P1, P2) : SPI_LCD.spiRead(P1, P2))

From 3655e240f5796a84d4e89b3524484e37091efad2 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Fri, 27 Mar 2020 17:06:39 -0400
Subject: [PATCH 508/565] Fix SD finished ExtUI / host action (#17285)

---
 Marlin/src/MarlinCore.cpp         |  5 +++--
 Marlin/src/gcode/lcd/M0_M1.cpp    | 22 +++++++++++-----------
 Marlin/src/inc/Conditionals_adv.h |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 0ea1a22fd8da..7adc8272ea15 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -423,7 +423,8 @@ void startOrResumeJob() {
     switch (card.sdprinting_done_state) {
 
       case 1:
-        did_state = print_job_timer.duration() < 60 || queue.enqueue_one_P(PSTR("M31"));
+        if (print_job_timer.duration() > 60)
+          did_state = queue.enqueue_one_P(PSTR("M31"));
         break;
 
       case 2:
@@ -437,7 +438,7 @@ void startOrResumeJob() {
         break;
 
       case 4:                                   // Display "Click to Continue..."
-        #if HAS_RESUME_CONTINUE                 // 30 min timeout with LCD, 1 min without
+        #if HAS_LEDS_OFF_FLAG                   // 30 min timeout with LCD, 1 min without
           did_state = queue.enqueue_one_P(
             print_job_timer.duration() < 60 ? PSTR("M0Q1P1") : PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60"))
           );
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 20ce55bd78be..43b39226f71b 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -56,11 +56,11 @@ void GcodeSuite::M0_M1() {
 
   planner.synchronize();
 
-  #if HAS_LCD_MENU || HAS_LEDS_OFF_FLAG
+  #if HAS_LEDS_OFF_FLAG
     const bool seenQ = parser.seen('Q');
-    #if HAS_LEDS_OFF_FLAG
-      if (seenQ) printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
-    #endif
+    if (seenQ) printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
+  #else
+    constexpr bool seenQ = false;
   #endif
 
   #if HAS_LCD_MENU
@@ -75,12 +75,12 @@ void GcodeSuite::M0_M1() {
     }
 
   #elif ENABLED(EXTENSIBLE_UI)
-
-    if (parser.string_arg)
-      ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
-    else
-      ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
-
+    if (!seenQ) {
+      if (parser.string_arg)
+        ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
+      else
+        ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
+    }
   #else
 
     if (parser.string_arg) {
@@ -94,7 +94,7 @@ void GcodeSuite::M0_M1() {
   wait_for_user = true;
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
+    if (!seenQ) host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
   #endif
 
   if (ms > 0) ms += millis();  // wait until this time for a click
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 09de5d89d70a..a52ae1af2976 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -93,7 +93,7 @@
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
   #define HAS_SOFTWARE_ENDSTOPS 1
 #endif
-#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
+#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS)
   #define HAS_RESUME_CONTINUE 1
 #endif
 

From 129b270628781eae776764e63fd514553e6c2204 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Fri, 27 Mar 2020 23:29:17 +0100
Subject: [PATCH 509/565] QSPI EEPROM for SAMD51 (#17292)

---
 ...persistent_store_eeprom.cpp => eeprom.cpp} |   2 +-
 Marlin/src/HAL/DUE/EepromEmulation.cpp        |   2 +-
 ...persistent_store_eeprom.cpp => eeprom.cpp} |   2 +-
 Marlin/src/HAL/DUE/inc/Conditionals_post.h    |   2 +-
 ...sistent_store_impl.cpp => eeprom_impl.cpp} |   2 +-
 Marlin/src/HAL/ESP32/inc/Conditionals_post.h  |   2 +-
 ...sistent_store_impl.cpp => eeprom_impl.cpp} |   2 +-
 .../{persistent_store_api.h => eeprom_api.h}  |   2 +-
 ...stent_store_flash.cpp => eeprom_flash.cpp} |   2 +-
 ...ent_store_sdcard.cpp => eeprom_sdcard.cpp} |   2 +-
 .../src/HAL/LPC1768/inc/Conditionals_post.h   |   2 +-
 Marlin/src/HAL/SAMD51/QSPIFlash.cpp           |  78 +++++++++++
 Marlin/src/HAL/SAMD51/QSPIFlash.h             |  51 +++++++
 Marlin/src/HAL/SAMD51/eeprom.cpp              |  66 +++++++++
 Marlin/src/HAL/SAMD51/eeprom_flash.cpp        |  96 +++++++++++++
 Marlin/src/HAL/SAMD51/eeprom_qspi.cpp         |  71 ++++++++++
 Marlin/src/HAL/SAMD51/inc/Conditionals_post.h |   4 +-
 .../HAL/SAMD51/persistent_store_eeprom.cpp    | 129 ------------------
 ...stent_store_flash.cpp => eeprom_flash.cpp} |   2 +-
 ...sistent_store_impl.cpp => eeprom_impl.cpp} |  12 +-
 ...ent_store_sdcard.cpp => eeprom_sdcard.cpp} |   2 +-
 Marlin/src/HAL/STM32/inc/Conditionals_post.h  |   2 +-
 ...persistent_store_eeprom.cpp => eeprom.cpp} |   6 +-
 ...stent_store_flash.cpp => eeprom_flash.cpp} |   7 +-
 ...ent_store_sdcard.cpp => eeprom_sdcard.cpp} |   3 +-
 ...persistent_store_eeprom.cpp => eeprom.cpp} |   2 +-
 .../HAL/STM32_F4_F7/inc/Conditionals_post.h   |   2 +-
 ...sistent_store_impl.cpp => eeprom_impl.cpp} |   2 +-
 .../HAL/TEENSY31_32/inc/Conditionals_post.h   |   2 +-
 ...persistent_store_eeprom.cpp => eeprom.cpp} |   2 +-
 ...ersistent_store_api.cpp => eeprom_api.cpp} |   2 +-
 .../{persistent_store_api.h => eeprom_api.h}  |   0
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |   2 +-
 Marlin/src/inc/Conditionals_post.h            |  11 +-
 .../screens/interface_settings_screen.cpp     |   2 +-
 Marlin/src/module/configuration_store.cpp     |   2 +-
 Marlin/src/module/configuration_store.h       |   2 +-
 Marlin/src/module/printcounter.cpp            |   2 +-
 Marlin/src/module/printcounter.h              |   4 +-
 Marlin/src/pins/samd/pins_RAMPS_144.h         |   3 +-
 platformio.ini                                |   1 +
 41 files changed, 413 insertions(+), 179 deletions(-)
 rename Marlin/src/HAL/AVR/{persistent_store_eeprom.cpp => eeprom.cpp} (97%)
 rename Marlin/src/HAL/DUE/{persistent_store_eeprom.cpp => eeprom.cpp} (98%)
 rename Marlin/src/HAL/ESP32/{persistent_store_impl.cpp => eeprom_impl.cpp} (97%)
 rename Marlin/src/HAL/LINUX/{persistent_store_impl.cpp => eeprom_impl.cpp} (98%)
 rename Marlin/src/HAL/LPC1768/{persistent_store_api.h => eeprom_api.h} (95%)
 rename Marlin/src/HAL/LPC1768/{persistent_store_flash.cpp => eeprom_flash.cpp} (99%)
 rename Marlin/src/HAL/LPC1768/{persistent_store_sdcard.cpp => eeprom_sdcard.cpp} (99%)
 create mode 100644 Marlin/src/HAL/SAMD51/QSPIFlash.cpp
 create mode 100644 Marlin/src/HAL/SAMD51/QSPIFlash.h
 create mode 100644 Marlin/src/HAL/SAMD51/eeprom.cpp
 create mode 100644 Marlin/src/HAL/SAMD51/eeprom_flash.cpp
 create mode 100644 Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
 delete mode 100644 Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp
 rename Marlin/src/HAL/STM32/{persistent_store_flash.cpp => eeprom_flash.cpp} (99%)
 rename Marlin/src/HAL/STM32/{persistent_store_impl.cpp => eeprom_impl.cpp} (91%)
 rename Marlin/src/HAL/STM32/{persistent_store_sdcard.cpp => eeprom_sdcard.cpp} (98%)
 rename Marlin/src/HAL/STM32F1/{persistent_store_eeprom.cpp => eeprom.cpp} (95%)
 rename Marlin/src/HAL/STM32F1/{persistent_store_flash.cpp => eeprom_flash.cpp} (95%)
 rename Marlin/src/HAL/STM32F1/{persistent_store_sdcard.cpp => eeprom_sdcard.cpp} (98%)
 rename Marlin/src/HAL/STM32_F4_F7/{persistent_store_eeprom.cpp => eeprom.cpp} (98%)
 rename Marlin/src/HAL/TEENSY31_32/{persistent_store_impl.cpp => eeprom_impl.cpp} (97%)
 rename Marlin/src/HAL/TEENSY35_36/{persistent_store_eeprom.cpp => eeprom.cpp} (98%)
 rename Marlin/src/HAL/shared/{persistent_store_api.cpp => eeprom_api.cpp} (96%)
 rename Marlin/src/HAL/shared/{persistent_store_api.h => eeprom_api.h} (100%)

diff --git a/Marlin/src/HAL/AVR/persistent_store_eeprom.cpp b/Marlin/src/HAL/AVR/eeprom.cpp
similarity index 97%
rename from Marlin/src/HAL/AVR/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/AVR/eeprom.cpp
index 1ae37f892aa6..ee416b7a12f3 100644
--- a/Marlin/src/HAL/AVR/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/AVR/eeprom.cpp
@@ -25,7 +25,7 @@
 
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() { return true; }
 bool PersistentStore::access_finish() { return true; }
diff --git a/Marlin/src/HAL/DUE/EepromEmulation.cpp b/Marlin/src/HAL/DUE/EepromEmulation.cpp
index f1ae224bfcb5..66af50cfd2e0 100644
--- a/Marlin/src/HAL/DUE/EepromEmulation.cpp
+++ b/Marlin/src/HAL/DUE/EepromEmulation.cpp
@@ -57,7 +57,7 @@
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "../shared/Marduino.h"
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #define EEPROMSize     4096
 #define PagesPerGroup   128
diff --git a/Marlin/src/HAL/DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/DUE/eeprom.cpp
similarity index 98%
rename from Marlin/src/HAL/DUE/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/DUE/eeprom.cpp
index fbdc760e4548..ec9ef51ffcad 100644
--- a/Marlin/src/HAL/DUE/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/DUE/eeprom.cpp
@@ -27,7 +27,7 @@
 #if ENABLED(EEPROM_SETTINGS)
 
 #include "../../inc/MarlinConfig.h"
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #if !defined(E2END) && ENABLED(FLASH_EEPROM_EMULATION)
   #define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
diff --git a/Marlin/src/HAL/DUE/inc/Conditionals_post.h b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
index b52462f6d891..8a305009ce27 100644
--- a/Marlin/src/HAL/DUE/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#if USE_EMULATED_EEPROM
+#if USE_FALLBACK_EEPROM
   #undef SRAM_EEPROM_EMULATION
   #undef SDCARD_EEPROM_EMULATION
   #define FLASH_EEPROM_EMULATION
diff --git a/Marlin/src/HAL/ESP32/persistent_store_impl.cpp b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
similarity index 97%
rename from Marlin/src/HAL/ESP32/persistent_store_impl.cpp
rename to Marlin/src/HAL/ESP32/eeprom_impl.cpp
index 7113b684128e..dbfee14055c4 100644
--- a/Marlin/src/HAL/ESP32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 #include "EEPROM.h"
 
 #define EEPROM_SIZE 4096
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
index e51b55698e49..11603c9ef41d 100644
--- a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
@@ -22,6 +22,6 @@
 #pragma once
 
 // If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
-#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
   #define SDCARD_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/LINUX/persistent_store_impl.cpp b/Marlin/src/HAL/LINUX/eeprom_impl.cpp
similarity index 98%
rename from Marlin/src/HAL/LINUX/persistent_store_impl.cpp
rename to Marlin/src/HAL/LINUX/eeprom_impl.cpp
index 660ecd56f184..4745f0567392 100644
--- a/Marlin/src/HAL/LINUX/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/LINUX/eeprom_impl.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 #include <stdio.h>
 
 #define LINUX_EEPROM_SIZE (E2END + 1)
diff --git a/Marlin/src/HAL/LPC1768/persistent_store_api.h b/Marlin/src/HAL/LPC1768/eeprom_api.h
similarity index 95%
rename from Marlin/src/HAL/LPC1768/persistent_store_api.h
rename to Marlin/src/HAL/LPC1768/eeprom_api.h
index 55a58fde1dfb..f874eac58a74 100644
--- a/Marlin/src/HAL/LPC1768/persistent_store_api.h
+++ b/Marlin/src/HAL/LPC1768/eeprom_api.h
@@ -21,6 +21,6 @@
  */
 #pragma once
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #define FLASH_EEPROM_EMULATION
diff --git a/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
similarity index 99%
rename from Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
rename to Marlin/src/HAL/LPC1768/eeprom_flash.cpp
index e166858d6460..9225807480fe 100644
--- a/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
@@ -40,7 +40,7 @@
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "persistent_store_api.h"
+#include "eeprom_api.h"
 
 extern "C" {
   #include <lpc17xx_iap.h>
diff --git a/Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
similarity index 99%
rename from Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index aa61938b022b..d982bd6268ca 100644
--- a/Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "persistent_store_api.h"
+#include "eeprom_api.h"
 
 #include <chanfs/diskio.h>
 #include <chanfs/ff.h>
diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
index a8d102e865ae..490cfd50e889 100644
--- a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
@@ -21,6 +21,6 @@
  */
 #pragma once
 
-#if USE_EMULATED_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.cpp b/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
new file mode 100644
index 000000000000..76a332970731
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
@@ -0,0 +1,78 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#include "QSPIFlash.h"
+
+#define INVALID_ADDR    0xffffffff
+#define SECTOR_OF(a)    (a & ~(SFLASH_SECTOR_SIZE - 1))
+#define OFFSET_OF(a)    (a & (SFLASH_SECTOR_SIZE - 1))
+
+Adafruit_SPIFlashBase * QSPIFlash::_flashBase = nullptr;
+uint8_t QSPIFlash::_buf[SFLASH_SECTOR_SIZE];
+uint32_t QSPIFlash::_addr = INVALID_ADDR;
+
+void QSPIFlash::begin() {
+  if (_flashBase != nullptr) return;
+
+  _flashBase = new Adafruit_SPIFlashBase(new Adafruit_FlashTransport_QSPI());
+  _flashBase->begin(NULL);
+}
+
+size_t QSPIFlash::size() {
+  return _flashBase->size();
+}
+
+uint8_t QSPIFlash::readByte(const uint32_t address) {
+  if (SECTOR_OF(address) == _addr) return _buf[OFFSET_OF(address)];
+
+  return _flashBase->read8(address);
+}
+
+void QSPIFlash::writeByte(const uint32_t address, const uint8_t value) {
+  uint32_t const sector_addr = SECTOR_OF(address);
+
+  // Page changes, flush old and update new cache
+  if (sector_addr != _addr) {
+    flush();
+    _addr = sector_addr;
+
+    // read a whole page from flash
+    _flashBase->readBuffer(sector_addr, _buf, SFLASH_SECTOR_SIZE);
+  }
+
+  _buf[OFFSET_OF(address)] = value;
+}
+
+void QSPIFlash::flush() {
+  if (_addr == INVALID_ADDR) return;
+
+  _flashBase->eraseSector(_addr / SFLASH_SECTOR_SIZE);
+  _flashBase->writeBuffer(_addr, _buf, SFLASH_SECTOR_SIZE);
+
+  _addr = INVALID_ADDR;
+}
+
+#endif // QSPI_EEPROM
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/QSPIFlash.h
new file mode 100644
index 000000000000..7f75286ebfc1
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.h
@@ -0,0 +1,51 @@
+/**
+ * @file QSPIFlash.h
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach and Dean Miller for Adafruit Industries LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Derived from Adafruit_SPIFlash class with no SdFat references
+ *
+ */
+
+#pragma once
+
+#include "Adafruit_SPIFlashBase.h"
+
+// This class extends Adafruit_SPIFlashBase by adding caching support.
+//
+// This class will use 4096 Bytes of RAM as a block cache.
+class QSPIFlash {
+  public:
+    static void begin();
+    static size_t size();
+    static uint8_t readByte(const uint32_t address);
+    static void writeByte(const uint32_t address, const uint8_t v);
+    static void flush();
+
+  private:
+    static Adafruit_SPIFlashBase * _flashBase;
+    static uint8_t _buf[SFLASH_SECTOR_SIZE];
+    static uint32_t _addr;
+};
+
+extern QSPIFlash qspi;
diff --git a/Marlin/src/HAL/SAMD51/eeprom.cpp b/Marlin/src/HAL/SAMD51/eeprom.cpp
new file mode 100644
index 000000000000..e167515bff3a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom.cpp
@@ -0,0 +1,66 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(EEPROM_SETTINGS) && NONE(QSPI_EEPROM, FLASH_EEPROM_EMULATION)
+
+#include "../shared/eeprom_api.h"
+
+size_t PersistentStore::capacity() { return E2END + 1; }
+
+bool PersistentStore::access_start() { return true; }
+bool PersistentStore::access_finish() { return true; }
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  while (size--) {
+    const uint8_t v = *value;
+    uint8_t * const p = (uint8_t * const)pos;
+    if (v != eeprom_read_byte(p)) {
+      eeprom_write_byte(p, v);
+      delay(2);
+      if (eeprom_read_byte(p) != v) {
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
+        return true;
+      }
+    }
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  while (size--) {
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+#endif // EEPROM_SETTINGS && !(QSPI_EEPROM || FLASH_EEPROM_EMULATION)
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
new file mode 100644
index 000000000000..fd8973369a8a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
@@ -0,0 +1,96 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+
+#include "../shared/eeprom_api.h"
+
+#define NVMCTRL_CMD(c)    do{                                                 \
+                            SYNC(!NVMCTRL->STATUS.bit.READY);                 \
+                            NVMCTRL->INTFLAG.bit.DONE = true;                 \
+                            NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \
+                            SYNC(NVMCTRL->INTFLAG.bit.DONE);                  \
+                          }while(0)
+#define NVMCTRL_FLUSH()   do{                                           \
+                            if (NVMCTRL->SEESTAT.bit.LOAD)              \
+                              NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH);  \
+                          }while(0)
+
+size_t PersistentStore::capacity() {
+  const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
+                sblk = NVMCTRL->SEESTAT.bit.SBLK;
+
+  return   (!psz && !sblk)         ? 0
+         : (psz <= 2)              ? (0x200 << psz)
+         : (sblk == 1 || psz == 3) ?  4096
+         : (sblk == 2 || psz == 4) ?  8192
+         : (sblk <= 4 || psz == 5) ? 16384
+         : (sblk >= 9 && psz == 7) ? 65536
+                                   : 32768;
+}
+
+bool PersistentStore::access_start() {
+  NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED;  // Buffered mode and segment reallocation active
+  if (NVMCTRL->SEESTAT.bit.RLOCK)
+    NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE);    // Unlock E2P data write access
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  NVMCTRL_FLUSH();
+  if (!NVMCTRL->SEESTAT.bit.LOCK)
+    NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE);    // Lock E2P data write access
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  while (size--) {
+    const uint8_t v = *value;
+    SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+    if (NVMCTRL->INTFLAG.bit.SEESFULL)
+      NVMCTRL_FLUSH();      // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
+    ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
+    SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  while (size--) {
+    SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+    uint8_t c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+#endif // FLASH_EEPROM_EMULATION
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
new file mode 100644
index 000000000000..c6aa383f9f40
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
@@ -0,0 +1,71 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#include "../shared/eeprom_api.h"
+
+#include "QSPIFlash.h"
+
+static bool initialized;
+
+size_t PersistentStore::capacity() { return qspi.size(); }
+
+bool PersistentStore::access_start() {
+  if (!initialized) {
+    qspi.begin();
+    initialized = true;
+  }
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  qspi.flush();
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  while (size--) {
+    const uint8_t v = *value;
+    qspi.writeByte(pos, v);
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  while (size--) {
+    uint8_t c = qspi.readByte(pos);
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+#endif // QSPI_EEPROM
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
index b52462f6d891..490cfd50e889 100644
--- a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
@@ -21,8 +21,6 @@
  */
 #pragma once
 
-#if USE_EMULATED_EEPROM
-  #undef SRAM_EEPROM_EMULATION
-  #undef SDCARD_EEPROM_EMULATION
+#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp
deleted file mode 100644
index 6b7326bb25b4..000000000000
--- a/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- *
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifdef __SAMD51__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
-#include "../shared/persistent_store_api.h"
-
-#if ENABLED(FLASH_EEPROM_EMULATION)
-  #define NVMCTRL_CMD(c)    do{                                                 \
-                              SYNC(!NVMCTRL->STATUS.bit.READY);                 \
-                              NVMCTRL->INTFLAG.bit.DONE = true;                 \
-                              NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \
-                              SYNC(NVMCTRL->INTFLAG.bit.DONE);                  \
-                            }while(0)
-  #define NVMCTRL_FLUSH()   do{                                           \
-                              if (NVMCTRL->SEESTAT.bit.LOAD)              \
-                                NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH);  \
-                            }while(0)
-#endif
-
-bool PersistentStore::access_start() {
-  #if ENABLED(FLASH_EEPROM_EMULATION)
-    NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED;  // Buffered mode and segment reallocation active
-  #endif
-
-  return true;
-}
-
-bool PersistentStore::access_finish() {
-  #if ENABLED(FLASH_EEPROM_EMULATION)
-    NVMCTRL_FLUSH();
-    if (!NVMCTRL->SEESTAT.bit.LOCK)
-      NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE);    // Lock E2P data write access
-  #endif
-
-  return true;
-}
-
-bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
-  #if ENABLED(FLASH_EEPROM_EMULATION)
-    if (NVMCTRL->SEESTAT.bit.RLOCK)
-      NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE);    // Unlock E2P data write access
-  #endif
-
-  while (size--) {
-    const uint8_t v = *value;
-    #if ENABLED(FLASH_EEPROM_EMULATION)
-      SYNC(NVMCTRL->SEESTAT.bit.BUSY);
-      if (NVMCTRL->INTFLAG.bit.SEESFULL)
-        NVMCTRL_FLUSH();      // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
-      ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
-      SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
-    #else
-      uint8_t * const p = (uint8_t * const)pos;
-      if (v != eeprom_read_byte(p)) {
-        eeprom_write_byte(p, v);
-        delay(2);
-        if (eeprom_read_byte(p) != v) {
-          SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
-          return true;
-        }
-      }
-    #endif
-    crc16(crc, &v, 1);
-    pos++;
-    value++;
-  }
-  return false;
-}
-
-bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
-  while (size--) {
-    uint8_t c;
-    #if ENABLED(FLASH_EEPROM_EMULATION)
-      SYNC(NVMCTRL->SEESTAT.bit.BUSY);
-      c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
-    #else
-      c = eeprom_read_byte((uint8_t*)pos);
-    #endif
-    if (writing) *value = c;
-    crc16(crc, &c, 1);
-    pos++;
-    value++;
-  }
-  return false;
-}
-
-size_t PersistentStore::capacity() {
-  #if ENABLED(FLASH_EEPROM_EMULATION)
-    const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
-                  sblk = NVMCTRL->SEESTAT.bit.SBLK;
-
-         if (!psz && !sblk)         return     0;
-    else if (psz <= 2)              return (0x200 << psz);
-    else if (sblk == 1 || psz == 3) return  4096;
-    else if (sblk == 2 || psz == 4) return  8192;
-    else if (sblk <= 4 || psz == 5) return 16384;
-    else if (sblk >= 9 && psz == 7) return 65536;
-    else                            return 32768;
-  #else
-    return E2END + 1;
-  #endif
-}
-
-#endif // EEPROM_SETTINGS
-
-#endif // __SAMD51__
diff --git a/Marlin/src/HAL/STM32/persistent_store_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
similarity index 99%
rename from Marlin/src/HAL/STM32/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32/eeprom_flash.cpp
index 80ef901ceba9..39012f8205e0 100644
--- a/Marlin/src/HAL/STM32/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -27,7 +27,7 @@
 
 #if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 
 // Only STM32F4 can support wear leveling at this time
diff --git a/Marlin/src/HAL/STM32/persistent_store_impl.cpp b/Marlin/src/HAL/STM32/eeprom_impl.cpp
similarity index 91%
rename from Marlin/src/HAL/STM32/persistent_store_impl.cpp
rename to Marlin/src/HAL/STM32/eeprom_impl.cpp
index d9538741dda7..cd0f93e8d878 100644
--- a/Marlin/src/HAL/STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_impl.cpp
@@ -24,9 +24,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if EITHER(USE_REAL_EEPROM, SRAM_EEPROM_EMULATION)
+#if EITHER(USE_WIRED_EEPROM, SRAM_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() {
   return true;
@@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     uint8_t v = *value;
 
     // Save to either external EEPROM, program flash or Backup SRAM
-    #if USE_REAL_EEPROM
+    #if USE_WIRED_EEPROM
       // EEPROM has only ~100,000 write cycles,
       // so only write bytes that have changed!
       uint8_t * const p = (uint8_t * const)pos;
@@ -68,7 +68,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
   do {
     // Read from either external EEPROM, program flash or Backup SRAM
     const uint8_t c = (
-      #if USE_REAL_EEPROM
+      #if USE_WIRED_EEPROM
         eeprom_read_byte((uint8_t*)pos)
       #else
         (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
@@ -85,7 +85,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() {
   return (
-    #if USE_REAL_EEPROM
+    #if USE_WIRED_EEPROM
       E2END + 1
     #else
       4096 // 4kB
@@ -93,5 +93,5 @@ size_t PersistentStore::capacity() {
   );
 }
 
-#endif // USE_REAL_EEPROM || SRAM_EEPROM_EMULATION
+#endif // USE_WIRED_EEPROM || SRAM_EEPROM_EMULATION
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/STM32/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
similarity index 98%
rename from Marlin/src/HAL/STM32/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index c5afc557e91f..2b89c21b8997 100644
--- a/Marlin/src/HAL/STM32/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -30,7 +30,7 @@
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef E2END
   #define E2END 0xFFF // 4KB
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
index e51b55698e49..11603c9ef41d 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
@@ -22,6 +22,6 @@
 #pragma once
 
 // If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
-#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
   #define SDCARD_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32F1/eeprom.cpp
similarity index 95%
rename from Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32F1/eeprom.cpp
index 1b3714c56d00..ed5d50cbdea4 100644
--- a/Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom.cpp
@@ -22,9 +22,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if USE_REAL_EEPROM
+#if USE_WIRED_EEPROM
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() {
   #if ENABLED(SPI_EEPROM)
@@ -73,5 +73,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() { return E2END + 1; }
 
-#endif // USE_REAL_EEPROM
+#endif // USE_WIRED_EEPROM
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/persistent_store_flash.cpp b/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
similarity index 95%
rename from Marlin/src/HAL/STM32F1/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32F1/eeprom_flash.cpp
index 3d6a3b4591f0..9c81730465c8 100644
--- a/Marlin/src/HAL/STM32F1/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
@@ -31,10 +31,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-// This is for EEPROM emulation in flash
-#if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #include <flash_stm32.h>
 #include <EEPROM.h>
@@ -108,5 +107,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS && EEPROM FLASH
+#endif // FLASH_EEPROM_EMULATION
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
similarity index 98%
rename from Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
index 8b5d89ad83ec..7894e69787dd 100644
--- a/Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
@@ -31,7 +31,7 @@
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef E2END
   #define E2END 0xFFF // 4KB
@@ -101,5 +101,4 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
 
 #endif // SDCARD_EEPROM_EMULATION
-
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
similarity index 98%
rename from Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
index 2ffbc609ecf5..b957aae6a88f 100644
--- a/Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
@@ -27,7 +27,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() { return true; }
 bool PersistentStore::access_finish() { return true; }
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
index 5a190342ac7c..d21624955ec4 100644
--- a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
-  #undef USE_REAL_EEPROM
+  #undef USE_WIRED_EEPROM
   #undef SRAM_EEPROM_EMULATION
   #undef SDCARD_EEPROM_EMULATION
   #define FLASH_EEPROM_EMULATION
diff --git a/Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
similarity index 97%
rename from Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp
rename to Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
index 6a179cd962ea..96499d4f19d1 100644
--- a/Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
@@ -22,7 +22,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() { return true; }
 bool PersistentStore::access_finish() { return true; }
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
index e51b55698e49..11603c9ef41d 100644
--- a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
@@ -22,6 +22,6 @@
 #pragma once
 
 // If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
-#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
   #define SDCARD_EEPROM_EMULATION
 #endif
diff --git a/Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp b/Marlin/src/HAL/TEENSY35_36/eeprom.cpp
similarity index 98%
rename from Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/TEENSY35_36/eeprom.cpp
index 32b215ee6e12..c66a45e2a54f 100644
--- a/Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/eeprom.cpp
@@ -27,7 +27,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 #include <avr/eeprom.h>
 
 bool PersistentStore::access_start() { return true; }
diff --git a/Marlin/src/HAL/shared/persistent_store_api.cpp b/Marlin/src/HAL/shared/eeprom_api.cpp
similarity index 96%
rename from Marlin/src/HAL/shared/persistent_store_api.cpp
rename to Marlin/src/HAL/shared/eeprom_api.cpp
index 735fa4278b7f..d8839e3d9d32 100644
--- a/Marlin/src/HAL/shared/persistent_store_api.cpp
+++ b/Marlin/src/HAL/shared/eeprom_api.cpp
@@ -24,7 +24,7 @@
 
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
 
-  #include "persistent_store_api.h"
+  #include "eeprom_api.h"
   PersistentStore persistentStore;
 
 #endif
diff --git a/Marlin/src/HAL/shared/persistent_store_api.h b/Marlin/src/HAL/shared/eeprom_api.h
similarity index 100%
rename from Marlin/src/HAL/shared/persistent_store_api.h
rename to Marlin/src/HAL/shared/eeprom_api.h
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 1ac036e5bc29..217d8945437f 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -27,7 +27,7 @@
   #include "../bedlevel.h"
 
   #include "../../../MarlinCore.h"
-  #include "../../../HAL/shared/persistent_store_api.h"
+  #include "../../../HAL/shared/eeprom_api.h"
   #include "../../../libs/hex_print_routines.h"
   #include "../../../module/configuration_store.h"
   #include "../../../lcd/ultralcd.h"
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ebc77b9383a7..d9db98646648 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -35,16 +35,19 @@
   #define HAS_LINEAR_E_JERK 1
 #endif
 
-// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+// Determine which type of 'EEPROM' is in use
 #if ENABLED(EEPROM_SETTINGS)
-  #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM)
-    #define USE_REAL_EEPROM 1
+  // EEPROM type may be defined by compile flags, configs, HALs, or pins
+  // Set additional flags to let HALs choose in their Conditionals_post.h
+  #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && ANY(I2C_EEPROM, SPI_EEPROM, QSPI_EEPROM)
+    #define USE_WIRED_EEPROM    1
   #else
-    #define USE_EMULATED_EEPROM 1
+    #define USE_FALLBACK_EEPROM 1
   #endif
 #else
   #undef I2C_EEPROM
   #undef SPI_EEPROM
+  #undef QSPI_EEPROM
   #undef SDCARD_EEPROM_EMULATION
   #undef SRAM_EEPROM_EMULATION
   #undef FLASH_EEPROM_EMULATION
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
index 61875c52f1f3..3de03579e4b0 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
@@ -252,7 +252,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
 }
 
 #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
-  #include "../../../../../HAL/shared/persistent_store_api.h"
+  #include "../../../../../HAL/shared/eeprom_api.h"
 
   bool restoreEEPROM() {
     uint8_t data[ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE];
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 129e207d2948..d80fe501955e 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -57,7 +57,7 @@
 #include "../MarlinCore.h"
 
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
-  #include "../HAL/shared/persistent_store_api.h"
+  #include "../HAL/shared/eeprom_api.h"
 #endif
 
 #include "probe.h"
diff --git a/Marlin/src/module/configuration_store.h b/Marlin/src/module/configuration_store.h
index a2c8d97dfad1..f2e84c96649b 100644
--- a/Marlin/src/module/configuration_store.h
+++ b/Marlin/src/module/configuration_store.h
@@ -24,7 +24,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../HAL/shared/persistent_store_api.h"
+  #include "../HAL/shared/eeprom_api.h"
 #endif
 
 class MarlinSettings {
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 4b4d4b60ad9f..3623c88a13de 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -35,7 +35,7 @@ Stopwatch print_job_timer;      // Global Print Job Timer instance
 
 #include "printcounter.h"
 #include "../MarlinCore.h"
-#include "../HAL/shared/persistent_store_api.h"
+#include "../HAL/shared/eeprom_api.h"
 
 #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
   #include "../libs/buzzer.h"
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index 261cdf058b59..39a237cc4451 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -28,7 +28,7 @@
 // Print debug messages with M111 S2
 //#define DEBUG_PRINTCOUNTER
 
-#if USE_REAL_EEPROM
+#if USE_WIRED_EEPROM
   // round up address to next page boundary (assuming 32 byte pages)
   #define STATS_EEPROM_ADDRESS 0x40
 #else
@@ -57,7 +57,7 @@ class PrintCounter: public Stopwatch {
   private:
     typedef Stopwatch super;
 
-    #if USE_REAL_EEPROM || defined(CPU_32_BIT)
+    #if USE_WIRED_EEPROM || defined(CPU_32_BIT)
       typedef uint32_t eeprom_address_t;
     #else
       typedef uint16_t eeprom_address_t;
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index b7d5172e0d94..f02a8b86bd55 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -44,8 +44,9 @@
 //
 // EEPROM
 //
-#define E2END 0x7FFF                              // 32Kb (24lc256)
+//#define QSPI_EEPROM                             // Use AGCM4 onboard QSPI EEPROM (Uses 4K of RAM)
 #define I2C_EEPROM                                // EEPROM on I2C-0
+#define E2END 0x7FFF                              // 32K (24lc256)
 
 //
 // Limit Switches
diff --git a/platformio.ini b/platformio.ini
index 2f3e86c31612..13808d299a3d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -792,6 +792,7 @@ build_unflags  = -std=gnu++11
 src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
 lib_deps       = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  Adafruit_SPIFlash=https://github.com/adafruit/Adafruit_SPIFlash/archive/master.zip
 debug_tool     = jlink
 
 #

From bed41af868f352bc0ca72b0b6936a97420c64ecf Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Fri, 27 Mar 2020 18:30:17 -0400
Subject: [PATCH 510/565] Fix Stepper PWM menu (#17298)

---
 Marlin/src/lcd/menu/menu_advanced.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 1577e59fc117..f2327b75e5e4 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -84,7 +84,7 @@ void menu_cancelobject();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_CURRENT_PWM(LABEL,I) EDIT_ITEM_P(long5, PSTR(LABEL), &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
+    #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y)
       EDIT_CURRENT_PWM(STR_X STR_Y, 0);
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)

From 8752fbd92c8edcd777b6a2afe54f4d70d3fc4d85 Mon Sep 17 00:00:00 2001
From: Mathias Rasmussen <mathiasvr@gmail.com>
Date: Fri, 27 Mar 2020 23:38:28 +0100
Subject: [PATCH 511/565] Store case light brightness in EEPROM (#17307)

---
 Marlin/src/module/configuration_store.cpp | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index d80fe501955e..2ecc9299c9b3 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -127,6 +127,11 @@
   void M710_report(const bool forReplay);
 #endif
 
+#define HAS_CASE_LIGHT_BRIGHTNESS (ENABLED(CASE_LIGHT_MENU) && DISABLED(CASE_LIGHT_NO_BRIGHTNESS))
+#if HAS_CASE_LIGHT_BRIGHTNESS
+  #include "../feature/caselight.h"
+#endif
+
 #pragma pack(push, 1) // No padding between variables
 
 typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stepper_current_t;
@@ -376,6 +381,13 @@ typedef struct SettingsDataStruct {
     uint8_t extui_data[ExtUI::eeprom_data_size];
   #endif
 
+  //
+  // HAS_CASE_LIGHT_BRIGHTNESS
+  //
+  #if HAS_CASE_LIGHT_BRIGHTNESS
+    uint8_t case_light_brightness;
+  #endif
+
 } SettingsData;
 
 //static_assert(sizeof(SettingsData) <= E2END + 1, "EEPROM too small to contain SettingsData!");
@@ -441,6 +453,10 @@ void MarlinSettings::postprocess() {
     planner.recalculate_max_e_jerk();
   #endif
 
+  #if HAS_CASE_LIGHT_BRIGHTNESS
+    update_case_light();
+  #endif
+
   // Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
   // and init stepper.count[], planner.position[] with current_position
   planner.refresh_positioning();
@@ -1309,6 +1325,13 @@ void MarlinSettings::postprocess() {
       }
     #endif
 
+    //
+    // Case Light Brightness
+    //
+    #if HAS_CASE_LIGHT_BRIGHTNESS
+      EEPROM_WRITE(case_light_brightness);
+    #endif
+
     //
     // Validate CRC and Data Size
     //
@@ -2163,6 +2186,14 @@ void MarlinSettings::postprocess() {
         }
       #endif
 
+      //
+      // Case Light Brightness
+      //
+      #if HAS_CASE_LIGHT_BRIGHTNESS
+        _FIELD_TEST(case_light_brightness);
+        EEPROM_READ(case_light_brightness);
+      #endif
+
       eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
       if (eeprom_error) {
         DEBUG_ECHO_START();
@@ -2458,6 +2489,14 @@ void MarlinSettings::reset() {
     ExtUI::onFactoryReset();
   #endif
 
+  //
+  // Case Light Brightness
+  //
+
+  #if HAS_CASE_LIGHT_BRIGHTNESS
+    case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS;
+  #endif
+
   //
   // Magnetic Parking Extruder
   //

From e71b25a555e869338723fa17799bcb9d4ea44fbe Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 28 Mar 2020 00:03:16 +0000
Subject: [PATCH 512/565] [cron] Bump distribution date (2020-03-28)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index afbb5cf3c8db..9978e3e6d3f3 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-27"
+  #define STRING_DISTRIBUTION_DATE "2020-03-28"
 #endif
 
 /**

From de648bfdc1de5b3b3bb93e39d4337c3f9bff1211 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Fri, 27 Mar 2020 22:08:47 -0400
Subject: [PATCH 513/565] Add Funmat HT V4.0 board support (#17305)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/core/boards.h                 |   1 +
 Marlin/src/pins/mega/pins_INTAMSYS40.h   | 152 +++++++++++++++++++++++
 Marlin/src/pins/pins.h                   |   2 +
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h |  16 +--
 4 files changed, 163 insertions(+), 8 deletions(-)
 create mode 100644 Marlin/src/pins/mega/pins_INTAMSYS40.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 86107f7d86a4..30c2d3eb87a3 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -144,6 +144,7 @@
 #define BOARD_LEAPFROG_XEED2015       1321  // Leapfrog Xeed 2015
 #define BOARD_PICA_REVB               1322  // PICA Shield (original version)
 #define BOARD_PICA                    1323  // PICA Shield (rev C or later)
+#define BOARD_INTAMSYS40              1324  // Intamsys 4.0 (Funmat HT)
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/mega/pins_INTAMSYS40.h b/Marlin/src/pins/mega/pins_INTAMSYS40.h
new file mode 100644
index 000000000000..c688823ddf75
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_INTAMSYS40.h
@@ -0,0 +1,152 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Intamsys Funmat HT V4.0 Mainboard
+ * 4988 Drivers Tested
+ * 2208 version exists and may or may not work
+ */
+
+#ifndef __AVR_ATmega2560__
+  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
+#endif
+
+#define BOARD_INFO_NAME "Intamsys 4.0"
+
+//
+// Servos
+//
+#define SERVO0_PIN                            12  // Uses High Temp Present Jumper Pin
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_MIN_PIN                             29
+#define Z_MAX_PIN                             69
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     69
+#endif
+
+#define FIL_RUNOUT_PIN                        10
+
+//
+// Steppers
+//
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27  // 44
+
+#define Y_STEP_PIN                            32  // 33
+#define Y_DIR_PIN                             33  // 31, 32
+#define Y_ENABLE_PIN                          31  // 32
+
+#define Z_STEP_PIN                            35  // 35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34  // 34
+
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
+
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
+
+#define MOTOR_CURRENT_PWM_X_PIN               11
+#define MOTOR_CURRENT_PWM_Y_PIN               44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
+
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
+#ifndef MOTOR_CURRENT_PWM_RANGE
+  #define MOTOR_CURRENT_PWM_RANGE  2000
+#endif
+#define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                             8  // Analog Input D62
+#define TEMP_BED_PIN                          10  // Analog Input D64
+
+#define TEMP_CHAMBER_PIN                       9  // Analog Input D63
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                           2  // PWM
+#define HEATER_BED_PIN                         4  // PWM
+#define HEATER_CHAMBER_PIN                     3  // PWM
+#define FAN_PIN                                7  // PWM
+
+//
+// Misc. Functions
+//
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+
+#if ENABLED(CASE_LIGHT_ENABLE)
+  #define CASE_LIGHT_PIN                       8
+#endif
+
+#if ENABLED(PSU_CONTROL)
+  #define PS_ON_PIN                           38  // UPS Module
+#endif
+
+//
+// LCD Controller
+//
+
+#define BEEPER_PIN                            18
+
+#if HAS_SPI_LCD
+  #define LCD_PINS_RS                         20
+  #define LCD_PINS_ENABLE                     30
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D5                         21
+  #define LCD_PINS_D6                          5
+  #define LCD_PINS_D7                          6
+  #define BTN_EN1                             40
+  #define BTN_EN2                             41
+  #define BTN_ENC                             19
+#endif
+
+///////////////////// SPARE HEADERS //////////////
+
+/**
+ *
+ * J25
+ * 1 D54
+ * 2 D55
+ * 3 D56
+ * 4 D57
+ * 5 D58
+ * 6 D59
+ * 7 D60
+ * 8 D61
+
+Hotend High Temp Connected : D12
+*/
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b43ba1cbc6d9..5de75a1f0e64 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -258,6 +258,8 @@
   #include "mega/pins_PICA.h"                   // ATmega2560                             env:mega2560
 #elif MB(PICA_REVB)
   #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:mega2560
+#elif MB(INTAMSYS40)
+  #include "mega/pins_INTAMSYS40.h"             // ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 2f2881ee3f0e..a8c6d30eb450 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -178,14 +178,14 @@
   //#define E4_HARDWARE_SERIAL Serial1
 
   // Unused servo pins may be repurposed with SoftwareSerialM
-  //#define X_SERIAL_TX_PIN  PF8   // SERVO3_PIN
-  //#define Y_SERIAL_TX_PIN  PF9   // SERVO2_PIN
-  //#define Z_SERIAL_TX_PIN  PA1   // SERVO1_PIN
-  //#define E0_SERIAL_TX_PIN PC3   // SERVO0_PIN
-  //#define X_SERIAL_RX_PIN  X_SERIAL_TX_PIN
-  //#define Y_SERIAL_RX_PIN  Y_SERIAL_TX_PIN
-  //#define Z_SERIAL_RX_PIN  Z_SERIAL_TX_PIN
-  //#define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN
+  //#define X_SERIAL_TX_PIN                 PF8   // SERVO3_PIN
+  //#define Y_SERIAL_TX_PIN                 PF9   // SERVO2_PIN
+  //#define Z_SERIAL_TX_PIN                 PA1   // SERVO1_PIN
+  //#define E0_SERIAL_TX_PIN                PC3   // SERVO0_PIN
+  //#define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+  //#define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+  //#define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
+  //#define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
 
   // Reduce baud rate for software serial reliability
   #if HAS_TMC_SW_SERIAL

From 53fe572bbdfe4d51e420f6d002197cee533e17fd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 27 Mar 2020 22:00:27 -0500
Subject: [PATCH 514/565] Limited backlash editing with Core kinematics
 (#17281)

---
 Marlin/src/gcode/calibrate/G28.cpp    |  20 ++--
 Marlin/src/gcode/calibrate/G425.cpp   | 144 +++++++++++++++-----------
 Marlin/src/gcode/calibrate/M425.cpp   |   6 +-
 Marlin/src/inc/Conditionals_post.h    |  13 +++
 Marlin/src/inc/MarlinConfig.h         |   3 +-
 Marlin/src/lcd/menu/menu_backlash.cpp |   6 +-
 6 files changed, 114 insertions(+), 78 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 4603c769673a..fafce9a89692 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -255,28 +255,28 @@ void GcodeSuite::G28() {
   #define HAS_HOMING_CURRENT (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2))
 
   #if HAS_HOMING_CURRENT
-    auto debug_current = [](const char * const s, const int16_t a, const int16_t b){
-      DEBUG_ECHO(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
+    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){
+      serialprintPGM(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
     };
     #if HAS_CURRENT_HOME(X)
       const int16_t tmc_save_current_X = stepperX.getMilliamps();
       stepperX.rms_current(X_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("X", tmc_save_current_X, X_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("X"), tmc_save_current_X, X_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(X2)
       const int16_t tmc_save_current_X2 = stepperX2.getMilliamps();
       stepperX2.rms_current(X2_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("X2", tmc_save_current_X2, X2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("X2"), tmc_save_current_X2, X2_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(Y)
       const int16_t tmc_save_current_Y = stepperY.getMilliamps();
       stepperY.rms_current(Y_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("Y", tmc_save_current_Y, Y_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("Y"), tmc_save_current_Y, Y_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(Y2)
       const int16_t tmc_save_current_Y2 = stepperY2.getMilliamps();
       stepperY2.rms_current(Y2_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("Y2", tmc_save_current_Y2, Y2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
   #endif
 
@@ -345,12 +345,8 @@ void GcodeSuite::G28() {
     #endif
 
     // Home Y (before X)
-    #if ENABLED(HOME_Y_BEFORE_X)
-
-      if (doY || (doX && ENABLED(CODEPENDENT_XY_HOMING)))
-        homeaxis(Y_AXIS);
-
-    #endif
+    if (ENABLED(HOME_Y_BEFORE_X) && (doY || (ENABLED(CODEPENDENT_XY_HOMING) && doX)))
+      homeaxis(Y_AXIS);
 
     // Home X
     if (doX || (doY && ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X))) {
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 69fb29165dfb..42c56fe51d82 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -37,6 +37,21 @@
 #include "../../module/endstops.h"
 #include "../../feature/bedlevel/bedlevel.h"
 
+#if !AXIS_CAN_CALIBRATE(X)
+  #undef CALIBRATION_MEASURE_LEFT
+  #undef CALIBRATION_MEASURE_RIGHT
+#endif
+
+#if !AXIS_CAN_CALIBRATE(Y)
+  #undef CALIBRATION_MEASURE_FRONT
+  #undef CALIBRATION_MEASURE_BACK
+#endif
+
+#if !AXIS_CAN_CALIBRATE(Z)
+  #undef CALIBRATION_MEASURE_AT_TOP_EDGES
+#endif
+
+
 /**
  * G425 backs away from the calibration object by various distances
  * depending on the confidence level:
@@ -207,42 +222,52 @@ inline float measure(const AxisEnum axis, const int dir, const bool stop_state,
 inline void probe_side(measurements_t &m, const float uncertainty, const side_t side, const bool probe_top_at_edge=false) {
   const xyz_float_t dimensions = CALIBRATION_OBJECT_DIMENSIONS;
   AxisEnum axis;
-  float dir;
+  float dir = 1;
 
   park_above_object(m, uncertainty);
 
   switch (side) {
-    case TOP: {
-      const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
-      m.obj_center.z = measurement - dimensions.z / 2;
-      m.obj_side[TOP] = measurement;
-      return;
-    }
-    case RIGHT: axis = X_AXIS; dir = -1; break;
-    case FRONT: axis = Y_AXIS; dir =  1; break;
-    case LEFT:  axis = X_AXIS; dir =  1; break;
-    case BACK:  axis = Y_AXIS; dir = -1; break;
+    #if AXIS_CAN_CALIBRATE(Z)
+      case TOP: {
+        const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
+        m.obj_center.z = measurement - dimensions.z / 2;
+        m.obj_side[TOP] = measurement;
+        return;
+      }
+    #endif
+    #if AXIS_CAN_CALIBRATE(X)
+      case LEFT:  axis = X_AXIS; break;
+      case RIGHT: axis = X_AXIS; dir = -1; break;
+    #endif
+    #if AXIS_CAN_CALIBRATE(Y)
+      case FRONT: axis = Y_AXIS; break;
+      case BACK:  axis = Y_AXIS; dir = -1; break;
+    #endif
     default: return;
   }
 
   if (probe_top_at_edge) {
-    // Probe top nearest the side we are probing
-    current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]);
-    calibration_move();
-    m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
-    m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2;
+    #if AXIS_CAN_CALIBRATE(Z)
+      // Probe top nearest the side we are probing
+      current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]);
+      calibration_move();
+      m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
+      m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2;
+    #endif
   }
 
-  // Move to safe distance to the side of the calibration object
-  current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty);
-  calibration_move();
+  if (AXIS_CAN_CALIBRATE(X) && axis == X_AXIS || AXIS_CAN_CALIBRATE(Y) && axis == Y_AXIS) {
+    // Move to safe distance to the side of the calibration object
+    current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty);
+    calibration_move();
 
-  // Plunge below the side of the calibration object and measure
-  current_position.z = m.obj_side[TOP] - CALIBRATION_NOZZLE_TIP_HEIGHT * 0.7;
-  calibration_move();
-  const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty);
-  m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2);
-  m.obj_side[side] = measurement;
+    // Plunge below the side of the calibration object and measure
+    current_position.z = m.obj_side[TOP] - (CALIBRATION_NOZZLE_TIP_HEIGHT) * 0.7f;
+    calibration_move();
+    const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty);
+    m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2);
+    m.obj_side[side] = measurement;
+  }
 }
 
 /**
@@ -252,7 +277,7 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
  *   uncertainty        in     - How far away from the calibration object to begin probing
  */
 inline void probe_sides(measurements_t &m, const float uncertainty) {
-  #ifdef CALIBRATION_MEASURE_AT_TOP_EDGES
+  #if ENABLED(CALIBRATION_MEASURE_AT_TOP_EDGES)
     constexpr bool probe_top_at_edge = true;
   #else
     // Probing at the exact center only works if the center is flat. Probing on a washer
@@ -261,18 +286,18 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     probe_side(m, uncertainty, TOP);
   #endif
 
-  #ifdef CALIBRATION_MEASURE_RIGHT
+  #if ENABLED(CALIBRATION_MEASURE_RIGHT)
     probe_side(m, uncertainty, RIGHT, probe_top_at_edge);
   #endif
 
-  #ifdef CALIBRATION_MEASURE_FRONT
+  #if ENABLED(CALIBRATION_MEASURE_FRONT)
     probe_side(m, uncertainty, FRONT, probe_top_at_edge);
   #endif
 
-  #ifdef CALIBRATION_MEASURE_LEFT
+  #if ENABLED(CALIBRATION_MEASURE_LEFT)
     probe_side(m, uncertainty, LEFT,  probe_top_at_edge);
   #endif
-  #ifdef CALIBRATION_MEASURE_BACK
+  #if ENABLED(CALIBRATION_MEASURE_BACK)
     probe_side(m, uncertainty, BACK,  probe_top_at_edge);
   #endif
 
@@ -313,7 +338,9 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 #if ENABLED(CALIBRATION_REPORTING)
   inline void report_measured_faces(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Sides:");
-    SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
+    #if AXIS_CAN_CALIBRATE(Z)
+      SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
+    #endif
     #if ENABLED(CALIBRATION_MEASURE_LEFT)
       SERIAL_ECHOLNPAIR("  Left: ", m.obj_side[LEFT]);
     #endif
@@ -343,19 +370,25 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 
   inline void report_measured_backlash(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Backlash:");
-    #if ENABLED(CALIBRATION_MEASURE_LEFT)
-      SERIAL_ECHOLNPAIR("  Left: ", m.backlash[LEFT]);
-    #endif
-    #if ENABLED(CALIBRATION_MEASURE_RIGHT)
-      SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
+    #if AXIS_CAN_CALIBRATE(X)
+      #if ENABLED(CALIBRATION_MEASURE_LEFT)
+        SERIAL_ECHOLNPAIR("  Left: ", m.backlash[LEFT]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_RIGHT)
+        SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
+      #endif
     #endif
-    #if ENABLED(CALIBRATION_MEASURE_FRONT)
-      SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
+    #if AXIS_CAN_CALIBRATE(Y)
+      #if ENABLED(CALIBRATION_MEASURE_FRONT)
+        SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_BACK)
+        SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
+      #endif
     #endif
-    #if ENABLED(CALIBRATION_MEASURE_BACK)
-      SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
+    #if AXIS_CAN_CALIBRATE(Z)
+      SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     #endif
-    SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     SERIAL_EOL();
   }
 
@@ -369,7 +402,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if HAS_Y_CENTER
       SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y);
     #endif
-    SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+    if (AXIS_CAN_CALIBRATE(Z)) SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
     SERIAL_EOL();
   }
 
@@ -417,6 +450,7 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
     probe_sides(m, uncertainty);
 
     #if ENABLED(BACKLASH_GCODE)
+
       #if HAS_X_CENTER
         backlash.distance_mm.x = (m.backlash[LEFT] + m.backlash[RIGHT]) / 2;
       #elif ENABLED(CALIBRATION_MEASURE_LEFT)
@@ -433,18 +467,18 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
         backlash.distance_mm.y = m.backlash[BACK];
       #endif
 
-      backlash.distance_mm.z = m.backlash[TOP];
+      if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP];
     #endif
   }
 
   #if ENABLED(BACKLASH_GCODE)
     // Turn on backlash compensation and move in all
-    // directions to take up any backlash
+    // allowed directions to take up any backlash
     {
       // New scope for TEMPORARY_BACKLASH_CORRECTION
       TEMPORARY_BACKLASH_CORRECTION(all_on);
       TEMPORARY_BACKLASH_SMOOTHING(0.0f);
-      const xyz_float_t move = { 3, 3, 3 };
+      const xyz_float_t move = { AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3 };
       current_position += move; calibration_move();
       current_position -= move; calibration_move();
     }
@@ -482,26 +516,18 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
 
   // Adjust the hotend offset
   #if HAS_HOTEND_OFFSET
-    #if HAS_X_CENTER
-      hotend_offset[extruder].x += m.pos_error.x;
-    #endif
-    #if HAS_Y_CENTER
-      hotend_offset[extruder].y += m.pos_error.y;
-    #endif
-    hotend_offset[extruder].z += m.pos_error.z;
+    if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) hotend_offset[extruder].x += m.pos_error.x;
+    if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) hotend_offset[extruder].y += m.pos_error.y;
+                             if (AXIS_CAN_CALIBRATE(Z)) hotend_offset[extruder].z += m.pos_error.z;
     normalize_hotend_offsets();
   #endif
 
   // Correct for positional error, so the object
   // is at the known actual spot
   planner.synchronize();
-  #if HAS_X_CENTER
-    update_measurements(m, X_AXIS);
-  #endif
-  #if HAS_Y_CENTER
-    update_measurements(m, Y_AXIS);
-  #endif
-  update_measurements(m, Z_AXIS);
+  if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) update_measurements(m, X_AXIS);
+  if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) update_measurements(m, Y_AXIS);
+                           if (AXIS_CAN_CALIBRATE(Z)) update_measurements(m, Z_AXIS);
 
   sync_plan_position();
 }
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 41c80daf7c7b..980152a4b169 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::M425() {
   bool noArgs = true;
 
   LOOP_XYZ(a) {
-    if (parser.seen(XYZ_CHAR(a))) {
+    if (CAN_CALIBRATE(a) && parser.seen(XYZ_CHAR(a))) {
       planner.synchronize();
       backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
       noArgs = false;
@@ -74,7 +74,7 @@ void GcodeSuite::M425() {
     SERIAL_ECHOLNPGM("active:");
     SERIAL_ECHOLNPAIR("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
-    LOOP_XYZ(a) {
+    LOOP_XYZ(a) if (CAN_CALIBRATE(a)) {
       SERIAL_CHAR(' ', XYZ_CHAR(a));
       SERIAL_ECHO(backlash.distance_mm[a]);
       SERIAL_EOL();
@@ -87,7 +87,7 @@ void GcodeSuite::M425() {
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
       SERIAL_ECHOPGM("  Average measured backlash (mm):");
       if (backlash.has_any_measurement()) {
-        LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) {
+        LOOP_XYZ(a) if (CAN_CALIBRATE(a) && backlash.has_measurement(AxisEnum(a))) {
           SERIAL_CHAR(' ', XYZ_CHAR(a));
           SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
         }
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d9db98646648..9ea298f02d46 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -139,6 +139,19 @@
   #define CORESIGN(n) (ANY(COREYX, COREZX, COREZY) ? (-(n)) : (n))
 #endif
 
+// Calibration codes only for non-core axes
+#if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
+  #if IS_CORE
+    #define X_AXIS_INDEX 0
+    #define Y_AXIS_INDEX 1
+    #define Z_AXIS_INDEX 2
+    #define CAN_CALIBRATE(A,B) (A##_AXIS_INDEX == B##_INDEX)
+  #else
+    #define CAN_CALIBRATE(...) 1
+  #endif
+#endif
+#define AXIS_CAN_CALIBRATE(A) CAN_CALIBRATE(A,NORMAL_AXIS)
+
 /**
  * No adjustable bed on non-cartesians
  */
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index d32506702e2f..c1655015e05e 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -35,11 +35,12 @@
 #include "Conditionals_post.h"
 #include HAL_PATH(../HAL, inc/Conditionals_post.h)
 
+#include "../core/types.h"  // Ahead of sanity-checks
+
 #include "SanityCheck.h"
 #include HAL_PATH(../HAL, inc/SanityCheck.h)
 
 // Include all core headers
-#include "../core/types.h"
 #include "../core/language.h"
 #include "../core/utility.h"
 #include "../core/serial.h"
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index ad9c51d4cfda..720694bfffba 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -39,9 +39,9 @@ void menu_backlash() {
   EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &backlash.correction, all_off, all_on);
 
   #define EDIT_BACKLASH_DISTANCE(N) EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &backlash.distance_mm[_AXIS(N)], 0.0f, 9.9f);
-  EDIT_BACKLASH_DISTANCE(A);
-  EDIT_BACKLASH_DISTANCE(B);
-  EDIT_BACKLASH_DISTANCE(C);
+  if (AXIS_CAN_CALIBRATE(A)) EDIT_BACKLASH_DISTANCE(A);
+  if (AXIS_CAN_CALIBRATE(B)) EDIT_BACKLASH_DISTANCE(B);
+  if (AXIS_CAN_CALIBRATE(C)) EDIT_BACKLASH_DISTANCE(C);
 
   #ifdef BACKLASH_SMOOTHING_MM
     EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &backlash.smoothing_mm, 0.0f, 9.9f);

From a84990961a62e4190cfac10b500ce9c693896e83 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 28 Mar 2020 01:19:43 -0500
Subject: [PATCH 515/565] Simplify TWIBus debug

---
 Marlin/src/feature/twibus.cpp | 56 +++++++++++------------------------
 Marlin/src/feature/twibus.h   |  7 +++--
 2 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index 60d78018a2ea..9dbb1deb4f9d 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -49,37 +49,27 @@ void TWIBus::address(const uint8_t adr) {
 
   addr = adr;
 
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("address"), adr);
-  #endif
+  debug(PSTR("address"), adr);
 }
 
 void TWIBus::addbyte(const char c) {
   if (buffer_s >= COUNT(buffer)) return;
   buffer[buffer_s++] = c;
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("addbyte"), c);
-  #endif
+  debug(PSTR("addbyte"), c);
 }
 
 void TWIBus::addbytes(char src[], uint8_t bytes) {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("addbytes"), bytes);
-  #endif
+  debug(PSTR("addbytes"), bytes);
   while (bytes--) addbyte(*src++);
 }
 
 void TWIBus::addstring(char str[]) {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("addstring"), str);
-  #endif
+  debug(PSTR("addstring"), str);
   while (char c = *str++) addbyte(c);
 }
 
 void TWIBus::send() {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("send"), addr);
-  #endif
+  debug(PSTR("send"), addr);
 
   Wire.beginTransmission(I2C_ADDRESS(addr));
   Wire.write(buffer, buffer_s);
@@ -89,21 +79,21 @@ void TWIBus::send() {
 }
 
 // static
-void TWIBus::echoprefix(uint8_t bytes, const char prefix[], uint8_t adr) {
+void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) {
   SERIAL_ECHO_START();
-  serialprintPGM(prefix);
+  serialprintPGM(pref);
   SERIAL_ECHOPAIR(": from:", adr, " bytes:", bytes, " data:");
 }
 
 // static
-void TWIBus::echodata(uint8_t bytes, const char prefix[], uint8_t adr) {
-  echoprefix(bytes, prefix, adr);
+void TWIBus::echodata(uint8_t bytes, const char pref[], uint8_t adr) {
+  echoprefix(bytes, pref, adr);
   while (bytes-- && Wire.available()) SERIAL_CHAR(Wire.read());
   SERIAL_EOL();
 }
 
-void TWIBus::echobuffer(const char prefix[], uint8_t adr) {
-  echoprefix(buffer_s, prefix, adr);
+void TWIBus::echobuffer(const char pref[], uint8_t adr) {
+  echoprefix(buffer_s, pref, adr);
   LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]);
   SERIAL_EOL();
 }
@@ -111,15 +101,11 @@ void TWIBus::echobuffer(const char prefix[], uint8_t adr) {
 bool TWIBus::request(const uint8_t bytes) {
   if (!addr) return false;
 
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("request"), bytes);
-  #endif
+  debug(PSTR("request"), bytes);
 
   // requestFrom() is a blocking function
   if (Wire.requestFrom(addr, bytes) == 0) {
-    #if ENABLED(DEBUG_TWIBUS)
-      debug("request fail", addr);
-    #endif
+    debug("request fail", addr);
     return false;
   }
 
@@ -127,9 +113,7 @@ bool TWIBus::request(const uint8_t bytes) {
 }
 
 void TWIBus::relay(const uint8_t bytes) {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("relay"), bytes);
-  #endif
+  debug(PSTR("relay"), bytes);
 
   if (request(bytes))
     echodata(bytes, PSTR("i2c-reply"), addr);
@@ -141,9 +125,7 @@ uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
   while (count < bytes && Wire.available())
     dst[count++] = Wire.read();
 
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("capture"), count);
-  #endif
+  debug(PSTR("capture"), count);
 
   return count;
 }
@@ -156,16 +138,12 @@ void TWIBus::flush() {
 #if I2C_SLAVE_ADDRESS > 0
 
   void TWIBus::receive(uint8_t bytes) {
-    #if ENABLED(DEBUG_TWIBUS)
-      debug(PSTR("receive"), bytes);
-    #endif
+    debug(PSTR("receive"), bytes);
     echodata(bytes, PSTR("i2c-receive"), 0);
   }
 
   void TWIBus::reply(char str[]/*=nullptr*/) {
-    #if ENABLED(DEBUG_TWIBUS)
-      debug(PSTR("reply"), str);
-    #endif
+    debug(PSTR("reply"), str);
 
     if (str) {
       reset();
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index faf9eb38cf18..2c1b20da5129 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -223,7 +223,6 @@ class TWIBus {
     #endif
 
     #if ENABLED(DEBUG_TWIBUS)
-
       /**
        * @brief Prints a debug message
        * @details Prints a simple debug message "TWIBus::function: value"
@@ -233,6 +232,10 @@ class TWIBus {
       static void debug(const char func[], char c);
       static void debug(const char func[], char adr[]);
       static inline void debug(const char func[], uint8_t v) { debug(func, (uint32_t)v); }
-
+    #else
+      static inline void debug(const char[], uint32_t) {}
+      static inline void debug(const char[], char) {}
+      static inline void debug(const char[], char[]) {}
+      static inline void debug(const char[], uint8_t) {}
     #endif
 };

From 747b964295118d425ad41cd7593dae48ccf9f14f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 28 Mar 2020 03:18:53 -0500
Subject: [PATCH 516/565] Clean up user-wait, SD completion (#17315)

---
 Marlin/Configuration_adv.h                   |   4 +
 Marlin/src/MarlinCore.cpp                    |  69 ++++--------
 Marlin/src/MarlinCore.h                      |   2 +
 Marlin/src/feature/mmu2/mmu2.cpp             |   3 +-
 Marlin/src/feature/pause.cpp                 |   8 +-
 Marlin/src/gcode/gcode.cpp                   |   6 +-
 Marlin/src/gcode/gcode.h                     |   4 +
 Marlin/src/gcode/lcd/M0_M1.cpp               |  49 +++------
 Marlin/src/gcode/sd/M1001.cpp                | 109 +++++++++++++++++++
 Marlin/src/lcd/language/language_en.h        |   1 +
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp |   4 +-
 Marlin/src/lcd/ultralcd.cpp                  |  22 ++--
 Marlin/src/module/probe.cpp                  |  10 +-
 Marlin/src/sd/cardreader.cpp                 |   3 +-
 Marlin/src/sd/cardreader.h                   |   1 -
 15 files changed, 178 insertions(+), 117 deletions(-)
 create mode 100644 Marlin/src/gcode/sd/M1001.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 370fbaf6ecae..00f89662c785 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1049,6 +1049,10 @@
 
   #define EVENT_GCODE_SD_STOP "G28XY"       // G-code to run on Stop Print (e.g., "G28XY" or "G27")
 
+  #if ENABLED(PRINTER_EVENT_LEDS)
+    #define PE_LEDS_COMPLETED_TIME  (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
+  #endif
+
   /**
    * Continue after Power-Loss (Creality3D)
    *
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 7adc8272ea15..8130affe301c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -210,6 +210,24 @@ bool wait_for_heatup = true;
 // For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
 #if HAS_RESUME_CONTINUE
   bool wait_for_user; // = false;
+
+  void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) {
+    #if DISABLED(ADVANCED_PAUSE_FEATURE)
+      UNUSED(no_sleep);
+    #endif
+    KEEPALIVE_STATE(PAUSED_FOR_USER);
+    wait_for_user = true;
+    if (ms) ms += millis(); // expire time
+    while (wait_for_user && !(ms && ELAPSED(millis(), ms))) {
+      idle(
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          no_sleep
+        #endif
+      );
+    }
+    wait_for_user = false;
+  }
+
 #endif
 
 // Inactivity shutdown
@@ -418,53 +436,8 @@ void startOrResumeJob() {
   }
 
   inline void finishSDPrinting() {
-
-    bool did_state = true;
-    switch (card.sdprinting_done_state) {
-
-      case 1:
-        if (print_job_timer.duration() > 60)
-          did_state = queue.enqueue_one_P(PSTR("M31"));
-        break;
-
-      case 2:
-        did_state = queue.enqueue_one_P(PSTR("M77"));
-        break;
-
-      case 3:
-        #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-          ui.set_progress_done();
-        #endif
-        break;
-
-      case 4:                                   // Display "Click to Continue..."
-        #if HAS_LEDS_OFF_FLAG                   // 30 min timeout with LCD, 1 min without
-          did_state = queue.enqueue_one_P(
-            print_job_timer.duration() < 60 ? PSTR("M0Q1P1") : PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60"))
-          );
-        #endif
-        break;
-
-      case 5:
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          recovery.purge();
-        #endif
-
-        #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
-          planner.finish_and_disable();
-        #endif
-
-        #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
-          ui.reselect_last_file();
-        #endif
-
-        SERIAL_ECHOLNPGM(STR_FILE_PRINTED);
-
-      default:
-        did_state = false;
-        card.sdprinting_done_state = 0;
-    }
-    if (did_state) ++card.sdprinting_done_state;
+    if (queue.enqueue_one_P(PSTR("M1001")))
+      marlin_state = MF_RUNNING;
   }
 
 #endif // SDSUPPORT
@@ -1209,7 +1182,7 @@ void loop() {
     #if ENABLED(SDSUPPORT)
       card.checkautostart();
       if (card.flag.abort_sd_printing) abortSDPrinting();
-      if (card.sdprinting_done_state) finishSDPrinting();
+      if (marlin_state == MF_SD_COMPLETE) finishSDPrinting();
     #endif
 
     queue.advance();
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 3bce72ab80fc..e6678c5b1888 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -83,6 +83,7 @@ enum MarlinState : uint8_t {
   MF_PAUSED       = _BV(1),
   MF_WAITING      = _BV(2),
   MF_STOPPED      = _BV(3),
+  MF_SD_COMPLETE  = _BV(4),
   MF_KILLED       = _BV(7)
 };
 
@@ -98,6 +99,7 @@ extern bool wait_for_heatup;
 
 #if HAS_RESUME_CONTINUE
   extern bool wait_for_user;
+  void wait_for_user_response(millis_t ms=0, const bool no_sleep=false);
 #endif
 
 // Inactivity shutdown timer
diff --git a/Marlin/src/feature/mmu2/mmu2.cpp b/Marlin/src/feature/mmu2/mmu2.cpp
index 2df34176da89..4506883f464e 100644
--- a/Marlin/src/feature/mmu2/mmu2.cpp
+++ b/Marlin/src/feature/mmu2/mmu2.cpp
@@ -707,14 +707,13 @@ void MMU2::filament_runout() {
     if (recover)  {
       LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER);
       BUZZ(200, 404);
-      wait_for_user = true;
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR);
       #endif
       #if ENABLED(EXTENSIBLE_UI)
         ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover"));
       #endif
-      while (wait_for_user) idle();
+      wait_for_user_response();
       BUZZ(200, 404);
       BUZZ(200, 404);
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index fb69803ee72a..de73163cbdc5 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -184,7 +184,6 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
     #endif
 
     KEEPALIVE_STATE(PAUSED_FOR_USER);
-    wait_for_user = true;    // LCD click or M108 will clear this
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0'
         #if NUM_RUNOUT_SENSORS > 1
@@ -246,13 +245,13 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
       if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_PURGE);
     #endif
 
-    wait_for_user = true;
     #if ENABLED(HOST_PROMPT_SUPPORT)
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
       ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging..."));
     #endif
+    wait_for_user = true; // A click or M108 breaks the purge_length loop
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
       do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
     wait_for_user = false;
@@ -508,13 +507,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
   // Wait for filament insert by user and press button
   KEEPALIVE_STATE(PAUSED_FOR_USER);
-  wait_for_user = true;    // LCD click or M108 will clear this
   #if ENABLED(HOST_PROMPT_SUPPORT)
     host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), CONTINUE_STR);
   #endif
   #if ENABLED(EXTENSIBLE_UI)
     ExtUI::onUserConfirmRequired_P(PSTR("Nozzle Parked"));
   #endif
+  wait_for_user = true;    // LCD click or M108 will clear this
   while (wait_for_user) {
     #if HAS_BUZZER
       filament_change_beep(max_beep_count);
@@ -540,8 +539,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
         ExtUI::onUserConfirmRequired_P(PSTR("HeaterTimeout"));
       #endif
 
-      // Wait for LCD click or M108
-      while (wait_for_user) idle_no_sleep();
+      wait_for_user_response(0, true); // Wait for LCD click or M108
 
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_INFO, PSTR("Reheating"));
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 1ce1e3d5cb65..1f9d710bb4c7 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -857,7 +857,11 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
 
       #if ENABLED(POWER_LOSS_RECOVERY)
         case 413: M413(); break;                                  // M413: Enable/disable/query Power-Loss Recovery
-        case 1000: M1000(); break;                                // M1000: Resume from power-loss
+        case 1000: M1000(); break;                                // M1000: [INTERNAL] Resume from power-loss
+      #endif
+
+      #if ENABLED(SDSUPPORT)
+        case 1001: M1001(); break;                                // M1001: [INTERNAL] Handle SD completion
       #endif
 
       #if ENABLED(MAX7219_GCODE)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index c1024ac44090..8e5d054d9995 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -968,6 +968,10 @@ class GcodeSuite {
     static void M1000();
   #endif
 
+  #if ENABLED(SDSUPPORT)
+    static void M1001();
+  #endif
+
   #if ENABLED(MAX7219_GCODE)
     static void M7219();
   #endif
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 43b39226f71b..190023b0904f 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -24,23 +24,19 @@
 
 #if HAS_RESUME_CONTINUE
 
+#include "../../inc/MarlinConfig.h"
+
 #include "../gcode.h"
-#include "../../module/planner.h"
 
-#include "../../inc/MarlinConfig.h"
+#include "../../module/planner.h" // for synchronize()
+#include "../../MarlinCore.h"     // for wait_for_user_response()
 
 #if HAS_LCD_MENU
   #include "../../lcd/ultralcd.h"
-#endif
-
-#if ENABLED(EXTENSIBLE_UI)
+#elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #endif
 
-#if HAS_LEDS_OFF_FLAG
-  #include "../../feature/leds/printer_event_leds.h"
-#endif
-
 #if ENABLED(HOST_PROMPT_SUPPORT)
   #include "../../feature/host_actions.h"
 #endif
@@ -56,18 +52,11 @@ void GcodeSuite::M0_M1() {
 
   planner.synchronize();
 
-  #if HAS_LEDS_OFF_FLAG
-    const bool seenQ = parser.seen('Q');
-    if (seenQ) printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
-  #else
-    constexpr bool seenQ = false;
-  #endif
-
   #if HAS_LCD_MENU
 
     if (parser.string_arg)
       ui.set_status(parser.string_arg, true);
-    else if (!seenQ) {
+    else {
       LCD_MESSAGEPGM(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
         ui.reset_progress_bar_timeout();
@@ -75,12 +64,10 @@ void GcodeSuite::M0_M1() {
     }
 
   #elif ENABLED(EXTENSIBLE_UI)
-    if (!seenQ) {
-      if (parser.string_arg)
-        ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
-      else
-        ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
-    }
+    if (parser.string_arg)
+      ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
+    else
+      ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
   #else
 
     if (parser.string_arg) {
@@ -90,25 +77,15 @@ void GcodeSuite::M0_M1() {
 
   #endif
 
-  KEEPALIVE_STATE(PAUSED_FOR_USER);
-  wait_for_user = true;
-
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    if (!seenQ) host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
+    host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
   #endif
 
-  if (ms > 0) ms += millis();  // wait until this time for a click
-  while (wait_for_user && (ms == 0 || PENDING(millis(), ms))) idle();
-
-  #if HAS_LEDS_OFF_FLAG
-    printerEventLEDs.onResumeAfterWait();
-  #endif
+  wait_for_user_response(ms);
 
   #if HAS_LCD_MENU
-    if (!seenQ) ui.reset_status();
+    ui.reset_status();
   #endif
-
-  wait_for_user = false;
 }
 
 #endif // HAS_RESUME_CONTINUE
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
new file mode 100644
index 000000000000..4261b57f97b3
--- /dev/null
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -0,0 +1,109 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SDSUPPORT)
+
+#include "../gcode.h"
+#include "../../module/printcounter.h"
+
+#if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
+  #include "../../lcd/ultralcd.h"
+#endif
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../feature/powerloss.h"
+#endif
+
+#if HAS_LEDS_OFF_FLAG
+  #include "../../feature/leds/printer_event_leds.h"
+#endif
+
+#if ENABLED(EXTENSIBLE_UI)
+  #include "../../lcd/extui/ui_api.h"
+#endif
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #include "../../feature/host_actions.h"
+#endif
+
+#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+  #include "../../module/planner.h"
+#endif
+
+#ifndef PE_LEDS_COMPLETED_TIME
+  #define PE_LEDS_COMPLETED_TIME (30*60)
+#endif
+
+/**
+ * M1001: Execute actions for SD print completion
+ */
+void GcodeSuite::M1001() {
+
+  // Report total print time
+  const bool long_print = print_job_timer.duration() > 60;
+  if (long_print) gcode.process_subcommands_now_P(PSTR("M31"));
+
+  // Stop the print job timer
+  gcode.process_subcommands_now_P(PSTR("M77"));
+
+  // Set the progress bar "done" state
+  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+    ui.set_progress_done();
+  #endif
+
+  // Purge the recovery file
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    recovery.purge();
+  #endif
+
+  // Announce SD file completion
+  SERIAL_ECHOLNPGM(STR_FILE_PRINTED);
+
+  // Update the status LED color
+  #if HAS_LEDS_OFF_FLAG
+    if (long_print) {
+      printerEventLEDs.onPrintCompleted();
+      #if ENABLED(EXTENSIBLE_UI)
+        ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE));
+      #endif
+      #if ENABLED(HOST_PROMPT_SUPPORT)
+        host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR);
+      #endif
+      wait_for_user_response(1000UL * TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30));
+      printerEventLEDs.onResumeAfterWait();
+    }
+  #endif
+
+  // Wait for the queue to empty (and "clean"), inject SD_FINISHED_RELEASECOMMAND
+  #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+    planner.finish_and_disable();
+  #endif
+
+  // Re-select the last printed file in the UI
+  #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
+    ui.reselect_last_file();
+  #endif
+}
+
+#endif // SDSUPPORT
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 75c13de9c71b..8fa22e2c713e 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -352,6 +352,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Print Paused");
   PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Printing...");
   PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Print Aborted");
+  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Print Done");
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("No Move.");
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("KILLED. ");
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("STOPPED. ");
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index a27e2c97261b..ac80870ac8b6 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -61,16 +61,14 @@ void _man_probe_pt(const xy_pos_t &xy) {
 
   float lcd_probe_pt(const xy_pos_t &xy) {
     _man_probe_pt(xy);
-    KEEPALIVE_STATE(PAUSED_FOR_USER);
     ui.defer_status_screen();
-    wait_for_user = true;
     #if ENABLED(HOST_PROMPT_SUPPORT)
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
       ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress"));
     #endif
-    while (wait_for_user) idle();
+    wait_for_user_response();
     ui.goto_previous_screen_no_defer();
     return current_position.z;
   }
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 7ff14405598c..bbcb678dd84a 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -776,6 +776,13 @@ void MarlinUI::update() {
     // If the action button is pressed...
     static bool wait_for_unclick; // = false
 
+    auto do_click = [&]{
+      wait_for_unclick = true;                        //  - Set debounce flag to ignore continous clicks
+      lcd_clicked = !wait_for_user && !no_reentry;    //  - Keep the click if not waiting for a user-click
+      wait_for_user = false;                          //  - Any click clears wait for user
+      quick_feedback();                               //  - Always make a click sound
+    };
+
     #if ENABLED(TOUCH_BUTTONS)
       if (touch_buttons) {
         RESET_STATUS_TIMEOUT();
@@ -796,12 +803,8 @@ void MarlinUI::update() {
             }
           }
         }
-        else if (!wait_for_unclick && (buttons & EN_C)) { // OK button, if not waiting for a debounce release:
-          wait_for_unclick = true;                        //  - Set debounce flag to ignore continous clicks
-          lcd_clicked = !wait_for_user && !no_reentry;    //  - Keep the click if not waiting for a user-click
-          wait_for_user = false;                          //  - Any click clears wait for user
-          quick_feedback();                               //  - Always make a click sound
-        }
+        else if (!wait_for_unclick && (buttons & EN_C))   // OK button, if not waiting for a debounce release:
+          do_click();
       }
       else // keep wait_for_unclick value
 
@@ -810,12 +813,7 @@ void MarlinUI::update() {
       {
         // Integrated LCD click handling via button_pressed
         if (!external_control && button_pressed()) {
-          if (!wait_for_unclick) {                        // If not waiting for a debounce release:
-            wait_for_unclick = true;                      //  - Set debounce flag to ignore continous clicks
-            lcd_clicked = !wait_for_user && !no_reentry;  //  - Keep the click if not waiting for a user-click
-            wait_for_user = false;                        //  - Any click clears wait for user
-            quick_feedback();                             //  - Always make a click sound
-          }
+          if (!wait_for_unclick) do_click();              // Handle the click
         }
         else
           wait_for_unclick = false;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 962c2307757d..6e3f2baa6692 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -134,12 +134,10 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
       LCD_MESSAGEPGM(MSG_MANUAL_DEPLOY_TOUCHMI);
       ui.return_to_status();
 
-      KEEPALIVE_STATE(PAUSED_FOR_USER);
-      wait_for_user = true; // LCD click or M108 will clear this
       #if ENABLED(HOST_PROMPT_SUPPORT)
-        host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI probe."), CONTINUE_STR);
+        host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR);
       #endif
-      while (wait_for_user) idle();
+      wait_for_user_response();
       ui.reset_status();
       ui.goto_screen(prev_screen);
 
@@ -297,15 +295,13 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       serialprintPGM(ds_str);
       SERIAL_EOL();
 
-      KEEPALIVE_STATE(PAUSED_FOR_USER);
-      wait_for_user = true;
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR);
       #endif
       #if ENABLED(EXTENSIBLE_UI)
         ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe"));
       #endif
-      while (wait_for_user) idle();
+      wait_for_user_response();
       ui.reset_status();
 
     } while(
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index aadd355afded..80e94b88b580 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -49,7 +49,6 @@
 // public:
 
 card_flags_t CardReader::flag;
-uint8_t CardReader::sdprinting_done_state;
 char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENAME_LENGTH];
 int8_t CardReader::autostart_index;
 
@@ -1089,7 +1088,7 @@ void CardReader::fileHasFinished() {
       presort();
     #endif
 
-    sdprinting_done_state = 1;
+    marlin_state = MF_SD_COMPLETE;
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 749ece01d30a..955a8b69b39e 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -49,7 +49,6 @@ typedef struct {
 
 class CardReader {
 public:
-  static uint8_t sdprinting_done_state;
   static card_flags_t flag;                         // Flags (above)
   static char filename[FILENAME_LENGTH],            // DOS 8.3 filename of the selected item
               longFilename[LONG_FILENAME_LENGTH];   // Long name of the selected item

From b02d662addc15076cf68ab8489d0511f0542892a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Sat, 28 Mar 2020 18:41:17 +0500
Subject: [PATCH 517/565] fix #42

---
 Marlin/Configuration.h                   | 14 +++++++++-----
 Marlin/src/lcd/menu/menu_bed_corners.cpp |  8 ++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 0cdb9b4fb46c..6c04e586fd90 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1396,12 +1396,16 @@
 
 // Add a menu item to move between bed corners for manual bed adjustment
 #define LEVEL_BED_CORNERS
-
 #if ENABLED(LEVEL_BED_CORNERS)
-  #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
-  #define LEVEL_CORNERS_HEIGHT 0.0  // (mm) Z height of nozzle at leveling points
-  #define LEVEL_CORNERS_Z_HOP       4.0   // (mm) Z height of nozzle between leveling points
-  #define LEVEL_CENTER_TOO              // Move to the center after the last corner
+  #define LEVEL_CORNERS_INSET_LFRB { 5, 5, 5, 5 } // (mm) Left, Front, Right, Back insets
+#if (GITHUB_USER==URSOFT) //не тыкаем в ковер, у меня щуп есть
+  #define LEVEL_CORNERS_HEIGHT     0.5            // (mm) Z height of nozzle at leveling points
+#else
+  #define LEVEL_CORNERS_HEIGHT     0.0            // (mm) Z height of nozzle at leveling points
+#endif
+  #define LEVEL_CORNERS_Z_HOP      4.0            // (mm) Z height of nozzle between leveling points
+  #define LEVEL_CORNERS_3POINT                    // LEVEL_CENTER_TOO ignored https://github.com/ursoft/Marlin/issues/42
+  #define LEVEL_CENTER_TOO                        // Move to the center after the last corner
 #endif
 
 /**
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 3d0a5bf2aa33..fafa96ff4254 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -62,18 +62,26 @@ static inline void _lcd_goto_next_corner() {
   switch (bed_corner) {
     case 0: current_position   = lf;   break; // copy xy
     case 1: current_position.x = rb.x; break;
+#if ENABLED (LEVEL_CORNERS_3POINT)
+    case 2: current_position.set(X_CENTER, rb.y); break;
+#else
     case 2: current_position.y = rb.y; break;
     case 3: current_position.x = lf.x; break;
     #if ENABLED(LEVEL_CENTER_TOO)
       case 4: current_position.set(X_CENTER, Y_CENTER); break;
     #endif
+#endif
   }
   line_to_current_position(manual_feedrate_mm_s.x);
   line_to_z(LEVEL_CORNERS_HEIGHT);
   if (++bed_corner > (3
+#if ENABLED (LEVEL_CORNERS_3POINT)
+      - 1
+#else      
     #if ENABLED(LEVEL_CENTER_TOO)
       + 1
     #endif
+#endif
   )) bed_corner = 0;
 }
 

From 2f7e5cf7ddd04ae0474f104dd1b712b480fe692c Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Sat, 28 Mar 2020 09:53:04 -0500
Subject: [PATCH 518/565] Fix typo...

---
 Marlin/src/libs/numtostr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index ac82bf16f12f..1ed315ae07d7 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -312,7 +312,7 @@ const char* ftostr52sign(const float &f) {
 
 // Convert signed float to string with +12.345 format
 const char* ftostr53sign(const float &f) {
-  long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
+  long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
   conv[0] = MINUSOR(i, '+');
   conv[1] = DIGIMOD(i, 10000);
   conv[2] = DIGIMOD(i, 1000);

From fc74c6a7b6646cf608f96bdf362a136eb306415e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Mar 2020 00:03:23 +0000
Subject: [PATCH 519/565] [cron] Bump distribution date (2020-03-29)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9978e3e6d3f3..0a2599294a90 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-28"
+  #define STRING_DISTRIBUTION_DATE "2020-03-29"
 #endif
 
 /**

From b35dc5f0b41dc592dbce29682cf617afc652f11f Mon Sep 17 00:00:00 2001
From: oscarsan1 <oscarsan1@users.noreply.github.com>
Date: Sun, 29 Mar 2020 19:37:12 +0200
Subject: [PATCH 520/565] Fix Trigorilla 1.4 missing spaces

---
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index dcf5ff5a0a76..9016028055ca 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -66,13 +66,13 @@
     #define RAMPS_D8_PIN     TRIGORILLA_FAN0_PIN
   #else
     // EEB
-    #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
+    #define RAMPS_D8_PIN     TRIGORILLA_HEATER_BED_PIN
     #define FAN_PIN          TRIGORILLA_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
   #endif
 #elif TEMP_SENSOR_BED
   // EFB (Anycubic Kossel default)
   #define RAMPS_D9_PIN       TRIGORILLA_FAN0_PIN
-  #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
+  #define RAMPS_D8_PIN       TRIGORILLA_HEATER_BED_PIN
 #else
   // EFF
   #define RAMPS_D9_PIN       TRIGORILLA_FAN1_PIN
@@ -83,7 +83,7 @@
   #define FAN1_PIN           TRIGORILLA_FAN1_PIN
 #endif
 #define FAN2_PIN             TRIGORILLA_FAN2_PIN
-#define ORIG_E0_AUTO_FAN_PINTRIGORILLA_FAN2_PIN   // Used in Anycubic Kossel example config
+#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN   // Used in Anycubic Kossel example config
 
 #include "pins_RAMPS.h"
 

From add34aa286bbcbd081aff4a25055505759f3e9f1 Mon Sep 17 00:00:00 2001
From: thisiskeithb <thisiskeithb@outlook.com>
Date: Sat, 28 Mar 2020 06:49:59 -0700
Subject: [PATCH 521/565] Fix STM32F1 USB Composite Dependency

Co-authored-by: Lord-Quake <Lord-Quake@users.noreply.github.com>
---
 platformio.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 13808d299a3d..4e801713a029 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -301,7 +301,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-  USBComposite_stm32f1@==0.91
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -316,7 +316,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-  USBComposite_stm32f1@==0.91
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -332,7 +332,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-  USBComposite_stm32f1@==0.91
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -348,7 +348,7 @@ extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-  USBComposite_stm32f1@==0.91
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 

From fc11e7217460056473f91dfb7dd574884319f567 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 29 Mar 2020 16:10:55 -0500
Subject: [PATCH 522/565] Fix extra unskew call

Fixes #17264
---
 Marlin/src/module/planner.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index c71a0f61ccd1..e1a050a45924 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1519,10 +1519,6 @@ void Planner::check_axes_activity() {
 
       #endif
     }
-
-    #if ENABLED(SKEW_CORRECTION)
-      unskew(raw);
-    #endif
   }
 
 #endif // HAS_LEVELING

From 765a9f3471b8a6b67c23f79cc6965e2f795f284a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 29 Mar 2020 16:26:55 -0500
Subject: [PATCH 523/565] do_pause_e_move => unscaled_e_move

---
 Marlin/src/feature/pause.cpp             | 31 +++++++++---------------
 Marlin/src/feature/pause.h               |  2 --
 Marlin/src/gcode/feature/camera/M240.cpp | 10 ++------
 Marlin/src/lcd/language/language_fr.h    |  4 +--
 Marlin/src/module/motion.cpp             | 13 ++++++++++
 Marlin/src/module/motion.h               |  2 ++
 Marlin/src/module/tool_change.cpp        |  6 ++---
 7 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index de73163cbdc5..9c615b6ff82f 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -134,15 +134,6 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
   return thermalManager.wait_for_hotend(active_extruder);
 }
 
-void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s) {
-  #if HAS_FILAMENT_SENSOR
-    runout.reset();
-  #endif
-  current_position.e += length / planner.e_factor[active_extruder];
-  line_to_current_position(fr_mm_s);
-  planner.synchronize();
-}
-
 /**
  * Load filament into the hotend
  *
@@ -217,7 +208,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
   #endif
 
   // Slow Load filament
-  if (slow_load_length) do_pause_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
+  if (slow_load_length) unscaled_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
 
   // Fast Load Filament
   if (fast_load_length) {
@@ -226,7 +217,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
       planner.settings.retract_acceleration = FILAMENT_CHANGE_FAST_LOAD_ACCEL;
     #endif
 
-    do_pause_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE);
+    unscaled_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE);
 
     #if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0
       planner.settings.retract_acceleration = saved_acceleration;
@@ -253,7 +244,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
     #endif
     wait_for_user = true; // A click or M108 breaks the purge_length loop
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
-      do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
+      unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
     wait_for_user = false;
 
   #else
@@ -266,7 +257,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
         #endif
 
         // Extrude filament to get into hotend
-        do_pause_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
+        unscaled_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
       }
 
       #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -331,13 +322,13 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
   #endif
 
   // Retract filament
-  do_pause_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier);
+  unscaled_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier);
 
   // Wait for filament to cool
   safe_delay(FILAMENT_UNLOAD_PURGE_DELAY);
 
   // Quickly purge
-  do_pause_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier,
+  unscaled_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier,
                   (FILAMENT_UNLOAD_PURGE_FEEDRATE) * mix_multiplier);
 
   // Unload filament
@@ -346,7 +337,7 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
     planner.settings.retract_acceleration = FILAMENT_CHANGE_UNLOAD_ACCEL;
   #endif
 
-  do_pause_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier);
+  unscaled_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier);
 
   #if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0
     planner.settings.retract_acceleration = saved_acceleration;
@@ -436,7 +427,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
 
   // Initial retract before move to filament change position
   if (retract && thermalManager.hotEnoughToExtrude(active_extruder))
-    do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
+    unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
 
   // Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
   if (!axes_need_homing())
@@ -631,11 +622,11 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
   #if ENABLED(FWRETRACT)
     // If retracted before goto pause
     if (fwretract.retracted[active_extruder])
-      do_pause_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
+      unscaled_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
   #endif
 
   // If resume_position is negative
-  if (resume_position.e < 0) do_pause_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
+  if (resume_position.e < 0) unscaled_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
 
   // Move XY to starting position, then Z
   do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
@@ -644,7 +635,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
   do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
 
   #if ADVANCED_PAUSE_RESUME_PRIME != 0
-    do_pause_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
+    unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
   #endif
 
   // Now all extrusion positions are resumed and ready to be confirmed
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index 5ac67a565c36..f1c8eed4d367 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -83,8 +83,6 @@ extern uint8_t did_pause_print;
   #define DXC_PASS
 #endif
 
-void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s);
-
 bool pause_print(const float &retract, const xyz_pos_t &park_point, const float &unload_length=0, const bool show_lcd=false DXC_PARAMS);
 
 void wait_for_confirmation(const bool is_reload=false, const int8_t max_beep_count=0 DXC_PARAMS);
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index 3c045a7e687f..33ef9bf1a186 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -48,14 +48,8 @@
 
   #ifdef PHOTO_RETRACT_MM
     inline void e_move_m240(const float length, const feedRate_t &fr_mm_s) {
-      if (length && thermalManager.hotEnoughToExtrude(active_extruder)) {
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          do_pause_e_move(length, fr_mm_s);
-        #else
-          current_position.e += length / planner.e_factor[active_extruder];
-          line_to_current_position(fr_mm_s);
-        #endif
-      }
+      if (length && thermalManager.hotEnoughToExtrude(active_extruder))
+        unscaled_e_move(length, fr_mm_s);
     }
   #endif
 
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ffa12f39fe6d..e691d26ab4c1 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -93,7 +93,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Allumer alim.");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Eteindre alim.");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrusion");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Rétraction");
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Rétractation");
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Déplacer un axe");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Régler Niv. lit");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveau du lit");
@@ -317,7 +317,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Moteurs bloqués");
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("KILLED");
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("STOPPÉ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Rétraction mm");
+  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Rétractation mm");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Ech. rétr. mm");
   PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Vit. rétract°");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Saut Z mm");
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index e47727b3ec52..834da3ad3518 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -55,6 +55,10 @@
   #include "../lcd/ultralcd.h"
 #endif
 
+#if HAS_FILAMENT_SENSOR
+  #include "../feature/runout.h"
+#endif
+
 #if ENABLED(SENSORLESS_HOMING)
   #include "../feature/tmc_util.h"
 #endif
@@ -332,6 +336,15 @@ void line_to_current_position(const feedRate_t &fr_mm_s/*=feedrate_mm_s*/) {
   planner.buffer_line(current_position, fr_mm_s, active_extruder);
 }
 
+void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s) {
+  #if HAS_FILAMENT_SENSOR
+    runout.reset();
+  #endif
+  current_position.e += length / planner.e_factor[active_extruder];
+  line_to_current_position(fr_mm_s);
+  planner.synchronize();
+}
+
 #if IS_KINEMATIC
 
   /**
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index f6a75a91a72a..4d1ab3bab80b 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -184,6 +184,8 @@ void sync_plan_position_e();
  */
 void line_to_current_position(const feedRate_t &fr_mm_s=feedrate_mm_s);
 
+void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s);
+
 void prepare_line_to_destination();
 
 void _internal_move_to_destination(const feedRate_t &fr_mm_s=0.0f
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 0d91669973ba..2471581c8c68 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -856,7 +856,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         }
         else {
           #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            do_pause_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
+            unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
           #else
             current_position.e -= toolchange_settings.swap_length / planner.e_factor[old_tool];
             planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.retract_speed), old_tool);
@@ -991,8 +991,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
           if (should_swap && !too_cold) {
             #if ENABLED(ADVANCED_PAUSE_FEATURE)
-              do_pause_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed));
-              do_pause_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE);
+              unscaled_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed));
+              unscaled_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE);
             #else
               current_position.e += toolchange_settings.swap_length / planner.e_factor[new_tool];
               planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.prime_speed), new_tool);

From d029a098107334aec718c62adf82817b34950f3f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 29 Mar 2020 17:14:06 -0500
Subject: [PATCH 524/565] Minor HAL cleanup

---
 Marlin/src/HAL/LPC1768/main.cpp       | 2 +-
 Marlin/src/HAL/STM32/SoftwareSerial.h | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
index fb7394344ea4..d7b05dce9d75 100644
--- a/Marlin/src/HAL/LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -90,7 +90,7 @@ void HAL_init() {
 
   //debug_frmwrk_init();
   //_DBG("\n\nDebug running\n");
-  // Initialise the SD card chip select pins as soon as possible
+  // Initialize the SD card chip select pins as soon as possible
   #if PIN_EXISTS(SS)
     OUT_WRITE(SS_PIN, HIGH);
   #endif
diff --git a/Marlin/src/HAL/STM32/SoftwareSerial.h b/Marlin/src/HAL/STM32/SoftwareSerial.h
index 3799701cfe5b..504bd6979b2c 100644
--- a/Marlin/src/HAL/STM32/SoftwareSerial.h
+++ b/Marlin/src/HAL/STM32/SoftwareSerial.h
@@ -29,9 +29,7 @@
  * The latest version of this library can always be found at
  * http://arduiniana.org.
  */
-
-#ifndef SOFTWARESERIAL_H
-#define SOFTWARESERIAL_H
+#pragma once
 
 #include <Arduino.h>
 
@@ -64,7 +62,6 @@ class SoftwareSerial : public Stream {
     uint32_t delta_start = 0;
 
     // static data
-    static bool initialised;
     static HardwareTimer timer;
     static const IRQn_Type timer_interrupt_number;
     static uint32_t timer_interrupt_priority;
@@ -91,7 +88,7 @@ class SoftwareSerial : public Stream {
   public:
     // public methods
 
-    SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic = false);
+    SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic=false);
     virtual ~SoftwareSerial();
     void begin(long speed);
     bool listen();
@@ -115,5 +112,3 @@ class SoftwareSerial : public Stream {
 
     using Print::write;
 };
-
-#endif // SOFTWARESERIAL_H

From 223aa5cc4efdab1ad987e490abe2e3020a7b211e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 29 Mar 2020 17:20:01 -0500
Subject: [PATCH 525/565] No unscaled_e_move for CNC

---
 Marlin/src/module/motion.cpp | 18 ++++++++++--------
 Marlin/src/module/motion.h   |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 834da3ad3518..1cc0a04712ad 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -336,14 +336,16 @@ void line_to_current_position(const feedRate_t &fr_mm_s/*=feedrate_mm_s*/) {
   planner.buffer_line(current_position, fr_mm_s, active_extruder);
 }
 
-void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s) {
-  #if HAS_FILAMENT_SENSOR
-    runout.reset();
-  #endif
-  current_position.e += length / planner.e_factor[active_extruder];
-  line_to_current_position(fr_mm_s);
-  planner.synchronize();
-}
+#if EXTRUDERS
+  void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s) {
+    #if HAS_FILAMENT_SENSOR
+      runout.reset();
+    #endif
+    current_position.e += length / planner.e_factor[active_extruder];
+    line_to_current_position(fr_mm_s);
+    planner.synchronize();
+  }
+#endif
 
 #if IS_KINEMATIC
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 4d1ab3bab80b..e504f187f9e1 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -184,7 +184,9 @@ void sync_plan_position_e();
  */
 void line_to_current_position(const feedRate_t &fr_mm_s=feedrate_mm_s);
 
-void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s);
+#if EXTRUDERS
+  void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s);
+#endif
 
 void prepare_line_to_destination();
 

From 9b886c2ad460d93324f9e1a016fefdbbb2e35445 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 29 Mar 2020 18:12:06 -0500
Subject: [PATCH 526/565] Load balance some tests

---
 Marlin/src/pins/rambo/pins_RAMBO.h   | 11 +++++++++
 Marlin/src/pins/ramps/pins_RAMPS.h   |  8 +++---
 buildroot/share/tests/mega2560-tests | 37 ----------------------------
 buildroot/share/tests/rambo-tests    | 35 ++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 0a443cc19ac8..dec72b8ea751 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -72,6 +72,10 @@
   #define Z_MIN_PROBE_PIN                     30
 #endif
 
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                       5
+#endif
+
 //
 // Steppers
 //
@@ -153,6 +157,13 @@
 #define SPINDLE_LASER_ENA_PIN                 31  // Pullup!
 #define SPINDLE_DIR_PIN                       32
 
+//
+// SPI for Max6675 or Max31855 Thermocouple
+//
+#ifndef MAX6675_SS_PIN
+  #define MAX6675_SS_PIN                      32  // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN
+#endif
+
 //
 // M7/M8/M9 - Coolant Control
 //
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 050932773ea3..ffe7f7bb1ec8 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -169,11 +169,11 @@
   #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
+//
 // SPI for Max6675 or Max31855 Thermocouple
-#if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
-#else
-  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
+//
+#ifndef MAX6675_SS_PIN
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/buildroot/share/tests/mega2560-tests b/buildroot/share/tests/mega2560-tests
index 0bedfd5a73d2..884ea8be4ab2 100755
--- a/buildroot/share/tests/mega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -12,43 +12,6 @@ set -e
 #restore_configs
 #exec_test $1 $2 "Default Configuration"
 
-#
-# Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
-# Test a "Fix Mounted" Probe with Safe Homing, some arc options,
-# linear bed leveling, M48, leveling debug, and firmware retraction.
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_0 -2
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_BED 2
-opt_set TEMP_SENSOR_PROBE 1
-opt_add TEMP_PROBE_PIN 12
-opt_set TEMP_SENSOR_CHAMBER 3
-opt_add HEATER_CHAMBER_PIN 45
-opt_set GRID_MAX_POINTS_X 16
-opt_set FANMUX0_PIN 53
-opt_disable USE_WATCHDOG
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
-           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
-           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
-           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
-           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
-           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
-           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
-           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \
-           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
-           ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
-           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
-           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
-           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
-           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
-           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
-           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
-           HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
-exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
-
 #
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #
diff --git a/buildroot/share/tests/rambo-tests b/buildroot/share/tests/rambo-tests
index 3f741fcba6b3..8092059627ea 100644
--- a/buildroot/share/tests/rambo-tests
+++ b/buildroot/share/tests/rambo-tests
@@ -33,5 +33,40 @@ opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
 exec_test $1 $2 "Rambo CNC Configuration"
 
+#
+# Lots of options - Formerly the first Mega2560 test
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_RAMBO
+opt_set EXTRUDERS 2
+opt_set TEMP_SENSOR_0 -2
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_BED 2
+opt_set TEMP_SENSOR_PROBE 1
+opt_add TEMP_PROBE_PIN 12
+opt_set TEMP_SENSOR_CHAMBER 3
+opt_add HEATER_CHAMBER_PIN 45
+opt_set GRID_MAX_POINTS_X 16
+opt_set FANMUX0_PIN 53
+opt_disable USE_WATCHDOG
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
+           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
+           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
+           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
+           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
+           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
+           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \
+           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
+           ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
+           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
+           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
+           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
+           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
+           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
+exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
+
 # clean up
 restore_configs

From 747a4bb62360cd6bd44557f117e83140c7cb940c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 30 Mar 2020 00:03:19 +0000
Subject: [PATCH 527/565] [cron] Bump distribution date (2020-03-30)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0a2599294a90..7f5c59aeef8e 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-29"
+  #define STRING_DISTRIBUTION_DATE "2020-03-30"
 #endif
 
 /**

From 0ea26d538bfb883bed57c005a6c0c3a365c31acc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 31 Mar 2020 00:03:22 +0000
Subject: [PATCH 528/565] [cron] Bump distribution date (2020-03-31)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7f5c59aeef8e..33b9bbfbea6d 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-30"
+  #define STRING_DISTRIBUTION_DATE "2020-03-31"
 #endif
 
 /**

From 96ab16a9dd7167840d9c9a871c43c60bdc7c6b15 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 31 Mar 2020 12:36:59 -0500
Subject: [PATCH 529/565] Pulldown for all FastIO headers

Co-Authored-By: borsegbr <borsegbr@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/fastio.h                   |  4 ++--
 Marlin/src/HAL/DUE/fastio.h                   |  2 +-
 Marlin/src/HAL/ESP32/fastio.h                 |  2 +-
 Marlin/src/HAL/LPC1768/fastio.h               |  2 +-
 Marlin/src/HAL/SAMD51/fastio.h                |  4 ++--
 Marlin/src/HAL/TEENSY31_32/fastio.h           |  3 ++-
 Marlin/src/HAL/TEENSY35_36/fastio.h           |  3 ++-
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   | 21 ++++++++++---------
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
index 2246a0f9d09f..a45e0f2bebb7 100644
--- a/Marlin/src/HAL/AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -98,9 +98,9 @@
 
 #define SET_INPUT(IO)         _SET_INPUT(IO)
 #define SET_INPUT_PULLUP(IO)  do{ _SET_INPUT(IO); _WRITE(IO, HIGH); }while(0)
+#define SET_INPUT_PULLDOWN    SET_INPUT
 #define SET_OUTPUT(IO)        _SET_OUTPUT(IO)
-
-#define SET_PWM(IO)           SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 #define IS_INPUT(IO)          _IS_INPUT(IO)
 #define IS_OUTPUT(IO)         _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/DUE/fastio.h b/Marlin/src/HAL/DUE/fastio.h
index 6f1f8d8bf2a8..01abd8204946 100644
--- a/Marlin/src/HAL/DUE/fastio.h
+++ b/Marlin/src/HAL/DUE/fastio.h
@@ -166,7 +166,7 @@
 // Set pin as output (wrapper) -  reads the pin and sets the output to that value
 #define SET_OUTPUT(IO)       _SET_OUTPUT(IO)
 // Set pin as PWM
-#define SET_PWM(IO)           SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 // Check if pin is an input
 #define IS_INPUT(IO)         ((digitalPinToPort(IO)->PIO_OSR & digitalPinToBitMask(IO)) == 0)
diff --git a/Marlin/src/HAL/ESP32/fastio.h b/Marlin/src/HAL/ESP32/fastio.h
index 9c4efaee9de3..09930194d616 100644
--- a/Marlin/src/HAL/ESP32/fastio.h
+++ b/Marlin/src/HAL/ESP32/fastio.h
@@ -56,7 +56,7 @@
 #define SET_OUTPUT(IO)          do{ _SET_OUTPUT(IO); }while(0)
 
 // Set pin as PWM
-#define SET_PWM(IO)             SET_OUTPUT(IO)
+#define SET_PWM                 SET_OUTPUT
 
 // Set pin as output and init
 #define OUT_WRITE(IO,V)         do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0)
diff --git a/Marlin/src/HAL/LPC1768/fastio.h b/Marlin/src/HAL/LPC1768/fastio.h
index 48de5b8fa079..8e8e66db7225 100644
--- a/Marlin/src/HAL/LPC1768/fastio.h
+++ b/Marlin/src/HAL/LPC1768/fastio.h
@@ -104,7 +104,7 @@
 /// set pin as output wrapper  -  reads the pin and sets the output to that value
 #define SET_OUTPUT(IO)        do{ _WRITE(IO, _READ(IO)); _SET_OUTPUT(IO); }while(0)
 // set pin as PWM
-#define SET_PWM(IO)           SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 /// check if pin is an input wrapper
 #define IS_INPUT(IO)          _IS_INPUT(IO)
diff --git a/Marlin/src/HAL/SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
index f6a2675de055..d3b3dc1f63c5 100644
--- a/Marlin/src/HAL/SAMD51/fastio.h
+++ b/Marlin/src/HAL/SAMD51/fastio.h
@@ -100,9 +100,9 @@
                                   PORT->Group[port].DIRCLR.reg = MASK(pin);                           \
                                 }while(0)
 // Set pin as PWM (push pull)
-#define SET_PWM(IO)             SET_OUTPUT(IO)
+#define SET_PWM                 SET_OUTPUT
 // Set pin as PWM (open drain)
-#define SET_PWM_OD(IO)          SET_OUTPUT_OD(IO)
+#define SET_PWM_OD              SET_OUTPUT_OD
 
 // check if pin is an output
 #define IS_OUTPUT(IO)            ((PORT->Group[(EPortType)GET_SAMD_PORT(IO)].DIR.reg & MASK(GET_SAMD_PIN(IO))) \
diff --git a/Marlin/src/HAL/TEENSY31_32/fastio.h b/Marlin/src/HAL/TEENSY31_32/fastio.h
index 8547fe2b7a81..e74920d49334 100644
--- a/Marlin/src/HAL/TEENSY31_32/fastio.h
+++ b/Marlin/src/HAL/TEENSY31_32/fastio.h
@@ -76,8 +76,9 @@
 
 #define SET_INPUT(IO)         _SET_INPUT(IO)
 #define SET_INPUT_PULLUP(IO)  _SET_INPUT_PULLUP(IO)
+#define SET_INPUT_PULLDOWN    SET_INPUT
 #define SET_OUTPUT(IO)        _SET_OUTPUT(IO)
-#define SET_PWM(IO)            SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 #define IS_INPUT(IO)          _IS_INPUT(IO)
 #define IS_OUTPUT(IO)         _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/TEENSY35_36/fastio.h b/Marlin/src/HAL/TEENSY35_36/fastio.h
index 8547fe2b7a81..e74920d49334 100644
--- a/Marlin/src/HAL/TEENSY35_36/fastio.h
+++ b/Marlin/src/HAL/TEENSY35_36/fastio.h
@@ -76,8 +76,9 @@
 
 #define SET_INPUT(IO)         _SET_INPUT(IO)
 #define SET_INPUT_PULLUP(IO)  _SET_INPUT_PULLUP(IO)
+#define SET_INPUT_PULLDOWN    SET_INPUT
 #define SET_OUTPUT(IO)        _SET_OUTPUT(IO)
-#define SET_PWM(IO)            SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 #define IS_INPUT(IO)          _IS_INPUT(IO)
 #define IS_OUTPUT(IO)         _IS_OUTPUT(IO)
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index ef2b23a3a2b0..3023a1c6bc9a 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -176,11 +176,12 @@
     #undef MAKE_ARDUINO_PINS
   } // namespace fast_io
 
-  #define SET_INPUT(pin)               fast_io::pin::set_input()
-  #define SET_INPUT_PULLUP(pin)        fast_io::pin::set_input(); fast_io::pin::set_high()
-  #define SET_OUTPUT(pin)              fast_io::pin::set_output()
-  #define READ(pin)                    fast_io::pin::read()
-  #define WRITE(pin, value)            fast_io::pin::write(value)
+  #define SET_INPUT(pin)              fast_io::pin::set_input()
+  #define SET_INPUT_PULLUP(pin)       do{ fast_io::pin::set_input(); fast_io::pin::set_high(); }while(0)
+  #define SET_INPUT_PULLDOWN          SET_INPUT
+  #define SET_OUTPUT(pin)             fast_io::pin::set_output()
+  #define READ(pin)                   fast_io::pin::read()
+  #define WRITE(pin, value)           fast_io::pin::write(value)
 
   #ifndef pgm_read_word_far
   #define pgm_read_word_far pgm_read_word
@@ -195,11 +196,11 @@
   #endif
 
   #define SERIAL_ECHO_START()
-  #define SERIAL_ECHOLNPGM(str)        Serial.println(F(str))
-  #define SERIAL_ECHOPGM(str)          Serial.print(F(str))
-  #define SERIAL_ECHO_MSG(str)         Serial.println(str)
-  #define SERIAL_ECHOLNPAIR(str, val) {Serial.print(F(str)); Serial.println(val);}
-  #define SERIAL_ECHOPAIR(str, val)   {Serial.print(F(str)); Serial.print(val);}
+  #define SERIAL_ECHOLNPGM(str)       Serial.println(F(str))
+  #define SERIAL_ECHOPGM(str)         Serial.print(F(str))
+  #define SERIAL_ECHO_MSG(str)        Serial.println(str)
+  #define SERIAL_ECHOLNPAIR(str, val) do{ Serial.print(F(str)); Serial.println(val); }while(0)
+  #define SERIAL_ECHOPAIR(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
 
   #define safe_delay delay
 

From 528907cb1604ae2f5c8807e7512e2ea1a98289bf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 31 Mar 2020 12:50:30 -0500
Subject: [PATCH 530/565] Additional TERN macros

---
 Marlin/src/core/macros.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index bcee642368dc..899baf73592e 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -194,6 +194,9 @@
 #define DISABLED(V...)      DO(DIS,&&,V)
 
 #define TERN(O,A,B)         _TERN(_ENA_1(O),B,A)    // OPTION converted to '0' or '1'
+#define TERN0(O,A)          _TERN(_ENA_1(O),0,A)    // OPTION converted to A or '0'
+#define TERN1(O,A)          _TERN(_ENA_1(O),1,A)    // OPTION converted to A or '1'
+#define TERN_(O,A)          _TERN(_ENA_1(O),,A)     // OPTION converted to A or '<nul>'
 #define _TERN(E,V...)       __TERN(_CAT(T_,E),V)    // Prepend 'T_' to get 'T_0' or 'T_1'
 #define __TERN(T,V...)      ___TERN(_CAT(_NO,T),V)  // Prepend '_NO' to get '_NOT_0' or '_NOT_1'
 #define ___TERN(P,V...)     THIRD(P,V)              // If first argument has a comma, A. Else B.

From e0e87ca19a57dc42e9eb5e22d044b8f3c1116544 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 31 Mar 2020 12:49:36 -0500
Subject: [PATCH 531/565] Fix last arc segment

Co-Authored-By: ellensp <ellensp@hotmail.com>
---
 Marlin/src/gcode/motion/G2_G3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index b11b1136b6e1..b0fb299ab26c 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -236,7 +236,7 @@ void plan_arc(
     planner.apply_leveling(raw);
   #endif
 
-  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, seg_length
+  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
     #if ENABLED(SCARA_FEEDRATE_SCALING)
       , inv_duration
     #endif

From ac0a7f2281a5c0df22a3df3fe83d4f112739bbe0 Mon Sep 17 00:00:00 2001
From: Eric Ptak <trouch@trouch.com>
Date: Tue, 31 Mar 2020 20:59:08 +0200
Subject: [PATCH 532/565] Fix Fysetc stm32flash usage (#17331)

---
 buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index 1aeaa4d700d2..67a75f5b47fe 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -30,7 +30,7 @@
 
 env.Replace(
 	UPLOADER=UPLOAD_TOOL,
-	UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr $UPLOAD_PORT -R -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"")
+	UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
 )
 
 # Python callback

From c759729478b7b41a4f6d276380249dd482e24bb8 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Tue, 31 Mar 2020 21:13:20 +0200
Subject: [PATCH 533/565] STM32F1: Restore M43 build support (#17336)

---
 Marlin/src/gcode/config/M43.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 2c28da62fb21..baf5efb137f6 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -67,7 +67,11 @@ inline void toggle_pins() {
     else {
       watchdog_refresh();
       report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing   "));
-      const bool prior_mode = GET_PINMODE(pin);
+      #ifdef __STM32F1__
+        const auto prior_mode = _GET_MODE(i);
+      #else
+        const bool prior_mode = GET_PINMODE(pin);
+      #endif
       #if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO
         if (pin == TEENSY_E2) {
           SET_OUTPUT(TEENSY_E2);
@@ -96,7 +100,11 @@ inline void toggle_pins() {
           watchdog_refresh();
         }
       }
-      pinMode(pin, prior_mode);
+      #ifdef __STM32F1__
+        _SET_MODE(i, prior_mode);
+      #else
+        pinMode(pin, prior_mode);
+      #endif
     }
     SERIAL_EOL();
   }

From d83ad6f321af6511d35e0396776f557195fcba9f Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Tue, 31 Mar 2020 13:22:04 -0600
Subject: [PATCH 534/565] Improve / fix FTDI EVE Touch UI (#17338)

- Fix timeout and debugging string
- Fix check for whether `LCD_TIMEOUT_TO_STATUS` is valid
- Fix incorrect debugging message
- Make capitalization of callbacks consistent.
- Allow Touch UI to use hardware SPI on Einsy boards
- Move print stats to About Printer page.
- More generic about screen with GPL license.
- Add missing handler for power loss event
- Less code duplication on status screen and main/advanced menu; more legible
- Reorganize advanced and main menu to add more features
- Hide home Z button when using Z_SAFE_HOMING
- Fix compilation errors when certain features enabled
- Fix missing labels in UI
- Improve color scheme
- Add new preheat menus
- Fix incorrect rendering of Marlin logo on boot
- Add Level X Axis and Auto calibrate buttons
---
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |   2 +-
 Marlin/src/gcode/temp/M303.cpp                |   2 +-
 .../ftdi_eve_lib/basic/spi.cpp                |  11 +
 .../ftdi_eve_lib/extended/event_loop.cpp      |   2 +-
 .../ftdi_eve_touch_ui/language/language_en.h  |  14 +-
 .../lib/ftdi_eve_touch_ui/marlin_events.cpp   |   8 +-
 .../lib/ftdi_eve_touch_ui/pin_mappings.h      |  15 +-
 .../screens/about_screen.cpp                  |  78 +++---
 .../screens/advanced_settings_menu.cpp        | 154 ++++++------
 .../base_numeric_adjustment_screen.cpp        |  12 +-
 .../ftdi_eve_touch_ui/screens/base_screen.cpp |   8 +-
 .../screens/bio_advanced_settings.cpp         |   2 +-
 .../screens/bio_confirm_home_e.cpp            |  12 +-
 .../screens/bio_confirm_home_xyz.cpp          |  10 +-
 .../screens/bio_main_menu.cpp                 |   4 +-
 .../ftdi_eve_touch_ui/screens/boot_screen.cpp |  14 +-
 .../screens/change_filament_screen.cpp        |   3 +-
 .../screens/interface_settings_screen.cpp     |  10 +-
 .../screens/interface_sounds_screen.cpp       |   2 +-
 .../ftdi_eve_touch_ui/screens/main_menu.cpp   | 165 +++++++------
 .../screens/preheat_menu.cpp                  |  83 +++++++
 .../screens/preheat_timer_screen.cpp          |   3 -
 .../lib/ftdi_eve_touch_ui/screens/screens.cpp |   1 +
 .../lib/ftdi_eve_touch_ui/screens/screens.h   |   9 +-
 .../screens/status_screen.cpp                 | 226 ++++++++---------
 .../lib/ftdi_eve_touch_ui/theme/colors.h      | 228 ++++++++++--------
 .../theme/marlin_bootscreen_landscape.h       |   4 +-
 .../theme/marlin_bootscreen_portrait.h        |   4 +-
 Marlin/src/lcd/extui/ui_api.h                 |   4 +-
 Marlin/src/lcd/extui_dgus_lcd.cpp             |   6 +-
 Marlin/src/lcd/extui_example.cpp              |   4 +-
 Marlin/src/lcd/extui_malyan_lcd.cpp           |   2 +-
 Marlin/src/lcd/language/language_en.h         |   3 +
 Marlin/src/module/temperature.cpp             |  10 +-
 34 files changed, 641 insertions(+), 474 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp

diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index ea2c6e3dab1b..8d8cdc755717 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -63,7 +63,7 @@ void GcodeSuite::M1000() {
       #if HAS_LCD_MENU
         ui.goto_screen(menu_job_recovery);
       #elif ENABLED(EXTENSIBLE_UI)
-        ExtUI::OnPowerLossResume();
+        ExtUI::onPowerLossResume();
       #else
         SERIAL_ECHO_MSG("Resume requires LCD.");
       #endif
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index 657dd867ee9f..358a1436b171 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -73,7 +73,7 @@ void GcodeSuite::M303() {
   if (!WITHIN(e, SI, EI)) {
     SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM);
     #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::OnPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
+      ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
     #endif
     return;
   }
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
index 7f666be45b56..6621ea3cbf19 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
@@ -38,6 +38,11 @@ namespace FTDI {
     SET_OUTPUT(CLCD_SPI_CS);
     WRITE(CLCD_SPI_CS, 1);
 
+    #ifdef CLCD_SPI_EXTRA_CS
+      SET_OUTPUT(CLCD_SPI_EXTRA_CS);
+      WRITE(CLCD_SPI_EXTRA_CS, 1);
+    #endif
+
     #ifdef SPI_FLASH_SS
       SET_OUTPUT(SPI_FLASH_SS);
       WRITE(SPI_FLASH_SS, 1);
@@ -111,12 +116,18 @@ namespace FTDI {
       ::SPI.beginTransaction(spi_settings);
     #endif
     WRITE(CLCD_SPI_CS, 0);
+    #ifdef CLCD_SPI_EXTRA_CS
+      WRITE(CLCD_SPI_EXTRA_CS, 0);
+    #endif
     delayMicroseconds(1);
   }
 
   // CLCD SPI - Chip Deselect
   void SPI::spi_ftdi_deselect() {
     WRITE(CLCD_SPI_CS, 1);
+    #ifdef CLCD_SPI_EXTRA_CS
+      WRITE(CLCD_SPI_EXTRA_CS, 1);
+    #endif
     #ifndef CLCD_USE_SOFT_SPI
       ::SPI.endTransaction();
     #endif
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
index f0f693bfd887..b338758ed157 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
@@ -191,7 +191,7 @@ namespace FTDI {
 
             #if ENABLED(TOUCH_UI_DEBUG)
               SERIAL_ECHO_START();
-              SERIAL_ECHOLNPAIR("Touch end: ", tag);
+              SERIAL_ECHOLNPAIR("Touch end: ", pressed_tag);
             #endif
 
             const uint8_t saved_pressed_tag = pressed_tag;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
index e59e1d9468cc..ebd60aed31d5 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
@@ -70,13 +70,15 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PRINT_FINISHED           = u8"Print finished";
   PROGMEM Language_Str MSG_PRINT_ERROR              = u8"Print error";
   PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_1      = u8"Color Touch Panel";
-  PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2      = u8"Portions " COPYRIGHT_SIGN " 2019 Aleph Objects, Inc.\n"
-                                                        "Portions " COPYRIGHT_SIGN " 2019 Cocoa Press";
-  PROGMEM Language_Str MSG_FIRMWARE_FOR_TOOLHEAD    = u8"Firmware for toolhead:\n%s\n\n";
+  PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2      = WEBSITE_URL;
+  PROGMEM Language_Str MSG_LICENSE                  = u8"This program is free software: you can redistribute it and/or modify it under the terms of "
+                                                        "the GNU General Public License as published by the Free Software Foundation, either version 3 "
+                                                        "of the License, or (at your option) any later version.\n\nTo view a copy of the GNU General "
+                                                        "Public License, go to the following location: http://www.gnu.org/licenses.";
   PROGMEM Language_Str MSG_RUNOUT_1                 = u8"Runout 1";
   PROGMEM Language_Str MSG_RUNOUT_2                 = u8"Runout 2";
   PROGMEM Language_Str MSG_DISPLAY_MENU             = u8"Display";
-  PROGMEM Language_Str MSG_INTERFACE_SETTINGS       = u8"Interface Settings";
+  PROGMEM Language_Str MSG_INTERFACE                = u8"Interface";
   PROGMEM Language_Str MSG_MEASURE_AUTOMATICALLY    = u8"Measure automatically";
   PROGMEM Language_Str MSG_H_OFFSET                 = u8"H Offset";
   PROGMEM Language_Str MSG_V_OFFSET                 = u8"V Offset";
@@ -129,7 +131,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_SOUND_VOLUME             = u8"Sound volume";
   PROGMEM Language_Str MSG_SCREEN_LOCK              = u8"Screen lock";
   PROGMEM Language_Str MSG_BOOT_SCREEN              = u8"Boot screen";
-  PROGMEM Language_Str MSG_INTERFACE_SOUNDS         = u8"Interface Sounds";
+  PROGMEM Language_Str MSG_SOUNDS                   = u8"Sounds";
   PROGMEM Language_Str MSG_CLICK_SOUNDS             = u8"Click sounds";
   PROGMEM Language_Str MSG_EEPROM_RESTORED          = u8"Settings restored from backup";
   PROGMEM Language_Str MSG_EEPROM_RESET             = u8"Settings restored to default";
@@ -144,12 +146,12 @@ namespace Language_en {
 
   PROGMEM Language_Str MSG_TOUCH_CALIBRATION_START  = u8"Release to begin screen calibration";
   PROGMEM Language_Str MSG_TOUCH_CALIBRATION_PROMPT = u8"Touch the dots to calibrate";
+  PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS         = u8"Level X Axis";
 
   #ifdef TOUCH_UI_LULZBOT_BIO
     PROGMEM Language_Str MSG_MOVE_TO_HOME           = u8"Move to Home";
     PROGMEM Language_Str MSG_RAISE_PLUNGER          = u8"Raise Plunger";
     PROGMEM Language_Str MSG_RELEASE_XY_AXIS        = u8"Release X and Y Axis";
-    PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS       = u8"Auto-level X Axis";
     PROGMEM Language_Str MSG_BED_TEMPERATURE        = u8"Bed Temperature";
     PROGMEM Language_Str MSG_HOME_XYZ_WARNING       = u8"About to move to home position. Ensure the top and the bed of the printer are clear.\n\nContinue?";
     PROGMEM Language_Str MSG_HOME_E_WARNING         = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?";
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
index 96845d40658e..bed32cc6064d 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
@@ -131,8 +131,14 @@ namespace ExtUI {
     }
   #endif
 
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    void onPowerLossResume() {
+      // Called on resume from power-loss
+    }
+  #endif
+
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst) {
+    void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
       SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
index 548c6c7439d4..b5b0f22e11dc 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
@@ -129,12 +129,13 @@
  *      9         GND     GND     GND     -->  GND
  *     10         5V      5V      5V      -->  KILL [3]
  *
- * [1] This configuration is not compatible with the
- *     EinsyRetro 1.1a because there is a level shifter
- *     on MISO enabled by SD/USB chip select.
+ * [1] This configuration allows daisy-chaining of the
+ *     display and SD/USB on EXP2, except for [2]
  *
- * [2] This configuration allows daisy-chaining of the
- *     display and SD/USB on EXP2.
+ * [2] The Ultimachine Einsy boards have a level shifter
+ *     on MISO enabled by SD_CSEL chip select, hence it
+ *     is not possible to run both the display and the
+ *     SD/USB on EXP2.
  *
  * [3] Archim Rambo provides 5V on this pin. On any other
  *     board, divert this wire from the ribbon cable and
@@ -148,4 +149,8 @@
 
   #define CLCD_SPI_CS                    BTN_EN1
   #define CLCD_MOD_RESET                 BTN_EN2
+  
+  #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
+    #define CLCD_SPI_EXTRA_CS            SDSS
+  #endif
 #endif
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
index afd4402fc109..70acc09071e9 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
@@ -27,7 +27,7 @@
 #include "screens.h"
 
 #define GRID_COLS 4
-#define GRID_ROWS 9
+#define GRID_ROWS 7
 
 using namespace FTDI;
 using namespace Theme;
@@ -45,50 +45,62 @@ void AboutScreen::onRedraw(draw_mode_t) {
      .cmd(COLOR_RGB(bg_text_enabled))
      .tag(0);
 
-  draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(4,1),
-    #ifdef CUSTOM_MACHINE_NAME
-      F(CUSTOM_MACHINE_NAME)
-    #else
-      GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1)
-    #endif
-    , OPT_CENTER, font_xlarge
-  );
+  #define HEADING_POS BTN_POS(1,2), BTN_SIZE(4,1)
+  #define FW_VERS_POS BTN_POS(1,3), BTN_SIZE(4,1)
+  #define FW_INFO_POS BTN_POS(1,4), BTN_SIZE(4,1)
+  #define LICENSE_POS BTN_POS(1,5), BTN_SIZE(4,2)
+  #define STATS_POS   BTN_POS(1,7), BTN_SIZE(2,1)
+  #define BACK_POS    BTN_POS(3,7), BTN_SIZE(2,1)
 
-  #ifdef TOOLHEAD_NAME
-    char about_str[
-      strlen_P(GET_TEXT(FIRMWARE_FOR_TOOLHEAD)) +
-      strlen_P(TOOLHEAD_NAME) +
-      strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) + 1
-    ];
+  #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
+  #define INSET_POS(pos) _INSET_POS(pos)
 
-    sprintf_P(about_str, GET_TEXT(MSG_FIRMWARE_FOR_TOOLHEAD), TOOLHEAD_NAME);
-    strcat_P (about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2));
+  char about_str[
+    strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) +
+    strlen_P(TOOLHEAD_NAME) + 1
+  ];
+  #ifdef TOOLHEAD_NAME
+    // If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name.
+    // But this is optional, so squelch the compiler warning here.
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wformat-extra-args"
+    sprintf_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2), TOOLHEAD_NAME);
+    #pragma GCC diagnostic pop
+  #else
+    strcpy_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2));
   #endif
 
-  cmd.tag(2);
-  draw_text_box(cmd, BTN_POS(1,3), BTN_SIZE(4,3),
-    #ifdef TOOLHEAD_NAME
-      about_str
+  draw_text_box(cmd, HEADING_POS,
+    #ifdef CUSTOM_MACHINE_NAME
+      F(CUSTOM_MACHINE_NAME)
     #else
-      GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_2)
+      GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1)
     #endif
-    , OPT_CENTER, font_medium
+    , OPT_CENTER, font_xlarge
   );
-
-  cmd.tag(0);
-  draw_text_box(cmd, BTN_POS(1,6), BTN_SIZE(4,2), progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium);
-
-  cmd.font(font_medium).colors(action_btn).tag(1).button(BTN_POS(2,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY));
+  draw_text_box(cmd, FW_VERS_POS, progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium);
+  draw_text_box(cmd, FW_INFO_POS, about_str, OPT_CENTER, font_medium);
+  draw_text_box(cmd, INSET_POS(LICENSE_POS), GET_TEXT_F(MSG_LICENSE), OPT_CENTER, font_tiny);
+
+  cmd.font(font_medium)
+     .colors(normal_btn)
+     .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU))
+     .colors(action_btn)
+     .tag(1).button(BACK_POS,  GET_TEXT_F(MSG_BACK));
 }
 
 bool AboutScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case 1: GOTO_PREVIOUS();            return true;
-#if ENABLED(TOUCH_UI_DEVELOPER_MENU)
-    case 2: GOTO_SCREEN(DeveloperMenu); return true;
-#endif
-    default:                            return false;
+    case 1: GOTO_PREVIOUS(); break;
+    #if ENABLED(PRINTCOUNTER)
+      case 2: GOTO_SCREEN(StatisticsScreen); break;
+    #endif
+    #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
+      case 3: GOTO_SCREEN(DeveloperMenu); break;
+    #endif
+    default: return false;
   }
+  return true;
 }
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index 6029382838e6..57137c5d4aa5 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -37,127 +37,116 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
        .cmd(CLEAR(true,true,true));
   }
 
+    #ifdef TOUCH_UI_PORTRAIT
+      #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+        #define GRID_ROWS 9
+      #else
+        #define GRID_ROWS 8
+      #endif
+      #define GRID_COLS 2
+      #define RESTORE_DEFAULTS_POS    BTN_POS(1,1), BTN_SIZE(2,1)
+      #define DISPLAY_POS             BTN_POS(1,2), BTN_SIZE(1,1)
+      #define INTERFACE_POS           BTN_POS(2,2), BTN_SIZE(1,1)
+      #define ZPROBE_ZOFFSET_POS      BTN_POS(1,3), BTN_SIZE(1,1)
+      #define STEPS_PER_MM_POS        BTN_POS(2,3), BTN_SIZE(1,1)
+      #define FILAMENT_POS            BTN_POS(1,4), BTN_SIZE(1,1)
+      #define VELOCITY_POS            BTN_POS(2,4), BTN_SIZE(1,1)
+      #define TMC_CURRENT_POS         BTN_POS(1,5), BTN_SIZE(1,1)
+      #define ACCELERATION_POS        BTN_POS(2,5), BTN_SIZE(1,1)
+      #define ENDSTOPS_POS            BTN_POS(1,6), BTN_SIZE(1,1)
+      #define JERK_POS                BTN_POS(2,6), BTN_SIZE(1,1)
+      #define OFFSETS_POS             BTN_POS(1,7), BTN_SIZE(1,1)
+      #define BACKLASH_POS            BTN_POS(2,7), BTN_SIZE(1,1)
+      #define CASE_LIGHT_POS          BTN_POS(1,8), BTN_SIZE(1,1)
+      #define TMC_HOMING_THRS_POS     BTN_POS(2,8), BTN_SIZE(1,1)
+      #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+        #define BACK_POS              BTN_POS(1,9), BTN_SIZE(2,1)
+      #else
+        #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
+      #endif
+    #else
+      #define GRID_ROWS 6
+      #define GRID_COLS 3
+      #define ZPROBE_ZOFFSET_POS      BTN_POS(1,1), BTN_SIZE(1,1)
+      #define CASE_LIGHT_POS          BTN_POS(1,4), BTN_SIZE(1,1)
+      #define STEPS_PER_MM_POS        BTN_POS(2,1), BTN_SIZE(1,1)
+      #define TMC_CURRENT_POS         BTN_POS(3,1), BTN_SIZE(1,1)
+      #define TMC_HOMING_THRS_POS     BTN_POS(3,2), BTN_SIZE(1,1)
+      #define BACKLASH_POS            BTN_POS(3,3), BTN_SIZE(1,1)
+      #define FILAMENT_POS            BTN_POS(1,3), BTN_SIZE(1,1)
+      #define ENDSTOPS_POS            BTN_POS(3,4), BTN_SIZE(1,1)
+      #define DISPLAY_POS             BTN_POS(3,5), BTN_SIZE(1,1)
+      #define INTERFACE_POS           BTN_POS(1,5), BTN_SIZE(2,1)
+      #define RESTORE_DEFAULTS_POS    BTN_POS(1,6), BTN_SIZE(2,1)
+      #define VELOCITY_POS            BTN_POS(2,2), BTN_SIZE(1,1)
+      #define ACCELERATION_POS        BTN_POS(2,3), BTN_SIZE(1,1)
+      #define JERK_POS                BTN_POS(2,4), BTN_SIZE(1,1)
+      #define OFFSETS_POS             BTN_POS(1,2), BTN_SIZE(1,1)
+      #define BACK_POS                BTN_POS(3,6), BTN_SIZE(1,1)
+    #endif
+
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
        .font(Theme::font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-      #define GRID_ROWS 10
-      #define GRID_COLS 2
       .enabled(
         #if HAS_BED_PROBE
           1
         #endif
       )
-      .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
+      .tag(2) .button( ZPROBE_ZOFFSET_POS,     GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
       .enabled(
         #if HAS_CASE_LIGHT
           1
         #endif
       )
-      .tag(16).button( BTN_POS(1,6),  BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
-      .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
+      .tag(16).button( CASE_LIGHT_POS,         GET_TEXT_F(MSG_CASE_LIGHT))
+      .tag(3) .button( STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
       .enabled(
         #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
-      .tag(13).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
+      .tag(13).button( TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
       .enabled(
-        #if HAS_TRINAMIC_CONFIG
+        #if ENABLED(SENSORLESS_HOMING)
           1
         #endif
       )
-      .tag(14).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
+      .tag(14).button( TMC_HOMING_THRS_POS,    GET_TEXT_F(MSG_TMC_HOMING_THRS))
       .enabled(
         #if HOTENDS > 1
           1
         #endif
       )
-      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
+      .tag(4) .button( OFFSETS_POS,            GET_TEXT_F(MSG_OFFSETS_MENU))
       .enabled(
         #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
           1
         #endif
       )
-      .tag(11).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
-      .tag(12).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
-      .tag(15).button( BTN_POS(2,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
-      .tag(9) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(10).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
-      .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
-      .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
-      #if DISABLED(CLASSIC_JERK)
-      .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
-      #else
-      .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
-      #endif
-      .enabled(
-        #if ENABLED(BACKLASH_GCODE)
-          1
-        #endif
-      )
-      .tag(8).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
-      .colors(action_btn)
-      .tag(1) .button( BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
-      #undef GRID_COLS
-      #undef GRID_ROWS
-    #else
-      #define GRID_ROWS 6
-      #define GRID_COLS 3
-      .enabled(
-        #if HAS_BED_PROBE
-          1
-        #endif
-      )
-      .tag(2) .button( BTN_POS(1,1),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
-      .enabled(
-        #if HAS_CASE_LIGHT
-          1
-        #endif
-      )
-      .tag(16).button( BTN_POS(1,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
-      .enabled(1)
-      .tag(3) .button( BTN_POS(2,1),  BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
-      .enabled(
-        #if HAS_TRINAMIC_CONFIG
-          1
-        #endif
-      )
-      .tag(13).button( BTN_POS(3,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
-      .enabled(
-        #if HAS_TRINAMIC_CONFIG
-          1
+      .tag(11).button( FILAMENT_POS,           GET_TEXT_F(MSG_FILAMENT))
+      .tag(12).button( ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
+      .tag(15).button( DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
+      .tag(9) .button( INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
+      .tag(10).button( RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
+      .tag(5) .button( VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
+      .tag(6) .button( ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
+      .tag(7) .button( JERK_POS,               GET_TEXT_F(
+        #if DISABLED(CLASSIC_JERK)
+          MSG_JUNCTION_DEVIATION
+        #else
+          JERK_POS
         #endif
-      )
-      .tag(14).button( BTN_POS(3,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
+       ))
       .enabled(
         #if ENABLED(BACKLASH_GCODE)
           1
         #endif
       )
-      .tag(8).button( BTN_POS(3,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
-      .enabled(
-        #if HOTENDS > 1
-          1
-        #endif
-      )
-      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
-      .tag(12).button( BTN_POS(3,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
-      .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
-      .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
-      #if DISABLED(CLASSIC_JERK)
-      .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
-      #else
-      .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
-      #endif
-      .tag(11).button( BTN_POS(1,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
-      .tag(15).button( BTN_POS(3,5),  BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
-      .tag(9) .button( BTN_POS(1,5),  BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(10).button( BTN_POS(1,6),  BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
+      .tag(8).button( BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
       .colors(action_btn)
-      .tag(1) .button( BTN_POS(3,6),  BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
-    #endif
+      .tag(1).button( BACK_POS,                GET_TEXT_F(MSG_BACK));
   }
 }
 
@@ -191,6 +180,8 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     case 12: GOTO_SCREEN(EndstopStatesScreen); break;
     #if HAS_TRINAMIC_CONFIG
     case 13: GOTO_SCREEN(StepperCurrentScreen); break;
+    #endif
+    #if ENABLED(SENSORLESS_HOMING)
     case 14: GOTO_SCREEN(StepperBumpSensitivityScreen); break;
     #endif
     case 15: GOTO_SCREEN(DisplayTuningScreen); break;
@@ -201,5 +192,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   }
   return true;
 }
-
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
index 97e399a4030b..3e3f1d48a205 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
@@ -345,10 +345,14 @@ void BaseNumericAdjustmentScreen::widgets_t::home_buttons(uint8_t tag) {
   }
 
   cmd.font(LAYOUT_FONT);
- _button(cmd, tag+0, BTN_POS(5,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X));
- _button(cmd, tag+1, BTN_POS(7,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y));
- _button(cmd, tag+2, BTN_POS(9,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z));
- _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ _button(cmd, tag+0, BTN_POS(5,_line),    BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X));
+ _button(cmd, tag+1, BTN_POS(7,_line),    BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y));
+ #if DISABLED(Z_SAFE_HOMING)
+   _button(cmd, tag+2, BTN_POS(9,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z));
+   _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ #else
+   _button(cmd, tag+3, BTN_POS(9,_line),  BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ #endif
 
   _line++;
 }
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
index 77cadabcd778..7e88b7883af8 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
@@ -46,7 +46,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
     return false;
   }
 
-  #ifdef LCD_TIMEOUT_TO_STATUS
+  #if LCD_TIMEOUT_TO_STATUS
     if (EventLoop::get_pressed_tag() != 0) {
       reset_menu_timeout();
     }
@@ -66,7 +66,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
 }
 
 void BaseScreen::onIdle() {
-  #ifdef LCD_TIMEOUT_TO_STATUS
+  #if LCD_TIMEOUT_TO_STATUS
     if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) {
       reset_menu_timeout();
       #if ENABLED(TOUCH_UI_DEBUG)
@@ -78,12 +78,12 @@ void BaseScreen::onIdle() {
 }
 
 void BaseScreen::reset_menu_timeout() {
-  #ifdef LCD_TIMEOUT_TO_STATUS
+  #if LCD_TIMEOUT_TO_STATUS
     last_interaction = millis();
   #endif
 }
 
-#ifdef LCD_TIMEOUT_TO_STATUS
+#if LCD_TIMEOUT_TO_STATUS
   uint32_t BaseScreen::last_interaction;
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index 6c9f74f93f09..ed8bcee55736 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -85,7 +85,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
         #endif
       )
       .tag(12) .button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
-      .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+      .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
       .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
       .colors(action_btn)
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
index a3254bae9ae4..79a6112e4fc9 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
@@ -36,11 +36,13 @@ void BioConfirmHomeE::onRedraw(draw_mode_t) {
 bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
-      SpinnerDialogBox::enqueueAndWait_P(F(
-        "G28 E\n"
-        AXIS_LEVELING_COMMANDS "\n"
-        PARK_AND_RELEASE_COMMANDS
-      ));
+      #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
+        SpinnerDialogBox::enqueueAndWait_P(F(
+          "G28 E\n"
+          AXIS_LEVELING_COMMANDS "\n"
+          PARK_AND_RELEASE_COMMANDS
+        ));
+      #endif
       current_screen.forget();
       break;
     case 2:
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
index 883a446b3ea9..3ae2d680ce63 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
@@ -36,10 +36,12 @@ void BioConfirmHomeXYZ::onRedraw(draw_mode_t) {
 bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
-      SpinnerDialogBox::enqueueAndWait_P(F(
-       "G28\n"
-       PARK_AND_RELEASE_COMMANDS
-      ));
+      #ifdef PARK_AND_RELEASE_COMMANDS
+        SpinnerDialogBox::enqueueAndWait_P(F(
+         "G28\n"
+         PARK_AND_RELEASE_COMMANDS
+        ));
+      #endif
       current_screen.forget();
       break;
     case 2:
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
index 40ed8479ee64..1f6aa45c1746 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
@@ -51,7 +51,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .tag(4).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
        .tag(5).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
        .tag(6).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
-       .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+       .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
        .tag(8).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
        .tag(9).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
        .colors(action_btn)
@@ -72,7 +72,9 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case 2: GOTO_SCREEN(BioConfirmHomeXYZ);                                              break;
     case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? F("G0 E0 F120") : F("G112"));   break;
     case 4: StatusScreen::unlockMotors();                                                break;
+    #ifdef AXIS_LEVELING_COMMANDS
     case 5: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS));               break;
+    #endif
     case 6: GOTO_SCREEN(TemperatureScreen);                                              break;
     case 7: GOTO_SCREEN(InterfaceSettingsScreen);                                        break;
     case 8: GOTO_SCREEN(AdvancedSettingsMenu);                                           break;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
index 996c12cf23fd..5e022b58e73d 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
@@ -80,12 +80,14 @@ void BootScreen::onIdle() {
       SpinnerDialogBox::hide();
     }
 
-    if (UIData::animations_enabled()) {
-      // If there is a startup video in the flash SPI, play
-      // that, otherwise show a static splash screen.
-      if (!MediaPlayerScreen::playBootMedia())
-        showSplashScreen();
-    }
+    #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
+      if (UIData::animations_enabled()) {
+        // If there is a startup video in the flash SPI, play
+        // that, otherwise show a static splash screen.
+        if (!MediaPlayerScreen::playBootMedia())
+          showSplashScreen();
+      }
+    #endif
 
     StatusScreen::loadBitmaps();
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
index 2d1e0d66272f..2b5963fdf6f1 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
@@ -111,6 +111,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
        .cmd(CLEAR(true,true,true))
+       .cmd(COLOR_RGB(bg_text_enabled))
        .tag(0)
     #ifdef TOUCH_UI_PORTRAIT
        .font(font_large)
@@ -119,7 +120,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
     #endif
        .text(BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_EXTRUDER_SELECTION))
     #ifdef TOUCH_UI_PORTRAIT
-       .text(BTN_POS(1,7), BTN_SIZE(1,1), F(""))
+       .text(BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
     #else
        .text(BTN_POS(3,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
        .font(font_small)
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
index 3de03579e4b0..4e165aa4484a 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
@@ -69,7 +69,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .cmd(COLOR_RGB(bg_text_enabled))
        .tag(0)
        .font(font_medium)
-       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE))
     #undef EDGE_R
     #define EDGE_R 30
        .font(font_small)
@@ -77,7 +77,9 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .text(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_LCD_BRIGHTNESS), OPT_RIGHTX | OPT_CENTERY)
        .text(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUND_VOLUME),   OPT_RIGHTX | OPT_CENTERY)
        .text(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_SCREEN_LOCK),    OPT_RIGHTX | OPT_CENTERY);
+    #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
     cmd.text(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BOOT_SCREEN),    OPT_RIGHTX | OPT_CENTERY);
+    #endif
     #undef EDGE_R
   }
 
@@ -95,16 +97,18 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .tag(3).slider(BTN_POS(3,3), BTN_SIZE(2,1), screen_data.InterfaceSettingsScreen.volume,     0xFF)
        .colors(ui_toggle)
        .tag(4).toggle2(BTN_POS(3,4), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), LockScreen::is_enabled())
+    #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
        .tag(5).toggle2(BTN_POS(3,5), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), UIData::animations_enabled())
+    #endif
     #undef EDGE_R
     #define EDGE_R 0
     #ifdef TOUCH_UI_PORTRAIT
        .colors(normal_btn)
-       .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+       .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
        .colors(action_btn)
        .tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
     #else
-       .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+       .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUNDS))
        .colors(action_btn)
        .tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
     #endif
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
index 57f520e8abd1..48fae863a706 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
@@ -71,7 +71,7 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) {
     #define GRID_ROWS 9
 
        .font(font_medium)
-       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
     #undef EDGE_R
     #define EDGE_R 30
        .font(font_small)
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
index 016996e26579..5d165edef0fa 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
@@ -37,81 +37,89 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .cmd(CLEAR(true,true,true));
   }
 
+  #ifdef TOUCH_UI_PORTRAIT
+    #define GRID_ROWS 8
+    #define GRID_COLS 2
+    #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
+    #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
+    #define FILAMENTCHANGE_POS    BTN_POS(1,3), BTN_SIZE(2,1)
+    #define TEMPERATURE_POS       BTN_POS(1,4), BTN_SIZE(2,1)
+    #define MOVE_AXIS_POS         BTN_POS(1,5), BTN_SIZE(1,1)
+    #define DISABLE_STEPPERS_POS  BTN_POS(2,5), BTN_SIZE(1,1)
+    #define AUTO_HOME_POS         BTN_POS(1,6), BTN_SIZE(1,1)
+    #define CLEAN_NOZZLE_POS      BTN_POS(2,6), BTN_SIZE(1,1)
+    #define LEVEL_BED_POS         BTN_POS(1,7), BTN_SIZE(1,1)
+    #define LEVEL_AXIS_POS        BTN_POS(2,7), BTN_SIZE(1,1)
+    #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
+  #else
+    #define GRID_ROWS 6
+    #define GRID_COLS 2
+    #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(1,1)
+    #define ABOUT_PRINTER_POS     BTN_POS(2,1), BTN_SIZE(1,1)
+    #define AUTO_HOME_POS         BTN_POS(1,2), BTN_SIZE(1,1)
+    #define CLEAN_NOZZLE_POS      BTN_POS(2,2), BTN_SIZE(1,1)
+    #define MOVE_AXIS_POS         BTN_POS(1,3), BTN_SIZE(1,1)
+    #define DISABLE_STEPPERS_POS  BTN_POS(2,3), BTN_SIZE(1,1)
+    #define TEMPERATURE_POS       BTN_POS(1,4), BTN_SIZE(1,1)
+    #define FILAMENTCHANGE_POS    BTN_POS(2,4), BTN_SIZE(1,1)
+    #define LEVEL_BED_POS         BTN_POS(1,5), BTN_SIZE(1,1)
+    #define LEVEL_AXIS_POS        BTN_POS(2,5), BTN_SIZE(1,1)
+    #define BACK_POS              BTN_POS(1,6), BTN_SIZE(2,1)
+  #endif
+
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
        .font(Theme::font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-      #define GRID_ROWS 8
-      #define GRID_COLS 2
-        .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME))
-        .enabled(
-          #if ENABLED(NOZZLE_CLEAN_FEATURE)
-            1
-          #endif
-        )
-        .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE))
-        .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS))
-        .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS))
-        .tag(6).button( BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_TEMPERATURE))
-        .enabled(
-          #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
-            1
-          #endif
+       .tag(2).button( AUTO_HOME_POS, GET_TEXT_F(MSG_AUTO_HOME))
+       .enabled(
+           #if ANY(NOZZLE_CLEAN_FEATURE, TOUCH_UI_COCOA_PRESS)
+             1
+           #endif
+         )
+       .tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F(
+         #if ENABLED(TOUCH_UI_COCOA_PRESS)
+            MSG_PREHEAT_1
+         #else
+            MSG_CLEAN_NOZZLE
+         #endif
+       ))
+       .tag(4).button( MOVE_AXIS_POS,        GET_TEXT_F(MSG_MOVE_AXIS))
+       .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
+       .tag(6).button( TEMPERATURE_POS,      GET_TEXT_F(MSG_TEMPERATURE))
+       .enabled(
+           #if DISABLED(TOUCH_UI_LULZBOT_BIO)
+             1
+           #endif
+         )
+       .tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F(
+         #if ENABLED(TOUCH_UI_COCOA_PRESS)
+             MSG_CASE_LIGHT
+         #else
+             MSG_FILAMENTCHANGE
+         #endif
+        ))
+       .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
+       .enabled(
+         #ifdef PRINTCOUNTER
+           1
+         #endif
         )
-        .tag(7).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_FILAMENTCHANGE))
-        .tag(8).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
-        .enabled(
-          #ifdef PRINTCOUNTER
-            1
-          #endif
+       .enabled(
+         #ifdef AXIS_LEVELING_COMMANDS
+           1
+         #endif
         )
-        .tag(9).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_STATS_MENU))
-        .tag(10).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
-        .colors(action_btn)
-        .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
-      #undef GRID_COLS
-      #undef GRID_ROWS
-    #else
-      #define GRID_ROWS 5
-      #define GRID_COLS 2
-        .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME))
-        #if ENABLED(TOUCH_UI_COCOA_PRESS)
-          .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_PREHEAT_1))
-        #else
-          .enabled(
-            #if ENABLED(NOZZLE_CLEAN_FEATURE)
-              1
-            #endif
-          )
-          .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE))
-        #endif
-        .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS))
-        .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS))
-        .tag(6).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TEMPERATURE))
-        #if ENABLED(TOUCH_UI_COCOA_PRESS)
-          .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
-        #else
-          .enabled(
-            #if DISABLED(TOUCH_UI_LULZBOT_BIO)
-              1
-            #endif
-          )
-          .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENTCHANGE))
-        #endif
-        .tag(8).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
-        .enabled(
-          #ifdef PRINTCOUNTER
-            1
-          #endif
+       .tag(9).button( LEVEL_AXIS_POS, GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
+       .enabled(
+         #ifdef HAS_LEVELING
+           1
+         #endif
         )
-        .tag(9).button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_STATS_MENU))
-        .tag(10).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_MENU))
-        .colors(action_btn)
-        .tag(1).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
-      #undef GRID_COLS
-      #undef GRID_ROWS
-    #endif
+       .tag(10).button( LEVEL_BED_POS, GET_TEXT_F(MSG_LEVEL_BED))
+       .tag(11).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
+       .colors(action_btn)
+       .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK));
   }
 }
 
@@ -122,23 +130,32 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
     case 2:  SpinnerDialogBox::enqueueAndWait_P(F("G28"));            break;
     #if ENABLED(TOUCH_UI_COCOA_PRESS)
-    case 3:  GOTO_SCREEN(PreheatTimerScreen);                         break;
+    case 3:  GOTO_SCREEN(PreheatMenu);                                break;
     #elif ENABLED(NOZZLE_CLEAN_FEATURE)
     case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
     #endif
     case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
     case 5:  injectCommands_P(PSTR("M84"));                           break;
     case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
-    #if ENABLED(TOUCH_UI_COCOA_PRESS)
+    #if ENABLED(TOUCH_UI_COCOA_PRESS) && HAS_CASE_LIGHT
     case 7:  GOTO_SCREEN(CaseLightScreen);                            break;
     #else
     case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
     #endif
     case 8:  GOTO_SCREEN(AdvancedSettingsMenu);                       break;
-#if ENABLED(PRINTCOUNTER)
-    case 9:  GOTO_SCREEN(StatisticsScreen);                           break;
-#endif
-    case 10: GOTO_SCREEN(AboutScreen);                                break;
+    #ifdef AXIS_LEVELING_COMMANDS
+    case 9: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break;
+    #endif
+    #ifdef HAS_LEVELING
+    case 10:  SpinnerDialogBox::enqueueAndWait_P(F(
+      #ifdef BED_LEVELING_COMMANDS
+        BED_LEVELING_COMMANDS
+      #else
+        "G29"
+      #endif
+    ));            break;
+    #endif
+    case 11: GOTO_SCREEN(AboutScreen);                                break;
     default:
       return false;
   }
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
new file mode 100644
index 000000000000..f0b5dd887b8f
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
@@ -0,0 +1,83 @@
+/********************
+ * preheat_menu.cpp *
+ ********************/
+
+/****************************************************************************
+ *   Written By Marcio Teixeira 2020 - Cocoa Press                          *
+ *                                                                          *
+ *   This program is free software: you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by   *
+ *   the Free Software Foundation, either version 3 of the License, or      *
+ *   (at your option) any later version.                                    *
+ *                                                                          *
+ *   This program is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU General Public License for more details.                           *
+ *                                                                          *
+ *   To view a copy of the GNU General Public License, go to the following  *
+ *   location: <http://www.gnu.org/licenses/>.                              *
+ ****************************************************************************/
+
+#include "../config.h"
+
+#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_COCOA_PRESS)
+
+#include "screens.h"
+
+using namespace FTDI;
+using namespace ExtUI;
+using namespace Theme;
+
+void PreheatMenu::onRedraw(draw_mode_t what) {
+  if (what & BACKGROUND) {
+    CommandProcessor cmd;
+    cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
+       .cmd(CLEAR(true,true,true))
+       .tag(0);
+  }
+
+  #define GRID_ROWS 3
+  #define GRID_COLS 2
+    
+  if (what & FOREGROUND) {
+    CommandProcessor cmd;
+    cmd.cmd(COLOR_RGB(bg_text_enabled))
+       .font(Theme::font_medium)
+       .text  ( BTN_POS(1,1),  BTN_SIZE(2,1), GET_TEXT_F(MSG_PREHEAT_1))
+       .colors(normal_btn)
+       .tag(2).button( BTN_POS(1,2),  BTN_SIZE(1,1), F("Dark Chocolate"))
+       .tag(3).button( BTN_POS(2,2),  BTN_SIZE(1,1), F("Milk Chocolate"))
+       .tag(4).button( BTN_POS(1,3),  BTN_SIZE(1,1), F("White Chocolate"))
+       .colors(action_btn)
+       .tag(1) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
+  }
+}
+
+bool PreheatMenu::onTouchEnd(uint8_t tag) {
+  switch (tag) {
+    case 1: GOTO_PREVIOUS();                   break;
+    case 2:
+      #ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT
+        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT));
+      #endif
+      GOTO_SCREEN(PreheatTimerScreen);
+      break;
+    case 3:
+      #ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT
+        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT));
+      #endif
+      GOTO_SCREEN(PreheatTimerScreen);
+      break;
+    case 4:
+      #ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT
+        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT));
+      #endif
+      GOTO_SCREEN(PreheatTimerScreen);
+      break;
+    default: return false;
+  }
+  return true;
+}
+
+#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
index 0a24c3008204..7d68ae2d671a 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
@@ -77,9 +77,6 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
 
 void PreheatTimerScreen::onEntry() {
   screen_data.PreheatTimerScreen.start_ms = millis();
-  #ifdef COCOA_PRESS_PREHEAT_SCRIPT
-    injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_SCRIPT));
-  #endif
 }
 
 void PreheatTimerScreen::onRedraw(draw_mode_t what) {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
index 69c1cf1420b7..ce7546204021 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
@@ -105,6 +105,7 @@ SCREEN_TABLE {
   DECL_SCREEN(BioConfirmHomeE),
 #endif
 #if ENABLED(TOUCH_UI_COCOA_PRESS)
+  DECL_SCREEN(PreheatMenu),
   DECL_SCREEN(PreheatTimerScreen),
 #endif
 #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
index 02c5b148310d..346d122a0f25 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
@@ -76,6 +76,7 @@ enum {
   PRINTING_SCREEN_CACHE,
 #endif
 #if ENABLED(TOUCH_UI_COCOA_PRESS)
+  PREHEAT_MENU_CACHE,
   PREHEAT_TIMER_SCREEN_CACHE,
 #endif
   CHANGE_FILAMENT_SCREEN_CACHE,
@@ -99,7 +100,7 @@ enum {
 
 class BaseScreen : public UIScreen {
   protected:
-    #ifdef LCD_TIMEOUT_TO_STATUS
+    #if LCD_TIMEOUT_TO_STATUS
       static uint32_t last_interaction;
     #endif
 
@@ -314,6 +315,12 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,
 #endif
 
 #if ENABLED(TOUCH_UI_COCOA_PRESS)
+  class PreheatMenu : public BaseScreen, public CachedScreen<PREHEAT_MENU_CACHE> {
+    public:
+      static void onRedraw(draw_mode_t);
+      static bool onTouchEnd(uint8_t tag);
+  };
+
   class PreheatTimerScreen : public BaseScreen, public CachedScreen<PREHEAT_TIMER_SCREEN_CACHE> {
     private:
       static uint16_t secondsRemaining();
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
index e71f200a359c..98d0bba75941 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
@@ -33,9 +33,9 @@ using namespace FTDI;
 using namespace Theme;
 
 #ifdef TOUCH_UI_PORTRAIT
-  #define GRID_ROWS 8
+    #define GRID_ROWS 8
 #else
-  #define GRID_ROWS 8
+    #define GRID_ROWS 8
 #endif
 
 void StatusScreen::draw_axis_position(draw_mode_t what) {
@@ -43,41 +43,41 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
 
   #define GRID_COLS 3
 
+  #ifdef TOUCH_UI_PORTRAIT
+    #define X_LBL_POS  BTN_POS(1,5), BTN_SIZE(1,1)
+    #define Y_LBL_POS  BTN_POS(1,6), BTN_SIZE(1,1)
+    #define Z_LBL_POS  BTN_POS(1,7), BTN_SIZE(1,1)
+    #define X_VAL_POS  BTN_POS(2,5), BTN_SIZE(2,1)
+    #define Y_VAL_POS  BTN_POS(2,6), BTN_SIZE(2,1)
+    #define Z_VAL_POS  BTN_POS(2,7), BTN_SIZE(2,1)
+  #else
+    #define X_LBL_POS  BTN_POS(1,5), BTN_SIZE(1,1)
+    #define Y_LBL_POS  BTN_POS(2,5), BTN_SIZE(1,1)
+    #define Z_LBL_POS  BTN_POS(3,5), BTN_SIZE(1,1)
+    #define X_VAL_POS  BTN_POS(1,6), BTN_SIZE(1,1)
+    #define Y_VAL_POS  BTN_POS(2,6), BTN_SIZE(1,1)
+    #define Z_VAL_POS  BTN_POS(3,6), BTN_SIZE(1,1)
+  #endif
+
+  #define _UNION_POS(x1,y1,w1,h1,x2,y2,w2,h2) x1,y1,max(x1+w1,x2+w2)-x1,max(y1+h1,y2+h2)-y1
+  #define UNION_POS(p1, p2) _UNION_POS(p1, p2)
+
   if (what & BACKGROUND) {
     cmd.tag(6)
-    #ifdef TOUCH_UI_PORTRAIT
-      .fgcolor(Theme::axis_label)
-        .font(Theme::font_large)
-                         .button( BTN_POS(1,5), BTN_SIZE(2,1), F(""), OPT_FLAT)
-                         .button( BTN_POS(1,6), BTN_SIZE(2,1), F(""), OPT_FLAT)
-                         .button( BTN_POS(1,7), BTN_SIZE(2,1), F(""), OPT_FLAT)
-
-        .font(Theme::font_small)
-                         .text  ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X))
-                         .text  ( BTN_POS(1,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y))
-                         .text  ( BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z))
-
-        .font(Theme::font_medium)
-        .fgcolor(Theme::x_axis) .button( BTN_POS(2,5), BTN_SIZE(2,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(2,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::z_axis) .button( BTN_POS(2,7), BTN_SIZE(2,1), F(""), OPT_FLAT);
-    #else
-      .fgcolor(Theme::axis_label)
-        .font(Theme::font_large)
-                         .button( BTN_POS(1,5), BTN_SIZE(1,2), F(""),  OPT_FLAT)
-                         .button( BTN_POS(2,5), BTN_SIZE(1,2), F(""),  OPT_FLAT)
-                         .button( BTN_POS(3,5), BTN_SIZE(1,2), F(""),  OPT_FLAT)
-
-        .font(Theme::font_small)
-                         .text  ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X))
-                         .text  ( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y))
-                         .text  ( BTN_POS(3,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z))
-                         .font(Theme::font_medium)
-
-        .fgcolor(Theme::x_axis) .button( BTN_POS(1,6), BTN_SIZE(1,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(1,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::z_axis) .button( BTN_POS(3,6), BTN_SIZE(1,1), F(""), OPT_FLAT);
-    #endif
+       .fgcolor(Theme::axis_label)
+       .font(Theme::font_large)
+                               .button( UNION_POS(X_LBL_POS, X_VAL_POS), F(""), OPT_FLAT)
+                               .button( UNION_POS(Y_LBL_POS, Y_VAL_POS), F(""), OPT_FLAT)
+                               .button( UNION_POS(Z_LBL_POS, Z_VAL_POS), F(""), OPT_FLAT)
+       .font(Theme::font_medium)
+       .fgcolor(Theme::x_axis) .button( X_VAL_POS, F(""), OPT_FLAT)
+       .fgcolor(Theme::y_axis) .button( Y_VAL_POS, F(""), OPT_FLAT)
+       .fgcolor(Theme::z_axis) .button( Z_VAL_POS, F(""), OPT_FLAT)
+       .font(Theme::font_small)
+                               .text  ( X_LBL_POS, GET_TEXT_F(MSG_AXIS_X))
+                               .text  ( Y_LBL_POS, GET_TEXT_F(MSG_AXIS_Y))
+                               .text  ( Z_LBL_POS, GET_TEXT_F(MSG_AXIS_Z))
+       .colors(normal_btn);
   }
 
   if (what & FOREGROUND) {
@@ -101,16 +101,11 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
     else
       strcpy_P(z_str, PSTR("?"));
 
-    cmd.tag(6).font(Theme::font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-         .text  ( BTN_POS(2,5), BTN_SIZE(2,1), x_str)
-         .text  ( BTN_POS(2,6), BTN_SIZE(2,1), y_str)
-         .text  ( BTN_POS(2,7), BTN_SIZE(2,1), z_str);
-    #else
-         .text  ( BTN_POS(1,6), BTN_SIZE(1,1), x_str)
-         .text  ( BTN_POS(2,6), BTN_SIZE(1,1), y_str)
-         .text  ( BTN_POS(3,6), BTN_SIZE(1,1), z_str);
-    #endif
+    cmd.tag(6)
+       .font(Theme::font_medium)
+       .text  ( X_VAL_POS, x_str)
+       .text  ( Y_VAL_POS, y_str)
+       .text  ( Z_VAL_POS, z_str);
   }
 
   #undef GRID_COLS
@@ -125,49 +120,49 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
 void StatusScreen::draw_temperature(draw_mode_t what) {
   using namespace Theme;
 
+  #define TEMP_RECT_1 BTN_POS(1,1), BTN_SIZE(4,2)
+  #define TEMP_RECT_2 BTN_POS(1,1), BTN_SIZE(8,1)
+  #define NOZ_1_POS   BTN_POS(1,1), BTN_SIZE(4,1)
+  #define NOZ_2_POS   BTN_POS(5,1), BTN_SIZE(4,1)
+  #define BED_POS     BTN_POS(1,2), BTN_SIZE(4,1)
+  #define FAN_POS     BTN_POS(5,2), BTN_SIZE(4,1)
+
+  #define _ICON_POS(x,y,w,h) x, y, w/4, h
+  #define _TEXT_POS(x,y,w,h) x + w/4, y, w - w/4, h
+  #define ICON_POS(pos) _ICON_POS(pos)
+  #define TEXT_POS(pos) _TEXT_POS(pos)
+
   CommandProcessor cmd;
 
   if (what & BACKGROUND) {
     cmd.font(Theme::font_small)
-    #ifdef TOUCH_UI_PORTRAIT
-       .tag(5)
-       .fgcolor(temp)      .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT)
-                                  .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT)
-       .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT)
-       .tag(0)
-       .fgcolor(progress)  .button( BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                  .button( BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #else
        .tag(5)
-       .fgcolor(temp)      .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT)
-                                  .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT)
-       .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT)
-       .tag(0)
-       .fgcolor(progress)  .button( BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                  .button( BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #endif
+       .fgcolor(temp)     .button( TEMP_RECT_1, F(""), OPT_FLAT)
+                          .button( TEMP_RECT_2, F(""), OPT_FLAT)
+       .fgcolor(fan_speed).button( FAN_POS,     F(""), OPT_FLAT)
+       .tag(0);
 
     // Draw Extruder Bitmap on Extruder Temperature Button
 
     cmd.tag(5)
-       .cmd(BITMAP_SOURCE(Extruder_Icon_Info))
-       .cmd(BITMAP_LAYOUT(Extruder_Icon_Info))
-       .cmd(BITMAP_SIZE  (Extruder_Icon_Info))
-       .icon (BTN_POS(1,1), BTN_SIZE(1,1),  Extruder_Icon_Info, icon_scale)
-       .icon (BTN_POS(5,1), BTN_SIZE(1,1),  Extruder_Icon_Info, icon_scale);
+       .cmd (BITMAP_SOURCE(Extruder_Icon_Info))
+       .cmd (BITMAP_LAYOUT(Extruder_Icon_Info))
+       .cmd (BITMAP_SIZE  (Extruder_Icon_Info))
+       .icon(ICON_POS(NOZ_1_POS), Extruder_Icon_Info, icon_scale)
+       .icon(ICON_POS(NOZ_2_POS), Extruder_Icon_Info, icon_scale);
 
     // Draw Bed Heat Bitmap on Bed Heat Button
-    cmd.cmd(BITMAP_SOURCE(Bed_Heat_Icon_Info))
-       .cmd(BITMAP_LAYOUT(Bed_Heat_Icon_Info))
-       .cmd(BITMAP_SIZE  (Bed_Heat_Icon_Info))
-       .icon (BTN_POS(1,2), BTN_SIZE(1,1), Bed_Heat_Icon_Info, icon_scale);
+    cmd.cmd (BITMAP_SOURCE(Bed_Heat_Icon_Info))
+       .cmd (BITMAP_LAYOUT(Bed_Heat_Icon_Info))
+       .cmd (BITMAP_SIZE  (Bed_Heat_Icon_Info))
+       .icon(ICON_POS(BED_POS), Bed_Heat_Icon_Info, icon_scale);
 
     // Draw Fan Percent Bitmap on Bed Heat Button
 
-    cmd.cmd(BITMAP_SOURCE(Fan_Icon_Info))
-       .cmd(BITMAP_LAYOUT(Fan_Icon_Info))
-       .cmd(BITMAP_SIZE  (Fan_Icon_Info))
-       .icon  (BTN_POS(5,2), BTN_SIZE(1,1), Fan_Icon_Info, icon_scale);
+    cmd.cmd (BITMAP_SOURCE(Fan_Icon_Info))
+       .cmd (BITMAP_LAYOUT(Fan_Icon_Info))
+       .cmd (BITMAP_SIZE  (Fan_Icon_Info))
+       .icon(ICON_POS(FAN_POS), Fan_Icon_Info, icon_scale);
 
     #ifdef TOUCH_UI_USE_UTF8
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
@@ -212,10 +207,10 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
 
     cmd.tag(5)
        .font(font_medium)
-       .text(BTN_POS(2,1), BTN_SIZE(3,1), e0_str)
-       .text(BTN_POS(6,1), BTN_SIZE(3,1), e1_str)
-       .text(BTN_POS(2,2), BTN_SIZE(3,1), bed_str)
-       .text(BTN_POS(6,2), BTN_SIZE(3,1), fan_str);
+       .text(TEXT_POS(NOZ_1_POS), e0_str)
+       .text(TEXT_POS(NOZ_2_POS), e1_str)
+       .text(TEXT_POS(BED_POS), bed_str)
+       .text(TEXT_POS(FAN_POS), fan_str);
   }
 }
 
@@ -225,15 +220,18 @@ void StatusScreen::draw_progress(draw_mode_t what) {
 
   CommandProcessor cmd;
 
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define TIME_POS     BTN_POS(1,3), BTN_SIZE(4,1)
+    #define PROGRESS_POS BTN_POS(5,3), BTN_SIZE(4,1)
+  #else
+    #define TIME_POS     BTN_POS(9,1), BTN_SIZE(4,1)
+    #define PROGRESS_POS BTN_POS(9,2), BTN_SIZE(4,1)
+  #endif
+
   if (what & BACKGROUND) {
     cmd.tag(0).font(font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-       .fgcolor(progress) .button(BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                 .button(BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #else
-       .fgcolor(progress) .button(BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                 .button(BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #endif
+       .fgcolor(progress).button(TIME_POS,     F(""), OPT_FLAT)
+                         .button(PROGRESS_POS, F(""), OPT_FLAT);
   }
 
   if (what & FOREGROUND) {
@@ -248,13 +246,8 @@ void StatusScreen::draw_progress(draw_mode_t what) {
     sprintf_P(progress_str, PSTR("%-3d %%"),      getProgress_percent() );
 
     cmd.font(font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-       .tag(0).text(BTN_POS(1,3), BTN_SIZE(4,1), time_str)
-              .text(BTN_POS(5,3), BTN_SIZE(4,1), progress_str);
-    #else
-       .tag(0).text(BTN_POS(9,1), BTN_SIZE(4,1), time_str)
-              .text(BTN_POS(9,2), BTN_SIZE(4,1), progress_str);
-    #endif
+       .tag(0).text(TIME_POS, time_str)
+              .text(PROGRESS_POS, progress_str);
   }
 }
 
@@ -266,6 +259,14 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
   if (what & FOREGROUND) {
     using namespace ExtUI;
 
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define MEDIA_BTN_POS  BTN_POS(1,8), BTN_SIZE(2,1)
+    #define MENU_BTN_POS   BTN_POS(3,8), BTN_SIZE(2,1)
+  #else
+    #define MEDIA_BTN_POS  BTN_POS(1,7), BTN_SIZE(2,2)
+    #define MENU_BTN_POS   BTN_POS(3,7), BTN_SIZE(2,2)
+  #endif
+
     const bool has_media = isMediaInserted() && !isPrintingFromMedia();
 
     CommandProcessor cmd;
@@ -273,42 +274,29 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
        .font(Theme::font_medium)
        .enabled(has_media)
        .colors(has_media ? action_btn : normal_btn)
-       .tag(3).button(
-          #ifdef TOUCH_UI_PORTRAIT
-            BTN_POS(1,8), BTN_SIZE(2,1),
-          #else
-            BTN_POS(1,7), BTN_SIZE(2,2),
-          #endif
-          isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA)
-        ).colors(!has_media ? action_btn : normal_btn)
-      #ifdef TOUCH_UI_PORTRAIT
-       .tag(4).button( BTN_POS(3,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_MENU));
-      #else
-       .tag(4).button( BTN_POS(3,7), BTN_SIZE(2,2), GET_TEXT_F(MSG_BUTTON_MENU));
-    #endif
+       .tag(3).button(MEDIA_BTN_POS, isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA))
+       .colors(!has_media ? action_btn : normal_btn)
+       .tag(4).button( MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
   }
   #undef  GRID_COLS
 }
 
 void StatusScreen::draw_status_message(draw_mode_t what, const char* message) {
   #define GRID_COLS 1
+
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define STATUS_POS  BTN_POS(1,4), BTN_SIZE(1,1)
+  #else
+    #define STATUS_POS  BTN_POS(1,3), BTN_SIZE(1,2)
+  #endif
+
   if (what & BACKGROUND) {
     CommandProcessor cmd;
     cmd.fgcolor(Theme::status_msg)
        .tag(0)
-    #ifdef TOUCH_UI_PORTRAIT
-       .button( BTN_POS(1,4), BTN_SIZE(1,1), F(""), OPT_FLAT);
-    #else
-       .button( BTN_POS(1,3), BTN_SIZE(1,2), F(""), OPT_FLAT);
-    #endif
+       .button( STATUS_POS, F(""), OPT_FLAT);
 
-    draw_text_box(cmd,
-    #ifdef TOUCH_UI_PORTRAIT
-      BTN_POS(1,4), BTN_SIZE(1,1),
-    #else
-      BTN_POS(1,3), BTN_SIZE(1,2),
-    #endif
-      message, OPT_CENTER, font_large);
+    draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
   }
   #undef  GRID_COLS
 }
@@ -326,10 +314,10 @@ void StatusScreen::setStatusMessage(const char* message) {
      .cmd(CLEAR(true,true,true));
 
   draw_temperature(BACKGROUND);
-  draw_progress(BACKGROUND);
-  draw_axis_position(BACKGROUND);
   draw_status_message(BACKGROUND, message);
   draw_interaction_buttons(BACKGROUND);
+  draw_progress(BACKGROUND);
+  draw_axis_position(BACKGROUND);
 
   storeBackground();
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
index 933e91db80fd..e2770d8116d3 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
@@ -24,121 +24,149 @@
 #pragma once
 
 namespace Theme {
-  #ifdef TOUCH_UI_LULZBOT_BIO
-    // The Lulzbot Bio uses the color PANTONE 2175C on the case silkscreen.
-    // This translates to HSL(208°, 100%, 39%) as an accent color on the GUI.
-
-    constexpr int   accent_hue          = 208;
-    constexpr float accent_sat          = 0.5;
-
-    constexpr uint32_t logo_bg_rgb      = 0xffffff;
-    constexpr uint32_t logo_fill_rgb    = 0xffffff;
-    constexpr uint32_t logo_stroke_rgb  = hsl_to_rgb(accent_hue, 1.0, 0.39);
+  #if ENABLED(TOUCH_UI_COCOA_THEME)
+    constexpr int      accent_hue           = 23;
+
+    // Browns and Oranges
+    constexpr uint32_t accent_color_1       = hsl_to_rgb(12.8,0.597,0.263); // Darkest
+    constexpr uint32_t accent_color_2       = hsl_to_rgb(12.8,0.597,0.263);
+    constexpr uint32_t accent_color_3       = hsl_to_rgb( 9.6,0.664,0.443);
+    constexpr uint32_t accent_color_4       = hsl_to_rgb(16.3,0.873,0.537);
+    constexpr uint32_t accent_color_5       = hsl_to_rgb(23.0,0.889,0.539);
+    constexpr uint32_t accent_color_6       = hsl_to_rgb(23.0,0.889,0.539); // Lightest
   #else
-    // The Lulzbot logo uses the color PANTONE 382c.
-    // This translates to HSL(68°, 68%, 52%) as an accent color on the GUI.
-
-    constexpr int   accent_hue          = 68;
-    constexpr float accent_sat          = 0.68;
-
-    constexpr uint32_t logo_bg_rgb      = hsl_to_rgb(accent_hue, 0.77, 0.64);
-    constexpr uint32_t logo_fill_rgb    = hsl_to_rgb(accent_hue, 0.68, 0.52); // Lulzbot Green
-    constexpr uint32_t logo_stroke_rgb  = 0x000000;
+    // Use linear accent colors
+
+    #if ANY(TOUCH_UI_ROYAL_THEME, TOUCH_UI_FROZEN_THEME)
+        // Dark blue accent colors
+        constexpr int      accent_hue       = 216;
+        constexpr float    accent_sat       = 0.7;
+    #else
+        // Green accent colors
+        constexpr int      accent_hue       = 68;
+        constexpr float    accent_sat       = 0.68;
+    #endif
+
+    // Shades of accent color
+    constexpr uint32_t accent_color_0       = hsl_to_rgb(accent_hue, accent_sat, 0.15); // Darkest
+    constexpr uint32_t accent_color_1       = hsl_to_rgb(accent_hue, accent_sat, 0.26);
+    constexpr uint32_t accent_color_2       = hsl_to_rgb(accent_hue, accent_sat, 0.39);
+    constexpr uint32_t accent_color_3       = hsl_to_rgb(accent_hue, accent_sat, 0.52);
+    constexpr uint32_t accent_color_4       = hsl_to_rgb(accent_hue, accent_sat, 0.65);
+    constexpr uint32_t accent_color_5       = hsl_to_rgb(accent_hue, accent_sat, 0.78);
+    constexpr uint32_t accent_color_6       = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
   #endif
 
-  // Shades of accent color
+  // Shades of gray
 
-  #ifdef TOUCH_UI_COCOA_PRESS
-    constexpr uint32_t accent_color_1   = hsl_to_rgb(12.8,0.597,0.263); // Darkest
-    constexpr uint32_t accent_color_2   = hsl_to_rgb(12.8,0.597,0.263);
-    constexpr uint32_t accent_color_3   = hsl_to_rgb( 9.6,0.664,0.443);
-    constexpr uint32_t accent_color_4   = hsl_to_rgb(16.3,0.873,0.537);
-    constexpr uint32_t accent_color_5   = hsl_to_rgb(23.0,0.889,0.539);
-    constexpr uint32_t accent_color_6   = hsl_to_rgb(23.0,0.889,0.539); // Lightest
+  constexpr float    gray_sat               = 0.14;
+  constexpr uint32_t gray_color_0           = hsl_to_rgb(accent_hue, gray_sat, 0.15); // Darkest
+  constexpr uint32_t gray_color_1           = hsl_to_rgb(accent_hue, gray_sat, 0.26);
+  constexpr uint32_t gray_color_2           = hsl_to_rgb(accent_hue, gray_sat, 0.39);
+  constexpr uint32_t gray_color_3           = hsl_to_rgb(accent_hue, gray_sat, 0.52);
+  constexpr uint32_t gray_color_4           = hsl_to_rgb(accent_hue, gray_sat, 0.65);
+  constexpr uint32_t gray_color_5           = hsl_to_rgb(accent_hue, gray_sat, 0.78);
+  constexpr uint32_t gray_color_6           = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest
+
+  #if ENABLED(TOUCH_UI_ROYAL_THEME)
+    constexpr uint32_t theme_darkest        = accent_color_1;
+    constexpr uint32_t theme_dark           = accent_color_4;
+
+    constexpr uint32_t bg_color             = gray_color_0;
+    constexpr uint32_t axis_label           = gray_color_1;
+
+    constexpr uint32_t bg_text_enabled      = accent_color_6;
+    constexpr uint32_t bg_text_disabled     = gray_color_0;
+    constexpr uint32_t bg_normal            = accent_color_4;
+    constexpr uint32_t fg_disabled          = gray_color_0;
+    constexpr uint32_t fg_normal            = accent_color_0;
+    constexpr uint32_t fg_action            = accent_color_1;
+
+    constexpr uint32_t logo_bg_rgb          = accent_color_1;
+    constexpr uint32_t logo_fill_rgb        = accent_color_0;
+    constexpr uint32_t logo_stroke_rgb      = accent_color_4;
+  #elif ANY(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
+    constexpr uint32_t theme_darkest        = accent_color_1;
+    constexpr uint32_t theme_dark           = accent_color_4;
+
+    constexpr uint32_t bg_color             = 0xFFFFFF;
+    constexpr uint32_t axis_label           = gray_color_5;
+
+    constexpr uint32_t bg_text_enabled      = accent_color_1;
+    constexpr uint32_t bg_text_disabled     = gray_color_1;
+    constexpr uint32_t bg_normal            = accent_color_4;
+    constexpr uint32_t fg_disabled          = gray_color_6;
+    constexpr uint32_t fg_normal            = accent_color_1;
+    constexpr uint32_t fg_action            = accent_color_4;
+
+    constexpr uint32_t logo_bg_rgb          = accent_color_5;
+    constexpr uint32_t logo_fill_rgb        = accent_color_6;
+    constexpr uint32_t logo_stroke_rgb      = accent_color_2;
   #else
-    constexpr uint32_t accent_color_1   = hsl_to_rgb(accent_hue, accent_sat, 0.26); // Darkest
-    constexpr uint32_t accent_color_2   = hsl_to_rgb(accent_hue, accent_sat, 0.39);
-    constexpr uint32_t accent_color_3   = hsl_to_rgb(accent_hue, accent_sat, 0.52);
-    constexpr uint32_t accent_color_4   = hsl_to_rgb(accent_hue, accent_sat, 0.65);
-    constexpr uint32_t accent_color_5   = hsl_to_rgb(accent_hue, accent_sat, 0.78);
-    constexpr uint32_t accent_color_6   = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
+    constexpr uint32_t theme_darkest        = gray_color_1;
+    constexpr uint32_t theme_dark           = gray_color_2;
+
+    constexpr uint32_t bg_color             = gray_color_1;
+    constexpr uint32_t axis_label           = gray_color_2;
+
+    constexpr uint32_t bg_text_enabled      = 0xFFFFFF;
+    constexpr uint32_t bg_text_disabled     = gray_color_2;
+    constexpr uint32_t bg_normal            = gray_color_1;
+    constexpr uint32_t fg_disabled          = gray_color_1;
+    constexpr uint32_t fg_normal            = gray_color_2;
+    constexpr uint32_t fg_action            = accent_color_2;
+
+    constexpr uint32_t logo_bg_rgb          = accent_color_4;
+    constexpr uint32_t logo_fill_rgb        = accent_color_3;
+    constexpr uint32_t logo_stroke_rgb      = 0x000000;
   #endif
 
-  // Shades of gray
-
-  constexpr float gray_sat = 0.14;
+  constexpr uint32_t shadow_rgb             = gray_color_6;
+  constexpr uint32_t stroke_rgb             = accent_color_1;
+  constexpr uint32_t fill_rgb               = accent_color_3;
+  constexpr uint32_t syringe_rgb            = accent_color_5;
 
-  constexpr uint32_t gray_color_1       = hsl_to_rgb(accent_hue, gray_sat, 0.26); // Darkest
-  constexpr uint32_t gray_color_2       = hsl_to_rgb(accent_hue, gray_sat, 0.39);
-  constexpr uint32_t gray_color_3       = hsl_to_rgb(accent_hue, gray_sat, 0.52);
-  constexpr uint32_t gray_color_4       = hsl_to_rgb(accent_hue, gray_sat, 0.65);
-  constexpr uint32_t gray_color_5       = hsl_to_rgb(accent_hue, gray_sat, 0.78);
-  constexpr uint32_t gray_color_6       = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest
-
-  #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
-    // Lulzbot TAZ Pro
-    constexpr uint32_t theme_darkest    = gray_color_1;
-    constexpr uint32_t theme_dark       = gray_color_2;
-
-    constexpr uint32_t bg_color         = theme_darkest;
-    constexpr uint32_t bg_text_disabled = theme_dark;
-    constexpr uint32_t bg_text_enabled  = 0xFFFFFF;
-    constexpr uint32_t bg_normal        = theme_darkest;
-
-    constexpr uint32_t fg_normal        = theme_dark;
-    constexpr uint32_t fg_action        = accent_color_2;
-    constexpr uint32_t fg_disabled      = theme_darkest;
+  #if ENABLED(TOUCH_UI_ROYAL_THEME)
+    constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.26);
+    constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.13);
+    constexpr uint32_t z_axis               = hsl_to_rgb(240, 1.00, 0.10); 
   #else
-    // Lulzbot Bio
-    constexpr uint32_t theme_darkest    = accent_color_1;
-    constexpr uint32_t theme_dark       = accent_color_4;
-
-    constexpr uint32_t bg_color         = 0xFFFFFF;
-    constexpr uint32_t bg_text_disabled = gray_color_1;
-    constexpr uint32_t bg_text_enabled  = accent_color_1;
-    constexpr uint32_t bg_normal        = accent_color_4;
-
-    constexpr uint32_t fg_normal        = accent_color_1;
-    constexpr uint32_t fg_action        = accent_color_4;
-    constexpr uint32_t fg_disabled      = gray_color_6;
-
-    constexpr uint32_t shadow_rgb       = gray_color_6;
-    constexpr uint32_t stroke_rgb       = accent_color_1;
-    constexpr uint32_t fill_rgb         = accent_color_3;
-    constexpr uint32_t syringe_rgb      = accent_color_5;
+    constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.5);
+    constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.37);
+    constexpr uint32_t z_axis               = hsl_to_rgb(240, 1.00, 0.37);
   #endif
-
-  constexpr uint32_t x_axis             = 0xFF0000;
-  constexpr uint32_t y_axis             = 0x00BB00;
-  constexpr uint32_t z_axis             = 0x0000BF;
-  constexpr uint32_t e_axis             = gray_color_2;
-  constexpr uint32_t feedrate           = gray_color_2;
-  constexpr uint32_t other              = gray_color_2;
+  constexpr uint32_t e_axis                 = axis_label;
+  constexpr uint32_t feedrate               = axis_label;
+  constexpr uint32_t other                  = axis_label;
 
   // Status screen
-  constexpr uint32_t progress           = gray_color_2;
-  constexpr uint32_t status_msg         = gray_color_2;
-  constexpr uint32_t fan_speed          = 0x377198;
-  constexpr uint32_t temp               = 0x892c78;
-  constexpr uint32_t axis_label         = gray_color_2;
+  constexpr uint32_t progress               = axis_label;
+  constexpr uint32_t status_msg             = axis_label;
+  #if ENABLED(TOUCH_UI_ROYAL_THEME)
+    constexpr uint32_t fan_speed            = hsl_to_rgb(240, 0.5, 0.13);
+    constexpr uint32_t temp                 = hsl_to_rgb(343, 1.0, 0.23);
+  #else
+    constexpr uint32_t fan_speed            = hsl_to_rgb(204, 0.47, 0.41);
+    constexpr uint32_t temp                 = hsl_to_rgb(311, 0.51, 0.35);
+  #endif
 
-  constexpr uint32_t disabled_icon      = gray_color_1;
+  constexpr uint32_t disabled_icon          = gray_color_1;
 
   // Calibration Registers Screen
-  constexpr uint32_t transformA         = 0x3010D0;
-  constexpr uint32_t transformB         = 0x4010D0;
-  constexpr uint32_t transformC         = 0x5010D0;
-  constexpr uint32_t transformD         = 0x6010D0;
-  constexpr uint32_t transformE         = 0x7010D0;
-  constexpr uint32_t transformF         = 0x8010D0;
-  constexpr uint32_t transformVal       = 0x104010;
-
-  constexpr btn_colors disabled_btn     = {.bg = bg_color,      .grad = fg_disabled, .fg = fg_disabled,  .rgb = fg_disabled };
-  constexpr btn_colors normal_btn       = {.bg = fg_action,     .grad = 0xFFFFFF,    .fg = fg_normal,    .rgb = 0xFFFFFF };
-  constexpr btn_colors action_btn       = {.bg = bg_color,      .grad = 0xFFFFFF,    .fg = fg_action,    .rgb = 0xFFFFFF };
-  constexpr btn_colors red_btn          = {.bg = 0xFF5555,      .grad = 0xFFFFFF,    .fg = 0xFF0000,     .rgb = 0xFFFFFF };
-  constexpr btn_colors ui_slider        = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = accent_color_3 };
-  constexpr btn_colors ui_toggle        = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = 0xFFFFFF };
+  constexpr uint32_t transformA             = 0x3010D0;
+  constexpr uint32_t transformB             = 0x4010D0;
+  constexpr uint32_t transformC             = 0x5010D0;
+  constexpr uint32_t transformD             = 0x6010D0;
+  constexpr uint32_t transformE             = 0x7010D0;
+  constexpr uint32_t transformF             = 0x8010D0;
+  constexpr uint32_t transformVal           = 0x104010;
+
+  constexpr btn_colors disabled_btn         = {.bg = bg_color,      .grad = fg_disabled, .fg = fg_disabled,  .rgb = fg_disabled };
+  constexpr btn_colors normal_btn           = {.bg = fg_action,     .grad = 0xFFFFFF,    .fg = fg_normal,    .rgb = 0xFFFFFF };
+  constexpr btn_colors action_btn           = {.bg = bg_color,      .grad = 0xFFFFFF,    .fg = fg_action,    .rgb = 0xFFFFFF };
+  constexpr btn_colors red_btn              = {.bg = 0xFF5555,      .grad = 0xFFFFFF,    .fg = 0xFF0000,     .rgb = 0xFFFFFF };
+  constexpr btn_colors ui_slider            = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = accent_color_3 };
+  constexpr btn_colors ui_toggle            = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = 0xFFFFFF };
 
   // Temperature color scale
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
index 5e01f0471c6b..a65cbea52ad8 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
@@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0xADF3, 0x546C, 0x419D, 0x546F, 0x3D05,
 
 #define LOGO_BACKGROUND logo_bg_rgb
 #define LOGO_PAINT_PATHS \
-  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \
-  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill)
+  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) \
+  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke)
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
index a5af7a14cd9c..a9c1d4049e91 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
@@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0x3C19, 0x70C5, 0x371A, 0x7159, 0x3302,
 
 #define LOGO_BACKGROUND logo_bg_rgb
 #define LOGO_PAINT_PATHS \
-  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \
-  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill)
+  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) \
+  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke)
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 61fecaed46a8..01e0d1b7a384 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -341,10 +341,10 @@ namespace ExtUI {
   void onConfigurationStoreWritten(bool success);
   void onConfigurationStoreRead(bool success);
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void OnPowerLossResume();
+    void onPowerLossResume();
   #endif
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst);
+    void onPidTuning(const result_t rst);
   #endif
 };
 
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 66a58f82dc08..855d09033e85 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -123,7 +123,7 @@ namespace ExtUI {
   }
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void OnPowerLossResume() {
+    void onPowerLossResume() {
       // Called on resume from power-loss
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POWER_LOSS);
     }
@@ -131,9 +131,9 @@ namespace ExtUI {
 
 
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst) {
+    void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
-      SERIAL_ECHOLNPAIR("OnPidTuning:",rst);
+      SERIAL_ECHOLNPAIR("onPidTuning:",rst);
       switch(rst) {
         case PID_BAD_EXTRUDER_NUM:
           ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_BAD_EXTRUDER_NUM));
diff --git a/Marlin/src/lcd/extui_example.cpp b/Marlin/src/lcd/extui_example.cpp
index 741787dbe665..5c9a193ded3b 100644
--- a/Marlin/src/lcd/extui_example.cpp
+++ b/Marlin/src/lcd/extui_example.cpp
@@ -94,13 +94,13 @@ namespace ExtUI {
   }
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void OnPowerLossResume() {
+    void onPowerLossResume() {
       // Called on resume from power-loss
     }
   #endif
 
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst) {
+    void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
     }
   #endif
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index 0bb8060b07c0..ddb8b846cb07 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -483,7 +483,7 @@ namespace ExtUI {
   void onLoadSettings(const char*) {}
   void onConfigurationStoreWritten(bool) {}
   void onConfigurationStoreRead(bool) {}
-  void OnPidTuning(const result_t) {}
+  void onPidTuning(const result_t) {}
 }
 
 #endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 8fa22e2c713e..a52d9652ac64 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -602,6 +602,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
+  
+  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Level X Axis");
+  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibrate");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4e49fcfa2463..4018c7586c74 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -411,7 +411,7 @@ volatile bool Temperature::raw_temps_ready = false;
     if (target > GHV(BED_MAXTEMP - 10, temp_range[heater].maxtemp - 15)) {
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       #if ENABLED(EXTENSIBLE_UI)
-        ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
+        ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
       #endif
       return;
     }
@@ -527,7 +527,7 @@ volatile bool Temperature::raw_temps_ready = false;
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
+          ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
         #endif
         break;
       }
@@ -572,7 +572,7 @@ volatile bool Temperature::raw_temps_ready = false;
       #endif
       if (((ms - t1) + (ms - t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::OnPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
+          ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
         #endif
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
@@ -623,7 +623,7 @@ volatile bool Temperature::raw_temps_ready = false;
           printerEventLEDs.onPidTuningDone(color);
         #endif
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE);
+          ExtUI::onPidTuning(ExtUI::result_t::PID_DONE);
         #endif
 
         goto EXIT_M303;
@@ -637,7 +637,7 @@ volatile bool Temperature::raw_temps_ready = false;
       printerEventLEDs.onPidTuningDone(color);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE);
+      ExtUI::onPidTuning(ExtUI::result_t::PID_DONE);
     #endif
 
     EXIT_M303:

From e7f020f3f208db23450c845a6c4b67d784a64058 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 31 Mar 2020 14:42:32 -0500
Subject: [PATCH 535/565] Shorten some internal pin names

---
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 9016028055ca..f32f006e9268 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -47,43 +47,43 @@
 #endif
 
 // Labeled pins
-#define TRIGORILLA_HEATER_BED_PIN              8
-#define TRIGORILLA_HEATER_0_PIN               10
-#define TRIGORILLA_HEATER_1_PIN               45  // Anycubic Kossel: Unused
+#define TG_HEATER_BED_PIN                      8
+#define TG_HEATER_0_PIN                       10
+#define TG_HEATER_1_PIN                       45  // Anycubic Kossel: Unused
 
-#define TRIGORILLA_FAN0_PIN                    9  // Anycubic Kossel: Usually the part cooling fan
-#define TRIGORILLA_FAN1_PIN                    7  // Anycubic Kossel: Unused
-#define TRIGORILLA_FAN2_PIN                   44  // Anycubic Kossel: Hotend fan
+#define TG_FAN0_PIN                            9  // Anycubic Kossel: Usually the part cooling fan
+#define TG_FAN1_PIN                            7  // Anycubic Kossel: Unused
+#define TG_FAN2_PIN                           44  // Anycubic Kossel: Hotend fan
 
 // Remap MOSFET pins to common usages:
 
-#define RAMPS_D10_PIN    TRIGORILLA_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
+#define RAMPS_D10_PIN            TG_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
 
 #if HOTENDS > 1                                   // EEF and EEB
-  #define RAMPS_D9_PIN   TRIGORILLA_HEATER_1_PIN
+  #define RAMPS_D9_PIN           TG_HEATER_1_PIN
   #if !TEMP_SENSOR_BED
     // EEF
-    #define RAMPS_D8_PIN     TRIGORILLA_FAN0_PIN
+    #define RAMPS_D8_PIN             TG_FAN0_PIN
   #else
     // EEB
-    #define RAMPS_D8_PIN     TRIGORILLA_HEATER_BED_PIN
-    #define FAN_PIN          TRIGORILLA_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
+    #define RAMPS_D8_PIN       TG_HEATER_BED_PIN
+    #define FAN_PIN                  TG_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
   #endif
 #elif TEMP_SENSOR_BED
   // EFB (Anycubic Kossel default)
-  #define RAMPS_D9_PIN       TRIGORILLA_FAN0_PIN
-  #define RAMPS_D8_PIN       TRIGORILLA_HEATER_BED_PIN
+  #define RAMPS_D9_PIN               TG_FAN0_PIN
+  #define RAMPS_D8_PIN         TG_HEATER_BED_PIN
 #else
   // EFF
-  #define RAMPS_D9_PIN       TRIGORILLA_FAN1_PIN
-  #define RAMPS_D8_PIN       TRIGORILLA_FAN0_PIN
+  #define RAMPS_D9_PIN               TG_FAN1_PIN
+  #define RAMPS_D8_PIN               TG_FAN0_PIN
 #endif
 
 #if HOTENDS > 1 || TEMP_SENSOR_BED                // EEF, EEB, EFB
-  #define FAN1_PIN           TRIGORILLA_FAN1_PIN
+  #define FAN1_PIN                   TG_FAN1_PIN
 #endif
-#define FAN2_PIN             TRIGORILLA_FAN2_PIN
-#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN   // Used in Anycubic Kossel example config
+#define FAN2_PIN                     TG_FAN2_PIN
+#define ORIG_E0_AUTO_FAN_PIN         TG_FAN2_PIN  // Used in Anycubic Kossel example config
 
 #include "pins_RAMPS.h"
 

From 5236889377c3cef48644696372db7e5bb2a92d3e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 1 Apr 2020 00:03:36 +0000
Subject: [PATCH 536/565] [cron] Bump distribution date (2020-04-01)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 33b9bbfbea6d..00d24330a6dc 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-31"
+  #define STRING_DISTRIBUTION_DATE "2020-04-01"
 #endif
 
 /**

From 178ca2bcdffcdd185cd38ba77627ee6e64cbec0b Mon Sep 17 00:00:00 2001
From: Marcelo Castagna <margaale@users.noreply.github.com>
Date: Tue, 31 Mar 2020 21:13:37 -0300
Subject: [PATCH 537/565] Fix M710 report formatting (#17356)

---
 Marlin/src/gcode/feature/controllerfan/M710.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index e00fa77d62b6..c19919b2d486 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -29,11 +29,11 @@
 
 void M710_report(const bool forReplay) {
   if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
-  SERIAL_ECHOLNPAIR("M710 "
-    "S", int(controllerFan.settings.active_speed),
-    "I", int(controllerFan.settings.idle_speed),
-    "A", int(controllerFan.settings.auto_mode),
-    "D", controllerFan.settings.duration,
+  SERIAL_ECHOLNPAIR("  M710"
+    " S", int(controllerFan.settings.active_speed),
+    " I", int(controllerFan.settings.idle_speed),
+    " A", int(controllerFan.settings.auto_mode),
+    " D", controllerFan.settings.duration,
     " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
     " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
   );

From 192c7c27b9130d5e13f6a1a96ccf490c48d2e26c Mon Sep 17 00:00:00 2001
From: Simon Jouet <simon-jouet@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:20:38 +0100
Subject: [PATCH 538/565] Fix extra TMC serial begin calls (#17351)

---
 Marlin/src/module/stepper/trinamic.cpp | 43 ++++++++++++++++----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 14598f9c73dc..f0ac48f51405 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -331,115 +331,126 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
     #endif
   #endif
 
+  enum TMCAxis : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7, TOTAL };
+
   void tmc_serial_begin() {
+    struct {
+      const void *ptr[TMCAxis::TOTAL];
+      bool began(const TMCAxis a, const void * const p) {
+        LOOP_L_N(i, a) if (p == ptr[i]) return true;
+        ptr[a] = p; return false;
+      };
+    } sp_helper;
+    #define HW_SERIAL_BEGIN(A) do{ if (sp_helper.began(TMCAxis::A, &A##_HARDWARE_SERIAL)) \
+                                         A##_HARDWARE_SERIAL.begin(TMC_BAUD_RATE); }while(0)
     #if AXIS_HAS_UART(X)
       #ifdef X_HARDWARE_SERIAL
-        X_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(X);
       #else
         stepperX.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(X2)
       #ifdef X2_HARDWARE_SERIAL
-        X2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(X2);
       #else
         stepperX2.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(Y)
       #ifdef Y_HARDWARE_SERIAL
-        Y_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(Y);
       #else
         stepperY.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(Y2)
       #ifdef Y2_HARDWARE_SERIAL
-        Y2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(Y2);
       #else
         stepperY2.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(Z)
       #ifdef Z_HARDWARE_SERIAL
-        Z_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(Z);
       #else
         stepperZ.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(Z2)
       #ifdef Z2_HARDWARE_SERIAL
-        Z2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(Z2);
       #else
         stepperZ2.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(Z3)
       #ifdef Z3_HARDWARE_SERIAL
-        Z3_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(Z3);
       #else
         stepperZ3.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(Z4)
       #ifdef Z4_HARDWARE_SERIAL
-        Z4_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(Z4);
       #else
         stepperZ4.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E0)
       #ifdef E0_HARDWARE_SERIAL
-        E0_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E0);
       #else
         stepperE0.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E1)
       #ifdef E1_HARDWARE_SERIAL
-        E1_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E1);
       #else
         stepperE1.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E2)
       #ifdef E2_HARDWARE_SERIAL
-        E2_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E2);
       #else
         stepperE2.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E3)
       #ifdef E3_HARDWARE_SERIAL
-        E3_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E3);
       #else
         stepperE3.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E4)
       #ifdef E4_HARDWARE_SERIAL
-        E4_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E4);
       #else
         stepperE4.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E5)
       #ifdef E5_HARDWARE_SERIAL
-        E5_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E5);
       #else
         stepperE5.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E6)
       #ifdef E6_HARDWARE_SERIAL
-        E6_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E6);
       #else
         stepperE6.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
     #if AXIS_HAS_UART(E7)
       #ifdef E7_HARDWARE_SERIAL
-        E7_HARDWARE_SERIAL.begin(TMC_BAUD_RATE);
+        HW_SERIAL_BEGIN(E7);
       #else
         stepperE7.beginSerial(TMC_BAUD_RATE);
       #endif

From c47bdae9f20207b08f3f8b581c2e9a00bbf6b15b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 2 Apr 2020 00:03:23 +0000
Subject: [PATCH 539/565] [cron] Bump distribution date (2020-04-02)

---
 Marlin/src/inc/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 00d24330a6dc..0316c69672e7 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-04-01"
+  #define STRING_DISTRIBUTION_DATE "2020-04-02"
 #endif
 
 /**

From 7f5dc7b91920ffd4ecd8b70e58bc97cc6be39fa2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 1 Apr 2020 15:00:43 -0500
Subject: [PATCH 540/565] More 8 extruders (TMC) support

---
 Marlin/src/module/configuration_store.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 2ecc9299c9b3..b2c728fbe0e5 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -37,7 +37,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V76"
+#define EEPROM_VERSION "V77"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -134,10 +134,10 @@
 
 #pragma pack(push, 1) // No padding between variables
 
-typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stepper_current_t;
-typedef struct { uint32_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_hybrid_threshold_t;
-typedef struct {  int16_t X, Y, Z, X2;                                     } tmc_sgt_t;
-typedef struct {     bool X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stealth_enabled_t;
+typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stepper_current_t;
+typedef struct { uint32_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_hybrid_threshold_t;
+typedef struct {  int16_t X, Y, Z, X2;                                                 } tmc_sgt_t;
+typedef struct {     bool X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stealth_enabled_t;
 
 // Limit an index to an array size
 #define ALIM(I,ARR) _MIN(I, COUNT(ARR) - 1)

From 514afddeb4b3a7ede9ff481504aae69219a95f68 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 1 Apr 2020 18:53:58 -0500
Subject: [PATCH 541/565] Minor code cleanup

---
 Marlin/src/feature/tmc_util.cpp               |  2 +-
 Marlin/src/inc/Conditionals_post.h            |  2 +-
 Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp   |  4 ++--
 Marlin/src/lcd/dogm/ultralcd_DOGM.cpp         |  8 +------
 Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp |  1 -
 Marlin/src/lcd/ultralcd.cpp                   |  6 ++---
 Marlin/src/module/configuration_store.cpp     |  6 ++---
 Marlin/src/module/temperature.cpp             | 22 ++++++-------------
 8 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index e5e69eed50b3..bfc2e1a555cc 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1254,7 +1254,7 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
     #endif
   }
 
-  if (axis_connection) ui.set_status_P(GET_TEXT(MSG_ERROR_TMC));
+  if (axis_connection) LCD_MESSAGEPGM(MSG_ERROR_TMC);
 }
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 9ea298f02d46..20867b4fea08 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2164,7 +2164,7 @@
     #define SHARED_SD_CARD
   #endif
   #if DISABLED(SHARED_SD_CARD)
-    #define INIT_SDCARD_ON_BOOT
+    #define INIT_SDCARD_ON_BOOT 1
   #endif
 #endif
 
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index ee025f6585d6..3c89d1803c55 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -367,11 +367,11 @@ void MarlinUI::init_lcd() {
 }
 
 bool MarlinUI::detected() {
-  return true
+  return (true
     #if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && defined(DETECT_DEVICE)
       && lcd.LcdDetected() == 1
     #endif
-  ;
+  );
 }
 
 #if HAS_SLOW_BUTTONS
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index fc7656f1cd7e..4e07999bf6f6 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -244,13 +244,7 @@ void MarlinUI::init_lcd() {
   #if DISABLED(MKS_LCD12864B)
 
     #if PIN_EXISTS(LCD_BACKLIGHT)
-      OUT_WRITE(LCD_BACKLIGHT_PIN, (
-        #if ENABLED(DELAYED_BACKLIGHT_INIT)
-          LOW  // Illuminate after reset
-        #else
-          HIGH // Illuminate right away
-        #endif
-      ));
+      OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
     #endif
 
     #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
index 6ac84c2bb0af..bd73e811d125 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
@@ -441,7 +441,6 @@ void DGUSScreenVariableHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variab
     DGUSLCD_SendStringToDisplay(var);
   }
 
-
   void DGUSScreenVariableHandler::SDCardInserted() {
     top_file = 0;
     auto cs = ScreenHandler.getCurrentScreen();
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index bbcb678dd84a..ff0331eb2072 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -351,10 +351,8 @@ void MarlinUI::init() {
     #endif
   #endif
 
-  #if HAS_ENCODER_ACTION
-    #if HAS_SLOW_BUTTONS
-      slow_buttons = 0;
-    #endif
+  #if HAS_ENCODER_ACTION && HAS_SLOW_BUTTONS
+    slow_buttons = 0;
   #endif
 
   update_buttons();
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index b2c728fbe0e5..a2beb322f96f 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1391,7 +1391,7 @@ void MarlinSettings::postprocess() {
       DEBUG_ECHO_START();
       DEBUG_ECHOLNPAIR("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
       #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
-        ui.set_status_P(GET_TEXT(MSG_ERR_EEPROM_VERSION));
+        LCD_MESSAGEPGM(MSG_ERR_EEPROM_VERSION);
       #endif
       eeprom_error = true;
     }
@@ -2199,7 +2199,7 @@ void MarlinSettings::postprocess() {
         DEBUG_ECHO_START();
         DEBUG_ECHOLNPAIR("Index: ", int(eeprom_index - (EEPROM_OFFSET)), " Size: ", datasize());
         #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
-          ui.set_status_P(GET_TEXT(MSG_ERR_EEPROM_INDEX));
+          LCD_MESSAGEPGM(MSG_ERR_EEPROM_INDEX);
         #endif
       }
       else if (working_crc != stored_crc) {
@@ -2207,7 +2207,7 @@ void MarlinSettings::postprocess() {
         DEBUG_ERROR_START();
         DEBUG_ECHOLNPAIR("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
         #if HAS_LCD_MENU && DISABLED(EEPROM_AUTO_INIT)
-          ui.set_status_P(GET_TEXT(MSG_ERR_EEPROM_CRC));
+          LCD_MESSAGEPGM(MSG_ERR_EEPROM_CRC);
         #endif
       }
       else if (!validating) {
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4018c7586c74..42c79fdd1988 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -542,22 +542,14 @@ volatile bool Temperature::raw_temps_ready = false;
 
         // Make sure heating is actually working
         #if WATCH_BED || WATCH_HOTENDS
-          if (
-            #if WATCH_BED && WATCH_HOTENDS
-              true
-            #elif WATCH_HOTENDS
-              !isbed
-            #else
-              isbed
-            #endif
-          ) {
-            if (!heated) {                                          // If not yet reached target...
-              if (current_temp > next_watch_temp) {                      // Over the watch temp?
-                next_watch_temp = current_temp + watch_temp_increase;    // - set the next temp to watch for
-                temp_change_ms = ms + watch_temp_period * 1000UL;   // - move the expiration timer up
-                if (current_temp > watch_temp_target) heated = true;     // - Flag if target temperature reached
+          if (BOTH(WATCH_BED, WATCH_HOTENDS) || isbed == DISABLED(WATCH_HOTENDS)) {
+            if (!heated) {                                            // If not yet reached target...
+              if (current_temp > next_watch_temp) {                   // Over the watch temp?
+                next_watch_temp = current_temp + watch_temp_increase; // - set the next temp to watch for
+                temp_change_ms = ms + watch_temp_period * 1000UL;     // - move the expiration timer up
+                if (current_temp > watch_temp_target) heated = true;  // - Flag if target temperature reached
               }
-              else if (ELAPSED(ms, temp_change_ms))                 // Watch timer expired
+              else if (ELAPSED(ms, temp_change_ms))                   // Watch timer expired
                 _temp_error(heater, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
             }
             else if (current_temp < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?

From 62e8c2dd871f62d80122fe919d065ee3a3e5d520 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 1 Apr 2020 23:50:08 -0500
Subject: [PATCH 542/565] Fix up 'system' includes

---
 Marlin/src/HAL/ESP32/eeprom_impl.cpp           | 2 +-
 Marlin/src/HAL/SAMD51/QSPIFlash.h              | 2 +-
 Marlin/src/feature/digipot/digipot_mcp4018.cpp | 4 ++--
 Marlin/src/feature/digipot/digipot_mcp4451.cpp | 2 +-
 Marlin/src/module/temperature.cpp              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/eeprom_impl.cpp b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
index dbfee14055c4..f36aabf28e3a 100644
--- a/Marlin/src/HAL/ESP32/eeprom_impl.cpp
+++ b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
@@ -27,7 +27,7 @@
 #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
 
 #include "../shared/eeprom_api.h"
-#include "EEPROM.h"
+#include <EEPROM.h>
 
 #define EEPROM_SIZE 4096
 
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/QSPIFlash.h
index 7f75286ebfc1..b6f22769ff60 100644
--- a/Marlin/src/HAL/SAMD51/QSPIFlash.h
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.h
@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include "Adafruit_SPIFlashBase.h"
+#include <Adafruit_SPIFlashBase.h>
 
 // This class extends Adafruit_SPIFlashBase by adding caching support.
 //
diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
index e8df4a475fee..ebfbee794ab5 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
@@ -24,8 +24,8 @@
 
 #if BOTH(DIGIPOT_I2C, DIGIPOT_MCP4018)
 
-#include "Stream.h"
-#include "utility/twi.h"
+#include <Stream.h>
+#include <utility/twi.h>
 #include <SlowSoftI2CMaster.h>  //https://github.com/stawel/SlowSoftI2CMaster
 
 // Settings for the I2C based DIGIPOT (MCP4018) based on WT150
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index 1183c96aa515..79bb6eb3c28a 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -24,7 +24,7 @@
 
 #if ENABLED(DIGIPOT_I2C) && DISABLED(DIGIPOT_MCP4018)
 
-#include "Stream.h"
+#include <Stream.h>
 #include <Wire.h>
 
 #if MB(MKS_SBASE)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 42c79fdd1988..af2f1a10e8dd 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(MAX6675_IS_MAX31865)
-  #include "Adafruit_MAX31865.h"
+  #include <Adafruit_MAX31865.h>
   #ifndef MAX31865_CS_PIN
     #define MAX31865_CS_PIN     MAX6675_SS_PIN  // HW:49   SW:65    for example
   #endif

From f263782f1b1fa981c292f6cdeea8e00bc6f73df3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 1 Apr 2020 23:50:32 -0500
Subject: [PATCH 543/565] Fix ESP32 eeprom flag

---
 Marlin/src/HAL/ESP32/eeprom_impl.cpp         | 4 ++--
 Marlin/src/HAL/ESP32/inc/Conditionals_post.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/eeprom_impl.cpp b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
index f36aabf28e3a..1c005ff3d4a3 100644
--- a/Marlin/src/HAL/ESP32/eeprom_impl.cpp
+++ b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
@@ -24,7 +24,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
+#if USE_WIRED_EEPROM
 
 #include "../shared/eeprom_api.h"
 #include <EEPROM.h>
@@ -59,5 +59,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() { return EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS
+#endif // USE_WIRED_EEPROM
 #endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
index 11603c9ef41d..8849c06e9355 100644
--- a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
-#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
-  #define SDCARD_EEPROM_EMULATION
+#undef USE_WIRED_EEPROM
+#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
+  #define USE_WIRED_EEPROM 1
 #endif

From 9f86dde19525af511b07239c23d93d586a045122 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 2 Apr 2020 01:22:48 -0500
Subject: [PATCH 544/565] Clean up UI declarations, apply TERN_

---
 Marlin/src/MarlinCore.cpp | 38 ++++++++++++++++++++------------------
 Marlin/src/MarlinCore.h   | 16 +++-------------
 Marlin/src/lcd/ultralcd.h | 23 +++++++++++++----------
 3 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 8130affe301c..3a6582bbb1e6 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -218,13 +218,8 @@ bool wait_for_heatup = true;
     KEEPALIVE_STATE(PAUSED_FOR_USER);
     wait_for_user = true;
     if (ms) ms += millis(); // expire time
-    while (wait_for_user && !(ms && ELAPSED(millis(), ms))) {
-      idle(
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          no_sleep
-        #endif
-      );
-    }
+    while (wait_for_user && !(ms && ELAPSED(millis(), ms)))
+      idle(TERN_(ADVANCED_PAUSE_FEATURE, no_sleep));
     wait_for_user = false;
   }
 
@@ -647,52 +642,54 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
 /**
  * Standard idle routine keeps the machine alive
  */
-void idle(
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    bool no_stepper_sleep/*=false*/
-  #endif
-) {
+void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
+  // Handle Power-Loss Recovery
   #if ENABLED(POWER_LOSS_RECOVERY) && PIN_EXISTS(POWER_LOSS)
     recovery.outage();
   #endif
 
+  // Run StallGuard endstop checks
   #if ENABLED(SPI_ENDSTOPS)
     if (endstops.tmc_spi_homing.any
-      #if ENABLED(IMPROVE_HOMING_RELIABILITY)
-        && ELAPSED(millis(), sg_guard_period)
-      #endif
-    ) {
-      for (uint8_t i = 4; i--;) // Read SGT 4 times per idle loop
+      && TERN1(IMPROVE_HOMING_RELIABILITY, ELAPSED(millis(), sg_guard_period))
+    ) LOOP_L_N(i, 4) // Read SGT 4 times per idle loop
         if (endstops.tmc_spi_homing_check()) break;
-    }
   #endif
 
+  // Max7219 heartbeat, animation, etc.
   #if ENABLED(MAX7219_DEBUG)
     max7219.idle_tasks();
   #endif
 
+  // Read Buttons and Update the LCD
   ui.update();
 
+  // Announce Host Keepalive state (if any)
   #if ENABLED(HOST_KEEPALIVE_FEATURE)
     gcode.host_keepalive();
   #endif
 
+  // Core Marlin activities
   manage_inactivity(
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       no_stepper_sleep
     #endif
   );
 
+  // Manage heaters (and Watchdog)
   thermalManager.manage_heater();
 
+  // Update the Print Job Timer state
   #if ENABLED(PRINTCOUNTER)
     print_job_timer.tick();
   #endif
 
+  // Update the Beeper queue
   #if USE_BEEPER
     buzzer.tick();
   #endif
 
+  // Run i2c Position Encoders
   #if ENABLED(I2C_POSITION_ENCODERS)
     static millis_t i2cpem_next_update_ms;
     if (planner.has_blocks_queued()) {
@@ -704,10 +701,12 @@ void idle(
     }
   #endif
 
+  // Run HAL idle tasks
   #ifdef HAL_IDLETASK
     HAL_idletask();
   #endif
 
+  // Auto-report Temperatures / SD Status
   #if HAS_AUTO_REPORTING
     if (!gcode.autoreport_paused) {
       #if ENABLED(AUTO_REPORT_TEMPERATURES)
@@ -719,14 +718,17 @@ void idle(
     }
   #endif
 
+  // Handle USB Flash Drive insert / remove
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
     Sd2Card::idle();
   #endif
 
+  // Update the Prusa MMU2
   #if ENABLED(PRUSA_MMU2)
     mmu2.mmu_loop();
   #endif
 
+  // Handle Joystick jogging
   #if ENABLED(POLL_JOG)
     joystick.inject_jog_moves();
   #endif
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index e6678c5b1888..3f8b72b88a53 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -38,19 +38,9 @@
 
 void stop();
 
-void idle(
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    bool no_stepper_sleep=false    // Pass true to keep steppers from timing out
-  #endif
-);
-
-inline void idle_no_sleep() {
-  idle(
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      true
-    #endif
-  );
-}
+// Pass true to keep steppers from timing out
+void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep=false));
+inline void idle_no_sleep() { idle(TERN_(ADVANCED_PAUSE_FEATURE, true)); }
 
 #if ENABLED(EXPERIMENTAL_I2CBUS)
   #include "feature/twibus.h"
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index 1bcf9956feee..2737a1a64883 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -273,7 +273,16 @@ class MarlinUI {
 
   // LCD implementations
   static void clear_lcd();
-  static void init_lcd();
+
+  #if HAS_SPI_LCD
+    static bool detected();
+    static void init_lcd();
+    FORCE_INLINE static void refresh() { refresh(LCDVIEW_CLEAR_CALL_REDRAW); }
+  #else
+    static inline bool detected() { return true; }
+    static inline void init_lcd() {}
+    static inline void refresh()  {}
+  #endif
 
   #if HAS_DISPLAY
 
@@ -332,12 +341,9 @@ class MarlinUI {
 
       static millis_t next_button_update_ms;
 
-      static bool detected();
-
       static LCDViewAction lcdDrawUpdate;
       FORCE_INLINE static bool should_draw() { return bool(lcdDrawUpdate); }
       FORCE_INLINE static void refresh(const LCDViewAction type) { lcdDrawUpdate = type; }
-      FORCE_INLINE static void refresh() { refresh(LCDVIEW_CLEAR_CALL_REDRAW); }
 
       #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
         static void draw_custom_bootscreen(const uint8_t frame=0);
@@ -403,8 +409,6 @@ class MarlinUI {
 
       static void status_screen();
 
-    #else
-      static void refresh() {}
     #endif
 
     static bool get_blink();
@@ -418,13 +422,12 @@ class MarlinUI {
   #else // No LCD
 
     // Send status to host as a notification
-    void set_status(const char* message, const bool=false);
-    void set_status_P(PGM_P message, const int8_t=0);
-    void status_printf_P(const uint8_t, PGM_P message, ...);
+    static void set_status(const char* message, const bool=false);
+    static void set_status_P(PGM_P message, const int8_t=0);
+    static void status_printf_P(const uint8_t, PGM_P message, ...);
 
     static inline void init() {}
     static inline void update() {}
-    static inline void refresh() {}
     static inline void return_to_status() {}
     static inline void set_alert_status_P(PGM_P const) {}
     static inline void reset_status(const bool=false) {}

From 555a90e0a298080c3a0bf700072ce652c00ed633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Thu, 2 Apr 2020 17:37:58 +0500
Subject: [PATCH 545/565] fix #32

---
 Marlin/Configuration.h     | 12 ------------
 Marlin/Configuration_adv.h |  8 ++++----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6c04e586fd90..a93c00c31a10 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -723,11 +723,7 @@
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
 //#define Z4_DRIVER_TYPE A4988
-#if (GITHUB_USER==URSOFT)
-#define E0_DRIVER_TYPE LV8729
-#else
 #define E0_DRIVER_TYPE TMC2208_STANDALONE
-#endif
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
@@ -779,11 +775,7 @@
  * Override with M92
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-#if (GITHUB_USER==URSOFT)
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 * 2 }
-#else
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 }
-#endif
 /**
  * Default Max Feed Rate (mm/s)
  * Override with M203
@@ -1127,11 +1119,7 @@
 // @section extruder
 
 // For direct drive extruder v9 set to true, for geared extruder set to false.
-#if (GITHUB_USER==URSOFT)
-#define INVERT_E0_DIR true
-#else
 #define INVERT_E0_DIR false
-#endif
 #define INVERT_E1_DIR false
 #define INVERT_E2_DIR false
 #define INVERT_E3_DIR false
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 98539c7aaaf5..cb8082be8cfa 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1693,8 +1693,8 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-//#define MINIMUM_STEPPER_POST_DIR_DELAY 20
-//#define MINIMUM_STEPPER_PRE_DIR_DELAY 20
+#define MINIMUM_STEPPER_POST_DIR_DELAY 20
+#define MINIMUM_STEPPER_PRE_DIR_DELAY 20
 
 /**
  * Minimum stepper driver pulse width (in µs)
@@ -1707,7 +1707,7 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-//#define MINIMUM_STEPPER_PULSE 2
+#define MINIMUM_STEPPER_PULSE 2
 
 /**
  * Maximum stepping rate (in Hz) the stepper driver allows
@@ -1721,7 +1721,7 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-//#define MAXIMUM_STEPPER_RATE 400000
+#define MAXIMUM_STEPPER_RATE 400000
 
 // @section temperature
 

From 3460acc1592cd0229356992365ae1fc3076f0947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Mon, 6 Apr 2020 18:36:42 +0500
Subject: [PATCH 546/565] fix #45

---
 Marlin/Configuration_adv.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 318752681289..0a049821ab45 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1060,6 +1060,7 @@
     #define PE_LEDS_COMPLETED_TIME  5       // (seconds) Time to keep the LED "done" color before restoring normal illumination
    #else
     #define PE_LEDS_COMPLETED_TIME  (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
+   #endif
   #endif
 
   /**

From ecd2288ad62a139c4f9ecdb141d0f75353c57c14 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Wed, 8 Apr 2020 19:48:21 +0300
Subject: [PATCH 547/565] voltage

---
 Marlin/Configuration.h     | 10 +++++-----
 Marlin/Configuration_adv.h | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ee21032ac52c..69e4997a89b7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -795,7 +795,7 @@
  * Override with M201
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-#define DEFAULT_MAX_ACCELERATION      { 2000, 2000, 100, 100 }
+#define DEFAULT_MAX_ACCELERATION      { 2500, 2500, 100, 100 }
 
 #define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
@@ -810,9 +810,9 @@
  *   M204 R    Retract Acceleration
  *   M204 T    Travel Acceleration
  */
-#define DEFAULT_ACCELERATION          2000    // X, Y, Z and E acceleration for printing moves
-#define DEFAULT_RETRACT_ACCELERATION  2000    // E acceleration for retracts
-#define DEFAULT_TRAVEL_ACCELERATION   2000    // X, Y, Z acceleration for travel (non printing) moves
+#define DEFAULT_ACCELERATION          2500    // X, Y, Z and E acceleration for printing moves
+#define DEFAULT_RETRACT_ACCELERATION  2500    // E acceleration for retracts
+#define DEFAULT_TRAVEL_ACCELERATION   2500    // X, Y, Z acceleration for travel (non printing) moves
 
 /**
  * Default Jerk limits (mm/s)
@@ -2058,7 +2058,7 @@
 //#define FYSETC_MINI_12864_1_2  // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0  // Type A/B. Discreet RGB Backlight
 #define FYSETC_MINI_12864_2_1  // Type A/B. Neopixel RGB Backlight
-#define DEFAULT_LCD_CONTRAST 190 //изображение на экране пропадает. помогло сначала M250 C255 затем M150 P255 B255 R255 U255 W255
+#define DEFAULT_LCD_CONTRAST 255 //изображение на экране пропадает. помогло сначала M250 C255 затем M150 P255 B255 R255 U255 W255
 //
 // Factory display for Creality CR-10
 // https://www.aliexpress.com/item/32833148327.html
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 18e1fbef76ca..470cf2f8aad0 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2062,7 +2062,7 @@
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
-    #define X_CURRENT       890        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
+    #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
     #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
     #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
@@ -2078,7 +2078,7 @@
   #endif
 
   #if AXIS_IS_TMC(Y)
-    #define Y_CURRENT       890
+    #define Y_CURRENT       800
     #define Y_CURRENT_HOME  Y_CURRENT
     #define Y_MICROSTEPS     16
     #define Y_RSENSE          0.11
@@ -2094,7 +2094,7 @@
   #endif
 
   #if AXIS_IS_TMC(Z)
-    #define Z_CURRENT       550
+    #define Z_CURRENT       800
     #define Z_CURRENT_HOME  Z_CURRENT
     #define Z_MICROSTEPS     16
     #define Z_RSENSE          0.11
@@ -2126,14 +2126,14 @@
   #endif
 
   #if AXIS_IS_TMC(E0)
-    #define E0_CURRENT      550
+    #define E0_CURRENT      600
     #define E0_MICROSTEPS    16
     #define E0_RSENSE         0.11
     #define E0_CHAIN_POS     -1
   #endif
 
   #if AXIS_IS_TMC(E1)
-    #define E1_CURRENT      550
+    #define E1_CURRENT      800
     #define E1_MICROSTEPS    16
     #define E1_RSENSE         0.11
     #define E1_CHAIN_POS     -1

From d26bc97087b202f24489436b0fcaa4c8eb1d697a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Thu, 9 Apr 2020 18:10:50 +0500
Subject: [PATCH 548/565] fix #33

---
 Marlin/Configuration.h                    |  9 ++++---
 Marlin/src/feature/leds/leds.cpp          | 13 ++++++++++
 Marlin/src/feature/leds/leds.h            | 29 +++++++++++++++++++++++
 Marlin/src/feature/leds/neopixel.cpp      |  9 -------
 Marlin/src/gcode/feature/leds/M150.cpp    | 22 +++++++++++++++--
 Marlin/src/lcd/menu/menu_led.cpp          | 28 +++++++++++-----------
 Marlin/src/lcd/ultralcd.cpp               | 27 +++++++++++++++++----
 Marlin/src/module/configuration_store.cpp | 11 ++++-----
 8 files changed, 110 insertions(+), 38 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a93c00c31a10..95fac4436270 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2283,17 +2283,20 @@
 #define NEOPIXEL_LED
 #define NEOPIXEL_EEPROM_STORE_HACK // store user color to EERPOM (unused area) // https://github.com/ursoft/Marlin/issues/33
 #if ENABLED(NEOPIXEL_LED)
-  #define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
+  //#define NEOPIXEL_TYPE   NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
   //#define NEOPIXEL_PIN     4       // LED driving pin
   //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
   //#define NEOPIXEL2_PIN    5
-  //#define NEOPIXEL_PIXELS 30       // Number of LEDs in the strip, larger of 2 strips if 2 neopixel strips are used
+  // последний светодиод №3: если не задействовать, то при выключении оставляет красную подсветку
+  // если задействовать, то можно его яркостью управлять другими, в т.ч. погасить весь экран (управлять его цветом пока не получается)
+  #define NEOPIXEL_PIXELS 4
+  #define NEOPIXEL_SAVING_TIMEOUT 120 // seconds
   //#define NEOPIXEL_IS_SEQUENTIAL   // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
   #define NEOPIXEL_BRIGHTNESS 127  // Initial brightness (0-255)
   //#define NEOPIXEL_STARTUP_TEST  // Cycle through colors at startup
 
   // Use a single Neopixel LED for static (background) lighting
-  //#define NEOPIXEL_BKGD_LED_INDEX  0               // Index of the LED to use
+  #define NEOPIXEL_BKGD_LED_INDEX  0               // Index of the LED to use
   //#define NEOPIXEL_BKGD_COLOR { 0, 255, 0, 0 } // R, G, B, W
 #endif
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 25ad1e267aff..55acfb20f50e 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -54,6 +54,19 @@
     LED_USER_PRESET_BRIGHTNESS
   );
 #endif
+#ifdef NEOPIXEL_BKGD_LED_INDEX
+
+void Marlin_NeoPixel::set_color_background() {
+#ifdef NEOPIXEL_BKGD_COLOR
+    uint8_t background_color[4] = NEOPIXEL_BKGD_COLOR;
+    set_pixel_color(NEOPIXEL_BKGD_LED_INDEX, adaneo1.Color(background_color[0], background_color[1], background_color[2], background_color[3]));
+#else
+    set_pixel_color(NEOPIXEL_BKGD_LED_INDEX, neo.Color(LEDLights::defaultLEDColor.r, LEDLights::defaultLEDColor.g, LEDLights::defaultLEDColor.b, LEDLights::defaultLEDColor.w));
+#endif
+    show();
+  }
+
+#endif
 
 #if EITHER(LED_CONTROL_MENU, PRINTER_EVENT_LEDS)
   LEDColor LEDLights::color;
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 4bfc505939fc..be6ed28b25c5 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -181,6 +181,35 @@ class LEDLights {
   #if ENABLED(LED_COLOR_PRESETS)
    #ifdef NEOPIXEL_EEPROM_STORE_HACK
     static LEDColor defaultLEDColor;
+    static inline void set_default_all()  { 
+      defaultLEDColor =  MakeLEDColor(
+        LED_USER_PRESET_RED,
+        LED_USER_PRESET_GREEN,
+        LED_USER_PRESET_BLUE,
+        LED_USER_PRESET_WHITE,
+        LED_USER_PRESET_BRIGHTNESS
+      );
+      neo.set_color_background();
+      set_color(defaultLEDColor);
+    }
+    static void set_color_all(const LEDColor &color
+      #if ENABLED(NEOPIXEL_LED)
+        , bool isSequence=false
+      #endif
+    ) {
+      defaultLEDColor = color;
+      neo.set_color_background();
+      set_color(color, isSequence);
+    }
+    static inline void set_red_all()      { set_color_all(LEDColorRed()); }
+    static inline void set_orange_all()   { set_color_all(LEDColorOrange()); }
+    static inline void set_yellow_all()   { set_color_all(LEDColorYellow()); }
+    static inline void set_blue_all()     { set_color_all(LEDColorBlue()); }
+    static inline void set_indigo_all()   { set_color_all(LEDColorIndigo()); }
+    static inline void set_violet_all()   { set_color_all(LEDColorViolet()); }
+    static inline void set_green_all()    { set_color_all(LEDColorGreen()); }
+    static inline void set_white_all()    { set_color_all(LEDColorWhite()); }
+    static inline void update_all()       { set_color_all(color); }
    #else
     static const LEDColor defaultLEDColor;
    #endif
diff --git a/Marlin/src/feature/leds/neopixel.cpp b/Marlin/src/feature/leds/neopixel.cpp
index 892ebe15cbc7..2d2c14b190a9 100644
--- a/Marlin/src/feature/leds/neopixel.cpp
+++ b/Marlin/src/feature/leds/neopixel.cpp
@@ -42,15 +42,6 @@ Adafruit_NeoPixel Marlin_NeoPixel::adaneo1(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIX
   #endif
 ;
 
-#ifdef NEOPIXEL_BKGD_LED_INDEX
-
-  void Marlin_NeoPixel::set_color_background() {
-    uint8_t background_color[4] = NEOPIXEL_BKGD_COLOR;
-    set_pixel_color(NEOPIXEL_BKGD_LED_INDEX, adaneo1.Color(background_color[0], background_color[1], background_color[2], background_color[3]));
-  }
-
-#endif
-
 void Marlin_NeoPixel::set_color(const uint32_t color) {
   for (uint16_t i = 0; i < pixels(); ++i) {
     #ifdef NEOPIXEL_BKGD_LED_INDEX
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 656b7e5f9035..ca6c248e0826 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -43,15 +43,33 @@
  *   M150 W          ; Turn LED white using a white LED
  *   M150 P127       ; Set LED 50% brightness
  *   M150 P          ; Set LED full brightness
+ *   M150 S0         ; Work with pixel #0 only 
+ *   M150 S          ; Work with all pixels (including 0)
  */
 void GcodeSuite::M150() {
-  leds.set_color(MakeLEDColor(
+  const LEDColor c((MakeLEDColor(
     parser.seen('R') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
     parser.seen('U') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
     parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
     parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
     parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : neo.brightness()
-  ));
+  )));
+  if(parser.seen('S')) {
+    uint8_t idx = parser.byteval('S', 0xFF);
+    if(idx < NEOPIXEL_PIXELS || idx == 0xFF) {
+      uint8_t real_idx = (idx == 0xFF) ? 0 : idx;
+      if(real_idx == 0) LEDLights::defaultLEDColor = c;
+      neo.set_pixel_color(real_idx, neo.Color(c.r, c.g, c.b, c.w));
+      neo.set_brightness(c.i);
+      neo.show();
+      if(idx != 0xFF) return;
+    } else {
+      SERIAL_ECHOLNPAIR("pixel index out of range: ", idx);
+      SERIAL_EOL();
+      return;
+    }
+  }
+  leds.set_color(c);
 }
 
 #endif // HAS_COLOR_LEDS
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index b9e75422bcf5..225cb54b30d7 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -39,14 +39,14 @@
       STATIC_ITEM(MSG_LED_PRESETS, SS_CENTER|SS_INVERT);
     #endif
     BACK_ITEM(MSG_LED_CONTROL);
-    ACTION_ITEM(MSG_SET_LEDS_WHITE, leds.set_white);
-    ACTION_ITEM(MSG_SET_LEDS_RED, leds.set_red);
-    ACTION_ITEM(MSG_SET_LEDS_ORANGE, leds.set_orange);
-    ACTION_ITEM(MSG_SET_LEDS_YELLOW,leds.set_yellow);
-    ACTION_ITEM(MSG_SET_LEDS_GREEN, leds.set_green);
-    ACTION_ITEM(MSG_SET_LEDS_BLUE, leds.set_blue);
-    ACTION_ITEM(MSG_SET_LEDS_INDIGO, leds.set_indigo);
-    ACTION_ITEM(MSG_SET_LEDS_VIOLET, leds.set_violet);
+    ACTION_ITEM(MSG_SET_LEDS_WHITE, leds.set_white_all);
+    ACTION_ITEM(MSG_SET_LEDS_RED, leds.set_red_all);
+    ACTION_ITEM(MSG_SET_LEDS_ORANGE, leds.set_orange_all);
+    ACTION_ITEM(MSG_SET_LEDS_YELLOW,leds.set_yellow_all);
+    ACTION_ITEM(MSG_SET_LEDS_GREEN, leds.set_green_all);
+    ACTION_ITEM(MSG_SET_LEDS_BLUE, leds.set_blue_all);
+    ACTION_ITEM(MSG_SET_LEDS_INDIGO, leds.set_indigo_all);
+    ACTION_ITEM(MSG_SET_LEDS_VIOLET, leds.set_violet_all);
     END_MENU();
   }
 
@@ -55,13 +55,13 @@
 void menu_led_custom() {
   START_MENU();
   BACK_ITEM(MSG_LED_CONTROL);
-  EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds.color.r, 0, 255, leds.update, true);
-  EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds.color.g, 0, 255, leds.update, true);
-  EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds.color.b, 0, 255, leds.update, true);
+  EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds.color.r, 0, 255, leds.update_all, true);
+  EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds.color.g, 0, 255, leds.update_all, true);
+  EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds.color.b, 0, 255, leds.update_all, true);
   #if EITHER(RGBW_LED, NEOPIXEL_LED)
-    EDIT_ITEM(uint8, MSG_INTENSITY_W, &leds.color.w, 0, 255, leds.update, true);
+    EDIT_ITEM(uint8, MSG_INTENSITY_W, &leds.color.w, 0, 255, leds.update_all, true);
     #if ENABLED(NEOPIXEL_LED)
-      EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
+      EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update_all, true);
     #endif
   #endif
   END_MENU();
@@ -72,7 +72,7 @@ void menu_led() {
   BACK_ITEM(MSG_MAIN);
   bool led_on = leds.lights_on;
   EDIT_ITEM(bool, MSG_LEDS, &led_on, leds.toggle);
-  ACTION_ITEM(MSG_SET_LEDS_DEFAULT, leds.set_default);
+  ACTION_ITEM(MSG_SET_LEDS_DEFAULT, leds.set_default_all);
   #if ENABLED(LED_COLOR_PRESETS)
     SUBMENU(MSG_LED_PRESETS, menu_led_presets);
   #endif
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 0750e8a6a53e..b31db5a992bb 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -634,13 +634,13 @@ void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
   #endif
 
   // RED ALERT. RED ALERT.
-  #ifdef LED_BACKLIGHT_TIMEOUT
+  //#ifdef LED_BACKLIGHT_TIMEOUT
     leds.set_color(LEDColorRed());
     #ifdef NEOPIXEL_BKGD_LED_INDEX
-      neo.set_pixel_color(NEOPIXEL_BKGD_LED_INDEX, 255, 0, 0, 0);
+      neo.set_pixel_color(NEOPIXEL_BKGD_LED_INDEX, 0xFF0000);
       neo.show();
     #endif
-  #endif
+  //#endif
 
   draw_kill_screen();
 }
@@ -795,8 +795,25 @@ void MarlinUI::update() {
       return;
     }
   #endif
-  static millis_t next_lcd_update_ms;
+  static millis_t next_lcd_update_ms, last_enc_update_ms, last_activity_ms;
   millis_t ms = millis();
+  #if NEOPIXEL_PIXELS == 4 //т.е. возможно полное выключение экрана
+    if(!LEDLights::lights_on && int32_t(ms - last_enc_update_ms) >= 3000) { //в таком состоянии помаргиваем кнопкой
+      static bool blink = false;
+      uint32_t c = neo.Color(LEDLights::defaultLEDColor.r, LEDLights::defaultLEDColor.g, LEDLights::defaultLEDColor.b, LEDLights::defaultLEDColor.w);
+      neo.set_pixel_color(2, blink ? 0 : c);
+      neo.set_brightness(LEDLights::defaultLEDColor.i);
+      neo.show();
+      blink = !blink;
+      last_enc_update_ms = ms;
+    }
+    if(last_activity_ms == 0 || encoderDiff || lcd_clicked || card.isPrinting()) {
+      last_activity_ms = ms;
+    }
+    if(LEDLights::lights_on && ELAPSED(ms, last_activity_ms + NEOPIXEL_SAVING_TIMEOUT * 1000)) {
+      LEDLights::toggle();
+    }
+  #endif
 
   #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
     static millis_t return_to_status_ms = 0;
@@ -999,6 +1016,8 @@ void MarlinUI::update() {
           encoderPosition += (encoderDiff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
           encoderDiff = 0;
         }
+        if((lcd_clicked || abs_diff) && !LEDLights::lights_on) //wake up display
+          LEDLights::toggle();
 
         RESET_STATUS_TIMEOUT();
 
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 69cecdbb3096..bd2fff3b4d32 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -1132,13 +1132,12 @@ void MarlinSettings::postprocess() {
       #endif
       #ifdef NEOPIXEL_EEPROM_STORE_HACK //good bye E4 & E5
         uint8_t *e4 = (uint8_t *)(&tmc_hybrid_threshold.E4);
-        e4[0] = LEDLights::color.r;
-        e4[1] = LEDLights::color.g;
-        e4[2] = LEDLights::color.b;
-        e4[3] = LEDLights::color.w;
-        e4[4] = LEDLights::color.i;
+        e4[0] = LEDLights::defaultLEDColor.r;
+        e4[1] = LEDLights::defaultLEDColor.g;
+        e4[2] = LEDLights::defaultLEDColor.b;
+        e4[3] = LEDLights::defaultLEDColor.w;
+        e4[4] = LEDLights::defaultLEDColor.i;
         e4[5] = ~(e4[0] ^ e4[1] ^ e4[2] ^ e4[3] ^ e4[4]);
-        LEDLights::defaultLEDColor = LEDLights::color;
       #endif
       EEPROM_WRITE(tmc_hybrid_threshold);
     }

From 9384f737ddeefafb86ff9c8cffd93c4247446b86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Thu, 9 Apr 2020 19:02:23 +0500
Subject: [PATCH 549/565] fix #33

---
 Marlin/src/lcd/ultralcd.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index b31db5a992bb..301f2768a5e2 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -795,8 +795,9 @@ void MarlinUI::update() {
       return;
     }
   #endif
-  static millis_t next_lcd_update_ms, last_enc_update_ms, last_activity_ms;
+  static millis_t next_lcd_update_ms = 0, last_enc_update_ms = 0;
   millis_t ms = millis();
+  static millis_t last_activity_ms = ms;
   #if NEOPIXEL_PIXELS == 4 //т.е. возможно полное выключение экрана
     if(!LEDLights::lights_on && int32_t(ms - last_enc_update_ms) >= 3000) { //в таком состоянии помаргиваем кнопкой
       static bool blink = false;
@@ -807,12 +808,14 @@ void MarlinUI::update() {
       blink = !blink;
       last_enc_update_ms = ms;
     }
-    if(last_activity_ms == 0 || encoderDiff || lcd_clicked || card.isPrinting()) {
-      last_activity_ms = ms;
-    }
-    if(LEDLights::lights_on && ELAPSED(ms, last_activity_ms + NEOPIXEL_SAVING_TIMEOUT * 1000)) {
-      LEDLights::toggle();
-    }
+  #endif
+  #if defined(NEOPIXEL_SAVING_TIMEOUT)
+  if(card.isPrinting()) {
+    last_activity_ms = ms;
+  }
+  if(LEDLights::lights_on && int32_t(ms - last_activity_ms) >= NEOPIXEL_SAVING_TIMEOUT * 1000) {
+    LEDLights::toggle();
+  }
   #endif
 
   #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
@@ -977,6 +980,11 @@ void MarlinUI::update() {
       const float abs_diff = ABS(encoderDiff);
       const bool encoderPastThreshold = (abs_diff >= (ENCODER_PULSES_PER_STEP));
       if (encoderPastThreshold || lcd_clicked) {
+        #if defined(NEOPIXEL_SAVING_TIMEOUT)
+        if(encoderDiff || lcd_clicked) {
+          last_activity_ms = ms;
+        }
+        #endif
         if (encoderPastThreshold) {
 
           #if HAS_LCD_MENU && ENABLED(ENCODER_RATE_MULTIPLIER)

From fff8bd1fbfc183836a3f31d077a84a23a6fce399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <build@vmpsoft.com>
Date: Sun, 12 Apr 2020 18:10:53 +0500
Subject: [PATCH 550/565] fix typo in #34

---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index d3637042e6e1..7a380ce552d2 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -670,7 +670,7 @@ void MarlinUI::draw_status_screen() {
     //
     if(PAGE_CONTAINS(42, 51)) {
     #ifndef DOGM_SD_PRESENT
-    if (card.isFileOpen() &&) {
+    if (card.isFileOpen()) {
       // Upper box
       u8g.drawBox(42, 42, 8, 7);     // 42-48 (or 41-47)
       // Right edge

From b8c726e275837ab0a04e917c9661d3bfd34b823d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Sat, 18 Apr 2020 15:16:47 +0500
Subject: [PATCH 551/565] =?UTF-8?q?=D1=83=D1=82=D0=BE=D1=87=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=80=D0=B0=D0=BD=D0=B6=D0=B5=D0=B2=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D0=B8=20=D0=B6=D0=B5=D0=BB=D1=82=D1=8B=D0=B9=20=D1=86=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B0=20=D0=BF=D0=BE=D0=B4=20=D1=81=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B4=D0=B8=D1=81=D0=BF=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/leds.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index be6ed28b25c5..1db019f4009d 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -128,8 +128,8 @@ typedef struct LEDColor {
 #define LEDColorOff()             LEDColor(  0,   0,   0)
 #define LEDColorRed()             LEDColor(255,   0,   0)
 #if ENABLED(LED_COLORS_REDUCE_GREEN)
-  #define LEDColorOrange()        LEDColor(255, 128,   0)
-  #define LEDColorYellow()        LEDColor(255,  75,   0)
+  #define LEDColorOrange()        LEDColor(255,  75,   0)
+  #define LEDColorYellow()        LEDColor(255, 128,   0)
 #else
   #define LEDColorOrange()        LEDColor(255,  80,   0)
   #define LEDColorYellow()        LEDColor(255, 255,   0)

From c32f37fb983e292bd53631c6a46cf3393d63b8ec Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 20 Apr 2020 19:13:35 +0300
Subject: [PATCH 552/565] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B8=D0=BB=20TMC2208=20UART=20=D0=BD=D0=B0=20256?=
 =?UTF-8?q?=20=D1=88=D0=B0=D0=B3=D0=BE=D0=B2=20=D0=B2=D0=BC=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=2016?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 84154667dd4b..57e182837b64 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -775,7 +775,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 409.87 } //BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 1280, 1280, 1600, 409.87 } //1280 по XY для uart2208 с stepp=256 | BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
 
 /**
  * Default Max Feed Rate (mm/s)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 477a16196164..7ff4aaa69f2d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2072,7 +2072,7 @@
   #if AXIS_IS_TMC(X)
     #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
-    #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
+    #define X_MICROSTEPS     256    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
     #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
     #define X_CHAIN_POS      -1    // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ...
   #endif
@@ -2088,7 +2088,7 @@
   #if AXIS_IS_TMC(Y)
     #define Y_CURRENT       800
     #define Y_CURRENT_HOME  Y_CURRENT
-    #define Y_MICROSTEPS     16
+    #define Y_MICROSTEPS     256
     #define Y_RSENSE          0.11
     #define Y_CHAIN_POS      -1
   #endif

From 4b20493a60b0a45092d2ab86e5869c1965aa7d79 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Mon, 20 Apr 2020 21:48:21 +0300
Subject: [PATCH 553/565] =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=86=D0=B8=D1=8E=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=81?=
 =?UTF-8?q?=D0=B5=D1=85,=20=D0=BF=D1=80=D0=B8=D0=BD=D1=83=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=2064=20=D0=BC=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=80=D0=BE=D1=88=D0=B0=D0=B3=D0=B0=20=D0=BD=D0=B0=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=81=D1=82=D1=80=D1=83=D0=B4=D0=B5=D1=80,=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=81=D1=87=D0=B8=D1=82=D0=B0=D0=BB=20=D1=88?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=BC=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 57e182837b64..be79a639d998 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -775,7 +775,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 1280, 1280, 1600, 409.87 } //1280 по XY для uart2208 с stepp=256 | BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 1280, 1280, 1600, 1639.48 } //1280 по XY для uart2208 с step=256 | BMG EXTRUDER 409.87 откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
 
 /**
  * Default Max Feed Rate (mm/s)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7ff4aaa69f2d..c30731bdc78e 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2067,7 +2067,7 @@
 #if HAS_TRINAMIC_CONFIG
 
   #define HOLD_MULTIPLIER    0.6  // Scales down the holding current from run current Множитель тока в режиме удержания ШД
-  #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
+  #define INTERPOLATE       false  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
     #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
@@ -2135,7 +2135,7 @@
 
   #if AXIS_IS_TMC(E0)
     #define E0_CURRENT      600
-    #define E0_MICROSTEPS    16
+    #define E0_MICROSTEPS    64
     #define E0_RSENSE         0.11
     #define E0_CHAIN_POS     -1
   #endif

From 459c18304ea08760f06e019b0bb42bcae2d86342 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 21 Apr 2020 00:32:00 +0300
Subject: [PATCH 554/565] =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83?=
 =?UTF-8?q?=D1=82=20=D0=B4=D0=B8=D1=81=D0=BF=D0=BB=D0=B5=D1=8F=20=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B4=D0=BE=2015=20=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=83=D1=82,=20=D0=BE=D1=82=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B=D0=B2=D0=B0=D0=BB=20=D0=BD=D0=B5=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=BD=D0=B0=D0=B4=D0=BE=20?=
 =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B5=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index be79a639d998..eafae7fef433 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2289,9 +2289,9 @@
   // последний светодиод №3: если не задействовать, то при выключении оставляет красную подсветку
   // если задействовать, то можно его яркостью управлять другими, в т.ч. погасить весь экран (управлять его цветом пока не получается)
   #define NEOPIXEL_PIXELS 4
-  #define NEOPIXEL_SAVING_TIMEOUT 120 // seconds
+  #define NEOPIXEL_SAVING_TIMEOUT 900 // seconds 15 минут
   //#define NEOPIXEL_IS_SEQUENTIAL   // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
-  #define NEOPIXEL_BRIGHTNESS 127  // Initial brightness (0-255)
+  #define NEOPIXEL_BRIGHTNESS 150  // Initial brightness (0-255)
   //#define NEOPIXEL_STARTUP_TEST  // Cycle through colors at startup
 
   // Use a single Neopixel LED for static (background) lighting

From 731a58a43f6ae2884e2aa47a4b490badd1270e31 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 21 Apr 2020 00:38:52 +0300
Subject: [PATCH 555/565] =?UTF-8?q?Revert=20"=D0=9F=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=D0=BB=20TMC2208=20UART=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20256=20=D1=88=D0=B0=D0=B3=D0=BE=D0=B2=20=D0=B2=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=2016"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c32f37fb983e292bd53631c6a46cf3393d63b8ec.
---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index eafae7fef433..4a8667e0f7a0 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -775,7 +775,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 1280, 1280, 1600, 1639.48 } //1280 по XY для uart2208 с step=256 | BMG EXTRUDER 409.87 откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 409.87 } //BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
 
 /**
  * Default Max Feed Rate (mm/s)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c30731bdc78e..f13a983f1afb 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2072,7 +2072,7 @@
   #if AXIS_IS_TMC(X)
     #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
-    #define X_MICROSTEPS     256    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
+    #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
     #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
     #define X_CHAIN_POS      -1    // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ...
   #endif
@@ -2088,7 +2088,7 @@
   #if AXIS_IS_TMC(Y)
     #define Y_CURRENT       800
     #define Y_CURRENT_HOME  Y_CURRENT
-    #define Y_MICROSTEPS     256
+    #define Y_MICROSTEPS     16
     #define Y_RSENSE          0.11
     #define Y_CHAIN_POS      -1
   #endif

From 7a4e90505f4113786ee3f3ab2aa687fcbb9a020d Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 21 Apr 2020 00:43:03 +0300
Subject: [PATCH 556/565] =?UTF-8?q?Revert=20"=D0=BE=D1=82=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B8=D0=BB=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8F=D1=86=D0=B8=D1=8E=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85,=20=D0=BF=D1=80=D0=B8=D0=BD=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=2064=20=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=80=D0=BE=D1=88=D0=B0=D0=B3=D0=B0=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=8D=D0=BA=D1=81=D1=82=D1=80=D1=83=D0=B4=D0=B5=D1=80,=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D1=87=D0=B8=D1=82=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B3=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=BC?=
 =?UTF-8?q?=D0=B3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4b20493a60b0a45092d2ab86e5869c1965aa7d79.
---
 Marlin/Configuration.h     | 2 +-
 Marlin/Configuration_adv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 4a8667e0f7a0..2e0980f5c8e3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -775,7 +775,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 409.87 } //BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 1280, 1280, 1600, 409.87 } //1280 по XY для uart2208 с stepp=256 | BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
 
 /**
  * Default Max Feed Rate (mm/s)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f13a983f1afb..477a16196164 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2067,7 +2067,7 @@
 #if HAS_TRINAMIC_CONFIG
 
   #define HOLD_MULTIPLIER    0.6  // Scales down the holding current from run current Множитель тока в режиме удержания ШД
-  #define INTERPOLATE       false  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
+  #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
     #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
@@ -2135,7 +2135,7 @@
 
   #if AXIS_IS_TMC(E0)
     #define E0_CURRENT      600
-    #define E0_MICROSTEPS    64
+    #define E0_MICROSTEPS    16
     #define E0_RSENSE         0.11
     #define E0_CHAIN_POS     -1
   #endif

From e67753335736c9aa4d20732813e00e5975eb4d7b Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 21 Apr 2020 00:48:41 +0300
Subject: [PATCH 557/565] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20tmc=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D0=B1=D1=8B=D0=BB=D0=BE=20=D0=B4=D0=BE=20?=
 =?UTF-8?q?=D1=8D=D0=BA=D1=81=D0=BF=D0=B5=D1=80=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D1=81=20=D0=BC=D0=B8=D0=BA=D1=80=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B3=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 2e0980f5c8e3..4a8667e0f7a0 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -775,7 +775,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 148.50 } //default Ulti Extruder
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 1280, 1280, 1600, 409.87 } //1280 по XY для uart2208 с stepp=256 | BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 409.87 } //BMG EXTRUDER откалибровано  формула=(значениевпрошивке * сколькодолжнобыловыйти) / скольковышло
 
 /**
  * Default Max Feed Rate (mm/s)

From 2346714483c0b4eb9f0ae5d1929187c6d1b02eb9 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 21 Apr 2020 00:51:28 +0300
Subject: [PATCH 558/565] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=B4=20=D0=B0=D0=BA=D1=82=D1=83?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20pid=20e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 4a8667e0f7a0..3ec2a4802e24 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -515,10 +515,10 @@
  #define DEFAULT_Ki 3.12
  #define DEFAULT_Kd 56.17
 #else
-  //M303 E0 S180 C8
-  #define DEFAULT_Kp 14.42
-  #define DEFAULT_Ki 0.84
-  #define DEFAULT_Kd 61.55
+  //M303 E0 S225 C8
+  #define DEFAULT_Kp 23.00
+  #define DEFAULT_Ki 1.62
+  #define DEFAULT_Kd 81.86
 #endif
 
   // MakerGear

From 5174ae51c17e208c691527754266a1c7af268dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B5=D1=80=D1=88=D0=B8?=
 =?UTF-8?q?=D0=BD?= <ursoft2004@mail.ru>
Date: Tue, 21 Apr 2020 02:55:25 +0500
Subject: [PATCH 559/565] fix #46

---
 Marlin/src/lcd/ultralcd.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 301f2768a5e2..9317099c7a39 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -810,11 +810,16 @@ void MarlinUI::update() {
     }
   #endif
   #if defined(NEOPIXEL_SAVING_TIMEOUT)
-  if(card.isPrinting()) {
+  const bool hasActivity = card.isPrinting()
+     || Temperature::degBed() > 50 || Temperature::degTargetBed() != 0
+     || Temperature::degHotend(0) > 50 || Temperature::degTargetHotend(0) != 0;
+  if(hasActivity) {
     last_activity_ms = ms;
   }
   if(LEDLights::lights_on && int32_t(ms - last_activity_ms) >= NEOPIXEL_SAVING_TIMEOUT * 1000) {
     LEDLights::toggle();
+  } else if(!LEDLights::lights_on && hasActivity) {
+    LEDLights::toggle();
   }
   #endif
 

From cdcdf769df6a854934ff9f222fa54f66b506f4fb Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 21 Apr 2020 01:25:03 +0300
Subject: [PATCH 560/565] =?UTF-8?q?10=20=D0=BC=D0=B8=D0=BD=D1=83=D1=82=20?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82=20=D0=B4=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B5=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 3ec2a4802e24..b6b2dee269d6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2289,7 +2289,7 @@
   // последний светодиод №3: если не задействовать, то при выключении оставляет красную подсветку
   // если задействовать, то можно его яркостью управлять другими, в т.ч. погасить весь экран (управлять его цветом пока не получается)
   #define NEOPIXEL_PIXELS 4
-  #define NEOPIXEL_SAVING_TIMEOUT 900 // seconds 15 минут
+  #define NEOPIXEL_SAVING_TIMEOUT 600 // seconds 10 минут
   //#define NEOPIXEL_IS_SEQUENTIAL   // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
   #define NEOPIXEL_BRIGHTNESS 150  // Initial brightness (0-255)
   //#define NEOPIXEL_STARTUP_TEST  // Cycle through colors at startup

From 841247218651c89116e74269ecd806f9921cdd34 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Thu, 23 Apr 2020 17:12:48 +0300
Subject: [PATCH 561/565] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20la=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D0=B8=D0=B7=D0=B8=D0=BB=20=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA=D1=83=D0=BB=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D1=85=D0=BE=D1=82=D0=B5=D0=BD=D0=B4?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 477a16196164..572ea9cdf636 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -432,7 +432,7 @@
 #if (GITHUB_USER==URSOFT)
  #define EXTRUDER_AUTO_FAN_SPEED 100
 #else
- #define EXTRUDER_AUTO_FAN_SPEED 200   // 255 == full speed
+ #define EXTRUDER_AUTO_FAN_SPEED 100   // 255 == full speed было 200
 #endif
 #define EXTRUDER_AUTO_FAN_SPEED_CONFIGURABLE
 //#define CHAMBER_AUTO_FAN_TEMPERATURE 30
@@ -1540,7 +1540,7 @@
  * See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
  * Mention @Sebastianv650 on GitHub to alert the author of any issues.
  */
-#define LIN_ADVANCE
+//#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
   //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
   #define LIN_ADVANCE_K 0       // Unit: mm compression per 1mm/s extruder speed

From fa0a381cf0187bc5f2f3f7ebdaf44a0924fe3923 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Tue, 28 Apr 2020 14:38:25 +0300
Subject: [PATCH 562/565] =?UTF-8?q?=D0=B4=D0=B2=D0=B8=D0=B3=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B8=20900=20=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 572ea9cdf636..27787e803916 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -432,7 +432,7 @@
 #if (GITHUB_USER==URSOFT)
  #define EXTRUDER_AUTO_FAN_SPEED 100
 #else
- #define EXTRUDER_AUTO_FAN_SPEED 100   // 255 == full speed было 200
+ #define EXTRUDER_AUTO_FAN_SPEED 120   // 255 == full speed было 200
 #endif
 #define EXTRUDER_AUTO_FAN_SPEED_CONFIGURABLE
 //#define CHAMBER_AUTO_FAN_TEMPERATURE 30
@@ -1900,7 +1900,7 @@
                                                   // This short retract is done immediately, before parking the nozzle.
   #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     60  // (mm/s) Unload filament feedrate. This can be pretty fast.
   #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_UNLOAD_LENGTH      790  // (mm) The length of filament for a complete unload.
+  #define FILAMENT_CHANGE_UNLOAD_LENGTH      650  // (mm) The length of filament for a complete unload.
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
                                                   //   Set to 0 for manual unloading.
@@ -1909,7 +1909,7 @@
                                                   // 0 to disable start loading and skip to fast load only
   #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  60  // (mm/s) Load filament feedrate. This can be pretty fast.
   #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   790  // (mm) Load length of filament, from extruder gear to nozzle.
+  #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   650  // (mm) Load length of filament, from extruder gear to nozzle.
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
   //#define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted.
@@ -2070,7 +2070,7 @@
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256 Включает или выключает интерполяцию по ВСЕМ осям
 
   #if AXIS_IS_TMC(X)
-    #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
+    #define X_CURRENT       900        // (mA) RMS current. Multiply by 1.414 for peak current. сюда пишем наш ток Irms, который мы посчитали ранее
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
     #define X_MICROSTEPS     16    // 0..256 количество микрошагов, поддерживается нативно до 256, не забываем изменить число шагов на мм
     #define X_RSENSE          0.11  // Если на Ваших драйверах резистор Rsense отличается от стандартного R110, сюда вписываем номинал
@@ -2086,7 +2086,7 @@
   #endif
 
   #if AXIS_IS_TMC(Y)
-    #define Y_CURRENT       800
+    #define Y_CURRENT       900
     #define Y_CURRENT_HOME  Y_CURRENT
     #define Y_MICROSTEPS     16
     #define Y_RSENSE          0.11

From 7202b530997883be845a704ba12bea548f15120b Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sat, 9 May 2020 22:40:02 +0300
Subject: [PATCH 563/565] Update Configuration_adv.h

---
 Marlin/Configuration_adv.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 27787e803916..9c72397578d6 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -432,7 +432,11 @@
 #if (GITHUB_USER==URSOFT)
  #define EXTRUDER_AUTO_FAN_SPEED 100
 #else
+<<<<<<< HEAD
  #define EXTRUDER_AUTO_FAN_SPEED 120   // 255 == full speed было 200
+=======
+ #define EXTRUDER_AUTO_FAN_SPEED 200   // 255 == full speed
+>>>>>>> parent of 841247218... убрал la понизил скорость кулера на хотенде
 #endif
 #define EXTRUDER_AUTO_FAN_SPEED_CONFIGURABLE
 //#define CHAMBER_AUTO_FAN_TEMPERATURE 30
@@ -1540,7 +1544,7 @@
  * See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
  * Mention @Sebastianv650 on GitHub to alert the author of any issues.
  */
-//#define LIN_ADVANCE
+#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
   //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
   #define LIN_ADVANCE_K 0       // Unit: mm compression per 1mm/s extruder speed

From a95b5db3511abf91ce2ab65a9984ca33cfddc8d9 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sat, 9 May 2020 22:47:31 +0300
Subject: [PATCH 564/565] update

---
 Marlin/Configuration_adv.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9c72397578d6..064f4912e83f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -432,11 +432,7 @@
 #if (GITHUB_USER==URSOFT)
  #define EXTRUDER_AUTO_FAN_SPEED 100
 #else
-<<<<<<< HEAD
  #define EXTRUDER_AUTO_FAN_SPEED 120   // 255 == full speed было 200
-=======
- #define EXTRUDER_AUTO_FAN_SPEED 200   // 255 == full speed
->>>>>>> parent of 841247218... убрал la понизил скорость кулера на хотенде
 #endif
 #define EXTRUDER_AUTO_FAN_SPEED_CONFIGURABLE
 //#define CHAMBER_AUTO_FAN_TEMPERATURE 30

From 8c56c8addbdd2323bfd658cd4a9c84106af3fe44 Mon Sep 17 00:00:00 2001
From: respect <s.savickiy@gmail.com>
Date: Sat, 9 May 2020 23:08:31 +0300
Subject: [PATCH 565/565] Revert "Merge branch
 'bugfix-2.0.x-UltiSteel-ssavickiy' into ssavickiy"

This reverts commit bd0938a34f6f0c7289f137b994405f3d45bce7be, reversing
changes made to a95b5db3511abf91ce2ab65a9984ca33cfddc8d9.
---
 Marlin/Configuration_adv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 900caa7ff573..064f4912e83f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2102,7 +2102,7 @@
   #endif
 
   #if AXIS_IS_TMC(Z)
-    #define Z_CURRENT       550
+    #define Z_CURRENT       800
     #define Z_CURRENT_HOME  Z_CURRENT
     #define Z_MICROSTEPS     16
     #define Z_RSENSE          0.11
@@ -2141,7 +2141,7 @@
   #endif
 
   #if AXIS_IS_TMC(E1)
-    #define E1_CURRENT      550
+    #define E1_CURRENT      800
     #define E1_MICROSTEPS    16
     #define E1_RSENSE         0.11
     #define E1_CHAIN_POS     -1